Merge pull request #3541 from CombatExtended-Continued/generic-mortar…

…-shells Generic mortar shells
CombatExtended-Continued · Nov 21, 2024 · 20c146b · 20c146b
2 parents 236049c + 2168880
commit 20c146b
Show file tree

Hide file tree

Showing 8 changed files with 975 additions and 11 deletions.
diff --git a/Defs/Ammo/Generic/Shell_Mortar.xml b/Defs/Ammo/Generic/Shell_Mortar.xml
diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml
@@ -21,6 +21,7 @@
 			<Ammo_105mmHowitzerShell_Smoke>Bullet_105mmHowitzerShell_Smoke</Ammo_105mmHowitzerShell_Smoke>
 		</ammoTypes>
 		<isMortarAmmoSet>true</isMortarAmmoSet>
+		<similarTo>AmmoSet_ArtilleryShell</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
@@ -34,6 +35,7 @@
 			<Ammo_105mmHowitzerShell_Smoke>Bullet_105mmHowitzerShell_Smoke_directfire</Ammo_105mmHowitzerShell_Smoke>
 		</ammoTypes>
 		<isMortarAmmoSet>true</isMortarAmmoSet>
+		<similarTo>AmmoSet_ArtilleryShell</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<!-- ==================== Ammo ========================== -->

diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml
@@ -21,6 +21,7 @@
 			<Ammo_155mmHowitzerShell_Smoke>Bullet_155mmHowitzerShell_Smoke</Ammo_155mmHowitzerShell_Smoke>
 		</ammoTypes>
 		<isMortarAmmoSet>true</isMortarAmmoSet>
+		<similarTo>AmmoSet_ArtilleryShell</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<CombatExtended.AmmoSetDef>
@@ -383,7 +384,7 @@
 	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_HE</defName>
 		<label>make 155mm (HE) howitzer shells x1</label>
-		<description>Craft 1 155mm (HE) howitzer shells.</description>
+		<description>Craft a 155mm (HE) howitzer shell.</description>
 		<jobString>Making 155mm (HE) howitzer shells.</jobString>
 		<researchPrerequisite Inherit="False" />
 		<researchPrerequisites>
@@ -432,7 +433,7 @@
 	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_HE_HFuzed</defName>
 		<label>make 155mm (Airburst) howitzer shells x1</label>
-		<description>Craft 1 155mm (Airburst) howitzer shells.</description>
+		<description>Craft a 155mm (Airburst) howitzer shell.</description>
 		<jobString>Making 155mm (Airburst) howitzer shells.</jobString>
 		<researchPrerequisite Inherit="False" />
 		<researchPrerequisites>
@@ -484,7 +485,7 @@
 	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_Incendiary</defName>
 		<label>make 155mm (Incendiary) howitzer shells x1</label>
-		<description>Craft 155mm (Incendiary) Howitzer shell.</description>
+		<description>Craft a 155mm (Incendiary) Howitzer shell.</description>
 		<jobString>Making 155mm (Incendiary) Howitzer shell.</jobString>
 		<researchPrerequisite Inherit="False" />
 		<researchPrerequisites>
@@ -533,8 +534,8 @@
 	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_EMP</defName>
 		<label>make 155mm (EMP) howitzer shells x1</label>
-		<description>Craft 155mm (EMP) Howitzer shell.</description>
-		<jobString>Making 155mm (EMP) Howitzer shell.</jobString>
+		<description>Craft a 155mm (EMP) Howitzer shell.</description>
+		<jobString>Making 155mm (EMP) Howitzer shells.</jobString>
 		<researchPrerequisite Inherit="False" />
 		<researchPrerequisites>
 			<li>Mortars</li>

diff --git a/Defs/Ammo/Shell/15cmNebelwerfer.xml b/Defs/Ammo/Shell/15cmNebelwerfer.xml
@@ -90,8 +90,8 @@
 
 	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_15cmNebelwerfer_HE</defName>
-		<label>make 15cm Nebelwerfer (HE) rocket</label>
-		<description>Craft a 15cm Nebelwerfer (HE) rockets.</description>
+		<label>make 15cm Nebelwerfer (HE) rockets x6</label>
+		<description>Craft 6 15cm Nebelwerfer (HE) rockets.</description>
 		<jobString>Making 15cm Nebelwerfer (HE) rockets.</jobString>
 		<workAmount>44600</workAmount>
 		<ingredients>

diff --git a/Defs/Ammo/Shell/50mmType89Mortar.xml b/Defs/Ammo/Shell/50mmType89Mortar.xml
@@ -20,6 +20,7 @@
 			<Ammo_50mmType89MortarShell_Smoke>Bullet_50mmType89MortarShell_Smoke</Ammo_50mmType89MortarShell_Smoke>
 		</ammoTypes>
 		<isMortarAmmoSet>true</isMortarAmmoSet>
+		<similarTo>AmmoSet_MortarShell</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<!-- ==================== Ammo ========================== -->

diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml
@@ -21,6 +21,7 @@
 			<Shell_60mmMortar_Smoke>Bullet_60mmMortarShell_Smoke</Shell_60mmMortar_Smoke>
 		</ammoTypes>
 		<isMortarAmmoSet>true</isMortarAmmoSet>
+		<similarTo>AmmoSet_MortarShell</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<!-- ==================== Ammo ========================== -->

diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml
@@ -25,6 +25,7 @@
 			<Shell_Toxic MayRequire="Ludeon.RimWorld.Biotech">Bullet_81mmMortarShell_Tox</Shell_Toxic>
 			<Shell_Deadlife MayRequire="Ludeon.RimWorld.Anomaly">Bullet_81mmMortarShell_Deadlife</Shell_Deadlife>
 		</ammoTypes>
+		<similarTo>AmmoSet_MortarShell</similarTo>
 		<isMortarAmmoSet>true</isMortarAmmoSet>
 	</CombatExtended.AmmoSetDef>
 

diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
-  <!-- EN: make 15cm Nebelwerfer (HE) rocket -->
-  <MakeAmmo_15cmNebelwerfer_HE.label>制作150mm 火箭弹 (高爆弹)</MakeAmmo_15cmNebelwerfer_HE.label>
-  <!-- EN: Craft a 15cm Nebelwerfer (HE) rockets. -->
-  <MakeAmmo_15cmNebelwerfer_HE.description>制作150mm 火箭弹 (高爆弹)。</MakeAmmo_15cmNebelwerfer_HE.description>
+  <!-- EN: make 15cm Nebelwerfer (HE) rockets x6 -->
+  <MakeAmmo_15cmNebelwerfer_HE.label>制作150mm 火箭弹 (高爆弹) x6</MakeAmmo_15cmNebelwerfer_HE.label>
+  <!-- EN: Craft 6 15cm Nebelwerfer (HE) rockets. -->
+  <MakeAmmo_15cmNebelwerfer_HE.description>制作150mm 火箭弹 (高爆弹) x6。</MakeAmmo_15cmNebelwerfer_HE.description>
   <!-- EN: Making 15cm Nebelwerfer (HE) rockets. -->
   <MakeAmmo_15cmNebelwerfer_HE.jobString>正在制作150mm 火箭弹 (高爆弹)。</MakeAmmo_15cmNebelwerfer_HE.jobString>