From 643f676c7e15cb6007222d10521a2a9b81a04c8e Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:55:26 +0200 Subject: [PATCH 1/7] Generic mortar ammo --- Defs/Ammo/Generic/Shell_Mortar.xml | 962 +++++++++++++++++++++++++++ Defs/Ammo/Shell/105mmHowitzer.xml | 2 + Defs/Ammo/Shell/155mmHowitzer.xml | 11 +- Defs/Ammo/Shell/50mmType89Mortar.xml | 1 + Defs/Ammo/Shell/60mmMortar.xml | 1 + Defs/Ammo/Shell/81mmMortar.xml | 1 + 6 files changed, 973 insertions(+), 5 deletions(-) create mode 100644 Defs/Ammo/Generic/Shell_Mortar.xml diff --git a/Defs/Ammo/Generic/Shell_Mortar.xml b/Defs/Ammo/Generic/Shell_Mortar.xml new file mode 100644 index 0000000000..c780be74ca --- /dev/null +++ b/Defs/Ammo/Generic/Shell_Mortar.xml @@ -0,0 +1,962 @@ + + + + + + + AmmoMortarShell + + AmmoShells + UI/Icons/ThingCategories/CaliberMortar + + + + AmmoMortarShellHeavy + + AmmoShells + UI/Icons/ThingCategories/CaliberCannon + + + + + + AmmoSet_MortarShell + + + Bullet_81mmMortarShell_HE + Bullet_81mmMortarShell_HE_HFuzed + Bullet_81mmMortarShell_Incendiary + Bullet_81mmMortarShell_EMP + Bullet_81mmMortarShell_Firefoam + Bullet_81mmMortarShell_Smoke + Bullet_81mmMortarShell_Antigrain + Bullet_81mmMortarShell_Tox + Bullet_81mmMortarShell_Deadlife + + true + + + + AmmoSet_HeavyMortarShell + + + Bullet_155mmHowitzerShell_HE + Bullet_155mmHowitzerShell_HE_HFuzed + Bullet_155mmHowitzerShell_Incendiary + Bullet_155mmHowitzerShell_EMP + Bullet_155mmHowitzerShell_Smoke + + true + + + + + + + + Low-velocity shell designed to be fired from a mortar. + + 200 + + +
  • AmmoMortarShell
    • +     + 25 + 30 + MortarBomb_Explode + true +     + + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     +     + + + Ammo_MortarShell_HighExplosive + + + Things/Ammo/Mortar/HE + Graphic_StackCount + + + 50.09 + 5.27 + 8.17 + + GrenadeHE + Bullet_81mmMortarShell_HE + + + + Ammo_MortarShell_HighExplosive_HFuzed + + + Things/Ammo/Mortar/Airburst + Graphic_StackCount + + + 63.09 + 5.27 + 8.17 + + GrenadeHETF + Bullet_81mmMortarShell_HE + + + + Ammo_MortarShell_Incendiary + + + Things/Ammo/Mortar/Incendiary + Graphic_StackCount + + + 42.34 + 5.65 + 9.0 + + GrenadeIncendiary + Bullet_81mmMortarShell_Incendiary + + + + Ammo_MortarShell_EMP + + + Things/Ammo/Mortar/EMP + Graphic_StackCount + + + 112.42 + 5.27 + 8.17 + + GrenadeEMP + Bullet_81mmMortarShell_EMP + + + + Ammo_MortarShell_Firefoam + + + Things/Ammo/Mortar/Firefoam + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + FoamFuel + Bullet_81mmMortarShell_Firefoam + false + + + + Ammo_MortarShell_Smoke + + + Things/Ammo/Mortar/Smoke + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Smoke + Bullet_81mmMortarShell_Smoke + false + + + + Ammo_MortarShell_AntigrainWarhead + + + Things/Ammo/Mortar/Antigrain + Graphic_StackCount + + + 1500 + 6.5 + 6 + + +
  • RewardStandardCore
    • +     + +
  • CE_AutoEnableTrade_Sellable
    • +     + Antigrain + false + + +
  • + 14.9 + 300 + BombSuper + 0.7 + 0.22 + true + GiantExplosion + Explosion_GiantBomb + 60~120 + True + true +
    • +     +     + + + Ammo_MortarShell_Toxic + + + Things/Ammo/Mortar/Toxic + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Toxic + Bullet_81mmMortarShell_Tox + + + + Ammo_MortarShell_Deadlife + + + Things/Ammo/Mortar/Deadlife + Graphic_StackCount + + + 41.03 + 4.4 + 10.01 + + Deadlife + Bullet_81mmMortarShell_Deadlife + + + + + + Large cannon shell used by howitzers. + +
  • AmmoMortarShellHeavy
    • +     + 25 + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + + 300 + 46.7 + 47.67 + + 40 + MortarBomb_Explode + true +     + + + Ammo_HeavyMortarShell_HE + + + Things/Ammo/Cannon/Howitzer/HE + Graphic_StackCount + + + 384.6 + + GrenadeHE + Bullet_155mmHowitzerShell_HE + + + + Ammo_HeavyMortarShell_HE_HFuzed + + + Things/Ammo/Cannon/Howitzer/AB + Graphic_StackCount + + + 449.6 + + GrenadeHETF + Bullet_155mmHowitzerShell_HE + + + + Ammo_HeavyMortarShell_Incendiary + + + Things/Ammo/Cannon/Howitzer/INC + Graphic_StackCount + + + 283.1 + + GrenadeIncendiary + Bullet_155mmHowitzerShell_Incendiary + + + + Ammo_HeavyMortarShell_EMP + + + Things/Ammo/Cannon/Howitzer/EMP + Graphic_StackCount + + + 673.94 + + GrenadeEMP + Bullet_155mmHowitzerShell_EMP + + + + Ammo_HeavyMortarShell_Smoke + + + Things/Ammo/Cannon/Howitzer/SMK + Graphic_StackCount + + + 262.5 + + Smoke + false + Bullet_155mmHowitzerShell_Smoke + + + + + + + + MakeAmmo_MortarShell_HighExplosive + + Craft 5 mortar shells (HE). + Making mortar shells (HE). + 10600 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_HighExplosive_HFuzed + + Craft 5 mortar shells (Airburst). + Making mortar shells (Airburst). + 11800 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 5 + +     + + + MakeAmmo_MortarShell_Incendiary + + Craft 5 mortar shells (Incendiary). + Making mortar shells (Incendiary). + 9000 + +
  • + + +
  • Steel
    • + + + 58 + +
  • + + +
  • Prometheum
    • + + + 5 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_EMP + + Craft 5 mortar shells (EMP). + Making mortar shells (EMP). + + +
  • Mortars
    • +
  • MicroelectronicsBasics
    • +     + 13800 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • ComponentIndustrial
    • + + + 14 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Firefoam + + Craft 5 mortar shells (Firefoam). + Making mortar shells (Firefoam). + + +
  • Mortars
    • +
  • Firefoam
    • +     + 8800 + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • MeatRaw
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     + +
  • MeatRaw
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Smoke + + Craft 5 mortar shells (Smoke). + Making mortar shells (Smoke). + 6600 + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Toxic + + Craft 5 mortar shells (Tox). + Making mortar shells (Tox). + + +
  • Mortars
    • +
  • ToxGas
    • +     + 6600 + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Deadlife + + Craft 5 deadlife mortar shells. + Making deadlife mortar shells. + +
  • DeadlifeDust
    • +
  • Mortars
    • +     + +
  • BioferriteShaper
    • +     + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Bioferrite
    • + + + 25 + +     + + +
  • Steel
    • +
  • Bioferrite
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 6600 +     + + + + + MakeAmmo_HeavyMortarShell_HE + + Craft 2 heavy mortar shells (HE). + Making heavy mortar shells (HE). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 17400 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • FSX
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 2 + +     + + + MakeAmmo_HeavyMortarShell_HE_HFuzed + + Craft 2 155mm (Airburst) heavy mortar shells. + Making 155mm (Airburst) heavy mortar shells. + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 18600 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +
  • + + +
  • FSX
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 2 + + + 5 + +     + + + MakeAmmo_HeavyMortarShell_Incendiary + + Craft 2 heavy mortar shells (Incendiary). + Making heavy mortar shell (Incendiary). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 12600 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 5 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Prometheum
    • +     +     + + 2 + +     + + + MakeAmmo_HeavyMortarShell_EMP + + Craft 2 heavy mortar shells (EMP). + Making heavy mortar shells (EMP). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +
  • MicroelectronicsBasics
    • +     + 18400 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 15 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 2 + +     + + + MakeAmmo_HeavyMortarShell_Smoke + + Craft (Smoke) heavy mortar shell. + Making (Smoke) heavy mortar shell. + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 11400 + +
  • + + +
  • Steel
    • + + + 90 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 3 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 2 + +     + +     \ No newline at end of file diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml index f3ede8934f..ed43a974b4 100644 --- a/Defs/Ammo/Shell/105mmHowitzer.xml +++ b/Defs/Ammo/Shell/105mmHowitzer.xml @@ -21,6 +21,7 @@ Bullet_105mmHowitzerShell_Smoke true + AmmoSet_HeavyMortarShell @@ -34,6 +35,7 @@ Bullet_105mmHowitzerShell_Smoke_directfire true + AmmoSet_HeavyMortarShell diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml index 553d3d57fb..f79ee3d9d2 100644 --- a/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/Defs/Ammo/Shell/155mmHowitzer.xml @@ -21,6 +21,7 @@ Bullet_155mmHowitzerShell_Smoke true + AmmoSet_HeavyMortarShell @@ -384,7 +385,7 @@ MakeAmmo_155mmHowitzerShell_HE - Craft 1 155mm (HE) howitzer shells. + Craft 1 155mm (HE) howitzer shell. Making 155mm (HE) howitzer shells. @@ -433,7 +434,7 @@ MakeAmmo_155mmHowitzerShell_HE_HFuzed - Craft 1 155mm (Airburst) howitzer shells. + Craft 1 155mm (Airburst) howitzer shell. Making 155mm (Airburst) howitzer shells. @@ -485,7 +486,7 @@ MakeAmmo_155mmHowitzerShell_Incendiary - Craft 155mm (Incendiary) Howitzer shell. + Craft 1 155mm (Incendiary) Howitzer shell. Making 155mm (Incendiary) Howitzer shell. @@ -534,8 +535,8 @@ MakeAmmo_155mmHowitzerShell_EMP - Craft 155mm (EMP) Howitzer shell. - Making 155mm (EMP) Howitzer shell. + Craft 1 155mm (EMP) Howitzer shell. + Making 155mm (EMP) Howitzer shells.
  • Mortars
    • diff --git a/Defs/Ammo/Shell/50mmType89Mortar.xml b/Defs/Ammo/Shell/50mmType89Mortar.xml index 08e9046f26..7c2ddd8ba7 100644 --- a/Defs/Ammo/Shell/50mmType89Mortar.xml +++ b/Defs/Ammo/Shell/50mmType89Mortar.xml @@ -20,6 +20,7 @@ Bullet_50mmType89MortarShell_Smoke true + AmmoSet_MortarShell     diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml index 59d4e8b801..acbaae418e 100644 --- a/Defs/Ammo/Shell/60mmMortar.xml +++ b/Defs/Ammo/Shell/60mmMortar.xml @@ -21,6 +21,7 @@ Bullet_60mmMortarShell_Smoke true + AmmoSet_MortarShell diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index ba9a5ffc43..944d7807c1 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/Defs/Ammo/Shell/81mmMortar.xml @@ -25,6 +25,7 @@ Bullet_81mmMortarShell_Tox Bullet_81mmMortarShell_Deadlife + AmmoSet_MortarShell true From 4ef9efbfdcb43e75645178578574c02c3210f6a4 Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:58:35 +0200 Subject: [PATCH 2/7] teeny typo --- Defs/Ammo/Shell/15cmNebelwerfer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Defs/Ammo/Shell/15cmNebelwerfer.xml b/Defs/Ammo/Shell/15cmNebelwerfer.xml index e165de80a4..eb28ba378b 100644 --- a/Defs/Ammo/Shell/15cmNebelwerfer.xml +++ b/Defs/Ammo/Shell/15cmNebelwerfer.xml @@ -91,7 +91,7 @@ MakeAmmo_15cmNebelwerfer_HE - Craft a 15cm Nebelwerfer (HE) rockets. + Craft 6 15cm Nebelwerfer (HE) rockets. Making 15cm Nebelwerfer (HE) rockets. 44600 From e3d9a49736fb6f4b829bbe2984b237ec145006df Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:51:10 +0200 Subject: [PATCH 3/7] Heavy mortar => artillery label --- Defs/Ammo/Generic/Shell_Mortar.xml | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Defs/Ammo/Generic/Shell_Mortar.xml b/Defs/Ammo/Generic/Shell_Mortar.xml index c780be74ca..52ad5762ca 100644 --- a/Defs/Ammo/Generic/Shell_Mortar.xml +++ b/Defs/Ammo/Generic/Shell_Mortar.xml @@ -38,7 +38,7 @@ AmmoSet_HeavyMortarShell - + Bullet_155mmHowitzerShell_HE Bullet_155mmHowitzerShell_HE_HFuzed @@ -271,7 +271,7 @@ Ammo_HeavyMortarShell_HE - + Things/Ammo/Cannon/Howitzer/HE Graphic_StackCount @@ -285,7 +285,7 @@ Ammo_HeavyMortarShell_HE_HFuzed - + Things/Ammo/Cannon/Howitzer/AB Graphic_StackCount @@ -299,7 +299,7 @@ Ammo_HeavyMortarShell_Incendiary - + Things/Ammo/Cannon/Howitzer/INC Graphic_StackCount @@ -313,7 +313,7 @@ Ammo_HeavyMortarShell_EMP - + Things/Ammo/Cannon/Howitzer/EMP Graphic_StackCount @@ -327,7 +327,7 @@ Ammo_HeavyMortarShell_Smoke - + Things/Ammo/Cannon/Howitzer/SMK Graphic_StackCount @@ -721,9 +721,9 @@ MakeAmmo_HeavyMortarShell_HE - - Craft 2 heavy mortar shells (HE). - Making heavy mortar shells (HE). + + Craft 2 artillery shells (HE). + Making artillery shells (HE).
  • Mortars
    • @@ -770,9 +770,9 @@ MakeAmmo_HeavyMortarShell_HE_HFuzed - - Craft 2 155mm (Airburst) heavy mortar shells. - Making 155mm (Airburst) heavy mortar shells. + + Craft 2 155mm (Airburst) artillery shells. + Making 155mm (Airburst) artillery shells.
  • Mortars
    • @@ -822,9 +822,9 @@ MakeAmmo_HeavyMortarShell_Incendiary - - Craft 2 heavy mortar shells (Incendiary). - Making heavy mortar shell (Incendiary). + + Craft 2 artillery shells (Incendiary). + Making artillery shell (Incendiary).
  • Mortars
    • @@ -871,9 +871,9 @@ MakeAmmo_HeavyMortarShell_EMP - - Craft 2 heavy mortar shells (EMP). - Making heavy mortar shells (EMP). + + Craft 2 artillery shells (EMP). + Making artillery shells (EMP).
  • Mortars
    • @@ -912,9 +912,9 @@ MakeAmmo_HeavyMortarShell_Smoke - - Craft (Smoke) heavy mortar shell. - Making (Smoke) heavy mortar shell. + + Craft 2 artillery shells (Smoke). + Making artillery shells (Smoke).
  • Mortars
    • From 74901ead9198107c501877a240cf79f486331599 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 19 Nov 2024 19:14:12 -0500 Subject: [PATCH 4/7] Rename heavymortar for clarity, revise some grammar. --- Defs/Ammo/Generic/Shell_Mortar.xml | 42 +++++++++++++++--------------- Defs/Ammo/Shell/105mmHowitzer.xml | 4 +-- Defs/Ammo/Shell/155mmHowitzer.xml | 10 +++---- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Defs/Ammo/Generic/Shell_Mortar.xml b/Defs/Ammo/Generic/Shell_Mortar.xml index 52ad5762ca..9908447e5c 100644 --- a/Defs/Ammo/Generic/Shell_Mortar.xml +++ b/Defs/Ammo/Generic/Shell_Mortar.xml @@ -37,14 +37,14 @@     - AmmoSet_HeavyMortarShell + AmmoSet_ArtilleryShell - Bullet_155mmHowitzerShell_HE - Bullet_155mmHowitzerShell_HE_HFuzed - Bullet_155mmHowitzerShell_Incendiary - Bullet_155mmHowitzerShell_EMP - Bullet_155mmHowitzerShell_Smoke + Bullet_155mmHowitzerShell_HE + Bullet_155mmHowitzerShell_HE_HFuzed + Bullet_155mmHowitzerShell_Incendiary + Bullet_155mmHowitzerShell_EMP + Bullet_155mmHowitzerShell_Smoke true @@ -270,7 +270,7 @@ - Ammo_HeavyMortarShell_HE + Ammo_ArtilleryShell_HE Things/Ammo/Cannon/Howitzer/HE @@ -284,7 +284,7 @@ - Ammo_HeavyMortarShell_HE_HFuzed + Ammo_ArtilleryShell_HE_HFuzed Things/Ammo/Cannon/Howitzer/AB @@ -298,7 +298,7 @@ - Ammo_HeavyMortarShell_Incendiary + Ammo_ArtilleryShell_Incendiary Things/Ammo/Cannon/Howitzer/INC @@ -312,7 +312,7 @@ - Ammo_HeavyMortarShell_EMP + Ammo_ArtilleryShell_EMP Things/Ammo/Cannon/Howitzer/EMP @@ -326,7 +326,7 @@ - Ammo_HeavyMortarShell_Smoke + Ammo_ArtilleryShell_Smoke Things/Ammo/Cannon/Howitzer/SMK @@ -720,7 +720,7 @@ - MakeAmmo_HeavyMortarShell_HE + MakeAmmo_ArtilleryShell_HE Craft 2 artillery shells (HE). Making artillery shells (HE). @@ -764,12 +764,12 @@ - 2 + 2 - MakeAmmo_HeavyMortarShell_HE_HFuzed + MakeAmmo_ArtilleryShell_HE_HFuzed Craft 2 155mm (Airburst) artillery shells. Making 155mm (Airburst) artillery shells. @@ -813,7 +813,7 @@ - 2 + 2 5 @@ -821,7 +821,7 @@ - MakeAmmo_HeavyMortarShell_Incendiary + MakeAmmo_ArtilleryShell_Incendiary Craft 2 artillery shells (Incendiary). Making artillery shell (Incendiary). @@ -865,12 +865,12 @@ - 2 + 2 - MakeAmmo_HeavyMortarShell_EMP + MakeAmmo_ArtilleryShell_EMP Craft 2 artillery shells (EMP). Making artillery shells (EMP). @@ -906,12 +906,12 @@ - 2 + 2 - MakeAmmo_HeavyMortarShell_Smoke + MakeAmmo_ArtilleryShell_Smoke Craft 2 artillery shells (Smoke). Making artillery shells (Smoke). @@ -955,7 +955,7 @@ - 2 + 2 diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml index ed43a974b4..1f65f79fb9 100644 --- a/Defs/Ammo/Shell/105mmHowitzer.xml +++ b/Defs/Ammo/Shell/105mmHowitzer.xml @@ -21,7 +21,7 @@ Bullet_105mmHowitzerShell_Smoke true - AmmoSet_HeavyMortarShell + AmmoSet_ArtilleryShell @@ -35,7 +35,7 @@ Bullet_105mmHowitzerShell_Smoke_directfire true - AmmoSet_HeavyMortarShell + AmmoSet_ArtilleryShell diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml index f79ee3d9d2..ec901b3462 100644 --- a/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/Defs/Ammo/Shell/155mmHowitzer.xml @@ -21,7 +21,7 @@ Bullet_155mmHowitzerShell_Smoke true - AmmoSet_HeavyMortarShell + AmmoSet_ArtilleryShell @@ -385,7 +385,7 @@ MakeAmmo_155mmHowitzerShell_HE - Craft 1 155mm (HE) howitzer shell. + Craft Ammo_MortarShell_Firefoam 155mm (HE) howitzer shell. Making 155mm (HE) howitzer shells. @@ -434,7 +434,7 @@ MakeAmmo_155mmHowitzerShell_HE_HFuzed - Craft 1 155mm (Airburst) howitzer shell. + Craft a 155mm (Airburst) howitzer shell. Making 155mm (Airburst) howitzer shells. @@ -486,7 +486,7 @@ MakeAmmo_155mmHowitzerShell_Incendiary - Craft 1 155mm (Incendiary) Howitzer shell. + Craft a 155mm (Incendiary) Howitzer shell. Making 155mm (Incendiary) Howitzer shell. @@ -535,7 +535,7 @@ MakeAmmo_155mmHowitzerShell_EMP - Craft 1 155mm (EMP) Howitzer shell. + Craft a 155mm (EMP) Howitzer shell. Making 155mm (EMP) Howitzer shells. From b3c5c6d4e5454dcc538cd9c5d2e29e12788e2bfa Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 19 Nov 2024 19:17:51 -0500 Subject: [PATCH 5/7] Fix autofinish snafu --- Defs/Ammo/Shell/155mmHowitzer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml index ec901b3462..ff2598f65a 100644 --- a/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/Defs/Ammo/Shell/155mmHowitzer.xml @@ -385,7 +385,7 @@ MakeAmmo_155mmHowitzerShell_HE - Craft Ammo_MortarShell_Firefoam 155mm (HE) howitzer shell. + Craft a 155mm (HE) howitzer shell. Making 155mm (HE) howitzer shells. From a025450d8a5080ec5fc5cfd1cbe4b0020af2696f Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 19 Nov 2024 19:32:42 -0500 Subject: [PATCH 6/7] Label and whitespace tweaks --- Defs/Ammo/Generic/Shell_Mortar.xml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Defs/Ammo/Generic/Shell_Mortar.xml b/Defs/Ammo/Generic/Shell_Mortar.xml index 9908447e5c..bc6a495a04 100644 --- a/Defs/Ammo/Generic/Shell_Mortar.xml +++ b/Defs/Ammo/Generic/Shell_Mortar.xml @@ -21,7 +21,7 @@ AmmoSet_MortarShell - + Bullet_81mmMortarShell_HE Bullet_81mmMortarShell_HE_HFuzed @@ -38,7 +38,7 @@ AmmoSet_ArtilleryShell - + Bullet_155mmHowitzerShell_HE Bullet_155mmHowitzerShell_HE_HFuzed @@ -53,8 +53,7 @@ - + Low-velocity shell designed to be fired from a mortar. 200 @@ -68,8 +67,7 @@ true - +
  • CE_AutoEnableTrade
  • CE_AutoEnableCrafting_TableMachining
    • @@ -212,8 +210,7 @@     - + Ammo_MortarShell_Toxic @@ -248,8 +245,7 @@ - + Large cannon shell used by howitzers.
  • AmmoMortarShellHeavy
    • From 21688801b7a2bacd2caf0b8abab110694dd66810 Mon Sep 17 00:00:00 2001 From: sumghai Date: Wed, 20 Nov 2024 18:12:35 +1300 Subject: [PATCH 7/7] Fix Simp Mandarin translation for Nebelwerfer rocket crafting recipe --- Defs/Ammo/Shell/15cmNebelwerfer.xml | 2 +- .../DefInjected/RecipeDef/15cmNebelwerfer.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Defs/Ammo/Shell/15cmNebelwerfer.xml b/Defs/Ammo/Shell/15cmNebelwerfer.xml index eb28ba378b..1a0a534ff1 100644 --- a/Defs/Ammo/Shell/15cmNebelwerfer.xml +++ b/Defs/Ammo/Shell/15cmNebelwerfer.xml @@ -90,7 +90,7 @@ MakeAmmo_15cmNebelwerfer_HE - + Craft 6 15cm Nebelwerfer (HE) rockets. Making 15cm Nebelwerfer (HE) rockets. 44600 diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml index fdc946d2f1..7420d08d67 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml +++ b/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml @@ -1,10 +1,10 @@  - - 制作150mm 火箭弹 (高爆弹) - - 制作150mm 火箭弹 (高爆弹)。 + + 制作150mm 火箭弹 (高爆弹) x6 + + 制作150mm 火箭弹 (高爆弹) x6。 正在制作150mm 火箭弹 (高爆弹)。