From 5f9799ad206c8dfe3b4750c0129fe313f6c87d64 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 5 Jun 2024 02:02:27 +0330 Subject: [PATCH 1/5] Explosives Rework --- Defs/Ammo/Advanced/30x64mmFuelCell.xml | 4 ++-- Defs/Ammo/Advanced/60x225mmGammaShell.xml | 2 +- Defs/Ammo/Advanced/66mmThermalBolt.xml | 2 +- Defs/Ammo/Advanced/70mmMechanoidGrenade.xml | 4 ++-- Defs/Ammo/Advanced/80x256mmFuelCell.xml | 2 +- Defs/Ammo/Advanced/PlasmaCellHeavy.xml | 2 +- Defs/Ammo/Advanced/PlasmaCellPistol.xml | 2 +- Defs/Ammo/Advanced/PlasmaCellRifle.xml | 2 +- Defs/Ammo/Generic/AntiMateriel.xml | 6 ++--- Defs/Ammo/Generic/Autocannon.xml | 6 ++--- Defs/Ammo/Generic/LauncherGrenade.xml | 21 +++++++++++++++--- Defs/Ammo/Generic/Rifle.xml | 6 ++--- Defs/Ammo/Generic/RifleIntermediate.xml | 6 ++--- Defs/Ammo/Generic/RifleMagnum.xml | 6 ++--- Defs/Ammo/Grenade/20x42mmGrenade.xml | 8 +++---- Defs/Ammo/Grenade/25x40mmGrenade.xml | 6 ++--- Defs/Ammo/Grenade/25x59mmGrenade.xml | 12 +++++----- Defs/Ammo/Grenade/30x29mmGrenade.xml | 18 +++++++-------- Defs/Ammo/Grenade/35x32mmSRGrenade.xml | 14 ++++++------ Defs/Ammo/Grenade/40x46mmGrenade.xml | 22 +++++++++---------- Defs/Ammo/Grenade/40x47mmGrenade.xml | 10 ++++----- Defs/Ammo/Grenade/40x53mmGrenade.xml | 20 ++++++++--------- Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml | 14 ++++++------ Defs/Ammo/Grenade/50mmGS50Grenade.xml | 6 ++--- Defs/Ammo/Grenade/83mmPIATGrenade.xml | 12 +++++----- Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml | 4 ++-- Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml | 4 ++-- Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml | 2 +- Defs/Ammo/HighCaliber/2-Bore.xml | 4 ++-- Defs/Ammo/HighCaliber/20x102mmNATO.xml | 4 ++-- Defs/Ammo/HighCaliber/20x110mmHispano.xml | 4 ++-- 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 | 4 ++-- Defs/Ammo/HighCaliber/25x137mmNATO.xml | 4 ++-- Defs/Ammo/HighCaliber/300WinchesterMagnum.xml | 2 +- Defs/Ammo/HighCaliber/30x113mmB.xml | 4 ++-- Defs/Ammo/HighCaliber/30x165mm.xml | 4 ++-- Defs/Ammo/HighCaliber/30x173mmNATO.xml | 4 ++-- 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 | 4 ++-- Defs/Ammo/HighCaliber/50BMG.xml | 4 ++-- Defs/Ammo/HighCaliber/55Boys.xml | 4 ++-- Defs/Ammo/HighCaliber/600NitroExpress.xml | 4 ++-- Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml | 4 ++-- Defs/Ammo/HighCaliber/950JDJ.xml | 4 ++-- Defs/Ammo/Medieval/CannonBall.xml | 4 ++-- Defs/Ammo/Medieval/MortarGrenade.xml | 4 ++-- Defs/Ammo/Projectiles_Fragments.xml | 4 ++-- Defs/Ammo/Rifle/127x55mm.xml | 4 ++-- Defs/Ammo/Rifle/243Winchester.xml | 2 +- Defs/Ammo/Rifle/280British.xml | 2 +- Defs/Ammo/Rifle/30-30Winchester.xml | 4 ++-- Defs/Ammo/Rifle/300AACBlackout.xml | 4 ++-- Defs/Ammo/Rifle/303British.xml | 4 ++-- Defs/Ammo/Rifle/30Carbine.xml | 4 ++-- Defs/Ammo/Rifle/38-55Winchester.xml | 4 ++-- Defs/Ammo/Rifle/44-40Winchester.xml | 4 ++-- Defs/Ammo/Rifle/4570Gov.xml | 4 ++-- Defs/Ammo/Rifle/458SOCOM.xml | 4 ++-- Defs/Ammo/Rifle/50Beowulf.xml | 4 ++-- Defs/Ammo/Rifle/545x39mmSoviet.xml | 4 ++-- Defs/Ammo/Rifle/556x45mmNATO.xml | 2 +- Defs/Ammo/Rifle/56-56Spencer.xml | 4 ++-- Defs/Ammo/Rifle/58x42mmDBP10.xml | 4 ++-- Defs/Ammo/Rifle/6.5x52mm Carcano.xml | 4 ++-- Defs/Ammo/Rifle/65x50mmSRArisaka.xml | 4 ++-- Defs/Ammo/Rifle/7.92x57mmMauser.xml | 2 +- Defs/Ammo/Rifle/75x54mmFrench.xml | 4 ++-- Defs/Ammo/Rifle/762x39mmSoviet.xml | 6 ++--- Defs/Ammo/Rifle/77x58mmArisaka.xml | 4 ++-- Defs/Ammo/Rifle/792x33mmKurz.xml | 4 ++-- Defs/Ammo/Rifle/8x50mmRLebel.xml | 4 ++-- Defs/Ammo/Rifle/8x50mmRMannlicher.xml | 4 ++-- Defs/Ammo/Rifle/9x39mmSoviet.xml | 4 ++-- Defs/Ammo/Rocket/127mmJavelinMissile.xml | 4 ++-- Defs/Ammo/Rocket/130mmType63.xml | 2 +- Defs/Ammo/Rocket/132mmM13.xml | 2 +- Defs/Ammo/Rocket/150mmMBTLAWMissile.xml | 6 ++--- Defs/Ammo/Rocket/20mmFliegerfaust.xml | 2 +- Defs/Ammo/Rocket/50mmRocket.xml | 2 +- Defs/Ammo/Rocket/57mmS5Rocket.xml | 8 +++---- Defs/Ammo/Rocket/70mmAPKWS.xml | 4 ++-- Defs/Ammo/Rocket/83mmSMAW.xml | 10 ++++----- Defs/Ammo/Rocket/84mmAT4.xml | 4 ++-- Defs/Ammo/Rocket/84x246mmR.xml | 22 +++++++++---------- Defs/Ammo/Rocket/88mmRPzB.xml | 4 ++-- Defs/Ammo/Rocket/90mmMATADOR.xml | 4 ++-- Defs/Ammo/Rocket/90mmRecoilless.xml | 4 ++-- Defs/Ammo/Rocket/M6.xml | 4 ++-- Defs/Ammo/Rocket/M6A1.xml | 4 ++-- Defs/Ammo/Rocket/M6A3.xml | 6 ++--- Defs/Ammo/Rocket/M72LAW.xml | 4 ++-- Defs/Ammo/Rocket/M74.xml | 4 ++-- Defs/Ammo/Rocket/RPG28.xml | 4 ++-- Defs/Ammo/Rocket/RPG32.xml | 8 +++---- Defs/Ammo/Rocket/RPG7.xml | 12 +++++----- Defs/Ammo/Rocket/RPO.xml | 6 ++--- Defs/Ammo/Rocket/SPG9.xml | 12 +++++----- Defs/Ammo/Rocket/TomahawkLAM.xml | 2 +- Defs/Ammo/Shell/100x695mmR.xml | 12 +++++----- Defs/Ammo/Shell/105mmHowitzer.xml | 20 ++++++++--------- Defs/Ammo/Shell/105x607mmR.xml | 6 ++--- Defs/Ammo/Shell/105x617mmR.xml | 6 ++--- Defs/Ammo/Shell/120mmCannon.xml | 6 ++--- Defs/Ammo/Shell/155mmHowitzer.xml | 8 +++---- Defs/Ammo/Shell/15cmNebelwerfer.xml | 2 +- Defs/Ammo/Shell/28cmSpgr.xml | 2 +- Defs/Ammo/Shell/37x223mmR.xml | 2 +- Defs/Ammo/Shell/40x365mmBofors.xml | 4 ++-- Defs/Ammo/Shell/50mmType89Mortar.xml | 6 ++--- Defs/Ammo/Shell/57x307mmR.xml | 2 +- Defs/Ammo/Shell/57x438mmBofors.xml | 4 ++-- Defs/Ammo/Shell/60mmMortar.xml | 6 ++--- Defs/Ammo/Shell/75x350mmR.xml | 2 +- Defs/Ammo/Shell/762x385mmRCannon.xml | 8 +++---- Defs/Ammo/Shell/762x539mmR.xml | 2 +- Defs/Ammo/Shell/81mmMortar.xml | 6 ++--- Defs/Ammo/Shell/90mmCannon.xml | 10 ++++----- Defs/Ammo/Shotgun/10Gauge.xml | 2 +- Defs/Ammo/Shotgun/12Gauge.xml | 2 +- Defs/Ammo/Shotgun/20Gauge.xml | 2 +- Defs/Ammo/Shotgun/23x75mmR.xml | 2 +- Defs/Ammo/Shotgun/410Bore.xml | 4 ++-- Defs/ThingDefs_Misc/Weapons_Grenades.xml | 6 ++--- .../Core/ThingDefs_Misc/Weapons_Grenades.xml | 6 ++--- 131 files changed, 360 insertions(+), 345 deletions(-) diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml index cbdd232a0b..04c706c060 100644 --- a/Defs/Ammo/Advanced/30x64mmFuelCell.xml +++ b/Defs/Ammo/Advanced/30x64mmFuelCell.xml @@ -98,7 +98,7 @@ PrometheumFlame - 6 + 7 4.5 FilthPrometheum 0.2 @@ -113,7 +113,7 @@ 2.0 Thermobaric - 48 + 60 MortarBomb_Explode true true diff --git a/Defs/Ammo/Advanced/60x225mmGammaShell.xml b/Defs/Ammo/Advanced/60x225mmGammaShell.xml index 9446aa1b58..19b2c4d4aa 100644 --- a/Defs/Ammo/Advanced/60x225mmGammaShell.xml +++ b/Defs/Ammo/Advanced/60x225mmGammaShell.xml @@ -62,7 +62,7 @@ Burn - 33 + 39 73 false 7.5 diff --git a/Defs/Ammo/Advanced/66mmThermalBolt.xml b/Defs/Ammo/Advanced/66mmThermalBolt.xml index 05d0423413..3ac166c641 100644 --- a/Defs/Ammo/Advanced/66mmThermalBolt.xml +++ b/Defs/Ammo/Advanced/66mmThermalBolt.xml @@ -89,7 +89,7 @@ PrometheumFlame - 6 + 8 4.9 true FilthPrometheum diff --git a/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml b/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml index 78931b8c62..5838be4266 100644 --- a/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml +++ b/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml @@ -83,7 +83,7 @@ Bomb - 132 + 154 2.5 MortarBomb_Explode true @@ -104,7 +104,7 @@ 5 EMP - 132 + 154 diff --git a/Defs/Ammo/Advanced/80x256mmFuelCell.xml b/Defs/Ammo/Advanced/80x256mmFuelCell.xml index 9a4f4eb59f..e8cc700b2a 100644 --- a/Defs/Ammo/Advanced/80x256mmFuelCell.xml +++ b/Defs/Ammo/Advanced/80x256mmFuelCell.xml @@ -75,7 +75,7 @@ PrometheumFlame - 11 + 13 73 false 6.5 diff --git a/Defs/Ammo/Advanced/PlasmaCellHeavy.xml b/Defs/Ammo/Advanced/PlasmaCellHeavy.xml index 1798747dc8..cdf25b16f7 100644 --- a/Defs/Ammo/Advanced/PlasmaCellHeavy.xml +++ b/Defs/Ammo/Advanced/PlasmaCellHeavy.xml @@ -72,7 +72,7 @@ 165 Bomb - 18 + 25 1 true diff --git a/Defs/Ammo/Advanced/PlasmaCellPistol.xml b/Defs/Ammo/Advanced/PlasmaCellPistol.xml index 6d05352587..8906385b42 100644 --- a/Defs/Ammo/Advanced/PlasmaCellPistol.xml +++ b/Defs/Ammo/Advanced/PlasmaCellPistol.xml @@ -71,7 +71,7 @@ 137 Bomb - 2 + 3 true
  • diff --git a/Defs/Ammo/Advanced/PlasmaCellRifle.xml b/Defs/Ammo/Advanced/PlasmaCellRifle.xml index 2dabe4c673..7748ea0c6d 100644 --- a/Defs/Ammo/Advanced/PlasmaCellRifle.xml +++ b/Defs/Ammo/Advanced/PlasmaCellRifle.xml @@ -71,7 +71,7 @@ 178 Bomb - 2 + 4 0.5 true diff --git a/Defs/Ammo/Generic/AntiMateriel.xml b/Defs/Ammo/Generic/AntiMateriel.xml index b40c73e857..577e537769 100644 --- a/Defs/Ammo/Generic/AntiMateriel.xml +++ b/Defs/Ammo/Generic/AntiMateriel.xml @@ -78,7 +78,7 @@ CombatExtended.Graphic_StackCountRanged - 0.66 + 0.82 IncendiaryAP Bullet_50BMG_Incendiary @@ -86,13 +86,13 @@ Ammo_AntiMateriel_HE - + Things/Ammo/STACK_RANGED/HighCaliber/HE CombatExtended.Graphic_StackCountRanged - 0.89 + 1.36 ExplosiveAP Bullet_50BMG_HE diff --git a/Defs/Ammo/Generic/Autocannon.xml b/Defs/Ammo/Generic/Autocannon.xml index 7093fd98f2..244988c3c4 100644 --- a/Defs/Ammo/Generic/Autocannon.xml +++ b/Defs/Ammo/Generic/Autocannon.xml @@ -63,7 +63,7 @@ CombatExtended.Graphic_StackCountRanged - 1.35 + 1.67 IncendiaryAP Bullet_20x102mmNATO_Incendiary @@ -71,13 +71,13 @@ Ammo_Autocannon_HE - + Things/Ammo/STACK_RANGED/HighCaliber/HE CombatExtended.Graphic_StackCountRanged - 1.78 + 2.84 ExplosiveAP Bullet_20x102mmNATO_HE diff --git a/Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/Generic/LauncherGrenade.xml index 30aa521d51..d46149055a 100644 --- a/Defs/Ammo/Generic/LauncherGrenade.xml +++ b/Defs/Ammo/Generic/LauncherGrenade.xml @@ -17,6 +17,7 @@ Bullet_40x46mmGrenade_HE + Bullet_40x46mmGrenade_HE_TFuzed Bullet_40x46mmGrenade_HEDP Bullet_40x46mmGrenade_EMP Bullet_40x46mmGrenade_Smoke @@ -50,12 +51,26 @@ CombatExtended.Graphic_StackCountRanged - 2.19 + 2.27 GrenadeHE Bullet_40x46mmGrenade_HE + + Ammo_LauncherGrenade_HE_TFuzed + + + Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR + Graphic_StackCount + + + 3.25 + + GrenadeHETF + Bullet_40x46mmGrenade_HE + + Ammo_LauncherGrenade_HEDP @@ -64,7 +79,7 @@ Graphic_StackCount - 2.19 + 2.12 GrenadeHEDP Bullet_40x46mmGrenade_HE @@ -78,7 +93,7 @@ CombatExtended.Graphic_StackCountRanged - 4.25 + 4.57 GrenadeEMP Bullet_40x46mmGrenade_EMP diff --git a/Defs/Ammo/Generic/Rifle.xml b/Defs/Ammo/Generic/Rifle.xml index c4d2cde8db..308eaf26a4 100644 --- a/Defs/Ammo/Generic/Rifle.xml +++ b/Defs/Ammo/Generic/Rifle.xml @@ -92,7 +92,7 @@ CombatExtended.Graphic_StackCountRanged - 0.15 + 0.17 IncendiaryAP Bullet_762x51mmNATO_Incendiary @@ -100,13 +100,13 @@ Ammo_Rifle_HE - + Things/Ammo/STACK_RANGED/Rifle/HE CombatExtended.Graphic_StackCountRanged - 0.19 + 0.31 ExplosiveAP Bullet_762x51mmNATO_HE diff --git a/Defs/Ammo/Generic/RifleIntermediate.xml b/Defs/Ammo/Generic/RifleIntermediate.xml index eb94d6c9fb..7c2af17e1e 100644 --- a/Defs/Ammo/Generic/RifleIntermediate.xml +++ b/Defs/Ammo/Generic/RifleIntermediate.xml @@ -92,7 +92,7 @@ CombatExtended.Graphic_StackCountRanged - 0.09 + 0.1 IncendiaryAP Bullet_556x45mmNATO_Incendiary @@ -100,13 +100,13 @@ Ammo_RifleIntermediate_HE - + Things/Ammo/STACK_RANGED/Rifle/HE CombatExtended.Graphic_StackCountRanged - 0.12 + 0.17 ExplosiveAP Bullet_556x45mmNATO_HE diff --git a/Defs/Ammo/Generic/RifleMagnum.xml b/Defs/Ammo/Generic/RifleMagnum.xml index 315444ea54..0e44b26f4f 100644 --- a/Defs/Ammo/Generic/RifleMagnum.xml +++ b/Defs/Ammo/Generic/RifleMagnum.xml @@ -78,7 +78,7 @@ CombatExtended.Graphic_StackCountRanged - 0.27 + 0.33 IncendiaryAP Bullet_338Lapua_Incendiary @@ -86,13 +86,13 @@ Ammo_RifleMagnum_HE - + Things/Ammo/STACK_RANGED/HighCaliber/HE CombatExtended.Graphic_StackCountRanged - 0.36 + 0.52 ExplosiveAP Bullet_338Lapua_HE diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml index bb436b395f..7d73dfc411 100644 --- a/Defs/Ammo/Grenade/20x42mmGrenade.xml +++ b/Defs/Ammo/Grenade/20x42mmGrenade.xml @@ -195,7 +195,7 @@
  • Flame_Secondary - 12 + 27
    • @@ -211,7 +211,7 @@
  • Bomb_Secondary - 19 + 40
    • @@ -223,7 +223,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 18 + 25 1.0 true @@ -242,7 +242,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 18 + 25 1.5 diff --git a/Defs/Ammo/Grenade/25x40mmGrenade.xml b/Defs/Ammo/Grenade/25x40mmGrenade.xml index 730f84c91c..5adfc9f553 100644 --- a/Defs/Ammo/Grenade/25x40mmGrenade.xml +++ b/Defs/Ammo/Grenade/25x40mmGrenade.xml @@ -119,7 +119,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 18 + 24 1 true @@ -138,7 +138,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 18 + 24 1 true 0.5 @@ -159,7 +159,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 17 + 24 1.5 diff --git a/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml index 14d1cf24e2..01df165829 100644 --- a/Defs/Ammo/Grenade/25x59mmGrenade.xml +++ b/Defs/Ammo/Grenade/25x59mmGrenade.xml @@ -134,7 +134,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 19 + 26 1 true @@ -153,7 +153,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 19 + 26 1 true 1.4 @@ -175,13 +175,13 @@ CombatExtended.BulletCE Bullet - 30 + 29 50 - 4.818 + 3.613
  • - 16 + 17 Bomb 0.5 true @@ -200,7 +200,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 19 + 26 1.5 diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml index dde417dd36..e014e323ed 100644 --- a/Defs/Ammo/Grenade/30x29mmGrenade.xml +++ b/Defs/Ammo/Grenade/30x29mmGrenade.xml @@ -133,9 +133,9 @@ Bullet_30x29mmGrenade_HE - 1 Bomb - 22 + 30 + 1 true @@ -152,9 +152,9 @@ CombatExtended.ProjectileCE_Bursting - 1 Bomb - 22 + 30 + 1 true 1.4 2 @@ -175,9 +175,9 @@ Bullet - 35 + 37 45 - 5.569 + 4.177
  • @@ -198,9 +198,9 @@ Bullet_30x29mmGrenade_EMP - 2 EMP - 22 + 30 + 2 @@ -208,8 +208,8 @@ Bullet_30x29mmGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml index e224083093..e0e3c35a15 100644 --- a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml +++ b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml @@ -117,9 +117,9 @@ CombatExtended.ProjectileCE_Explosive - 1 Bomb - 20 + 27 + 1 true @@ -137,9 +137,9 @@ Bullet - 31 + 30 55 - 4.961 + 3.721
  • @@ -161,9 +161,9 @@ CombatExtended.ProjectileCE_Explosive - 1.5 EMP - 20 + 27 + 1.5 @@ -171,8 +171,8 @@ Bullet_35x32mmSRGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml index 10e1459515..536e7c9075 100644 --- a/Defs/Ammo/Grenade/40x46mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x46mmGrenade.xml @@ -150,9 +150,9 @@ Bullet_40x46mmGrenade_HE - 1.0 Bomb - 22 + 29 + 1.0 true @@ -169,9 +169,9 @@ CombatExtended.ProjectileCE_Bursting - 1.0 Bomb - 22 + 29 + 1.0 true 1.4 2 @@ -192,13 +192,13 @@ Bullet - 35 + 36 63 - 5.543 + 4.157
  • - 18 + 19 Bomb 0.5 true @@ -215,9 +215,9 @@ Bullet_40x46mmGrenade_EMP - 1.5 EMP - 22 + 29 + 1.5 @@ -225,8 +225,8 @@ Bullet_40x46mmGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke @@ -238,8 +238,8 @@ Bullet_40x46mmGrenade_Tox - 2 ToxGas + 2 ToxGas 1 diff --git a/Defs/Ammo/Grenade/40x47mmGrenade.xml b/Defs/Ammo/Grenade/40x47mmGrenade.xml index 67164ef02c..7b81f67509 100644 --- a/Defs/Ammo/Grenade/40x47mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x47mmGrenade.xml @@ -105,9 +105,9 @@ Bullet_40x47mmGrenade_HE - 1 Bomb - 22 + 29 + 1 true @@ -123,9 +123,9 @@ Bullet_40x47mmGrenade_EMP - 2.0 EMP - 22 + 29 + 2.0 @@ -133,8 +133,8 @@ Bullet_40x47mmGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml index 115654916d..a5a9b6646b 100644 --- a/Defs/Ammo/Grenade/40x53mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x53mmGrenade.xml @@ -135,9 +135,9 @@ Bullet_40x53mmGrenade_HE - 1 Bomb - 23 + 31 + 1 true @@ -154,9 +154,9 @@ CombatExtended.ProjectileCE_Bursting - 1.0 Bomb - 23 + 31 + 1.0 true 1.4 2 @@ -177,13 +177,13 @@ Bullet - 36 + 39 76 - 5.768 + 4.326
  • - 19 + 20 Bomb 0.5 true @@ -200,9 +200,9 @@ Bullet_40x53mmGrenade_EMP - 1.5 EMP - 23 + 31 + 1.5 @@ -210,8 +210,8 @@ Bullet_40x53mmGrenade_Smoke - 2.5 Smoke + 2.5 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml b/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml index bab26b96c6..d03b8f23b1 100644 --- a/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml +++ b/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml @@ -117,9 +117,9 @@ Bullet_40x53mmVOG25Grenade_HE - 1.0 Bomb - 26 + 34 + 1.0 true @@ -136,9 +136,9 @@ CombatExtended.ProjectileCE_Bursting - 1.0 Bomb - 26 + 34 + 1.0 true 1.4 2 @@ -157,9 +157,9 @@ Bullet_40x53mmVOG25Grenade_EMP - 2 EMP - 26 + 34 + 2 @@ -167,8 +167,8 @@ Bullet_40x53mmVOG25Grenade_Smoke - 2.5 Smoke + 2.5 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/50mmGS50Grenade.xml b/Defs/Ammo/Grenade/50mmGS50Grenade.xml index 07fe5d02f7..74fc576cd4 100644 --- a/Defs/Ammo/Grenade/50mmGS50Grenade.xml +++ b/Defs/Ammo/Grenade/50mmGS50Grenade.xml @@ -104,7 +104,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 25 + 33 1 true @@ -123,7 +123,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 25 + 33 2 @@ -132,8 +132,8 @@ Bullet_50mmGS50Grenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/83mmPIATGrenade.xml b/Defs/Ammo/Grenade/83mmPIATGrenade.xml index eb20fffced..f46babf8b7 100644 --- a/Defs/Ammo/Grenade/83mmPIATGrenade.xml +++ b/Defs/Ammo/Grenade/83mmPIATGrenade.xml @@ -103,11 +103,11 @@ Bullet 268 100 - 41.818 + 31.364
  • - 139 + 125 Bomb 1 true @@ -126,9 +126,9 @@ Bullet_83mmPIATGrenade_HE - 2.5 Bomb - 139 + 163 + 2.5 true @@ -144,9 +144,9 @@ Bullet_83mmPIATGrenade_EMP - 5 EMP - 139 + 163 + 5 diff --git a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml index d6cbb7c6e0..3984fd865e 100644 --- a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml +++ b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 16 + 18
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 23 + 27
    • diff --git a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml index 3ba50817f2..0bb537c929 100644 --- a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml +++ b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 16 + 19
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 24 + 28
    • diff --git a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml index d89338946a..b2c049e2d9 100644 --- a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml +++ b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml @@ -174,7 +174,7 @@
  • Bomb_Secondary - 32 + 31
    • diff --git a/Defs/Ammo/HighCaliber/2-Bore.xml b/Defs/Ammo/HighCaliber/2-Bore.xml index 448968e54f..a0c3526f1c 100644 --- a/Defs/Ammo/HighCaliber/2-Bore.xml +++ b/Defs/Ammo/HighCaliber/2-Bore.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 22 + 38
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 34 + 57
    • diff --git a/Defs/Ammo/HighCaliber/20x102mmNATO.xml b/Defs/Ammo/HighCaliber/20x102mmNATO.xml index 94c78e5a2b..dfa66be752 100644 --- a/Defs/Ammo/HighCaliber/20x102mmNATO.xml +++ b/Defs/Ammo/HighCaliber/20x102mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 27 + 25
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 42 + 38
    • diff --git a/Defs/Ammo/HighCaliber/20x110mmHispano.xml b/Defs/Ammo/HighCaliber/20x110mmHispano.xml index c70eef2227..60bc8c132e 100644 --- a/Defs/Ammo/HighCaliber/20x110mmHispano.xml +++ b/Defs/Ammo/HighCaliber/20x110mmHispano.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 26 + 28
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 39 + 42
    • diff --git a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml index b64779de2a..58dcb26503 100644 --- a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml +++ b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 30 + 28
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 45 + 42
    • diff --git a/Defs/Ammo/HighCaliber/20x138mmB.xml b/Defs/Ammo/HighCaliber/20x138mmB.xml index 8d7aa0cf7f..68332e1306 100644 --- a/Defs/Ammo/HighCaliber/20x138mmB.xml +++ b/Defs/Ammo/HighCaliber/20x138mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 27 + 28
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 41 + 42
    • diff --git a/Defs/Ammo/HighCaliber/20x139mm.xml b/Defs/Ammo/HighCaliber/20x139mm.xml index a7a210f70f..380ffb929d 100644 --- a/Defs/Ammo/HighCaliber/20x139mm.xml +++ b/Defs/Ammo/HighCaliber/20x139mm.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 30 + 28
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 46 + 42
    • diff --git a/Defs/Ammo/HighCaliber/20x82mmMauser.xml b/Defs/Ammo/HighCaliber/20x82mmMauser.xml index 510b6df233..14026c9b51 100644 --- a/Defs/Ammo/HighCaliber/20x82mmMauser.xml +++ b/Defs/Ammo/HighCaliber/20x82mmMauser.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 22 + 27
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 34 + 40
    • diff --git a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml index ca0b295457..7d2c7ebae7 100644 --- a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml +++ b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 22 + 25
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 33 + 38
    • diff --git a/Defs/Ammo/HighCaliber/25x137mmNATO.xml b/Defs/Ammo/HighCaliber/25x137mmNATO.xml index f9e204df0b..1583c9a86d 100644 --- a/Defs/Ammo/HighCaliber/25x137mmNATO.xml +++ b/Defs/Ammo/HighCaliber/25x137mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 39 + 35
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 59 + 52
    • diff --git a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml index c87eca6ccc..d3130205fc 100644 --- a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml +++ b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml @@ -173,7 +173,7 @@
  • Bomb_Secondary - 14 + 13
    • diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml index 7f908f3bbd..9725cb945a 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 + 63
    • diff --git a/Defs/Ammo/HighCaliber/30x165mm.xml b/Defs/Ammo/HighCaliber/30x165mm.xml index edc7b6c72c..9096f46687 100644 --- a/Defs/Ammo/HighCaliber/30x165mm.xml +++ b/Defs/Ammo/HighCaliber/30x165mm.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 46 + 50
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 71 + 75
    • diff --git a/Defs/Ammo/HighCaliber/30x173mmNATO.xml b/Defs/Ammo/HighCaliber/30x173mmNATO.xml index 0d01fd80ec..31e7e4cff1 100644 --- a/Defs/Ammo/HighCaliber/30x173mmNATO.xml +++ b/Defs/Ammo/HighCaliber/30x173mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 50 + 49
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 76 + 73
    • diff --git a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml index 44d70c8e07..15e07274d6 100644 --- a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 10 + 11
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 15 + 16
    • diff --git a/Defs/Ammo/HighCaliber/338NormaMagnum.xml b/Defs/Ammo/HighCaliber/338NormaMagnum.xml index 4931880f13..6ace5da293 100644 --- a/Defs/Ammo/HighCaliber/338NormaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338NormaMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 10 + 12
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 15 + 17
    • diff --git a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml index 88a6625def..60ff8a60a5 100644 --- a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml +++ b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 13 + 12
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 14 + 18
    • diff --git a/Defs/Ammo/HighCaliber/40x311mmR.xml b/Defs/Ammo/HighCaliber/40x311mmR.xml index b4d3365c81..2dfa64d3b1 100644 --- a/Defs/Ammo/HighCaliber/40x311mmR.xml +++ b/Defs/Ammo/HighCaliber/40x311mmR.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 66 + 75
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 101 + 113
    • diff --git a/Defs/Ammo/HighCaliber/470NitroExpress.xml b/Defs/Ammo/HighCaliber/470NitroExpress.xml index b3acb14b0d..d9943d7204 100644 --- a/Defs/Ammo/HighCaliber/470NitroExpress.xml +++ b/Defs/Ammo/HighCaliber/470NitroExpress.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 12 + 15
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 18 + 22
    • diff --git a/Defs/Ammo/HighCaliber/50BMG.xml b/Defs/Ammo/HighCaliber/50BMG.xml index d6f8b1d665..0e357669b6 100644 --- a/Defs/Ammo/HighCaliber/50BMG.xml +++ b/Defs/Ammo/HighCaliber/50BMG.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 16 + 18
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 24 + 26
    • diff --git a/Defs/Ammo/HighCaliber/55Boys.xml b/Defs/Ammo/HighCaliber/55Boys.xml index cad36955d1..4c6cf264f8 100644 --- a/Defs/Ammo/HighCaliber/55Boys.xml +++ b/Defs/Ammo/HighCaliber/55Boys.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 19 + 20
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 29 + 30
    • diff --git a/Defs/Ammo/HighCaliber/600NitroExpress.xml b/Defs/Ammo/HighCaliber/600NitroExpress.xml index 04a310c509..6b259a4a85 100644 --- a/Defs/Ammo/HighCaliber/600NitroExpress.xml +++ b/Defs/Ammo/HighCaliber/600NitroExpress.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 15 + 20
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 23 + 29
    • diff --git a/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml b/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml index aa5bb3e47d..0c8d834fbd 100644 --- a/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml +++ b/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 12 + 10
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 18 + 15
    • diff --git a/Defs/Ammo/HighCaliber/950JDJ.xml b/Defs/Ammo/HighCaliber/950JDJ.xml index 9839f8a987..35821b994a 100644 --- a/Defs/Ammo/HighCaliber/950JDJ.xml +++ b/Defs/Ammo/HighCaliber/950JDJ.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 29 + 39
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 45 + 58
    • diff --git a/Defs/Ammo/Medieval/CannonBall.xml b/Defs/Ammo/Medieval/CannonBall.xml index 99c44fba0a..3e7162a661 100644 --- a/Defs/Ammo/Medieval/CannonBall.xml +++ b/Defs/Ammo/Medieval/CannonBall.xml @@ -163,7 +163,7 @@ 99 Bomb - 82 + 99 0 0 2.0 @@ -187,7 +187,7 @@ 99 PrometheumFlame - 6 + 7 4.5 FilthPrometheum 0.25 diff --git a/Defs/Ammo/Medieval/MortarGrenade.xml b/Defs/Ammo/Medieval/MortarGrenade.xml index b177a5a8ba..bda04b8463 100644 --- a/Defs/Ammo/Medieval/MortarGrenade.xml +++ b/Defs/Ammo/Medieval/MortarGrenade.xml @@ -65,9 +65,9 @@ Graphic_Single - 1.0 Bomb - 30 + 39 + 1.0 25 true diff --git a/Defs/Ammo/Projectiles_Fragments.xml b/Defs/Ammo/Projectiles_Fragments.xml index 483d63028e..816f2a8f53 100644 --- a/Defs/Ammo/Projectiles_Fragments.xml +++ b/Defs/Ammo/Projectiles_Fragments.xml @@ -65,12 +65,12 @@ 50 40 70 - 6.387 + 4.79 5
  • - 25 + 22 Bomb 0.5
    • diff --git a/Defs/Ammo/Rifle/127x55mm.xml b/Defs/Ammo/Rifle/127x55mm.xml index 76d1c74f1e..9db87b94a1 100644 --- a/Defs/Ammo/Rifle/127x55mm.xml +++ b/Defs/Ammo/Rifle/127x55mm.xml @@ -181,7 +181,7 @@
  • Flame_Secondary - 8 + 20
    • 14 @@ -197,7 +197,7 @@
  • Bomb_Secondary - 13 + 30
    • 7 diff --git a/Defs/Ammo/Rifle/243Winchester.xml b/Defs/Ammo/Rifle/243Winchester.xml index 23e71ab318..9cb6218420 100644 --- a/Defs/Ammo/Rifle/243Winchester.xml +++ b/Defs/Ammo/Rifle/243Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • diff --git a/Defs/Ammo/Rifle/280British.xml b/Defs/Ammo/Rifle/280British.xml index c40c32f46d..13ee022365 100644 --- a/Defs/Ammo/Rifle/280British.xml +++ b/Defs/Ammo/Rifle/280British.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 8
    • diff --git a/Defs/Ammo/Rifle/30-30Winchester.xml b/Defs/Ammo/Rifle/30-30Winchester.xml index 0bdf9b0b19..738c1bdbe1 100644 --- a/Defs/Ammo/Rifle/30-30Winchester.xml +++ b/Defs/Ammo/Rifle/30-30Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 13
    • diff --git a/Defs/Ammo/Rifle/300AACBlackout.xml b/Defs/Ammo/Rifle/300AACBlackout.xml index a2ac2c1bcf..ffe8cec232 100644 --- a/Defs/Ammo/Rifle/300AACBlackout.xml +++ b/Defs/Ammo/Rifle/300AACBlackout.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 11
    • diff --git a/Defs/Ammo/Rifle/303British.xml b/Defs/Ammo/Rifle/303British.xml index 46b1e11cd2..ad69a13b82 100644 --- a/Defs/Ammo/Rifle/303British.xml +++ b/Defs/Ammo/Rifle/303British.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 9
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 13
    • diff --git a/Defs/Ammo/Rifle/30Carbine.xml b/Defs/Ammo/Rifle/30Carbine.xml index 8c79378fbf..c641a70f54 100644 --- a/Defs/Ammo/Rifle/30Carbine.xml +++ b/Defs/Ammo/Rifle/30Carbine.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 10
    • diff --git a/Defs/Ammo/Rifle/38-55Winchester.xml b/Defs/Ammo/Rifle/38-55Winchester.xml index a7196e91ad..eae2508376 100644 --- a/Defs/Ammo/Rifle/38-55Winchester.xml +++ b/Defs/Ammo/Rifle/38-55Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 11
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 16
    • diff --git a/Defs/Ammo/Rifle/44-40Winchester.xml b/Defs/Ammo/Rifle/44-40Winchester.xml index b7bbff3502..ef6c18a46c 100644 --- a/Defs/Ammo/Rifle/44-40Winchester.xml +++ b/Defs/Ammo/Rifle/44-40Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 9
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 14
    • diff --git a/Defs/Ammo/Rifle/4570Gov.xml b/Defs/Ammo/Rifle/4570Gov.xml index 8ed624752a..6229d62288 100644 --- a/Defs/Ammo/Rifle/4570Gov.xml +++ b/Defs/Ammo/Rifle/4570Gov.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 9 + 12
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 14 + 17
    • diff --git a/Defs/Ammo/Rifle/458SOCOM.xml b/Defs/Ammo/Rifle/458SOCOM.xml index 83c82cc6a9..9d7927f142 100644 --- a/Defs/Ammo/Rifle/458SOCOM.xml +++ b/Defs/Ammo/Rifle/458SOCOM.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 9 + 12
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 13 + 17
    • diff --git a/Defs/Ammo/Rifle/50Beowulf.xml b/Defs/Ammo/Rifle/50Beowulf.xml index 9cfb2dacc5..9c1101bfa1 100644 --- a/Defs/Ammo/Rifle/50Beowulf.xml +++ b/Defs/Ammo/Rifle/50Beowulf.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 9 + 12
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 14 + 18
    • diff --git a/Defs/Ammo/Rifle/545x39mmSoviet.xml b/Defs/Ammo/Rifle/545x39mmSoviet.xml index 30a639234f..19adcf33bd 100644 --- a/Defs/Ammo/Rifle/545x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/545x39mmSoviet.xml @@ -274,7 +274,7 @@
  • Flame_Secondary - 4 + 5
    • 142 @@ -291,7 +291,7 @@
  • Bomb_Secondary - 7 + 8
    • 142 diff --git a/Defs/Ammo/Rifle/556x45mmNATO.xml b/Defs/Ammo/Rifle/556x45mmNATO.xml index 7e27338406..88fd8cb737 100644 --- a/Defs/Ammo/Rifle/556x45mmNATO.xml +++ b/Defs/Ammo/Rifle/556x45mmNATO.xml @@ -289,7 +289,7 @@
  • Bomb_Secondary - 7 + 8
    • 142 diff --git a/Defs/Ammo/Rifle/56-56Spencer.xml b/Defs/Ammo/Rifle/56-56Spencer.xml index e375a58148..771b363a6f 100644 --- a/Defs/Ammo/Rifle/56-56Spencer.xml +++ b/Defs/Ammo/Rifle/56-56Spencer.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 12
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 19
    • diff --git a/Defs/Ammo/Rifle/58x42mmDBP10.xml b/Defs/Ammo/Rifle/58x42mmDBP10.xml index a9158d5946..7bfc535229 100644 --- a/Defs/Ammo/Rifle/58x42mmDBP10.xml +++ b/Defs/Ammo/Rifle/58x42mmDBP10.xml @@ -182,7 +182,7 @@
  • Flame_Secondary - 6 + 5
    • @@ -198,7 +198,7 @@
  • Bomb_Secondary - 9 + 8
    • diff --git a/Defs/Ammo/Rifle/6.5x52mm Carcano.xml b/Defs/Ammo/Rifle/6.5x52mm Carcano.xml index e911ddf6b5..6fde5f88ae 100644 --- a/Defs/Ammo/Rifle/6.5x52mm Carcano.xml +++ b/Defs/Ammo/Rifle/6.5x52mm Carcano.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 9
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 13
    • diff --git a/Defs/Ammo/Rifle/65x50mmSRArisaka.xml b/Defs/Ammo/Rifle/65x50mmSRArisaka.xml index 7b4c0c5f32..a7e27da639 100644 --- a/Defs/Ammo/Rifle/65x50mmSRArisaka.xml +++ b/Defs/Ammo/Rifle/65x50mmSRArisaka.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 12
    • diff --git a/Defs/Ammo/Rifle/7.92x57mmMauser.xml b/Defs/Ammo/Rifle/7.92x57mmMauser.xml index 90e916d853..35e3092439 100644 --- a/Defs/Ammo/Rifle/7.92x57mmMauser.xml +++ b/Defs/Ammo/Rifle/7.92x57mmMauser.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 9
    • diff --git a/Defs/Ammo/Rifle/75x54mmFrench.xml b/Defs/Ammo/Rifle/75x54mmFrench.xml index 62253a6992..6b490445c3 100644 --- a/Defs/Ammo/Rifle/75x54mmFrench.xml +++ b/Defs/Ammo/Rifle/75x54mmFrench.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 12
    • diff --git a/Defs/Ammo/Rifle/762x39mmSoviet.xml b/Defs/Ammo/Rifle/762x39mmSoviet.xml index 52227160f0..1f763eabd2 100644 --- a/Defs/Ammo/Rifle/762x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/762x39mmSoviet.xml @@ -212,7 +212,7 @@
  • Bomb_Secondary - 10 + 11
    • @@ -275,7 +275,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -292,7 +292,7 @@
  • Bomb_Secondary - 9 + 11
    • diff --git a/Defs/Ammo/Rifle/77x58mmArisaka.xml b/Defs/Ammo/Rifle/77x58mmArisaka.xml index e510e92f03..6220e64378 100644 --- a/Defs/Ammo/Rifle/77x58mmArisaka.xml +++ b/Defs/Ammo/Rifle/77x58mmArisaka.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 9
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 13
    • diff --git a/Defs/Ammo/Rifle/792x33mmKurz.xml b/Defs/Ammo/Rifle/792x33mmKurz.xml index 90bde6c0ef..f3b468c892 100644 --- a/Defs/Ammo/Rifle/792x33mmKurz.xml +++ b/Defs/Ammo/Rifle/792x33mmKurz.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 11
    • diff --git a/Defs/Ammo/Rifle/8x50mmRLebel.xml b/Defs/Ammo/Rifle/8x50mmRLebel.xml index 6105c976e6..c544ccdb08 100644 --- a/Defs/Ammo/Rifle/8x50mmRLebel.xml +++ b/Defs/Ammo/Rifle/8x50mmRLebel.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 9
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 14
    • diff --git a/Defs/Ammo/Rifle/8x50mmRMannlicher.xml b/Defs/Ammo/Rifle/8x50mmRMannlicher.xml index 9505461b5c..9cc8d1e5c2 100644 --- a/Defs/Ammo/Rifle/8x50mmRMannlicher.xml +++ b/Defs/Ammo/Rifle/8x50mmRMannlicher.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 10
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 16
    • diff --git a/Defs/Ammo/Rifle/9x39mmSoviet.xml b/Defs/Ammo/Rifle/9x39mmSoviet.xml index 882c8b223f..0cd9d2a761 100644 --- a/Defs/Ammo/Rifle/9x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/9x39mmSoviet.xml @@ -181,7 +181,7 @@
  • Flame_Secondary - 5 + 11
    • @@ -197,7 +197,7 @@
  • Bomb_Secondary - 8 + 16
    • diff --git a/Defs/Ammo/Rocket/127mmJavelinMissile.xml b/Defs/Ammo/Rocket/127mmJavelinMissile.xml index 28c1323703..a655d65443 100644 --- a/Defs/Ammo/Rocket/127mmJavelinMissile.xml +++ b/Defs/Ammo/Rocket/127mmJavelinMissile.xml @@ -15,13 +15,13 @@ Bullet 363 750 - 175.402 + 131.552 57 RocketPropelledLoop_Small
  • - 585 + 470 Bomb 3 true diff --git a/Defs/Ammo/Rocket/130mmType63.xml b/Defs/Ammo/Rocket/130mmType63.xml index 04731b0a57..253ed0235e 100644 --- a/Defs/Ammo/Rocket/130mmType63.xml +++ b/Defs/Ammo/Rocket/130mmType63.xml @@ -115,7 +115,7 @@ Bomb - 254 + 284 3.5 true diff --git a/Defs/Ammo/Rocket/132mmM13.xml b/Defs/Ammo/Rocket/132mmM13.xml index 92265a04c5..ee17d228d9 100644 --- a/Defs/Ammo/Rocket/132mmM13.xml +++ b/Defs/Ammo/Rocket/132mmM13.xml @@ -67,7 +67,7 @@ 81 Bomb - 337 + 369 4 true diff --git a/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml b/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml index 6587b13fda..512269adaa 100644 --- a/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml +++ b/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml @@ -13,15 +13,15 @@ Bullet - 281 + 286 600 - 137.525 + 103.144 54 RocketPropelledLoop_Small
  • - 458 + 375 Bomb 2.5 true diff --git a/Defs/Ammo/Rocket/20mmFliegerfaust.xml b/Defs/Ammo/Rocket/20mmFliegerfaust.xml index 0e14321f7a..7e3a5de57d 100644 --- a/Defs/Ammo/Rocket/20mmFliegerfaust.xml +++ b/Defs/Ammo/Rocket/20mmFliegerfaust.xml @@ -103,7 +103,7 @@ Bomb - 16 + 21 0.5 diff --git a/Defs/Ammo/Rocket/50mmRocket.xml b/Defs/Ammo/Rocket/50mmRocket.xml index 628834768a..cfab07c9b7 100644 --- a/Defs/Ammo/Rocket/50mmRocket.xml +++ b/Defs/Ammo/Rocket/50mmRocket.xml @@ -86,7 +86,7 @@ Bomb - 147 + 171 2.5 diff --git a/Defs/Ammo/Rocket/57mmS5Rocket.xml b/Defs/Ammo/Rocket/57mmS5Rocket.xml index 920fe07dfd..4372d7cf75 100644 --- a/Defs/Ammo/Rocket/57mmS5Rocket.xml +++ b/Defs/Ammo/Rocket/57mmS5Rocket.xml @@ -191,7 +191,7 @@ Bomb - 187 + 214 3 true @@ -216,11 +216,11 @@ Bullet 158 172 - 26.312 + 19.734
  • - 88 + 81 Bomb 1 MortarBomb_Explode @@ -243,7 +243,7 @@ Thermobaric - 160 + 181 3.5 0 0 diff --git a/Defs/Ammo/Rocket/70mmAPKWS.xml b/Defs/Ammo/Rocket/70mmAPKWS.xml index 7925231294..fc9a518d73 100644 --- a/Defs/Ammo/Rocket/70mmAPKWS.xml +++ b/Defs/Ammo/Rocket/70mmAPKWS.xml @@ -111,11 +111,11 @@ Bullet 248 300 - 44.285 + 33.215
  • - 148 + 132 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/83mmSMAW.xml b/Defs/Ammo/Rocket/83mmSMAW.xml index 4c5b7e0871..3414e961b4 100644 --- a/Defs/Ammo/Rocket/83mmSMAW.xml +++ b/Defs/Ammo/Rocket/83mmSMAW.xml @@ -137,11 +137,11 @@ Bullet 248 600 - 39.494 + 29.621
  • - 132 + 118 Bomb 1 MortarBomb_Explode @@ -165,7 +165,7 @@ Bomb - 154 + 179 2.5 MortarBomb_Explode true @@ -189,9 +189,9 @@ Graphic_Single - 5 Thermobaric - 260 + 285 + 5 MortarBomb_Explode true diff --git a/Defs/Ammo/Rocket/84mmAT4.xml b/Defs/Ammo/Rocket/84mmAT4.xml index 53500471e5..9099c68b6d 100644 --- a/Defs/Ammo/Rocket/84mmAT4.xml +++ b/Defs/Ammo/Rocket/84mmAT4.xml @@ -15,13 +15,13 @@ Bullet 248 420 - 31.995 + 23.996 63 RocketPropelledLoop_Small
  • - 107 + 97 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index b1fcdaf633..8d743e64d3 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -273,12 +273,12 @@ Bullet 248 400 - 33.03 + 24.773 64
  • - 110 + 100 Bomb 1 MortarBomb_Explode @@ -301,7 +301,7 @@ Thermobaric - 160 + 181 3.5 MortarBomb_Explode true @@ -318,7 +318,7 @@ Bomb - 151 + 176 2.5 51 MortarBomb_Explode @@ -343,7 +343,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 151 + 176 2.5 51 MortarBomb_Explode @@ -371,14 +371,14 @@ CombatExtended.BulletCE Bullet - 400 + 356 150 - 33.371 + 25.028 59
  • - 111 + 101 Bomb 1.0 true @@ -400,7 +400,7 @@ Bomb - 111 + 132 2.0 61 MortarBomb_Explode @@ -443,7 +443,7 @@ PrometheumFlame - 15 + 18 8.0 FilthPrometheum 0.5 @@ -469,7 +469,7 @@ EMP - 151 + 176 5.0 61 diff --git a/Defs/Ammo/Rocket/88mmRPzB.xml b/Defs/Ammo/Rocket/88mmRPzB.xml index b4b3f4e4b4..93656d9193 100644 --- a/Defs/Ammo/Rocket/88mmRPzB.xml +++ b/Defs/Ammo/Rocket/88mmRPzB.xml @@ -103,11 +103,11 @@ Bullet 208 220 - 37.321 + 27.991
  • - 124 + 112 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/90mmMATADOR.xml b/Defs/Ammo/Rocket/90mmMATADOR.xml index b3c3dd616a..98ceb1bbaa 100644 --- a/Defs/Ammo/Rocket/90mmMATADOR.xml +++ b/Defs/Ammo/Rocket/90mmMATADOR.xml @@ -15,13 +15,13 @@ Bullet 248 500 - 33.233 + 24.925 63 RocketPropelledLoop_Small
  • - 111 + 101 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/90mmRecoilless.xml b/Defs/Ammo/Rocket/90mmRecoilless.xml index db388dcffc..441842f59b 100644 --- a/Defs/Ammo/Rocket/90mmRecoilless.xml +++ b/Defs/Ammo/Rocket/90mmRecoilless.xml @@ -134,11 +134,11 @@ Bullet 239 350 - 31.885 + 23.914
  • - 106 + 97 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M6.xml b/Defs/Ammo/Rocket/M6.xml index 33669c1eea..527b0fee86 100644 --- a/Defs/Ammo/Rocket/M6.xml +++ b/Defs/Ammo/Rocket/M6.xml @@ -106,11 +106,11 @@ Bullet 208 76 - 42.273 + 31.705
  • - 141 + 123 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M6A1.xml b/Defs/Ammo/Rocket/M6A1.xml index db927b84c4..5426f0fd62 100644 --- a/Defs/Ammo/Rocket/M6A1.xml +++ b/Defs/Ammo/Rocket/M6A1.xml @@ -95,11 +95,11 @@ Bullet 208 76 - 42.273 + 31.705
  • - 141 + 123 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M6A3.xml b/Defs/Ammo/Rocket/M6A3.xml index 0423b77371..8fefe1a089 100644 --- a/Defs/Ammo/Rocket/M6A3.xml +++ b/Defs/Ammo/Rocket/M6A3.xml @@ -119,11 +119,11 @@ Bullet 208 76 - 42.273 + 31.705
  • - 141 + 123 Bomb 1.5 MortarBomb_Explode @@ -148,7 +148,7 @@ PrometheumFlame - 12 + 14 6.5 FilthPrometheum 0.5 diff --git a/Defs/Ammo/Rocket/M72LAW.xml b/Defs/Ammo/Rocket/M72LAW.xml index e0633b553c..195ebdc816 100644 --- a/Defs/Ammo/Rocket/M72LAW.xml +++ b/Defs/Ammo/Rocket/M72LAW.xml @@ -16,7 +16,7 @@ Bullet 248 300 - 31.584 + 23.688 RocketPropelledLoop_Small true Fleck_DisposableLauncherCasing @@ -24,7 +24,7 @@
  • - 105 + 96 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M74.xml b/Defs/Ammo/Rocket/M74.xml index 69122628ef..dc1381fd8b 100644 --- a/Defs/Ammo/Rocket/M74.xml +++ b/Defs/Ammo/Rocket/M74.xml @@ -101,8 +101,8 @@ PrometheumFlame - 0 - 8 + 11 + 6 FilthPrometheum 0.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/RPG28.xml b/Defs/Ammo/Rocket/RPG28.xml index 787030481c..fed5d06116 100644 --- a/Defs/Ammo/Rocket/RPG28.xml +++ b/Defs/Ammo/Rocket/RPG28.xml @@ -15,13 +15,13 @@ Bullet 279 1000 - 46.227 + 34.67 65 RocketPropelledLoop_Small
  • - 154 + 137 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/RPG32.xml b/Defs/Ammo/Rocket/RPG32.xml index b0c653a20b..43c36a60fb 100644 --- a/Defs/Ammo/Rocket/RPG32.xml +++ b/Defs/Ammo/Rocket/RPG32.xml @@ -118,11 +118,11 @@ Bullet 264 650 - 41.818 + 31.364
  • - 139 + 128 Bomb 1 MortarBomb_Explode @@ -146,9 +146,9 @@ Graphic_Single - 5 Thermobaric - 280 + 305 + 5 true diff --git a/Defs/Ammo/Rocket/RPG7.xml b/Defs/Ammo/Rocket/RPG7.xml index fd94a85b09..bc01df2f79 100644 --- a/Defs/Ammo/Rocket/RPG7.xml +++ b/Defs/Ammo/Rocket/RPG7.xml @@ -137,13 +137,13 @@ Bullet - 275 + 304 500 - 44.956 + 33.718
  • - 150 + 133 Bomb 1.5 MortarBomb_Explode @@ -170,7 +170,7 @@ 5 Thermobaric - 275 + 300 0 0 true @@ -190,10 +190,10 @@ Graphic_Single - 1.5 Bomb + 1.5 + 72 0 - 58 0 true diff --git a/Defs/Ammo/Rocket/RPO.xml b/Defs/Ammo/Rocket/RPO.xml index b888c8136f..2109eda466 100644 --- a/Defs/Ammo/Rocket/RPO.xml +++ b/Defs/Ammo/Rocket/RPO.xml @@ -53,9 +53,9 @@ CombatExtended.ProjectileCE_Explosive - 5 Thermobaric - 293 + 318 + 5 true true @@ -67,7 +67,7 @@ PrometheumFlame - 21 + 23 9.5 FilthPrometheum 0.5 diff --git a/Defs/Ammo/Rocket/SPG9.xml b/Defs/Ammo/Rocket/SPG9.xml index 35efe88284..2ac89caa75 100644 --- a/Defs/Ammo/Rocket/SPG9.xml +++ b/Defs/Ammo/Rocket/SPG9.xml @@ -154,11 +154,11 @@ Bullet 248 400 - 26.53 + 19.897
  • - 88 + 82 Bomb 1.0 MortarBomb_Explode @@ -184,7 +184,7 @@ 5 Thermobaric - 277 + 302 0 0 true @@ -201,10 +201,10 @@ Graphic_Single - 2.0 Bomb + 132 + 2.0 0 - 111 0 true MortarBomb_Explode @@ -228,7 +228,7 @@ EMP - 111 + 132 0 0 4.5 diff --git a/Defs/Ammo/Rocket/TomahawkLAM.xml b/Defs/Ammo/Rocket/TomahawkLAM.xml index 4370610dbd..e5486ef9b7 100644 --- a/Defs/Ammo/Rocket/TomahawkLAM.xml +++ b/Defs/Ammo/Rocket/TomahawkLAM.xml @@ -110,7 +110,7 @@ 19.5 Bomb - 5653 + 5000 Explosion_GiantBomb true diff --git a/Defs/Ammo/Shell/100x695mmR.xml b/Defs/Ammo/Shell/100x695mmR.xml index 0e557fe416..41a75a548a 100644 --- a/Defs/Ammo/Shell/100x695mmR.xml +++ b/Defs/Ammo/Shell/100x695mmR.xml @@ -97,11 +97,11 @@ 341 MortarBomb_Explode 380 - 52.045 + 39.034
  • - 173 + 153 Bomb 1.5 true @@ -109,7 +109,7 @@
  • 27 - 60 + 15
    • @@ -125,7 +125,7 @@ Bomb - 209 + 237 3 MortarBomb_Explode true @@ -133,8 +133,8 @@
  • - 52 - 163 + 40 + 41
    • diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml index 7518acde45..173a2421cc 100644 --- a/Defs/Ammo/Shell/105mmHowitzer.xml +++ b/Defs/Ammo/Shell/105mmHowitzer.xml @@ -181,7 +181,7 @@ Bomb - 217 + 245 3 MortarBomb_Explode true @@ -235,8 +235,8 @@ PrometheumFlame - 15 - 7 + 18 + 8 true FilthPrometheum 0.15 @@ -261,7 +261,7 @@ EMP - 217 + 245 0 0 true @@ -323,11 +323,11 @@ 352 MortarBomb_Explode 375 - 46.013 + 34.51
  • - 153 + 136 Bomb 1.5 true @@ -351,7 +351,7 @@ Bomb - 217 + 245 3 MortarBomb_Explode true @@ -375,8 +375,8 @@ PrometheumFlame - 15 - 7 + 18 + 8 FilthPrometheum 0.25 MortarIncendiary_Explode @@ -400,7 +400,7 @@ EMP - 216 + 245 0 0 6.5 diff --git a/Defs/Ammo/Shell/105x607mmR.xml b/Defs/Ammo/Shell/105x607mmR.xml index 145429ae8f..1a6f7e5a2c 100644 --- a/Defs/Ammo/Shell/105x607mmR.xml +++ b/Defs/Ammo/Shell/105x607mmR.xml @@ -97,11 +97,11 @@ 341 MortarBomb_Explode 410 - 53.916 + 40.437
  • - 180 + 158 Bomb 1.5 true @@ -125,7 +125,7 @@ Bomb - 331 + 362 4 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/105x617mmR.xml b/Defs/Ammo/Shell/105x617mmR.xml index 4c6d5fa279..262bbc58bc 100644 --- a/Defs/Ammo/Shell/105x617mmR.xml +++ b/Defs/Ammo/Shell/105x617mmR.xml @@ -98,11 +98,11 @@ 316 MortarBomb_Explode 390 - 46.013 + 34.51
  • - 153 + 136 Bomb 1.5 true @@ -127,7 +127,7 @@ Bomb 134 - 199 + 226 3 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/120mmCannon.xml b/Defs/Ammo/Shell/120mmCannon.xml index c4591b7825..ca9683c37e 100644 --- a/Defs/Ammo/Shell/120mmCannon.xml +++ b/Defs/Ammo/Shell/120mmCannon.xml @@ -96,11 +96,11 @@ 405 MortarBomb_Explode 420 - 62.411 + 46.809
  • - 208 + 181 Bomb 1.5 true @@ -124,7 +124,7 @@ Bomb - 315 + 346 4 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml index 16856404bb..96bcbed265 100644 --- a/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/Defs/Ammo/Shell/155mmHowitzer.xml @@ -161,7 +161,7 @@ Bomb - 546 + 575 5.5 MortarBomb_Explode true @@ -218,8 +218,8 @@ PrometheumFlame - 31 - 9.5 + 34 + 11.5 true FilthPrometheum 0.3 @@ -247,7 +247,7 @@ EMP - 452 + 483 true 9.5 diff --git a/Defs/Ammo/Shell/15cmNebelwerfer.xml b/Defs/Ammo/Shell/15cmNebelwerfer.xml index e165de80a4..40640d9365 100644 --- a/Defs/Ammo/Shell/15cmNebelwerfer.xml +++ b/Defs/Ammo/Shell/15cmNebelwerfer.xml @@ -67,7 +67,7 @@ 0 Bomb - 228 + 257 3.5 true diff --git a/Defs/Ammo/Shell/28cmSpgr.xml b/Defs/Ammo/Shell/28cmSpgr.xml index 4429dddd4e..bbc7ca9ad2 100644 --- a/Defs/Ammo/Shell/28cmSpgr.xml +++ b/Defs/Ammo/Shell/28cmSpgr.xml @@ -84,7 +84,7 @@ Bomb - 837 + 854 7 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/37x223mmR.xml b/Defs/Ammo/Shell/37x223mmR.xml index 1211af91b8..62374f449e 100644 --- a/Defs/Ammo/Shell/37x223mmR.xml +++ b/Defs/Ammo/Shell/37x223mmR.xml @@ -103,7 +103,7 @@ 150 Bomb - 33 + 43 1 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/40x365mmBofors.xml b/Defs/Ammo/Shell/40x365mmBofors.xml index a78c44dd4c..fe1fc5f940 100644 --- a/Defs/Ammo/Shell/40x365mmBofors.xml +++ b/Defs/Ammo/Shell/40x365mmBofors.xml @@ -129,7 +129,7 @@ Bomb - 64 + 79 1.5 MortarBomb_Explode true @@ -150,7 +150,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 64 + 79 1.5 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/50mmType89Mortar.xml b/Defs/Ammo/Shell/50mmType89Mortar.xml index 08e9046f26..7af85f6766 100644 --- a/Defs/Ammo/Shell/50mmType89Mortar.xml +++ b/Defs/Ammo/Shell/50mmType89Mortar.xml @@ -124,7 +124,7 @@ Bomb - 42 + 54 1.5 MortarBomb_Explode true @@ -149,7 +149,7 @@ PrometheumFlame - 6 + 7 4.5 true FilthPrometheum @@ -167,7 +167,7 @@ EMP - 42 + 54 true 2.5 diff --git a/Defs/Ammo/Shell/57x307mmR.xml b/Defs/Ammo/Shell/57x307mmR.xml index bfe2e9903f..0eefeaae0b 100644 --- a/Defs/Ammo/Shell/57x307mmR.xml +++ b/Defs/Ammo/Shell/57x307mmR.xml @@ -108,7 +108,7 @@ Bomb - 33 + 43 1 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/57x438mmBofors.xml b/Defs/Ammo/Shell/57x438mmBofors.xml index 7bf5532541..e4e4adc360 100644 --- a/Defs/Ammo/Shell/57x438mmBofors.xml +++ b/Defs/Ammo/Shell/57x438mmBofors.xml @@ -131,7 +131,7 @@ Bomb - 108 + 129 2 MortarBomb_Explode true @@ -152,7 +152,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 108 + 129 2 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml index 59d4e8b801..bd9dd24e00 100644 --- a/Defs/Ammo/Shell/60mmMortar.xml +++ b/Defs/Ammo/Shell/60mmMortar.xml @@ -147,7 +147,7 @@ Bomb 2 - 76 + 93 true MortarBomb_Explode true @@ -172,7 +172,7 @@ PrometheumFlame - 6 + 8 4.5 true FilthPrometheum @@ -190,7 +190,7 @@ EMP - 76 + 93 true 3.5 diff --git a/Defs/Ammo/Shell/75x350mmR.xml b/Defs/Ammo/Shell/75x350mmR.xml index fede10bf9a..0208880b03 100644 --- a/Defs/Ammo/Shell/75x350mmR.xml +++ b/Defs/Ammo/Shell/75x350mmR.xml @@ -126,7 +126,7 @@ Bomb - 104 + 125 2 100 MortarBomb_Explode diff --git a/Defs/Ammo/Shell/762x385mmRCannon.xml b/Defs/Ammo/Shell/762x385mmRCannon.xml index e3f89e027c..48f2186832 100644 --- a/Defs/Ammo/Shell/762x385mmRCannon.xml +++ b/Defs/Ammo/Shell/762x385mmRCannon.xml @@ -142,11 +142,11 @@ 264 MortarBomb_Explode 300 - 32.966 + 24.725
  • - 110 + 100 Bomb 1 true @@ -181,7 +181,7 @@ Bomb - 99 + 119 2 MortarBomb_Explode true @@ -218,7 +218,7 @@ EMP - 99 + 119 4 diff --git a/Defs/Ammo/Shell/762x539mmR.xml b/Defs/Ammo/Shell/762x539mmR.xml index 3a98f60de6..f7442c55a2 100644 --- a/Defs/Ammo/Shell/762x539mmR.xml +++ b/Defs/Ammo/Shell/762x539mmR.xml @@ -126,7 +126,7 @@ Bomb - 75 + 92 2 MortarBomb_Explode true diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index 49b31aebfb..830c85ce8e 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/Defs/Ammo/Shell/81mmMortar.xml @@ -231,7 +231,7 @@ Bomb - 156 + 181 2.5 true MortarBomb_Explode @@ -289,7 +289,7 @@ PrometheumFlame - 11 + 13 6.5 true FilthPrometheum @@ -307,7 +307,7 @@ EMP - 156 + 181 true 5.5 diff --git a/Defs/Ammo/Shell/90mmCannon.xml b/Defs/Ammo/Shell/90mmCannon.xml index e47c7d321b..a23acfcdf5 100644 --- a/Defs/Ammo/Shell/90mmCannon.xml +++ b/Defs/Ammo/Shell/90mmCannon.xml @@ -160,11 +160,11 @@ 304 MortarBomb_Explode 500 - 38.005 + 28.541
  • - 127 + 114 Bomb 1 true @@ -199,7 +199,7 @@ Bomb - 152 + 176 0 0 2.5 @@ -226,7 +226,7 @@ Bomb - 152 + 176 0 0 2.5 @@ -268,7 +268,7 @@ EMP - 152 + 176 0 0 5 diff --git a/Defs/Ammo/Shotgun/10Gauge.xml b/Defs/Ammo/Shotgun/10Gauge.xml index 4308289948..1d59c99f72 100644 --- a/Defs/Ammo/Shotgun/10Gauge.xml +++ b/Defs/Ammo/Shotgun/10Gauge.xml @@ -176,7 +176,7 @@ 43 EMP - 19 + 26 0 0 0.25 diff --git a/Defs/Ammo/Shotgun/12Gauge.xml b/Defs/Ammo/Shotgun/12Gauge.xml index 90d99d892c..90328fbd40 100644 --- a/Defs/Ammo/Shotgun/12Gauge.xml +++ b/Defs/Ammo/Shotgun/12Gauge.xml @@ -176,7 +176,7 @@ 43 EMP - 12 + 18 0 0 0.2 diff --git a/Defs/Ammo/Shotgun/20Gauge.xml b/Defs/Ammo/Shotgun/20Gauge.xml index 50f999ae84..83dafe41e8 100644 --- a/Defs/Ammo/Shotgun/20Gauge.xml +++ b/Defs/Ammo/Shotgun/20Gauge.xml @@ -174,7 +174,7 @@ EMP - 9 + 14 0 0 0.18 diff --git a/Defs/Ammo/Shotgun/23x75mmR.xml b/Defs/Ammo/Shotgun/23x75mmR.xml index 94c1763157..31f5dfe0f6 100644 --- a/Defs/Ammo/Shotgun/23x75mmR.xml +++ b/Defs/Ammo/Shotgun/23x75mmR.xml @@ -174,7 +174,7 @@ EMP - 29 + 39 0 0 0.5 diff --git a/Defs/Ammo/Shotgun/410Bore.xml b/Defs/Ammo/Shotgun/410Bore.xml index 43b8b84e93..003a5a907f 100644 --- a/Defs/Ammo/Shotgun/410Bore.xml +++ b/Defs/Ammo/Shotgun/410Bore.xml @@ -188,7 +188,7 @@ 43 EMP - 7 + 11 0 0 0.15 @@ -261,7 +261,7 @@ 33 EMP - 7 + 11 0 0 0.15 diff --git a/Defs/ThingDefs_Misc/Weapons_Grenades.xml b/Defs/ThingDefs_Misc/Weapons_Grenades.xml index 4c7a7b32c1..0a24d69741 100644 --- a/Defs/ThingDefs_Misc/Weapons_Grenades.xml +++ b/Defs/ThingDefs_Misc/Weapons_Grenades.xml @@ -72,9 +72,9 @@ Graphic_Single - 1.9 + 2.0 Bomb - 80 + 99 150 true true @@ -246,7 +246,7 @@ 2.5 Bomb - 234 + 232 90 true 8 diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml index a36fb35d53..e5c3039ac4 100644 --- a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml +++ b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml @@ -93,7 +93,7 @@ 1.5 Bomb - 56 + 70 60 true Fleck_GrenadePin @@ -238,7 +238,7 @@ 1 PrometheumFlame - 11 + 13 FilthPrometheum 0.75 12 @@ -366,7 +366,7 @@ 3 EMP - 56 + 70 60 true Fleck_GrenadePin From 03a12891d737ba65d43d19d5e94c5cf45750dd76 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Sun, 9 Jun 2024 17:58:30 +0330 Subject: [PATCH 2/5] .338 Lapua tweaks --- Defs/Ammo/HighCaliber/338LapuaMagnum.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml index 15e07274d6..39826e09c6 100644 --- a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml @@ -132,7 +132,7 @@ 26 - 11 + 12 134.160 @@ -142,7 +142,7 @@ 16 - 22 + 24 134.160 @@ -152,7 +152,7 @@ 16 - 22 + 24 134.160
  • @@ -168,7 +168,7 @@ 26 - 11 + 12 134.160
  • @@ -184,7 +184,7 @@ 14 - 39 + 42 173.980 225 From b677b17fbfbb85a1a66548cc3c8de2c9bd0e15ee Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:58:03 +0330 Subject: [PATCH 3/5] generic airburst launcher grenade textures --- .../STACK_RANGED/GrenadeLauncher/AIR/AIR_a.png | Bin 0 -> 2547 bytes .../STACK_RANGED/GrenadeLauncher/AIR/AIR_b.png | Bin 0 -> 7503 bytes .../STACK_RANGED/GrenadeLauncher/AIR/AIR_c.png | Bin 0 -> 12951 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_a.png create mode 100644 Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_b.png create mode 100644 Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_c.png diff --git a/Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_a.png b/Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_a.png new file mode 100644 index 0000000000000000000000000000000000000000..023d272c6a0b9d9ead678c519f11b7dbaee79e67 GIT binary patch literal 2547 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 literal 0 HcmV?d00001 diff --git a/Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_b.png b/Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_b.png new file mode 100644 index 0000000000000000000000000000000000000000..cd4179dc6c27c07e09e6f86fd7a9e3a8e73dc663 GIT binary patch literal 7503 zcmaJ`MNk|-m!83$KyV2V+}(o@9wfNCI{|__fdqGV28UpS4Hn$pAvnR^250lvZtY-AK{5x_y}1Vi=CQhTjOb3#mcAdvYlY6AC_}LL>u5qfV0~qkiz2(xSt-&&Ij%Fed-7(%0D% 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 p*`Yr9ys%lD3q;?l9JfU z{4l%dxVR;ToPO%0;xp~QQb2lb6B76EPDw8-bMmRF1P6)k{S$>0MH1>@h4PFFm3g@w z4uCH#9{avBE)KC&DcpYQoy!aNZ(16-Oo8dFA^!G4&B;F{%*-G%zR?5DvN}zBvG7ql zd_#B_1FxEDoH#(0#Oi7g+N5VhC@-G_-`!S~)_H_+dmluWeFYddAb{98p&{GxCy>`5 zo>yG5YIX4bXT86J%@N-TA443OSubRiEObw5plo*JNh*%6dSX`~TMkND6-z{Dfyu!$ zETWVitN94p-ztdbh`bNY9z-X#-yYgp!}bNmcsvu?S3w{=2e*%9Gj^K&TL`5;g{t|n zQXsiR6i2d*aPP)guT&y;O;L$5xZg!!Q^eYt7aK05p^EcJm{QI0d4|d+ErfNtvfO~8 z6n;*m6Y=!**Peg+boo_M#yjOBpbGE;?q+F04mQ&QFA31B8pv@&O-hr*zdxDBxCZ`U z2$jSU*HGD_klNqJ$kjqKP7oMCOqNMoqGtQO8yVb7j2`O-{PsKG&Tk1rr9IzZl3=fA zW@aX6wmTkf^Cx{D-aESyy(Q$_bn;9Puf8QzfY3lWO;|2r78ucsSgP3lBP8h>7oWA| z6SKbK+d;VXF=qF+?P=1=H3OOC1w>DnjAQ;v`7gZp=eDrZ)6;okVq)MIckeJ#Aes`L zdSkcAkfMqTY@&6WQ?YN8E;1~1&w)gmL1^(nnO@ByL3*-q$k6(IvVbTD@yerU8Iy3# zt1cr>3J#i|xuAnnxJ=SQLj-BO5RDJq=&X>18i`s&U#}hh2Ab%l60Z_)-g+V%wSw@S z8bCo&QQKQ1=IR&JKbqeJ3mdI^+g-r4Vb!F0`jz+8T)$&F_`Y>iqoD8pa_386K6!s{ zP-H^+6b-cWy(e*9?J|Dts+mb+|8FbWLyy3)>%7@_{{lh`87vRvePQTdvL}k_fyZLL zi19^1!Hj<$zeN#VHlq;Yu|3!zM~?e75*vLuLV|lw`K$?`v*O?~|I?XB8eSnKQAshQ zs!juE8mY5R&#axZ-RFIWL?s6(^I%GtYlqEYmroxP0;pm?i0Exk`_4)?)G>$~u}>X!#L`vc=^h*j*I3vCD*J~E-|NQk z5kxY|;J~Ma0gMt6gW`bF`RPh{S90Z8tQj=lLCM7po<*@T4Rt=KMy4@z)pJwim@)!_ z!YxFx{ewldUy_a7z^FMsP3lY}yyK(7sJFD+t1t)F+4bkF<7J^BlGG29K&XS^H+Nkq z97^d3gPFO`PW3c{oUX?lp_pkYr* zlIZYHxr5a~=U4S^J54G!-Tpn!3K#tj;A4ZMUzPm2YSO8iOl#ebg$F{^YLNkz_qZ>g zzKZZ67np6I!5m}|^~WrH$4WsY%%TT9OrOmSPap~dDy)Ex?>0QCpDX`6@cci1-(slc d0J!-EjH+qJX&n_K{r5u(ke5~l{gN~Z`7haJmqh>o literal 0 HcmV?d00001 diff --git a/Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_c.png b/Textures/Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR/AIR_c.png new file mode 100644 index 0000000000000000000000000000000000000000..e6a8e47f493a821a70299ebfc3c797d3fcd08954 GIT binary patch literal 12951 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 KiCQt^kpBk&5^c)> literal 0 HcmV?d00001 From 78cd6ec9198f3ca6b4165338d011d5a86b189b3b Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:03:58 +0330 Subject: [PATCH 4/5] Revert ".338 Lapua tweaks" This reverts commit 03a12891d737ba65d43d19d5e94c5cf45750dd76. --- Defs/Ammo/HighCaliber/338LapuaMagnum.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml index 39826e09c6..15e07274d6 100644 --- a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml @@ -132,7 +132,7 @@ 26 - 12 + 11 134.160 @@ -142,7 +142,7 @@ 16 - 24 + 22 134.160 @@ -152,7 +152,7 @@ 16 - 24 + 22 134.160
  • @@ -168,7 +168,7 @@ 26 - 12 + 11 134.160
  • @@ -184,7 +184,7 @@ 14 - 42 + 39 173.980 225 From d6f9741a9f19a9f35f04b8065b26b2b9212d0d6c Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:50:09 +0330 Subject: [PATCH 5/5] Tweaks and reversions --- Defs/Ammo/Advanced/30x64mmFuelCell.xml | 4 ++-- Defs/Ammo/Advanced/60x225mmGammaShell.xml | 2 +- Defs/Ammo/Advanced/66mmThermalBolt.xml | 2 +- Defs/Ammo/Advanced/70mmMechanoidGrenade.xml | 4 ++-- Defs/Ammo/Advanced/80x256mmFuelCell.xml | 2 +- Defs/Ammo/Advanced/PlasmaCellHeavy.xml | 2 +- Defs/Ammo/Advanced/PlasmaCellPistol.xml | 2 +- Defs/Ammo/Advanced/PlasmaCellRifle.xml | 2 +- Defs/Ammo/Grenade/20x42mmGrenade.xml | 6 ++--- Defs/Ammo/Grenade/25x40mmGrenade.xml | 8 +++---- Defs/Ammo/Grenade/25x59mmGrenade.xml | 12 +++++----- Defs/Ammo/Grenade/30x29mmGrenade.xml | 6 ++--- Defs/Ammo/Grenade/35x32mmSRGrenade.xml | 6 ++--- Defs/Ammo/Grenade/40x46mmGrenade.xml | 10 ++++----- Defs/Ammo/Grenade/40x47mmGrenade.xml | 4 ++-- Defs/Ammo/Grenade/40x53mmGrenade.xml | 10 ++++----- Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml | 6 ++--- Defs/Ammo/Grenade/50mmGS50Grenade.xml | 4 ++-- Defs/Ammo/Grenade/83mmPIATGrenade.xml | 8 +++---- Defs/Ammo/Medieval/CannonBall.xml | 18 +++++++-------- Defs/Ammo/Medieval/MortarGrenade.xml | 2 +- Defs/Ammo/Projectiles_Fragments.xml | 4 ++-- Defs/Ammo/Rocket/127mmJavelinMissile.xml | 4 ++-- Defs/Ammo/Rocket/130mmType63.xml | 2 +- Defs/Ammo/Rocket/132mmM13.xml | 2 +- Defs/Ammo/Rocket/150mmMBTLAWMissile.xml | 6 ++--- Defs/Ammo/Rocket/20mmFliegerfaust.xml | 2 +- Defs/Ammo/Rocket/50mmRocket.xml | 2 +- Defs/Ammo/Rocket/57mmS5Rocket.xml | 8 +++---- Defs/Ammo/Rocket/70mmAPKWS.xml | 4 ++-- Defs/Ammo/Rocket/83mmSMAW.xml | 8 +++---- Defs/Ammo/Rocket/84mmAT4.xml | 4 ++-- Defs/Ammo/Rocket/84x246mmR.xml | 22 +++++++++---------- Defs/Ammo/Rocket/88mmRPzB.xml | 4 ++-- Defs/Ammo/Rocket/90mmMATADOR.xml | 4 ++-- Defs/Ammo/Rocket/90mmRecoilless.xml | 4 ++-- Defs/Ammo/Rocket/M6.xml | 4 ++-- Defs/Ammo/Rocket/M6A1.xml | 4 ++-- Defs/Ammo/Rocket/M6A3.xml | 6 ++--- Defs/Ammo/Rocket/M72LAW.xml | 4 ++-- Defs/Ammo/Rocket/M74.xml | 4 ++-- Defs/Ammo/Rocket/RPG28.xml | 4 ++-- Defs/Ammo/Rocket/RPG32.xml | 6 ++--- Defs/Ammo/Rocket/RPG7.xml | 12 +++++----- Defs/Ammo/Rocket/RPO.xml | 4 ++-- Defs/Ammo/Rocket/SPG9.xml | 14 +++++------- Defs/Ammo/Rocket/TomahawkLAM.xml | 2 +- Defs/Ammo/Shell/100x695mmR.xml | 6 ++--- Defs/Ammo/Shell/105mmHowitzer.xml | 16 +++++++------- Defs/Ammo/Shell/105x607mmR.xml | 6 ++--- Defs/Ammo/Shell/105x617mmR.xml | 6 ++--- Defs/Ammo/Shell/120mmCannon.xml | 6 ++--- Defs/Ammo/Shell/155mmHowitzer.xml | 8 +++---- Defs/Ammo/Shell/15cmNebelwerfer.xml | 2 +- Defs/Ammo/Shell/28cmSpgr.xml | 2 +- Defs/Ammo/Shell/37x223mmR.xml | 2 +- Defs/Ammo/Shell/40x365mmBofors.xml | 4 ++-- Defs/Ammo/Shell/50mmType89Mortar.xml | 6 ++--- Defs/Ammo/Shell/57x307mmR.xml | 2 +- Defs/Ammo/Shell/57x438mmBofors.xml | 4 ++-- Defs/Ammo/Shell/60mmMortar.xml | 6 ++--- Defs/Ammo/Shell/75x350mmR.xml | 2 +- Defs/Ammo/Shell/762x385mmRCannon.xml | 8 +++---- Defs/Ammo/Shell/762x539mmR.xml | 2 +- Defs/Ammo/Shell/81mmMortar.xml | 8 ++++--- Defs/Ammo/Shell/90mmCannon.xml | 10 ++++----- Defs/Ammo/Shotgun/10Gauge.xml | 2 +- Defs/Ammo/Shotgun/12Gauge.xml | 2 +- Defs/Ammo/Shotgun/20Gauge.xml | 2 +- Defs/Ammo/Shotgun/23x75mmR.xml | 2 +- Defs/Ammo/Shotgun/410Bore.xml | 4 ++-- Defs/ThingDefs_Misc/Weapons_Grenades.xml | 4 ++-- .../Core/ThingDefs_Misc/Weapons_Grenades.xml | 6 ++--- 73 files changed, 195 insertions(+), 197 deletions(-) diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml index 04c706c060..cbdd232a0b 100644 --- a/Defs/Ammo/Advanced/30x64mmFuelCell.xml +++ b/Defs/Ammo/Advanced/30x64mmFuelCell.xml @@ -98,7 +98,7 @@ PrometheumFlame - 7 + 6 4.5 FilthPrometheum 0.2 @@ -113,7 +113,7 @@ 2.0 Thermobaric - 60 + 48 MortarBomb_Explode true true diff --git a/Defs/Ammo/Advanced/60x225mmGammaShell.xml b/Defs/Ammo/Advanced/60x225mmGammaShell.xml index 19b2c4d4aa..9446aa1b58 100644 --- a/Defs/Ammo/Advanced/60x225mmGammaShell.xml +++ b/Defs/Ammo/Advanced/60x225mmGammaShell.xml @@ -62,7 +62,7 @@ Burn - 39 + 33 73 false 7.5 diff --git a/Defs/Ammo/Advanced/66mmThermalBolt.xml b/Defs/Ammo/Advanced/66mmThermalBolt.xml index 3ac166c641..05d0423413 100644 --- a/Defs/Ammo/Advanced/66mmThermalBolt.xml +++ b/Defs/Ammo/Advanced/66mmThermalBolt.xml @@ -89,7 +89,7 @@ PrometheumFlame - 8 + 6 4.9 true FilthPrometheum diff --git a/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml b/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml index 5838be4266..78931b8c62 100644 --- a/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml +++ b/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml @@ -83,7 +83,7 @@ Bomb - 154 + 132 2.5 MortarBomb_Explode true @@ -104,7 +104,7 @@ 5 EMP - 154 + 132 diff --git a/Defs/Ammo/Advanced/80x256mmFuelCell.xml b/Defs/Ammo/Advanced/80x256mmFuelCell.xml index e8cc700b2a..9a4f4eb59f 100644 --- a/Defs/Ammo/Advanced/80x256mmFuelCell.xml +++ b/Defs/Ammo/Advanced/80x256mmFuelCell.xml @@ -75,7 +75,7 @@ PrometheumFlame - 13 + 11 73 false 6.5 diff --git a/Defs/Ammo/Advanced/PlasmaCellHeavy.xml b/Defs/Ammo/Advanced/PlasmaCellHeavy.xml index cdf25b16f7..1798747dc8 100644 --- a/Defs/Ammo/Advanced/PlasmaCellHeavy.xml +++ b/Defs/Ammo/Advanced/PlasmaCellHeavy.xml @@ -72,7 +72,7 @@ 165 Bomb - 25 + 18 1 true diff --git a/Defs/Ammo/Advanced/PlasmaCellPistol.xml b/Defs/Ammo/Advanced/PlasmaCellPistol.xml index 8906385b42..6d05352587 100644 --- a/Defs/Ammo/Advanced/PlasmaCellPistol.xml +++ b/Defs/Ammo/Advanced/PlasmaCellPistol.xml @@ -71,7 +71,7 @@ 137 Bomb - 3 + 2 true
  • diff --git a/Defs/Ammo/Advanced/PlasmaCellRifle.xml b/Defs/Ammo/Advanced/PlasmaCellRifle.xml index 7748ea0c6d..2dabe4c673 100644 --- a/Defs/Ammo/Advanced/PlasmaCellRifle.xml +++ b/Defs/Ammo/Advanced/PlasmaCellRifle.xml @@ -71,7 +71,7 @@ 178 Bomb - 4 + 2 0.5 true diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml index 7d73dfc411..c6c1236df7 100644 --- a/Defs/Ammo/Grenade/20x42mmGrenade.xml +++ b/Defs/Ammo/Grenade/20x42mmGrenade.xml @@ -223,7 +223,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 25 + 18 1.0 true @@ -242,7 +242,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 25 + 18 1.5 @@ -251,8 +251,8 @@ Bullet_20x42mmGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/25x40mmGrenade.xml b/Defs/Ammo/Grenade/25x40mmGrenade.xml index 5adfc9f553..a48d697858 100644 --- a/Defs/Ammo/Grenade/25x40mmGrenade.xml +++ b/Defs/Ammo/Grenade/25x40mmGrenade.xml @@ -119,7 +119,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 24 + 18 1 true @@ -138,7 +138,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 24 + 18 1 true 0.5 @@ -159,7 +159,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 24 + 18 1.5 @@ -168,8 +168,8 @@ Bullet_25x40mmGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml index 01df165829..e81592e0da 100644 --- a/Defs/Ammo/Grenade/25x59mmGrenade.xml +++ b/Defs/Ammo/Grenade/25x59mmGrenade.xml @@ -134,7 +134,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 26 + 19 1 true @@ -153,7 +153,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 26 + 19 1 true 1.4 @@ -177,11 +177,11 @@ Bullet 29 50 - 3.613 + 4.818
  • - 17 + 16 Bomb 0.5 true @@ -200,7 +200,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 26 + 19 1.5 @@ -209,8 +209,8 @@ Bullet_25x59mmGrenade_Smoke - 2 Smoke + 2 0.0 0.0 BlindSmoke diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml index e014e323ed..f8793aa3c9 100644 --- a/Defs/Ammo/Grenade/30x29mmGrenade.xml +++ b/Defs/Ammo/Grenade/30x29mmGrenade.xml @@ -134,7 +134,7 @@ Bomb - 30 + 22 1 true @@ -153,7 +153,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 30 + 22 1 true 1.4 @@ -177,7 +177,7 @@ Bullet 37 45 - 4.177 + 5.569
  • diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml index e0e3c35a15..3b83cceb9c 100644 --- a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml +++ b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml @@ -118,7 +118,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 27 + 20 1 true @@ -139,7 +139,7 @@ Bullet 30 55 - 3.721 + 4.961
  • @@ -162,7 +162,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 27 + 20 1.5 diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml index 536e7c9075..6d71f5cb83 100644 --- a/Defs/Ammo/Grenade/40x46mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x46mmGrenade.xml @@ -151,7 +151,7 @@ Bomb - 29 + 22 1.0 true @@ -170,7 +170,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 29 + 22 1.0 true 1.4 @@ -194,11 +194,11 @@ Bullet 36 63 - 4.157 + 5.543
  • - 19 + 18 Bomb 0.5 true @@ -216,7 +216,7 @@ EMP - 29 + 22 1.5 diff --git a/Defs/Ammo/Grenade/40x47mmGrenade.xml b/Defs/Ammo/Grenade/40x47mmGrenade.xml index 7b81f67509..d1d3ae9ec9 100644 --- a/Defs/Ammo/Grenade/40x47mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x47mmGrenade.xml @@ -106,7 +106,7 @@ Bomb - 29 + 22 1 true @@ -124,7 +124,7 @@ EMP - 29 + 22 2.0 diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml index a5a9b6646b..7388e77a43 100644 --- a/Defs/Ammo/Grenade/40x53mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x53mmGrenade.xml @@ -136,7 +136,7 @@ Bomb - 31 + 23 1 true @@ -155,7 +155,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 31 + 23 1.0 true 1.4 @@ -179,11 +179,11 @@ Bullet 39 76 - 4.326 + 5.768
  • - 20 + 19 Bomb 0.5 true @@ -201,7 +201,7 @@ EMP - 31 + 23 1.5 diff --git a/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml b/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml index d03b8f23b1..e331b51658 100644 --- a/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml +++ b/Defs/Ammo/Grenade/40x53mmVOG25Grenade.xml @@ -118,7 +118,7 @@ Bomb - 34 + 26 1.0 true @@ -137,7 +137,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 34 + 26 1.0 true 1.4 @@ -158,7 +158,7 @@ EMP - 34 + 26 2 diff --git a/Defs/Ammo/Grenade/50mmGS50Grenade.xml b/Defs/Ammo/Grenade/50mmGS50Grenade.xml index 74fc576cd4..e653551bd3 100644 --- a/Defs/Ammo/Grenade/50mmGS50Grenade.xml +++ b/Defs/Ammo/Grenade/50mmGS50Grenade.xml @@ -104,7 +104,7 @@ CombatExtended.ProjectileCE_Explosive Bomb - 33 + 25 1 true @@ -123,7 +123,7 @@ CombatExtended.ProjectileCE_Explosive EMP - 33 + 25 2 diff --git a/Defs/Ammo/Grenade/83mmPIATGrenade.xml b/Defs/Ammo/Grenade/83mmPIATGrenade.xml index f46babf8b7..f6ab9a5fb0 100644 --- a/Defs/Ammo/Grenade/83mmPIATGrenade.xml +++ b/Defs/Ammo/Grenade/83mmPIATGrenade.xml @@ -103,11 +103,11 @@ Bullet 268 100 - 31.364 + 41.818
  • - 125 + 139 Bomb 1 true @@ -127,7 +127,7 @@ Bomb - 163 + 139 2.5 true @@ -145,7 +145,7 @@ EMP - 163 + 139 5 diff --git a/Defs/Ammo/Medieval/CannonBall.xml b/Defs/Ammo/Medieval/CannonBall.xml index 3e7162a661..afce4271d6 100644 --- a/Defs/Ammo/Medieval/CannonBall.xml +++ b/Defs/Ammo/Medieval/CannonBall.xml @@ -163,18 +163,18 @@ 99 Bomb - 99 + 142 0 0 - 2.0 + 2.5 MortarBomb_Explode true
  • - 9 - 19 + 17 + 22
    • @@ -187,7 +187,7 @@ 99 PrometheumFlame - 7 + 6 4.5 FilthPrometheum 0.25 @@ -240,16 +240,16 @@ Bomb - 82 - 2.0 + 142 + 2.5 MortarBomb_Explode true
  • - 9 - 19 + 17 + 22
    • diff --git a/Defs/Ammo/Medieval/MortarGrenade.xml b/Defs/Ammo/Medieval/MortarGrenade.xml index bda04b8463..c432eeebca 100644 --- a/Defs/Ammo/Medieval/MortarGrenade.xml +++ b/Defs/Ammo/Medieval/MortarGrenade.xml @@ -66,7 +66,7 @@ Bomb - 39 + 30 1.0 25 true diff --git a/Defs/Ammo/Projectiles_Fragments.xml b/Defs/Ammo/Projectiles_Fragments.xml index 816f2a8f53..b00400fc59 100644 --- a/Defs/Ammo/Projectiles_Fragments.xml +++ b/Defs/Ammo/Projectiles_Fragments.xml @@ -65,12 +65,12 @@ 50 40 70 - 4.79 + 6.387 5
  • - 22 + 21 Bomb 0.5
    • diff --git a/Defs/Ammo/Rocket/127mmJavelinMissile.xml b/Defs/Ammo/Rocket/127mmJavelinMissile.xml index a655d65443..28c1323703 100644 --- a/Defs/Ammo/Rocket/127mmJavelinMissile.xml +++ b/Defs/Ammo/Rocket/127mmJavelinMissile.xml @@ -15,13 +15,13 @@ Bullet 363 750 - 131.552 + 175.402 57 RocketPropelledLoop_Small
  • - 470 + 585 Bomb 3 true diff --git a/Defs/Ammo/Rocket/130mmType63.xml b/Defs/Ammo/Rocket/130mmType63.xml index 253ed0235e..04731b0a57 100644 --- a/Defs/Ammo/Rocket/130mmType63.xml +++ b/Defs/Ammo/Rocket/130mmType63.xml @@ -115,7 +115,7 @@ Bomb - 284 + 254 3.5 true diff --git a/Defs/Ammo/Rocket/132mmM13.xml b/Defs/Ammo/Rocket/132mmM13.xml index ee17d228d9..92265a04c5 100644 --- a/Defs/Ammo/Rocket/132mmM13.xml +++ b/Defs/Ammo/Rocket/132mmM13.xml @@ -67,7 +67,7 @@ 81 Bomb - 369 + 337 4 true diff --git a/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml b/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml index 512269adaa..6587b13fda 100644 --- a/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml +++ b/Defs/Ammo/Rocket/150mmMBTLAWMissile.xml @@ -13,15 +13,15 @@ Bullet - 286 + 281 600 - 103.144 + 137.525 54 RocketPropelledLoop_Small
  • - 375 + 458 Bomb 2.5 true diff --git a/Defs/Ammo/Rocket/20mmFliegerfaust.xml b/Defs/Ammo/Rocket/20mmFliegerfaust.xml index 7e3a5de57d..0e14321f7a 100644 --- a/Defs/Ammo/Rocket/20mmFliegerfaust.xml +++ b/Defs/Ammo/Rocket/20mmFliegerfaust.xml @@ -103,7 +103,7 @@ Bomb - 21 + 16 0.5 diff --git a/Defs/Ammo/Rocket/50mmRocket.xml b/Defs/Ammo/Rocket/50mmRocket.xml index cfab07c9b7..628834768a 100644 --- a/Defs/Ammo/Rocket/50mmRocket.xml +++ b/Defs/Ammo/Rocket/50mmRocket.xml @@ -86,7 +86,7 @@ Bomb - 171 + 147 2.5 diff --git a/Defs/Ammo/Rocket/57mmS5Rocket.xml b/Defs/Ammo/Rocket/57mmS5Rocket.xml index 4372d7cf75..920fe07dfd 100644 --- a/Defs/Ammo/Rocket/57mmS5Rocket.xml +++ b/Defs/Ammo/Rocket/57mmS5Rocket.xml @@ -191,7 +191,7 @@ Bomb - 214 + 187 3 true @@ -216,11 +216,11 @@ Bullet 158 172 - 19.734 + 26.312
  • - 81 + 88 Bomb 1 MortarBomb_Explode @@ -243,7 +243,7 @@ Thermobaric - 181 + 160 3.5 0 0 diff --git a/Defs/Ammo/Rocket/70mmAPKWS.xml b/Defs/Ammo/Rocket/70mmAPKWS.xml index fc9a518d73..7925231294 100644 --- a/Defs/Ammo/Rocket/70mmAPKWS.xml +++ b/Defs/Ammo/Rocket/70mmAPKWS.xml @@ -111,11 +111,11 @@ Bullet 248 300 - 33.215 + 44.285
  • - 132 + 148 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/83mmSMAW.xml b/Defs/Ammo/Rocket/83mmSMAW.xml index 3414e961b4..a4f870c87f 100644 --- a/Defs/Ammo/Rocket/83mmSMAW.xml +++ b/Defs/Ammo/Rocket/83mmSMAW.xml @@ -137,11 +137,11 @@ Bullet 248 600 - 29.621 + 39.494
  • - 118 + 132 Bomb 1 MortarBomb_Explode @@ -165,7 +165,7 @@ Bomb - 179 + 154 2.5 MortarBomb_Explode true @@ -190,7 +190,7 @@ Thermobaric - 285 + 260 5 MortarBomb_Explode true diff --git a/Defs/Ammo/Rocket/84mmAT4.xml b/Defs/Ammo/Rocket/84mmAT4.xml index 9099c68b6d..53500471e5 100644 --- a/Defs/Ammo/Rocket/84mmAT4.xml +++ b/Defs/Ammo/Rocket/84mmAT4.xml @@ -15,13 +15,13 @@ Bullet 248 420 - 23.996 + 31.995 63 RocketPropelledLoop_Small
  • - 97 + 107 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index 8d743e64d3..b1fcdaf633 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -273,12 +273,12 @@ Bullet 248 400 - 24.773 + 33.03 64
  • - 100 + 110 Bomb 1 MortarBomb_Explode @@ -301,7 +301,7 @@ Thermobaric - 181 + 160 3.5 MortarBomb_Explode true @@ -318,7 +318,7 @@ Bomb - 176 + 151 2.5 51 MortarBomb_Explode @@ -343,7 +343,7 @@ CombatExtended.ProjectileCE_Bursting Bomb - 176 + 151 2.5 51 MortarBomb_Explode @@ -371,14 +371,14 @@ CombatExtended.BulletCE Bullet - 356 + 400 150 - 25.028 + 33.371 59
  • - 101 + 111 Bomb 1.0 true @@ -400,7 +400,7 @@ Bomb - 132 + 111 2.0 61 MortarBomb_Explode @@ -443,7 +443,7 @@ PrometheumFlame - 18 + 15 8.0 FilthPrometheum 0.5 @@ -469,7 +469,7 @@ EMP - 176 + 151 5.0 61 diff --git a/Defs/Ammo/Rocket/88mmRPzB.xml b/Defs/Ammo/Rocket/88mmRPzB.xml index 93656d9193..b4b3f4e4b4 100644 --- a/Defs/Ammo/Rocket/88mmRPzB.xml +++ b/Defs/Ammo/Rocket/88mmRPzB.xml @@ -103,11 +103,11 @@ Bullet 208 220 - 27.991 + 37.321
  • - 112 + 124 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/90mmMATADOR.xml b/Defs/Ammo/Rocket/90mmMATADOR.xml index 98ceb1bbaa..b3c3dd616a 100644 --- a/Defs/Ammo/Rocket/90mmMATADOR.xml +++ b/Defs/Ammo/Rocket/90mmMATADOR.xml @@ -15,13 +15,13 @@ Bullet 248 500 - 24.925 + 33.233 63 RocketPropelledLoop_Small
  • - 101 + 111 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/90mmRecoilless.xml b/Defs/Ammo/Rocket/90mmRecoilless.xml index 441842f59b..db388dcffc 100644 --- a/Defs/Ammo/Rocket/90mmRecoilless.xml +++ b/Defs/Ammo/Rocket/90mmRecoilless.xml @@ -134,11 +134,11 @@ Bullet 239 350 - 23.914 + 31.885
  • - 97 + 106 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M6.xml b/Defs/Ammo/Rocket/M6.xml index 527b0fee86..33669c1eea 100644 --- a/Defs/Ammo/Rocket/M6.xml +++ b/Defs/Ammo/Rocket/M6.xml @@ -106,11 +106,11 @@ Bullet 208 76 - 31.705 + 42.273
  • - 123 + 141 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M6A1.xml b/Defs/Ammo/Rocket/M6A1.xml index 5426f0fd62..db927b84c4 100644 --- a/Defs/Ammo/Rocket/M6A1.xml +++ b/Defs/Ammo/Rocket/M6A1.xml @@ -95,11 +95,11 @@ Bullet 208 76 - 31.705 + 42.273
  • - 123 + 141 Bomb 1.5 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M6A3.xml b/Defs/Ammo/Rocket/M6A3.xml index 8fefe1a089..0423b77371 100644 --- a/Defs/Ammo/Rocket/M6A3.xml +++ b/Defs/Ammo/Rocket/M6A3.xml @@ -119,11 +119,11 @@ Bullet 208 76 - 31.705 + 42.273
  • - 123 + 141 Bomb 1.5 MortarBomb_Explode @@ -148,7 +148,7 @@ PrometheumFlame - 14 + 12 6.5 FilthPrometheum 0.5 diff --git a/Defs/Ammo/Rocket/M72LAW.xml b/Defs/Ammo/Rocket/M72LAW.xml index 195ebdc816..e0633b553c 100644 --- a/Defs/Ammo/Rocket/M72LAW.xml +++ b/Defs/Ammo/Rocket/M72LAW.xml @@ -16,7 +16,7 @@ Bullet 248 300 - 23.688 + 31.584 RocketPropelledLoop_Small true Fleck_DisposableLauncherCasing @@ -24,7 +24,7 @@
  • - 96 + 105 Bomb 1 MortarBomb_Explode diff --git a/Defs/Ammo/Rocket/M74.xml b/Defs/Ammo/Rocket/M74.xml index dc1381fd8b..c5512e53d2 100644 --- a/Defs/Ammo/Rocket/M74.xml +++ b/Defs/Ammo/Rocket/M74.xml @@ -101,14 +101,14 @@ PrometheumFlame - 11 + 9 6 FilthPrometheum 0.5 MortarBomb_Explode true -