Merge branch 'Development' into pr/masakitenchi/3132

CombatExtended-Continued · Jun 4, 2024 · d1ff8a8 · d1ff8a8
2 parents 3049dd0 + 9898616
commit d1ff8a8
Show file tree

Hide file tree

Showing 110 changed files with 2,363 additions and 1,514 deletions.
diff --git a/Defs/Ammo/AmmoBases.xml b/Defs/Ammo/AmmoBases.xml
@@ -129,13 +129,27 @@
 		</skillRequirements>
 	</RecipeDef>
 
+	<RecipeDef Name="ArtilleryAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>Mortars</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>4</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
 	<RecipeDef Name="LauncherAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
 		<researchPrerequisite>CE_Launchers</researchPrerequisite>
 		<skillRequirements>
 			<Crafting>4</Crafting>
 		</skillRequirements>
 	</RecipeDef>
 
+	<RecipeDef Name="CannonAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>4</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
 	<RecipeDef Name="ChargeAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
 		<researchPrerequisite>ChargedShot</researchPrerequisite>
 		<skillRequirements>

diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml
@@ -27,13 +27,15 @@
 		<label>armor-piercing discarding sabot</label>
 		<labelShort>Sabot</labelShort>
 		<description>Uses a discarding sabot to fire an undersized projectile at higher muzzle velocities, greatly improving armor penetration.</description>
+		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
 	<CombatExtended.AmmoCategoryDef>
 		<defName>IncendiaryAP</defName>
 		<label>armor-piercing incendiary</label>
 		<labelShort>AP-I</labelShort>
 		<description>Filled with an incendiary compound that ignites on impact, doing additional damage and increasing armor penetration.</description>
+		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
 	<CombatExtended.AmmoCategoryDef>
@@ -44,6 +46,14 @@
 		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
+	<CombatExtended.AmmoCategoryDef>
+		<defName>CompositeRigidAP</defName>
+		<label>armor-piercing composite-rigid</label>
+		<labelShort>APCR</labelShort>
+		<description>Featuring a core of high-density hard material surrounded by a full-bore shell of a lighter material to reach higher muzzle velocities, greatly increasing armor penetration.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
 	<CombatExtended.AmmoCategoryDef>
 		<defName>TranqNonLethal</defName>
 		<label>tranquilizer</label>