From fd94f2b30b6f817496471fc39763cacde0d53e93 Mon Sep 17 00:00:00 2001 From: GrahammerTek Date: Tue, 27 May 2025 20:26:39 -0500 Subject: [PATCH 1/5] Added Explosive 30x113mmB Ammo --- Defs/Ammo/HighCaliber/30x113mmB.xml | 401 +++++++++++++++++++++++++++- 1 file changed, 392 insertions(+), 9 deletions(-) diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml index a3c99f8611..78c08c0608 100644 --- a/Defs/Ammo/HighCaliber/30x113mmB.xml +++ b/Defs/Ammo/HighCaliber/30x113mmB.xml @@ -18,6 +18,11 @@ Bullet_30x113mmB_Incendiary Bullet_30x113mmB_HE Bullet_30x113mmB_Sabot + Bullet_30x113mmBGrenade_HE + Bullet_30x113mmBGrenade_HE_TFuzed + Bullet_30x113mmBGrenade_HEDP + Bullet_30x113mmBGrenade_EMP + Bullet_30x113mmBGrenade_Smoke AmmoSet_Autocannon @@ -73,7 +78,7 @@ Bullet_30x113mmB_HE - + Ammo_30x113mmB_Sabot @@ -87,6 +92,78 @@ Bullet_30x113mmB_Sabot + + Ammo_30x113mmBGrenade_HE + + + Things/Ammo/GrenadeLauncher/HE + Graphic_StackCount + + + 0.34 + + GrenadeHE + Bullet_30x113mmBGrenade_HE + + + + Ammo_30x113mmBGrenade_HE_TFuzed + + + Things/Ammo/GrenadeLauncher/AIR + Graphic_StackCount + + + 0.34 + + GrenadeHETF + Bullet_30x113mmBGrenade_HE + + + + Ammo_30x113mmBGrenade_HEDP + + + Things/Ammo/GrenadeLauncher/DP + Graphic_StackCount + + + 0.34 + + GrenadeHEDP + Bullet_30x113mmBGrenade_HEDP + + + + Ammo_30x113mmBGrenade_EMP + + + Things/Ammo/GrenadeLauncher/EMP + Graphic_StackCount + + + 0.34 + + GrenadeEMP + 0.5 + Bullet_30x113mmBGrenade_EMP + + + + Ammo_30x113mmBGrenade_Smoke + + + Things/Ammo/GrenadeLauncher/SMK + Graphic_StackCount + + + 0.34 + + Smoke + 0 + Bullet_30x113mmBGrenade_Smoke + + @@ -156,12 +233,102 @@ + + Bullet_30x113mmBGrenade_HE + + + Bomb + 22 + 1.0 + true + 153 + + +
  • + + 23 + +
    • +     +     + + + Bullet_30x113mmBGrenade_HE_TFuzed + + CombatExtended.ProjectileCE_Bursting + + Bomb + 22 + 1.0 + true + 1.4 + 2 + 153 + + +
  • + + 23 + + -89~-5 +
    • +     +     + + + Bullet_30x113mmBGrenade_HEDP + + + Bullet + 36 + 65 + 5.23 + 153 + + +
  • + 17 + Bomb + 0.5 + true +
    • +
  • + + 9 + +
    • +     +     + + + Bullet_30x113mmBGrenade_EMP + + + EMP + 22 + 2 + + + + + Bullet_30x113mmBGrenade_Smoke + + + Smoke + 2.5 + 0.0 + 0.0 + BlindSmoke + 1 + + + MakeAmmo_30x113mmB_AP - - Craft 100 .30x113mmB (AP) cartridges. + + Craft 150 .30x113mmB (AP) cartridges. Making .30x113mmB (AP) cartridges.
  • @@ -186,8 +353,8 @@ MakeAmmo_30x113mmB_Incendiary - - Craft 100 .30x113mmB (AP-I) cartridges. + + Craft 150 .30x113mmB (AP-I) cartridges. Making .30x113mmB (AP-I) cartridges.
  • @@ -221,8 +388,8 @@ MakeAmmo_30x113mmB_HE - - Craft 100 .30x113mmB (AP-HE) cartridges. + + Craft 150 .30x113mmB (AP-HE) cartridges. Making .30x113mmB (AP-HE) cartridges.
  • @@ -256,8 +423,8 @@ MakeAmmo_30x113mmB_Sabot - - Craft 100 .30x113mmB (Sabot) cartridges. + + Craft 150 .30x113mmB (Sabot) cartridges. Making .30x113mmB (Sabot) cartridges.
  • @@ -298,4 +465,220 @@ 21000 + + MakeAmmo_30x113mmBGrenade_HE + + Craft 100 30x113mmB HE cartridges. + Making 30x113mmB HE cartridges. + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 11200 +     + + + MakeAmmo_30x113mmBGrenade_HE_TFuzed + + Craft 100 30x113mmB HE Time-Fuzed cartridges. + Making 30x113mmB HE Time-Fuzed cartridges. + CE_AdvancedLaunchers + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 12400 +     + + + MakeAmmo_30x113mmBGrenade_HEDP + + Craft 100 30x113mmB HEDP cartridges. + Making 30x113mmB HEDP cartridges. + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 10400 +     + + + MakeAmmo_30x113mmBGrenade_EMP + + Craft 100 30x113mmB EMP cartridges. + Making 30x113mmB EMP cartridges. + +
  • MicroelectronicsBasics
    • +
  • CE_Launchers
    • +     + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • ComponentIndustrial
    • + + + 11 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 13400 +     + + + MakeAmmo_30x113mmBGrenade_Smoke + + Craft 100 30x113mmB smoke cartridges. + Making 30x113mmB smoke cartridges. + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • Prometheum
    • + + + 3 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 9200 +     + \ No newline at end of file From da5ec6d358e4b183944a214785090df70618c323 Mon Sep 17 00:00:00 2001 From: GrahammerTek Date: Tue, 27 May 2025 21:24:41 -0500 Subject: [PATCH 2/5] Added separate 30x113mm AmmoSetDef --- Defs/Ammo/HighCaliber/30x113mmB.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml index 78c08c0608..fdfd817e5c 100644 --- a/Defs/Ammo/HighCaliber/30x113mmB.xml +++ b/Defs/Ammo/HighCaliber/30x113mmB.xml @@ -26,6 +26,18 @@ AmmoSet_Autocannon + + + AmmoSet_30x113mm + + + Bullet_30x113mmB_AP + Bullet_30x113mmB_Incendiary + Bullet_30x113mmB_HE + Bullet_30x113mmB_Sabot + + AmmoSet_Autocannon + From 0bcb7055dac7bb8a83baf4688be9edeec84667c8 Mon Sep 17 00:00:00 2001 From: GrahammerTek Date: Wed, 28 May 2025 01:18:10 -0500 Subject: [PATCH 3/5] Update 30x113mmB.xml --- Defs/Ammo/HighCaliber/30x113mmB.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml index fdfd817e5c..c9979cdd21 100644 --- a/Defs/Ammo/HighCaliber/30x113mmB.xml +++ b/Defs/Ammo/HighCaliber/30x113mmB.xml @@ -293,7 +293,7 @@ Bullet 36 - 65 + 51 5.23 153 From 72f08b67cf158a9552ea550181d622773b456147 Mon Sep 17 00:00:00 2001 From: GrahammerTek Date: Sat, 14 Jun 2025 16:09:24 -0500 Subject: [PATCH 4/5] Added Explosive ammo to generic autocannon + AP for launchers --- Defs/Ammo/Generic/Autocannon.xml | 284 +++++++++++++++++++++++++- Defs/Ammo/Generic/LauncherGrenade.xml | 132 ++++++++++++ 2 files changed, 413 insertions(+), 3 deletions(-) diff --git a/Defs/Ammo/Generic/Autocannon.xml b/Defs/Ammo/Generic/Autocannon.xml index 3af18d1f25..2c169b4cd1 100644 --- a/Defs/Ammo/Generic/Autocannon.xml +++ b/Defs/Ammo/Generic/Autocannon.xml @@ -20,6 +20,11 @@ Bullet_20x102mmNATO_Incendiary Bullet_20x102mmNATO_HE Bullet_20x102mmNATO_Sabot + Bullet_30x113mmBGrenade_HE + Ammo_AutocannonGrenade_HE_TFuzed + Ammo_AutocannonGrenade_HEDP + Ammo_AutocannonGrenade_EMP + Ammo_AutocannonGrenade_Smoke @@ -87,6 +92,63 @@ Sabot Bullet_20x102mmNATO_Sabot     + + + Ammo_AutocannonGrenade_HE + + + Things/Ammo/GrenadeLauncher/HE + Graphic_StackCount + + GrenadeHE + Bullet_30x113mmBGrenade_HE + + + + Ammo_AutocannonGrenade_HE_TFuzed + + + Things/Ammo/GrenadeLauncher/AIR + Graphic_StackCount + + GrenadeHETF + Bullet_30x113mmBGrenade_HE + + + + Ammo_AutocannonGrenade_HEDP + + + Things/Ammo/GrenadeLauncher/DP + Graphic_StackCount + + GrenadeHEDP + Bullet_30x113mmBGrenade_HEDP + + + + Ammo_AutocannonGrenade_EMP + + + Things/Ammo/GrenadeLauncher/EMP + Graphic_StackCount + + GrenadeEMP + 0.5 + Bullet_30x113mmBGrenade_EMP + + + + Ammo_AutocannonGrenade_Smoke + + + Things/Ammo/GrenadeLauncher/SMK + Graphic_StackCount + + Smoke + 0 + Bullet_30x113mmBGrenade_Smoke + @@ -153,9 +215,9 @@ MakeAmmo_Autocannon_HE - - Craft 200 autocannon shell (HE). - Making autocannon shell (HE). + + Craft 200 autocannon shell (AP-HE). + Making autocannon shell (AP-HE).
  • @@ -230,4 +292,220 @@ 13600 + + MakeAmmo_AutocannonGrenade_HE + + Craft 100 autocannon shell (HE). + Making autocannon shell (HE). + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 11200 +     + + + MakeAmmo_AutocannonGrenade_HE_TFuzed + + Craft 100 autocannon shell (HE Time-Fuzed). + Making autocannon shell (HE Time-Fuzed). + CE_AdvancedLaunchers + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 12400 +     + + + MakeAmmo_AutocannonGrenade_HEDP + + Craft 100 autocannon shell (HEDP). + Making autocannon shell (HEDP). + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 10400 +     + + + MakeAmmo_AutocannonGrenade_EMP + + Craft 100 autocannon shell (EMP). + Making autocannon shell (EMP). + +
  • MicroelectronicsBasics
    • +
  • CE_Launchers
    • +     + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • ComponentIndustrial
    • + + + 11 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 13400 +     + + + MakeAmmo_AutocannonGrenade_Smoke + + Craft 100 autocannon shell (Smoke). + Making autocannon shell (Smoke). + +
  • + + +
  • Steel
    • + + + 68 + +
  • + + +
  • Prometheum
    • + + + 3 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 100 + + 9200 +     + \ No newline at end of file diff --git a/Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/Generic/LauncherGrenade.xml index 60f5a9fe14..b357d45b93 100644 --- a/Defs/Ammo/Generic/LauncherGrenade.xml +++ b/Defs/Ammo/Generic/LauncherGrenade.xml @@ -21,6 +21,9 @@ Bullet_40x46mmGrenade_HEDP Bullet_40x46mmGrenade_EMP Bullet_40x46mmGrenade_Smoke + Bullet_20x42mm_AP + Bullet_20x42mm_Incendiary + Bullet_20x42mm_APHE @@ -110,6 +113,39 @@ 0 Bullet_40x46mmGrenade_Tox + + + Ammo_LauncherGrenade_AP + + + Things/Ammo/HighCaliber/AP + Graphic_StackCount + + ArmorPiercing + Bullet_20x42mm_AP + + + + Ammo_LauncherGrenade_Incendiary + + + Things/Ammo/HighCaliber/Incendiary + Graphic_StackCount + + IncendiaryAP + Bullet_20x42mm_Incendiary + + + + Ammo_LauncherGrenade_APHE + + + Things/Ammo/HighCaliber/HE + Graphic_StackCount + + ExplosiveAP + Bullet_20x42mm_APHE + @@ -377,4 +413,100 @@ 7400 + + MakeAmmo_LauncherGrenade_AP + + Craft 100 launcher AP cartridges. + Making launcher AP cartridges. + +
  • + + +
  • Steel
    • + + + 34 + +     + + +
  • Steel
    • +     +     + + 100 + + 4080 +     + + + MakeAmmo_LauncherGrenade_Incendiary + + Craft 100 launcher AP-I cartridges. + Making launcher AP-I cartridges. + +
  • + + +
  • Steel
    • + + + 34 + +
  • + + +
  • Prometheum
    • + + + 6 + +     + + +
  • Steel
    • +
  • Prometheum
    • +     +     + + 100 + + 5800 +     + + + MakeAmmo_LauncherGrenade_APHE + + Craft 100 launcher AP-HE cartridges. + Making launcher AP-HE cartridges. + +
  • + + +
  • Steel
    • + + + 34 + +
  • + + +
  • FSX
    • + + + 11 + +     + + +
  • Steel
    • +
  • FSX
    • +     +     + + 100 + + 7800 +     + \ No newline at end of file From e0a4697715dcc54a0a5034801e122a331604ee55 Mon Sep 17 00:00:00 2001 From: GrahammerTek Date: Sat, 21 Jun 2025 06:31:38 -0500 Subject: [PATCH 5/5] Fixed generic projectile --- Defs/Ammo/Generic/Autocannon.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Defs/Ammo/Generic/Autocannon.xml b/Defs/Ammo/Generic/Autocannon.xml index 2c169b4cd1..8f9fe5fc4f 100644 --- a/Defs/Ammo/Generic/Autocannon.xml +++ b/Defs/Ammo/Generic/Autocannon.xml @@ -21,10 +21,10 @@ Bullet_20x102mmNATO_HE Bullet_20x102mmNATO_Sabot Bullet_30x113mmBGrenade_HE - Ammo_AutocannonGrenade_HE_TFuzed - Ammo_AutocannonGrenade_HEDP - Ammo_AutocannonGrenade_EMP - Ammo_AutocannonGrenade_Smoke + Bullet_30x113mmBGrenade_HE_TFuzed + Bullet_30x113mmBGrenade_HEDP + Bullet_30x113mmBGrenade_EMP + Bullet_30x113mmBGrenade_Smoke