From f9ec7757ba3d4d4a1888f3f1545c1ea56518d7d9 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Mon, 2 Sep 2024 12:03:44 +0330 Subject: [PATCH 1/2] Projectile secondary damage decoupling --- Defs/Ammo/Grenade/20x42mmGrenade.xml | 4 ++-- Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml | 4 ++-- Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml | 4 ++-- Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml | 4 ++-- Defs/Ammo/HighCaliber/2-Bore.xml | 4 ++-- Defs/Ammo/HighCaliber/20x102mmNATO.xml | 4 ++-- Defs/Ammo/HighCaliber/20x110mmHispano.xml | 2 +- Defs/Ammo/HighCaliber/20x128mmOerlikon.xml | 4 ++-- Defs/Ammo/HighCaliber/20x138mmB.xml | 4 ++-- Defs/Ammo/HighCaliber/20x139mm.xml | 4 ++-- Defs/Ammo/HighCaliber/20x82mmMauser.xml | 4 ++-- Defs/Ammo/HighCaliber/20x99mmShVAK.xml | 2 +- Defs/Ammo/HighCaliber/23x152mmB.xml | 4 ++-- Defs/Ammo/HighCaliber/25x137mmNATO.xml | 4 ++-- Defs/Ammo/HighCaliber/300WinchesterMagnum.xml | 4 ++-- Defs/Ammo/HighCaliber/30x113mmB.xml | 4 ++-- Defs/Ammo/HighCaliber/30x165mm.xml | 2 +- Defs/Ammo/HighCaliber/30x173mmNATO.xml | 2 +- Defs/Ammo/HighCaliber/338LapuaMagnum.xml | 4 ++-- Defs/Ammo/HighCaliber/338NormaMagnum.xml | 4 ++-- Defs/Ammo/HighCaliber/408CheyenneTactical.xml | 4 ++-- Defs/Ammo/HighCaliber/40x311mmR.xml | 4 ++-- Defs/Ammo/HighCaliber/470NitroExpress.xml | 2 +- Defs/Ammo/HighCaliber/50BMG.xml | 4 ++-- Defs/Ammo/HighCaliber/55Boys.xml | 4 ++-- Defs/Ammo/HighCaliber/600NitroExpress.xml | 2 +- Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml | 4 ++-- Defs/Ammo/HighCaliber/950JDJ.xml | 4 ++-- Defs/Ammo/Rifle/127x55mm.xml | 4 ++-- Defs/Ammo/Rifle/243Winchester.xml | 4 ++-- Defs/Ammo/Rifle/277Fury.xml | 4 ++-- Defs/Ammo/Rifle/280British.xml | 4 ++-- Defs/Ammo/Rifle/30-30Winchester.xml | 4 ++-- Defs/Ammo/Rifle/3006Springfield.xml | 4 ++-- Defs/Ammo/Rifle/300AACBlackout.xml | 4 ++-- Defs/Ammo/Rifle/303British.xml | 4 ++-- Defs/Ammo/Rifle/30Carbine.xml | 2 +- Defs/Ammo/Rifle/38-55Winchester.xml | 4 ++-- Defs/Ammo/Rifle/44-40Winchester.xml | 4 ++-- Defs/Ammo/Rifle/4570Gov.xml | 2 +- Defs/Ammo/Rifle/458SOCOM.xml | 2 +- Defs/Ammo/Rifle/473x33mmCaseless.xml | 4 ++-- Defs/Ammo/Rifle/485x49mm.xml | 4 ++-- Defs/Ammo/Rifle/50Beowulf.xml | 2 +- Defs/Ammo/Rifle/545x39mmSoviet.xml | 8 ++++---- Defs/Ammo/Rifle/556x45mmNATO.xml | 8 ++++---- Defs/Ammo/Rifle/56-56Spencer.xml | 4 ++-- Defs/Ammo/Rifle/58x42mmDBP10.xml | 4 ++-- Defs/Ammo/Rifle/6.5Creedmoor.xml | 4 ++-- Defs/Ammo/Rifle/6.5x52mm Carcano.xml | 4 ++-- Defs/Ammo/Rifle/65x50mmSRArisaka.xml | 4 ++-- Defs/Ammo/Rifle/7.92x57mmMauser.xml | 4 ++-- Defs/Ammo/Rifle/75x54mmFrench.xml | 4 ++-- Defs/Ammo/Rifle/762x39mmSoviet.xml | 8 ++++---- Defs/Ammo/Rifle/762x51mmNATO.xml | 4 ++-- Defs/Ammo/Rifle/762x54mmR.xml | 4 ++-- Defs/Ammo/Rifle/77x58mmArisaka.xml | 4 ++-- Defs/Ammo/Rifle/792x33mmKurz.xml | 4 ++-- Defs/Ammo/Rifle/8.6mmBlackout.xml | 4 ++-- Defs/Ammo/Rifle/8x50mmRLebel.xml | 4 ++-- Defs/Ammo/Rifle/8x50mmRMannlicher.xml | 4 ++-- Defs/Ammo/Rifle/9x39mmSoviet.xml | 4 ++-- 62 files changed, 120 insertions(+), 120 deletions(-) diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml index e0a1cb2107..ae3b2fabb9 100644 --- a/Defs/Ammo/Grenade/20x42mmGrenade.xml +++ b/Defs/Ammo/Grenade/20x42mmGrenade.xml @@ -195,7 +195,7 @@
  • Flame_Secondary - 12 + 24
    • @@ -211,7 +211,7 @@
  • Bomb_Secondary - 19 + 33
    • diff --git a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml index d6cbb7c6e0..79b6b920ba 100644 --- a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml +++ b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 16 + 15
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 23 + 20
    • diff --git a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml index 3ba50817f2..bf95890b2a 100644 --- a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml +++ b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 16 + 15
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 24 + 21
    • diff --git a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml index d89338946a..ffceafa66d 100644 --- a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml +++ b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 21 + 17
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 32 + 24
    • diff --git a/Defs/Ammo/HighCaliber/2-Bore.xml b/Defs/Ammo/HighCaliber/2-Bore.xml index 448968e54f..a30d0e6dd4 100644 --- a/Defs/Ammo/HighCaliber/2-Bore.xml +++ b/Defs/Ammo/HighCaliber/2-Bore.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 22 + 37
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 34 + 51
    • diff --git a/Defs/Ammo/HighCaliber/20x102mmNATO.xml b/Defs/Ammo/HighCaliber/20x102mmNATO.xml index 94c78e5a2b..a6f64ac1ef 100644 --- a/Defs/Ammo/HighCaliber/20x102mmNATO.xml +++ b/Defs/Ammo/HighCaliber/20x102mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 27 + 22
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 42 + 31
    • diff --git a/Defs/Ammo/HighCaliber/20x110mmHispano.xml b/Defs/Ammo/HighCaliber/20x110mmHispano.xml index c70eef2227..e80897140d 100644 --- a/Defs/Ammo/HighCaliber/20x110mmHispano.xml +++ b/Defs/Ammo/HighCaliber/20x110mmHispano.xml @@ -149,7 +149,7 @@
  • Bomb_Secondary - 39 + 35
    • diff --git a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml index b64779de2a..1534cc9ba4 100644 --- a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml +++ b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 30 + 25
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 45 + 35
    • diff --git a/Defs/Ammo/HighCaliber/20x138mmB.xml b/Defs/Ammo/HighCaliber/20x138mmB.xml index 8d7aa0cf7f..7445798f07 100644 --- a/Defs/Ammo/HighCaliber/20x138mmB.xml +++ b/Defs/Ammo/HighCaliber/20x138mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 27 + 26
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 41 + 35
    • diff --git a/Defs/Ammo/HighCaliber/20x139mm.xml b/Defs/Ammo/HighCaliber/20x139mm.xml index a7a210f70f..c20cd09e97 100644 --- a/Defs/Ammo/HighCaliber/20x139mm.xml +++ b/Defs/Ammo/HighCaliber/20x139mm.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 30 + 26
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 46 + 35
    • diff --git a/Defs/Ammo/HighCaliber/20x82mmMauser.xml b/Defs/Ammo/HighCaliber/20x82mmMauser.xml index 510b6df233..7630b773ba 100644 --- a/Defs/Ammo/HighCaliber/20x82mmMauser.xml +++ b/Defs/Ammo/HighCaliber/20x82mmMauser.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 22 + 24
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 34 + 33
    • diff --git a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml index ca0b295457..ba555f936f 100644 --- a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml +++ b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml @@ -149,7 +149,7 @@
  • Bomb_Secondary - 33 + 31
    • diff --git a/Defs/Ammo/HighCaliber/23x152mmB.xml b/Defs/Ammo/HighCaliber/23x152mmB.xml index f524325852..34a7c3fddc 100644 --- a/Defs/Ammo/HighCaliber/23x152mmB.xml +++ b/Defs/Ammo/HighCaliber/23x152mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 35 + 34
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 53 + 46
    • diff --git a/Defs/Ammo/HighCaliber/25x137mmNATO.xml b/Defs/Ammo/HighCaliber/25x137mmNATO.xml index f9e204df0b..a253ab9367 100644 --- a/Defs/Ammo/HighCaliber/25x137mmNATO.xml +++ b/Defs/Ammo/HighCaliber/25x137mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 39 + 33
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 59 + 45
    • diff --git a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml index c87eca6ccc..cbb60ecab8 100644 --- a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml +++ b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 9 + 6
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 14 + 8
    • diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml index 7f908f3bbd..fd6c965341 100644 --- a/Defs/Ammo/HighCaliber/30x113mmB.xml +++ b/Defs/Ammo/HighCaliber/30x113mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 37 + 42
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 57 + 58
    • diff --git a/Defs/Ammo/HighCaliber/30x165mm.xml b/Defs/Ammo/HighCaliber/30x165mm.xml index edc7b6c72c..2f16e014e3 100644 --- a/Defs/Ammo/HighCaliber/30x165mm.xml +++ b/Defs/Ammo/HighCaliber/30x165mm.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 46 + 52
    • diff --git a/Defs/Ammo/HighCaliber/30x173mmNATO.xml b/Defs/Ammo/HighCaliber/30x173mmNATO.xml index 0d01fd80ec..4eae92b1a1 100644 --- a/Defs/Ammo/HighCaliber/30x173mmNATO.xml +++ b/Defs/Ammo/HighCaliber/30x173mmNATO.xml @@ -149,7 +149,7 @@
  • Bomb_Secondary - 76 + 69
    • diff --git a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml index 44d70c8e07..a23ce9dc8d 100644 --- a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 10 + 8
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 15 + 11
    • diff --git a/Defs/Ammo/HighCaliber/338NormaMagnum.xml b/Defs/Ammo/HighCaliber/338NormaMagnum.xml index 4931880f13..5030e9096b 100644 --- a/Defs/Ammo/HighCaliber/338NormaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338NormaMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 10 + 9
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 15 + 12
    • diff --git a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml index 88a6625def..a138e35833 100644 --- a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml +++ b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 13 + 9
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 14 + 12
    • diff --git a/Defs/Ammo/HighCaliber/40x311mmR.xml b/Defs/Ammo/HighCaliber/40x311mmR.xml index b4d3365c81..03371f0bd6 100644 --- a/Defs/Ammo/HighCaliber/40x311mmR.xml +++ b/Defs/Ammo/HighCaliber/40x311mmR.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 66 + 86
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 101 + 117
    • diff --git a/Defs/Ammo/HighCaliber/470NitroExpress.xml b/Defs/Ammo/HighCaliber/470NitroExpress.xml index b3acb14b0d..87be208c4b 100644 --- a/Defs/Ammo/HighCaliber/470NitroExpress.xml +++ b/Defs/Ammo/HighCaliber/470NitroExpress.xml @@ -173,7 +173,7 @@
  • Bomb_Secondary - 18 + 16
    • diff --git a/Defs/Ammo/HighCaliber/50BMG.xml b/Defs/Ammo/HighCaliber/50BMG.xml index d6f8b1d665..b6cacb3cc1 100644 --- a/Defs/Ammo/HighCaliber/50BMG.xml +++ b/Defs/Ammo/HighCaliber/50BMG.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 16 + 14
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 24 + 20
    • diff --git a/Defs/Ammo/HighCaliber/55Boys.xml b/Defs/Ammo/HighCaliber/55Boys.xml index cad36955d1..a646269473 100644 --- a/Defs/Ammo/HighCaliber/55Boys.xml +++ b/Defs/Ammo/HighCaliber/55Boys.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 19 + 17
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 29 + 23
    • diff --git a/Defs/Ammo/HighCaliber/600NitroExpress.xml b/Defs/Ammo/HighCaliber/600NitroExpress.xml index 04a310c509..a20f2c3173 100644 --- a/Defs/Ammo/HighCaliber/600NitroExpress.xml +++ b/Defs/Ammo/HighCaliber/600NitroExpress.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 15 + 17
    • diff --git a/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml b/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml index aa5bb3e47d..b697ad21b3 100644 --- a/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml +++ b/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 12 + 7
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 18 + 10
    • diff --git a/Defs/Ammo/HighCaliber/950JDJ.xml b/Defs/Ammo/HighCaliber/950JDJ.xml index 9839f8a987..0b3b496533 100644 --- a/Defs/Ammo/HighCaliber/950JDJ.xml +++ b/Defs/Ammo/HighCaliber/950JDJ.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 29 + 38
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 45 + 52
    • diff --git a/Defs/Ammo/Rifle/127x55mm.xml b/Defs/Ammo/Rifle/127x55mm.xml index 76d1c74f1e..994c3f4be0 100644 --- a/Defs/Ammo/Rifle/127x55mm.xml +++ b/Defs/Ammo/Rifle/127x55mm.xml @@ -181,7 +181,7 @@
  • Flame_Secondary - 8 + 17
    • 14 @@ -197,7 +197,7 @@
  • Bomb_Secondary - 13 + 23
    • 7 diff --git a/Defs/Ammo/Rifle/243Winchester.xml b/Defs/Ammo/Rifle/243Winchester.xml index 23e71ab318..95931e39de 100644 --- a/Defs/Ammo/Rifle/243Winchester.xml +++ b/Defs/Ammo/Rifle/243Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 4
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 6
    • diff --git a/Defs/Ammo/Rifle/277Fury.xml b/Defs/Ammo/Rifle/277Fury.xml index 1dc6529c94..7602604914 100644 --- a/Defs/Ammo/Rifle/277Fury.xml +++ b/Defs/Ammo/Rifle/277Fury.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 7
    • diff --git a/Defs/Ammo/Rifle/280British.xml b/Defs/Ammo/Rifle/280British.xml index c40c32f46d..2b7ecab255 100644 --- a/Defs/Ammo/Rifle/280British.xml +++ b/Defs/Ammo/Rifle/280British.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 7
    • diff --git a/Defs/Ammo/Rifle/30-30Winchester.xml b/Defs/Ammo/Rifle/30-30Winchester.xml index 0bdf9b0b19..ed71bab020 100644 --- a/Defs/Ammo/Rifle/30-30Winchester.xml +++ b/Defs/Ammo/Rifle/30-30Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 8
    • diff --git a/Defs/Ammo/Rifle/3006Springfield.xml b/Defs/Ammo/Rifle/3006Springfield.xml index 3b1ba1188c..344e77ad35 100644 --- a/Defs/Ammo/Rifle/3006Springfield.xml +++ b/Defs/Ammo/Rifle/3006Springfield.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/300AACBlackout.xml b/Defs/Ammo/Rifle/300AACBlackout.xml index a2ac2c1bcf..9e1f6d607f 100644 --- a/Defs/Ammo/Rifle/300AACBlackout.xml +++ b/Defs/Ammo/Rifle/300AACBlackout.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 7
    • diff --git a/Defs/Ammo/Rifle/303British.xml b/Defs/Ammo/Rifle/303British.xml index 46b1e11cd2..2f8270d156 100644 --- a/Defs/Ammo/Rifle/303British.xml +++ b/Defs/Ammo/Rifle/303British.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/30Carbine.xml b/Defs/Ammo/Rifle/30Carbine.xml index 8c79378fbf..4f31a523c1 100644 --- a/Defs/Ammo/Rifle/30Carbine.xml +++ b/Defs/Ammo/Rifle/30Carbine.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 6
    • diff --git a/Defs/Ammo/Rifle/38-55Winchester.xml b/Defs/Ammo/Rifle/38-55Winchester.xml index a7196e91ad..7f6f1c0e1f 100644 --- a/Defs/Ammo/Rifle/38-55Winchester.xml +++ b/Defs/Ammo/Rifle/38-55Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/44-40Winchester.xml b/Defs/Ammo/Rifle/44-40Winchester.xml index b7bbff3502..6f50628dc5 100644 --- a/Defs/Ammo/Rifle/44-40Winchester.xml +++ b/Defs/Ammo/Rifle/44-40Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 9
    • diff --git a/Defs/Ammo/Rifle/4570Gov.xml b/Defs/Ammo/Rifle/4570Gov.xml index 8ed624752a..c94a38e1dd 100644 --- a/Defs/Ammo/Rifle/4570Gov.xml +++ b/Defs/Ammo/Rifle/4570Gov.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 14 + 12
    • diff --git a/Defs/Ammo/Rifle/458SOCOM.xml b/Defs/Ammo/Rifle/458SOCOM.xml index 83c82cc6a9..1a960aacca 100644 --- a/Defs/Ammo/Rifle/458SOCOM.xml +++ b/Defs/Ammo/Rifle/458SOCOM.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 13 + 12
    • diff --git a/Defs/Ammo/Rifle/473x33mmCaseless.xml b/Defs/Ammo/Rifle/473x33mmCaseless.xml index 6959713083..2c27375412 100644 --- a/Defs/Ammo/Rifle/473x33mmCaseless.xml +++ b/Defs/Ammo/Rifle/473x33mmCaseless.xml @@ -179,7 +179,7 @@
  • Flame_Secondary - 5 + 3
    • @@ -195,7 +195,7 @@
  • Bomb_Secondary - 7 + 4
    • diff --git a/Defs/Ammo/Rifle/485x49mm.xml b/Defs/Ammo/Rifle/485x49mm.xml index fe1cca5b2d..a0f427b183 100644 --- a/Defs/Ammo/Rifle/485x49mm.xml +++ b/Defs/Ammo/Rifle/485x49mm.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 3
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 4
    • diff --git a/Defs/Ammo/Rifle/50Beowulf.xml b/Defs/Ammo/Rifle/50Beowulf.xml index 9cfb2dacc5..cd965a42ec 100644 --- a/Defs/Ammo/Rifle/50Beowulf.xml +++ b/Defs/Ammo/Rifle/50Beowulf.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 14 + 13
    • diff --git a/Defs/Ammo/Rifle/545x39mmSoviet.xml b/Defs/Ammo/Rifle/545x39mmSoviet.xml index 30a639234f..bde04ba16d 100644 --- a/Defs/Ammo/Rifle/545x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/545x39mmSoviet.xml @@ -196,7 +196,7 @@
  • Flame_Secondary - 5 + 3
    • @@ -212,7 +212,7 @@
  • Bomb_Secondary - 8 + 4
    • @@ -274,7 +274,7 @@
  • Flame_Secondary - 4 + 3
    • 142 @@ -291,7 +291,7 @@
  • Bomb_Secondary - 7 + 4
    • 142 diff --git a/Defs/Ammo/Rifle/556x45mmNATO.xml b/Defs/Ammo/Rifle/556x45mmNATO.xml index 7e27338406..f89fa9ae70 100644 --- a/Defs/Ammo/Rifle/556x45mmNATO.xml +++ b/Defs/Ammo/Rifle/556x45mmNATO.xml @@ -194,7 +194,7 @@
  • Flame_Secondary - 5 + 3
    • @@ -210,7 +210,7 @@
  • Bomb_Secondary - 8 + 5
    • @@ -272,7 +272,7 @@
  • Flame_Secondary - 5 + 3
    • 142 @@ -289,7 +289,7 @@
  • Bomb_Secondary - 7 + 5
    • 142 diff --git a/Defs/Ammo/Rifle/56-56Spencer.xml b/Defs/Ammo/Rifle/56-56Spencer.xml index e375a58148..74e2c13780 100644 --- a/Defs/Ammo/Rifle/56-56Spencer.xml +++ b/Defs/Ammo/Rifle/56-56Spencer.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 9
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 13
    • diff --git a/Defs/Ammo/Rifle/58x42mmDBP10.xml b/Defs/Ammo/Rifle/58x42mmDBP10.xml index a9158d5946..20c27fce87 100644 --- a/Defs/Ammo/Rifle/58x42mmDBP10.xml +++ b/Defs/Ammo/Rifle/58x42mmDBP10.xml @@ -182,7 +182,7 @@
  • Flame_Secondary - 6 + 3
    • @@ -198,7 +198,7 @@
  • Bomb_Secondary - 9 + 5
    • diff --git a/Defs/Ammo/Rifle/6.5Creedmoor.xml b/Defs/Ammo/Rifle/6.5Creedmoor.xml index 3d0929285c..d9db2a7be4 100644 --- a/Defs/Ammo/Rifle/6.5Creedmoor.xml +++ b/Defs/Ammo/Rifle/6.5Creedmoor.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/6.5x52mm Carcano.xml b/Defs/Ammo/Rifle/6.5x52mm Carcano.xml index e911ddf6b5..14481c0ef1 100644 --- a/Defs/Ammo/Rifle/6.5x52mm Carcano.xml +++ b/Defs/Ammo/Rifle/6.5x52mm Carcano.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 8
    • diff --git a/Defs/Ammo/Rifle/65x50mmSRArisaka.xml b/Defs/Ammo/Rifle/65x50mmSRArisaka.xml index 7b4c0c5f32..394792818d 100644 --- a/Defs/Ammo/Rifle/65x50mmSRArisaka.xml +++ b/Defs/Ammo/Rifle/65x50mmSRArisaka.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 7
    • diff --git a/Defs/Ammo/Rifle/7.92x57mmMauser.xml b/Defs/Ammo/Rifle/7.92x57mmMauser.xml index 90e916d853..cb99f6e921 100644 --- a/Defs/Ammo/Rifle/7.92x57mmMauser.xml +++ b/Defs/Ammo/Rifle/7.92x57mmMauser.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 13 + 9
    • diff --git a/Defs/Ammo/Rifle/75x54mmFrench.xml b/Defs/Ammo/Rifle/75x54mmFrench.xml index 62253a6992..906a5e96a1 100644 --- a/Defs/Ammo/Rifle/75x54mmFrench.xml +++ b/Defs/Ammo/Rifle/75x54mmFrench.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 7
    • diff --git a/Defs/Ammo/Rifle/762x39mmSoviet.xml b/Defs/Ammo/Rifle/762x39mmSoviet.xml index 52227160f0..dbb7357373 100644 --- a/Defs/Ammo/Rifle/762x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/762x39mmSoviet.xml @@ -196,7 +196,7 @@
  • Flame_Secondary - 7 + 5
    • @@ -212,7 +212,7 @@
  • Bomb_Secondary - 10 + 7
    • @@ -275,7 +275,7 @@
  • Flame_Secondary - 6 + 5
    • @@ -292,7 +292,7 @@
  • Bomb_Secondary - 9 + 7
    • diff --git a/Defs/Ammo/Rifle/762x51mmNATO.xml b/Defs/Ammo/Rifle/762x51mmNATO.xml index d8f704899b..769d35e14c 100644 --- a/Defs/Ammo/Rifle/762x51mmNATO.xml +++ b/Defs/Ammo/Rifle/762x51mmNATO.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/762x54mmR.xml b/Defs/Ammo/Rifle/762x54mmR.xml index e1fcdf6b2c..bf71bbb8f3 100644 --- a/Defs/Ammo/Rifle/762x54mmR.xml +++ b/Defs/Ammo/Rifle/762x54mmR.xml @@ -182,7 +182,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -198,7 +198,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/77x58mmArisaka.xml b/Defs/Ammo/Rifle/77x58mmArisaka.xml index e510e92f03..2f4c00544e 100644 --- a/Defs/Ammo/Rifle/77x58mmArisaka.xml +++ b/Defs/Ammo/Rifle/77x58mmArisaka.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 8
    • diff --git a/Defs/Ammo/Rifle/792x33mmKurz.xml b/Defs/Ammo/Rifle/792x33mmKurz.xml index 90bde6c0ef..880b1e99c8 100644 --- a/Defs/Ammo/Rifle/792x33mmKurz.xml +++ b/Defs/Ammo/Rifle/792x33mmKurz.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 7
    • diff --git a/Defs/Ammo/Rifle/8.6mmBlackout.xml b/Defs/Ammo/Rifle/8.6mmBlackout.xml index a6cc1fe328..c1fbd69cd7 100644 --- a/Defs/Ammo/Rifle/8.6mmBlackout.xml +++ b/Defs/Ammo/Rifle/8.6mmBlackout.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 8
    • diff --git a/Defs/Ammo/Rifle/8x50mmRLebel.xml b/Defs/Ammo/Rifle/8x50mmRLebel.xml index 6105c976e6..1dfc68cf29 100644 --- a/Defs/Ammo/Rifle/8x50mmRLebel.xml +++ b/Defs/Ammo/Rifle/8x50mmRLebel.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 9
    • diff --git a/Defs/Ammo/Rifle/8x50mmRMannlicher.xml b/Defs/Ammo/Rifle/8x50mmRMannlicher.xml index 9505461b5c..52303f1493 100644 --- a/Defs/Ammo/Rifle/8x50mmRMannlicher.xml +++ b/Defs/Ammo/Rifle/8x50mmRMannlicher.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 10
    • diff --git a/Defs/Ammo/Rifle/9x39mmSoviet.xml b/Defs/Ammo/Rifle/9x39mmSoviet.xml index 882c8b223f..6ad902297e 100644 --- a/Defs/Ammo/Rifle/9x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/9x39mmSoviet.xml @@ -181,7 +181,7 @@
  • Flame_Secondary - 5 + 8
    • @@ -197,7 +197,7 @@
  • Bomb_Secondary - 8 + 10
    • From 2ba0aaa91c660700a9b0ad4e6e75a0c3ba8e6331 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 9 Sep 2024 01:16:50 -0400 Subject: [PATCH 2/2] Give correct secondary damage --- Defs/Ammo/Rifle/38-55Winchester.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Defs/Ammo/Rifle/38-55Winchester.xml b/Defs/Ammo/Rifle/38-55Winchester.xml index 7f6f1c0e1f..982aab799f 100644 --- a/Defs/Ammo/Rifle/38-55Winchester.xml +++ b/Defs/Ammo/Rifle/38-55Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 11