Skip to content

Commit

Permalink
Rename heavymortar for clarity, revise some grammar.
Browse files Browse the repository at this point in the history
  • Loading branch information
N7Huntsman committed Nov 20, 2024
1 parent e3d9a49 commit 74901ea
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
42 changes: 21 additions & 21 deletions Defs/Ammo/Generic/Shell_Mortar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_HeavyMortarShell</defName>
<defName>AmmoSet_ArtilleryShell</defName>
<label>artillery shells</label>
<ammoTypes>
<Ammo_HeavyMortarShell_HE>Bullet_155mmHowitzerShell_HE</Ammo_HeavyMortarShell_HE>
<Ammo_HeavyMortarShell_HE_HFuzed>Bullet_155mmHowitzerShell_HE_HFuzed</Ammo_HeavyMortarShell_HE_HFuzed>
<Ammo_HeavyMortarShell_Incendiary>Bullet_155mmHowitzerShell_Incendiary</Ammo_HeavyMortarShell_Incendiary>
<Ammo_HeavyMortarShell_EMP>Bullet_155mmHowitzerShell_EMP</Ammo_HeavyMortarShell_EMP>
<Ammo_HeavyMortarShell_Smoke>Bullet_155mmHowitzerShell_Smoke</Ammo_HeavyMortarShell_Smoke>
<Ammo_ArtilleryShell_HE>Bullet_155mmHowitzerShell_HE</Ammo_ArtilleryShell_HE>
<Ammo_ArtilleryShell_HE_HFuzed>Bullet_155mmHowitzerShell_HE_HFuzed</Ammo_ArtilleryShell_HE_HFuzed>
<Ammo_ArtilleryShell_Incendiary>Bullet_155mmHowitzerShell_Incendiary</Ammo_ArtilleryShell_Incendiary>
<Ammo_ArtilleryShell_EMP>Bullet_155mmHowitzerShell_EMP</Ammo_ArtilleryShell_EMP>
<Ammo_ArtilleryShell_Smoke>Bullet_155mmHowitzerShell_Smoke</Ammo_ArtilleryShell_Smoke>
</ammoTypes>
<isMortarAmmoSet>true</isMortarAmmoSet>
</CombatExtended.AmmoSetDef>
Expand Down Expand Up @@ -270,7 +270,7 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyMortarShellBase">
<defName>Ammo_HeavyMortarShell_HE</defName>
<defName>Ammo_ArtilleryShell_HE</defName>
<label>artillery shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Howitzer/HE</texPath>
Expand All @@ -284,7 +284,7 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyMortarShellBase">
<defName>Ammo_HeavyMortarShell_HE_HFuzed</defName>
<defName>Ammo_ArtilleryShell_HE_HFuzed</defName>
<label>artillery shell (Airburst)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Howitzer/AB</texPath>
Expand All @@ -298,7 +298,7 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyMortarShellBase">
<defName>Ammo_HeavyMortarShell_Incendiary</defName>
<defName>Ammo_ArtilleryShell_Incendiary</defName>
<label>artillery shell (Incendiary)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Howitzer/INC</texPath>
Expand All @@ -312,7 +312,7 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyMortarShellBase">
<defName>Ammo_HeavyMortarShell_EMP</defName>
<defName>Ammo_ArtilleryShell_EMP</defName>
<label>artillery shell (EMP)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Howitzer/EMP</texPath>
Expand All @@ -326,7 +326,7 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyMortarShellBase">
<defName>Ammo_HeavyMortarShell_Smoke</defName>
<defName>Ammo_ArtilleryShell_Smoke</defName>
<label>artillery shell (Smoke)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Howitzer/SMK</texPath>
Expand Down Expand Up @@ -720,7 +720,7 @@
<!-- Heavy shells-->

<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_HeavyMortarShell_HE</defName>
<defName>MakeAmmo_ArtilleryShell_HE</defName>
<label>make artillery shells (HE) x2</label>
<description>Craft 2 artillery shells (HE).</description>
<jobString>Making artillery shells (HE).</jobString>
Expand Down Expand Up @@ -764,12 +764,12 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_HeavyMortarShell_HE>2</Ammo_HeavyMortarShell_HE>
<Ammo_ArtilleryShell_HE>2</Ammo_ArtilleryShell_HE>
</products>
</RecipeDef>

<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_HeavyMortarShell_HE_HFuzed</defName>
<defName>MakeAmmo_ArtilleryShell_HE_HFuzed</defName>
<label>make artillery shells (Airburst) x2</label>
<description>Craft 2 155mm (Airburst) artillery shells.</description>
<jobString>Making 155mm (Airburst) artillery shells.</jobString>
Expand Down Expand Up @@ -813,15 +813,15 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_HeavyMortarShell_HE_HFuzed>2</Ammo_HeavyMortarShell_HE_HFuzed>
<Ammo_ArtilleryShell_HE_HFuzed>2</Ammo_ArtilleryShell_HE_HFuzed>
</products>
<skillRequirements>
<Crafting>5</Crafting>
</skillRequirements>
</RecipeDef>

