Merge branch 'Development' into SamaelGray-ExplosionAP

CombatExtended-Continued · Jun 4, 2024 · 5e37bdb · 5e37bdb
2 parents 781e402 + 0eb87b5
commit 5e37bdb
Show file tree

Hide file tree

Showing 570 changed files with 10,974 additions and 1,670 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -9,7 +9,7 @@
 	</supportedVersions>
 	<packageId>CETeam.CombatExtended</packageId>
 	<description>Version: 15.6.0.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
-	<modIconPath>UI/Icons/CE_ModIcon_JustHat</modIconPath>
+	<modIconPath IgnoreIfNoMatchingField="True">UI/Icons/CE_ModIcon_JustHat</modIconPath>
 	<modDependencies>
 		<li>
 			<packageId>brrainz.harmony</packageId>
@@ -48,6 +48,8 @@
 		<li>miho.fortifiedoutremer</li>
 		<li>co.uk.epicguru.whatsthatmod</li>
 		<li>sarg.alphagenes</li>
+		<li>OskarPotocki.VFE.Classical</li>	
+		<li>OskarPotocki.VFE.Tribals</li>
 	</loadBefore>
 	<loadAfter>
 		<li>brrainz.harmony</li>
@@ -59,7 +61,6 @@
 		<li>HC.GiantRace</li>
 		<li>neronix17.fr.compilation</li>
 		<li>VanillaExpanded.VWEFT</li>
-		<li>oskarpotocki.vfe.mechanoid</li>
 		<li>hlx.ReinforcedMechanoids2</li>
 		<li>oskarpotocki.vanillafactionsexpanded.medievalmodule</li>
 		<li>vanillaexpanded.vwe</li>
@@ -84,10 +85,10 @@
 		<li>Killathon.MechHumanlikes.MechanicalBiomimetics</li>
 		<li>botchjob.divineorder</li>
 		<li>OskarPotocki.VFE.Deserters</li>
-		<li>OskarPotocki.VFE.Tribals</li>
 		<li>Sarg.AlphaMemes</li>
 		<li>K4G.Sultanate</li>
 		<li>Argon.VMEu</li>
+		<li>Bonible.rimsenalfactions</li>
 	</loadAfter>
 
 </ModMetaData>
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>