<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_HeavyMortarShell_Incendiary</defName>
<defName>MakeAmmo_ArtilleryShell_Incendiary</defName>
<label>make artillery shells (Incendiary) x2</label>
<description>Craft 2 artillery shells (Incendiary).</description>
<jobString>Making artillery shell (Incendiary).</jobString>
Expand Down Expand Up @@ -865,12 +865,12 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_HeavyMortarShell_Incendiary>2</Ammo_HeavyMortarShell_Incendiary>
<Ammo_ArtilleryShell_Incendiary>2</Ammo_ArtilleryShell_Incendiary>
</products>
</RecipeDef>

<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_HeavyMortarShell_EMP</defName>
<defName>MakeAmmo_ArtilleryShell_EMP</defName>
<label>make artillery shells (EMP) x2</label>
<description>Craft 2 artillery shells (EMP).</description>
<jobString>Making artillery shells (EMP).</jobString>
Expand Down Expand Up @@ -906,12 +906,12 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_HeavyMortarShell_EMP>2</Ammo_HeavyMortarShell_EMP>
<Ammo_ArtilleryShell_EMP>2</Ammo_ArtilleryShell_EMP>
</products>
</RecipeDef>

<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_HeavyMortarShell_Smoke</defName>
<defName>MakeAmmo_ArtilleryShell_Smoke</defName>
<label>make artillery shells (Smoke) x2</label>
<description>Craft 2 artillery shells (Smoke).</description>
<jobString>Making artillery shells (Smoke).</jobString>
Expand Down Expand Up @@ -955,7 +955,7 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_HeavyMortarShell_Smoke>2</Ammo_HeavyMortarShell_Smoke>
<Ammo_ArtilleryShell_Smoke>2</Ammo_ArtilleryShell_Smoke>
</products>
</RecipeDef>

Expand Down
4 changes: 2 additions & 2 deletions Defs/Ammo/Shell/105mmHowitzer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Ammo_105mmHowitzerShell_Smoke>Bullet_105mmHowitzerShell_Smoke</Ammo_105mmHowitzerShell_Smoke>
</ammoTypes>
<isMortarAmmoSet>true</isMortarAmmoSet>
<similarTo>AmmoSet_HeavyMortarShell</similarTo>
<similarTo>AmmoSet_ArtilleryShell</similarTo>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
Expand All @@ -35,7 +35,7 @@
<Ammo_105mmHowitzerShell_Smoke>Bullet_105mmHowitzerShell_Smoke_directfire</Ammo_105mmHowitzerShell_Smoke>
</ammoTypes>
<isMortarAmmoSet>true</isMortarAmmoSet>
<similarTo>AmmoSet_HeavyMortarShell</similarTo>
<similarTo>AmmoSet_ArtilleryShell</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->
Expand Down
10 changes: 5 additions & 5 deletions Defs/Ammo/Shell/155mmHowitzer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Ammo_155mmHowitzerShell_Smoke>Bullet_155mmHowitzerShell_Smoke</Ammo_155mmHowitzerShell_Smoke>
</ammoTypes>
<isMortarAmmoSet>true</isMortarAmmoSet>
<similarTo>AmmoSet_HeavyMortarShell</similarTo>
<similarTo>AmmoSet_ArtilleryShell</similarTo>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
Expand Down Expand Up @@ -385,7 +385,7 @@
<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_155mmHowitzerShell_HE</defName>
<label>make 155mm (HE) howitzer shells x1</label>
<description>Craft 1 155mm (HE) howitzer shell.</description>
<description>Craft Ammo_MortarShell_Firefoam 155mm (HE) howitzer shell.</description>
<jobString>Making 155mm (HE) howitzer shells.</jobString>
<researchPrerequisite Inherit="False" />
<researchPrerequisites>
Expand Down Expand Up @@ -434,7 +434,7 @@
<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_155mmHowitzerShell_HE_HFuzed</defName>
<label>make 155mm (Airburst) howitzer shells x1</label>
<description>Craft 1 155mm (Airburst) howitzer shell.</description>
<description>Craft a 155mm (Airburst) howitzer shell.</description>
<jobString>Making 155mm (Airburst) howitzer shells.</jobString>
<researchPrerequisite Inherit="False" />
<researchPrerequisites>
Expand Down Expand Up @@ -486,7 +486,7 @@
<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_155mmHowitzerShell_Incendiary</defName>
<label>make 155mm (Incendiary) howitzer shells x1</label>
<description>Craft 1 155mm (Incendiary) Howitzer shell.</description>
<description>Craft a 155mm (Incendiary) Howitzer shell.</description>
<jobString>Making 155mm (Incendiary) Howitzer shell.</jobString>
<researchPrerequisite Inherit="False" />
<researchPrerequisites>
Expand Down Expand Up @@ -535,7 +535,7 @@
<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
<defName>MakeAmmo_155mmHowitzerShell_EMP</defName>
<label>make 155mm (EMP) howitzer shells x1</label>
<description>Craft 1 155mm (EMP) Howitzer shell.</description>
<description>Craft a 155mm (EMP) Howitzer shell.</description>
<jobString>Making 155mm (EMP) Howitzer shells.</jobString>
<researchPrerequisite Inherit="False" />
<researchPrerequisites>
Expand Down

0 comments on commit 74901ea

Please sign in to comment.