diff --git a/About/Manifest.xml b/About/Manifest.xml index 1ae922265c..fa8421b68d 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -11,4 +11,4 @@ true https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/master/About/Manifest.xml https://github.com/CombatExtended-Continued/CombatExtended/releases/latest - + \ No newline at end of file diff --git a/Biotech/Patches/GeneDefs/GeneDefs_Misc.xml b/Biotech/Patches/GeneDefs/GeneDefs_Misc.xml index af6be95e26..bb589bedf6 100644 --- a/Biotech/Patches/GeneDefs/GeneDefs_Misc.xml +++ b/Biotech/Patches/GeneDefs/GeneDefs_Misc.xml @@ -44,7 +44,7 @@ - + Defs/GeneDef[defName="FireResistant"]/damageFactors @@ -52,7 +52,7 @@ 0.25 - + Defs/GeneDef[defName="FireWeakness"]/damageFactors @@ -61,4 +61,4 @@ - + \ No newline at end of file diff --git a/Defs/Ammo/Lasers/BaseLaserProjectiles.xml b/Defs/Ammo/Lasers/BaseLaserProjectiles.xml index 0a05bc7cac..79b99c2148 100644 --- a/Defs/Ammo/Lasers/BaseLaserProjectiles.xml +++ b/Defs/Ammo/Lasers/BaseLaserProjectiles.xml @@ -36,7 +36,7 @@
  • Things/Projectile/Laser_CE
    •  - + diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml index 4fc8390299..6fd657fd13 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml @@ -33,7 +33,6 @@ - @@ -205,7 +204,7 @@ - + 95 diff --git a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml index bee3d10687..90d95413ff 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml @@ -1,50 +1,50 @@ - + - - - AmmoSet_MeltaCharge - - - Bullet_Laser_MeltaCharge - - + + + AmmoSet_MeltaCharge + + + Bullet_Laser_MeltaCharge + + - - - Bullet_Laser_MeltaCharge - - CombatExtended.Lasers.LaserBeamCE - - ThirdParty/Warhammer/MeltaBeam - Graphic_Single - Transparent - (255,255,255) - - Projectile - BeamGraphic - 0.4 - -
  • ThirdParty/Warhammer/MeltaBeam
    • -     - - true - Bullet - 150 - 500 - 0.001 - - -
  • - false - false - Fleck_HeatGlow_API - 4 - ExplosionFlash - 5 -
    • -     -     + + + Bullet_Laser_MeltaCharge + + CombatExtended.Lasers.LaserBeamCE + + ThirdParty/Warhammer/MeltaBeam + Graphic_Single + Transparent + (255,255,255) + + Projectile + BeamGraphic + 0.4 + +
  • ThirdParty/Warhammer/MeltaBeam
    • +     + + true + Bullet + 150 + 500 + 0.001 + + +
  • + false + false + Fleck_HeatGlow_API + 4 + ExplosionFlash + 5 +
    • +     +     \ No newline at end of file diff --git a/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml b/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml index 0c708b0878..d97be58213 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml @@ -104,7 +104,7 @@ Bullet - +     CombatExtended.BulletCE     @@ -177,8 +177,8 @@ 14 3 0.7 - - + +
  • @@ -278,7 +278,7 @@ 2 -
    • + diff --git a/Defs/Ammo/Projectiles_Fragments.xml b/Defs/Ammo/Projectiles_Fragments.xml index 8f9c99f8d5..11bb1dbcc1 100644 --- a/Defs/Ammo/Projectiles_Fragments.xml +++ b/Defs/Ammo/Projectiles_Fragments.xml @@ -59,7 +59,7 @@ Things/Projectile/Bullet_Big Graphic_Single - + Bullet 50 diff --git a/Defs/Ammo/Rifle/5x100mmCaseless.xml b/Defs/Ammo/Rifle/5x100mmCaseless.xml index a14759d11d..4eaf44a79b 100644 --- a/Defs/Ammo/Rifle/5x100mmCaseless.xml +++ b/Defs/Ammo/Rifle/5x100mmCaseless.xml @@ -27,7 +27,7 @@ AmmoSet_Rifle - + AmmoSet_5x100mmCaseless_LV @@ -104,7 +104,7 @@ 204     - + Bullet_5x100mmCaseless_Sabot_LV diff --git a/Defs/Ammo/Rocket/130mmType63.xml b/Defs/Ammo/Rocket/130mmType63.xml index 52eaf5d548..7542b85279 100644 --- a/Defs/Ammo/Rocket/130mmType63.xml +++ b/Defs/Ammo/Rocket/130mmType63.xml @@ -1,178 +1,178 @@  - - Ammo130mmType63 - - AmmoRockets - Things/Ammo/Rocket/130mmType63/130mmType63_a - + + Ammo130mmType63 + + AmmoRockets + Things/Ammo/Rocket/130mmType63/130mmType63_a + - + - - AmmoSet_130mmType63 - - - Bullet_130mmType63_HE - - + + AmmoSet_130mmType63 + + + Bullet_130mmType63_HE + + - + - - 130mm heavy rocket typically used in multi-barrel rocket artillery launchers. - - 300 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo130mmType63
    • -     - 25 - 25 - MortarBomb_Explode -     + + 130mm heavy rocket typically used in multi-barrel rocket artillery launchers. + + 300 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo130mmType63
    • +     + 25 + 25 + MortarBomb_Explode +     - - Ammo_130mmType63_HE - - - Things/Ammo/Rocket/130mmType63 - Graphic_StackCount - - - 192.94 - 33 - 43.81 - - GrenadeHE - Bullet_130mmType63_HE - + + Ammo_130mmType63_HE + + + Things/Ammo/Rocket/130mmType63 + Graphic_StackCount + + + 192.94 + 33 + 43.81 + + GrenadeHE + Bullet_130mmType63_HE + - + - - - TransparentPostLight - - - 96 - MortarBomb_Explode - Artillery_HitThickRoof - MortarRound_PreImpact - RocketPropelledLoop_Big - true - 5 - - Things/WorldObjects/Munitions/Rocket - 0.4 - 20 - 0.3 - - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1.5 - 25~60 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 1 - 0~360 - 3 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 1 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 96 + MortarBomb_Explode + Artillery_HitThickRoof + MortarRound_PreImpact + RocketPropelledLoop_Big + true + 5 + + Things/WorldObjects/Munitions/Rocket + 0.4 + 20 + 0.3 + + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1.5 + 25~60 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 1 + 0~360 + 3 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 1 + 25~60 +
    • + + +     +     - - Bullet_130mmType63_HE - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/130mmType63 - Graphic_Single - - - Bomb - 254 - 3.5 - true - - -
  • - - 40 - 57 - -
    • -     -     + + Bullet_130mmType63_HE + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/130mmType63 + Graphic_Single + + + Bomb + 254 + 3.5 + true + + +
  • + + 40 + 57 + +
    • +     +     - + - - MakeAmmo_130mmType63_HE - - Craft 5 130mm Type63 HE rockets. - Making 130mm Type63 HE rockets. - 44600 - -
  • - - -
  • Steel
    • - - - 330 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -
  • - - -
  • FSX
    • - - - 23 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -
  • FSX
    • -     -     - - 5 - -     + + MakeAmmo_130mmType63_HE + + Craft 5 130mm Type63 HE rockets. + Making 130mm Type63 HE rockets. + 44600 + +
  • + + +
  • Steel
    • + + + 330 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +
  • + + +
  • FSX
    • + + + 23 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/132mmM13.xml b/Defs/Ammo/Rocket/132mmM13.xml index 6bfe389a88..bbb12c0f6f 100644 --- a/Defs/Ammo/Rocket/132mmM13.xml +++ b/Defs/Ammo/Rocket/132mmM13.xml @@ -1,163 +1,163 @@  - - Ammo132mmM13 - - AmmoRockets - Things/Projectile/Rocket/130mmType63 - + + Ammo132mmM13 + + AmmoRockets + Things/Projectile/Rocket/130mmType63 + - + - - AmmoSet_132mmM13 - - - Bullet_132mmM13_HE - - true - + + AmmoSet_132mmM13 + + + Bullet_132mmM13_HE + + true + - + - - 13.2cm rocket typically used in multi-railed rocket artillery launchers. - - 280 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo132mmM13
    • -     - 25 - 25 - MortarBomb_Explode -     + + 13.2cm rocket typically used in multi-railed rocket artillery launchers. + + 280 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo132mmM13
    • +     + 25 + 25 + MortarBomb_Explode +     - - Ammo_132mmM13_HE - - - Things/Ammo/Rocket/132mmM13 - Graphic_StackCount - - - 237.5 - 43 - 59.53 - - GrenadeHE - Bullet_132mmM13_HE - + + Ammo_132mmM13_HE + + + Things/Ammo/Rocket/132mmM13 + Graphic_StackCount + + + 237.5 + 43 + 59.53 + + GrenadeHE + Bullet_132mmM13_HE + - + - - Bullet_132mmM13_HE - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/132mmM13 - Graphic_Single - - - 81 - Bomb - 337 - 4 - true - - Things/WorldObjects/Munitions/Rocket - 0.35 - 20 - 0.23 - - - -
  • - - 40 - 80 - -
    • -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1.5 - 25~60 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 1 - 0~360 - 3 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 1 - 25~60 -
    • - - -     -     + + Bullet_132mmM13_HE + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/132mmM13 + Graphic_Single + + + 81 + Bomb + 337 + 4 + true + + Things/WorldObjects/Munitions/Rocket + 0.35 + 20 + 0.23 + + + +
  • + + 40 + 80 + +
    • +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1.5 + 25~60 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 1 + 0~360 + 3 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 1 + 25~60 +
    • + + +     +     - + - - MakeAmmo_132mmM13_HE - - Craft 4x 132mm M13 HE rockets. - Making 132mm M13 HE rockets. - 48400 - -
  • - - -
  • Steel
    • - - - 344 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -
  • - - -
  • FSX
    • - - - 29 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -
  • FSX
    • -     -     - - 4 - -     + + MakeAmmo_132mmM13_HE + + Craft 4x 132mm M13 HE rockets. + Making 132mm M13 HE rockets. + 48400 + +
  • + + +
  • Steel
    • + + + 344 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +
  • + + +
  • FSX
    • + + + 29 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 4 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/20mmFliegerfaust.xml b/Defs/Ammo/Rocket/20mmFliegerfaust.xml index f96b28473f..2abc9a605d 100644 --- a/Defs/Ammo/Rocket/20mmFliegerfaust.xml +++ b/Defs/Ammo/Rocket/20mmFliegerfaust.xml @@ -1,165 +1,165 @@  - - Ammo20mmFliegerfaust - + + Ammo20mmFliegerfaust + - + - - AmmoSet_20mmFliegerfaust - - - Bullet_20mmFliegerfaust_HE - - + + AmmoSet_20mmFliegerfaust + + + Bullet_20mmFliegerfaust_HE + + - + - - Outdated 20mm rocket designed to be fired in volleys at airplanes. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo20mmFliegerfaust
    • -     - 4000 - 25 - MortarBomb_Explode -     + + Outdated 20mm rocket designed to be fired in volleys at airplanes. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo20mmFliegerfaust
    • +     + 4000 + 25 + MortarBomb_Explode +     - - Ammo_20mmFliegerfaust_HE - - - Things/Ammo/RPG/Frag - Graphic_StackCount - - - 14.58 - 0.12 - 0.16 - - GrenadeHE - Bullet_20mmFliegerfaust_HE - + + Ammo_20mmFliegerfaust_HE + + + Things/Ammo/RPG/Frag + Graphic_StackCount + + + 14.58 + 0.12 + 0.16 + + GrenadeHE + Bullet_20mmFliegerfaust_HE + - + - - - TransparentPostLight - - - 81 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 10 - 4 - 0.7 - 25~30 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 4 - 0~360 - 2 - 0.5 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 81 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 10 + 4 + 0.7 + 25~30 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 4 + 0~360 + 2 + 0.5 + 25~60 +
    • + + +     +     - - Bullet_20mmFliegerfaust_HE - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/RPG/Frag - Graphic_Single - - - Bomb - 16 - 0.5 - - -
  • - - 1 - 1 - -
    • -     -     + + Bullet_20mmFliegerfaust_HE + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/RPG/Frag + Graphic_Single + + + Bomb + 16 + 0.5 + + +
  • + + 1 + 1 + +
    • +     +     - + - - MakeAmmo_20mmFliegerfaust_HE - - Craft 10 20mmFliegerfaust HE rockets. - Making 20mmFliegerfaust HE rockets. - 3200 - -
  • - - -
  • Steel
    • - - - 4 - -
  • - - -
  • FSX
    • - - - 1 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 10 - -     + + MakeAmmo_20mmFliegerfaust_HE + + Craft 10 20mmFliegerfaust HE rockets. + Making 20mmFliegerfaust HE rockets. + 3200 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • FSX
    • + + + 1 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 10 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/50mmRocket.xml b/Defs/Ammo/Rocket/50mmRocket.xml index 1805849855..053669864f 100644 --- a/Defs/Ammo/Rocket/50mmRocket.xml +++ b/Defs/Ammo/Rocket/50mmRocket.xml @@ -1,171 +1,171 @@  - - Ammo50mmRocket - + + Ammo50mmRocket + - + - - AmmoSet_50mmRocket - - - Bullet_50mmRocket_HE - - + + AmmoSet_50mmRocket + + + Bullet_50mmRocket_HE + + - + - - An unguided rocket equipped with an explosive warhead and a contact fuse. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo50mmRocket
    • -     - 25 - 25 - MortarBomb_Explode -     + + An unguided rocket equipped with an explosive warhead and a contact fuse. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo50mmRocket
    • +     + 25 + 25 + MortarBomb_Explode +     - - Ammo_50mmRocket_HE - - - Things/Ammo/Rocket/70mmAPKWS - Graphic_StackCount - 0.70 - - - 44.76 - 4.5 - 7.07 - - GrenadeHE - Bullet_50mmRocket_HE - + + Ammo_50mmRocket_HE + + + Things/Ammo/Rocket/70mmAPKWS + Graphic_StackCount + 0.70 + + + 44.76 + 4.5 + 7.07 + + GrenadeHE + Bullet_50mmRocket_HE + - + - - - TransparentPostLight - - - 0 - RocketPropelledLoop_Small - false - true - 5 - - Things/WorldObjects/Munitions/Rocket - 0.35 - 12 - 0.43 - - - + + + TransparentPostLight + + + 0 + RocketPropelledLoop_Small + false + true + 5 + + Things/WorldObjects/Munitions/Rocket + 0.35 + 12 + 0.43 + + + - - Bullet_50mmRocket_HE - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/70mmAPKWS - Graphic_Single - 0.70 - - - Bomb - 147 - 2.5 - - -
  • - - 23 - -
    • -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 60~120 -
    • -
  • - Fleck_CERocketSmokeTrail - 0.5 - 0~360 - 2 - 1 -
    • -
  • - Fleck_CERocketSmoke - 0.5 - 0~360 - 1 - 120~240 -
    • - - -     -     + + Bullet_50mmRocket_HE + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/70mmAPKWS + Graphic_Single + 0.70 + + + Bomb + 147 + 2.5 + + +
  • + + 23 + +
    • +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 60~120 +
    • +
  • + Fleck_CERocketSmokeTrail + 0.5 + 0~360 + 2 + 1 +
    • +
  • + Fleck_CERocketSmoke + 0.5 + 0~360 + 1 + 120~240 +
    • + + +     +     - + - - MakeAmmo_50mmRocket_HE - - Craft 10 50mm HE rockets. - Making 50mm HE rockets. - 11000 - -
  • - - -
  • Steel
    • - - - 46 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 10 - -     + + MakeAmmo_50mmRocket_HE + + Craft 10 50mm HE rockets. + Making 50mm HE rockets. + 11000 + +
  • + + +
  • Steel
    • + + + 46 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 10 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/57mmS5Rocket.xml b/Defs/Ammo/Rocket/57mmS5Rocket.xml index 3b8e4c25e2..beb399071a 100644 --- a/Defs/Ammo/Rocket/57mmS5Rocket.xml +++ b/Defs/Ammo/Rocket/57mmS5Rocket.xml @@ -1,460 +1,460 @@ - - Ammo57mmRocket - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + Ammo57mmRocket + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_57mmRocket_direct - - - Bullet_57mmRocket_HE - Bullet_57mmRocket_HEAT - Bullet_57mmRocket_Thermobaric - - + + AmmoSet_57mmRocket_direct + + + Bullet_57mmRocket_HE + Bullet_57mmRocket_HEAT + Bullet_57mmRocket_Thermobaric + + - - AmmoSet_57mmRocket_indirect - - - Bullet_57mmRocket_HE_indirect - Bullet_57mmRocket_HEAT_indirect - Bullet_57mmRocket_Thermobaric_indirect - - + + AmmoSet_57mmRocket_indirect + + + Bullet_57mmRocket_HE_indirect + Bullet_57mmRocket_HEAT_indirect + Bullet_57mmRocket_Thermobaric_indirect + + - + - - An unguided rocket launched from 57mm tubes and equipped with 55mm explosive warhead. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo57mmRocket
    • -     - 25 - 25 - MortarBomb_Explode -     + + An unguided rocket launched from 57mm tubes and equipped with 55mm explosive warhead. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo57mmRocket
    • +     + 25 + 25 + MortarBomb_Explode +     - - Ammo_57mmRocket_HE - - - Things/Ammo/Rocket/57mmS5/HE - Graphic_StackCount - - - 67.77 - 4.82 - 7.05 - - RocketHE - Bullet_57mmRocket_HE - + + Ammo_57mmRocket_HE + + + Things/Ammo/Rocket/57mmS5/HE + Graphic_StackCount + + + 67.77 + 4.82 + 7.05 + + RocketHE + Bullet_57mmRocket_HE + - - Ammo_57mmRocket_HEAT - - - Things/Ammo/Rocket/57mmS5/HEAT - Graphic_StackCount - - - 50.52 - 4.5 - 7.04 - - RocketHEAT - Bullet_57mmRocket_HEAT - + + Ammo_57mmRocket_HEAT + + + Things/Ammo/Rocket/57mmS5/HEAT + Graphic_StackCount + + + 50.52 + 4.5 + 7.04 + + RocketHEAT + Bullet_57mmRocket_HEAT + - - Ammo_57mmRocket_Thermobaric - - - Things/Ammo/Rocket/57mmS5/Thermobaric - Graphic_StackCount - - - 71.7 - 5.01 - 7.7 - - RocketThermobaric - Bullet_57mmRocket_Thermobaric - + + Ammo_57mmRocket_Thermobaric + + + Things/Ammo/Rocket/57mmS5/Thermobaric + Graphic_StackCount + + + 71.7 + 5.01 + 7.7 + + RocketThermobaric + Bullet_57mmRocket_Thermobaric + - + - - CombatExtended.ProjectileCE_Explosive - - Things/Projectile/Rocket/70mmAPKWS - Graphic_Single - TransparentPostLight - - - 120 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 10 - 4 - 0.7 - 25~30 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 4 - 0~360 - 2 - 0.5 - 25~60 -
    • - - -     -     + + CombatExtended.ProjectileCE_Explosive + + Things/Projectile/Rocket/70mmAPKWS + Graphic_Single + TransparentPostLight + + + 120 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 10 + 4 + 0.7 + 25~30 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 4 + 0~360 + 2 + 0.5 + 25~60 +
    • + + +     +     - - CombatExtended.ProjectileCE_Explosive - - 0 - false - true - 5 - - Things/WorldObjects/Munitions/Rocket - 0.35 - 12 - 0.43 - - - -
  • - -
  • - Fleck_CERocketFlame - 5 - 3 - 0.75 - 25~60 - 0.8 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 25~60 -
    • - - -     -     + + CombatExtended.ProjectileCE_Explosive + + 0 + false + true + 5 + + Things/WorldObjects/Munitions/Rocket + 0.35 + 12 + 0.43 + + + +
  • + +
  • + Fleck_CERocketFlame + 5 + 3 + 0.75 + 25~60 + 0.8 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_57mmRocket_HE - - - Things/Projectile/Rocket/S5/HE - - - Bomb - 187 - 3 - true - - -
  • - - 13 - 34 - -
    • -     -     + + Bullet_57mmRocket_HE + + + Things/Projectile/Rocket/S5/HE + + + Bomb + 187 + 3 + true + + +
  • + + 13 + 34 + +
    • +     +     - - Bullet_57mmRocket_HEAT - - CombatExtended.BulletCE - - Things/Projectile/Rocket/S5/HEAT - - - Bullet - 158 - 172 - 26.312 - - -
  • - 88 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 8 - 5 - -
    • -     -     + + Bullet_57mmRocket_HEAT + + CombatExtended.BulletCE + + Things/Projectile/Rocket/S5/HEAT + + + Bullet + 158 + 172 + 26.312 + + +
  • + 88 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 8 + 5 + +
    • +     +     - - Bullet_57mmRocket_Thermobaric - - - Things/Projectile/Rocket/S5/Thermobaric - - - Thermobaric - 160 - 3.5 - 0 - 0 - true - true - - + + Bullet_57mmRocket_Thermobaric + + + Things/Projectile/Rocket/S5/Thermobaric + + + Thermobaric + 160 + 3.5 + 0 + 0 + true + true + + - + - - Bullet_57mmRocket_HE_indirect - - - Things/Projectile/Rocket/S5/HE - - - Bomb - 187 - 3 - true - - -
  • - - 13 - 34 - -
    • -     -     + + Bullet_57mmRocket_HE_indirect + + + Things/Projectile/Rocket/S5/HE + + + Bomb + 187 + 3 + true + + +
  • + + 13 + 34 + +
    • +     +     - - Bullet_57mmRocket_HEAT_indirect - - CombatExtended.BulletCE - - Things/Projectile/Rocket/S5/HEAT - - - Bullet - 158 - 172 - 26.312 - - -
  • - 88 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 8 - 5 - -
    • -     -     + + Bullet_57mmRocket_HEAT_indirect + + CombatExtended.BulletCE + + Things/Projectile/Rocket/S5/HEAT + + + Bullet + 158 + 172 + 26.312 + + +
  • + 88 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 8 + 5 + +
    • +     +     - - Bullet_57mmRocket_Thermobaric_indirect - - - Things/Projectile/Rocket/S5/Thermobaric - - - Thermobaric - 160 - 3.5 - 0 - 0 - true - true - - + + Bullet_57mmRocket_Thermobaric_indirect + + + Things/Projectile/Rocket/S5/Thermobaric + + + Thermobaric + 160 + 3.5 + 0 + 0 + true + true + + - + - - MakeAmmo_57mmRocket_HE - - Craft 5 57mm HE rockets. - Making 57mm HE rockets. - -
  • - - -
  • Steel
    • - - - 50 - -
  • - - -
  • FSX
    • - - - 14 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - 13000 -     + + MakeAmmo_57mmRocket_HE + + Craft 5 57mm HE rockets. + Making 57mm HE rockets. + +
  • + + +
  • Steel
    • + + + 50 + +
  • + + +
  • FSX
    • + + + 14 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + 13000 +     - - MakeAmmo_57mmRocket_HEAT - - Craft 5 57mm HEAT rockets. - Making 57mm HEAT rockets. - -
  • - - -
  • Steel
    • - - - 46 - -
  • - - -
  • FSX
    • - - - 4 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - 8600 -     + + MakeAmmo_57mmRocket_HEAT + + Craft 5 57mm HEAT rockets. + Making 57mm HEAT rockets. + +
  • + + +
  • Steel
    • + + + 46 + +
  • + + +
  • FSX
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + 8600 +     - - MakeAmmo_57mmRocket_Thermobaric - - Craft 5 57mm thermobaric rockets. - Making 57mm thermobaric rockets. - -
  • - - -
  • Steel
    • - - - 52 - -
  • - - -
  • FSX
    • - - - 16 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - 14000 -     + + MakeAmmo_57mmRocket_Thermobaric + + Craft 5 57mm thermobaric rockets. + Making 57mm thermobaric rockets. + +
  • + + +
  • Steel
    • + + + 52 + +
  • + + +
  • FSX
    • + + + 16 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + 14000 +     -     + \ No newline at end of file diff --git a/Defs/Ammo/Rocket/70mmAPKWS.xml b/Defs/Ammo/Rocket/70mmAPKWS.xml index 6a73dec99a..29aa00f2a2 100644 --- a/Defs/Ammo/Rocket/70mmAPKWS.xml +++ b/Defs/Ammo/Rocket/70mmAPKWS.xml @@ -1,179 +1,179 @@  - - Ammo70mmAPKWS - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + Ammo70mmAPKWS + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_70mmAPKWS - - - Bullet_70mmAPKWS_HEAT - - + + AmmoSet_70mmAPKWS + + + Bullet_70mmAPKWS_HEAT + + - + - - 70mm laser-guided munition known as the Advanced Precision Kill Weapon System (APKWS), based on Hydra 70 unguided rockets. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo70mmAPKWS
    • -     - 25 - 40 - MortarBomb_Explode -     + + 70mm laser-guided munition known as the Advanced Precision Kill Weapon System (APKWS), based on Hydra 70 unguided rockets. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo70mmAPKWS
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_70mmAPKWS_HEAT - - - Things/Ammo/Rocket/70mmAPKWS - Graphic_StackCount - - - 101.17 - 15 - 21.59 - - RocketHEAT - Bullet_70mmAPKWS_HEAT - + + Ammo_70mmAPKWS_HEAT + + + Things/Ammo/Rocket/70mmAPKWS + Graphic_StackCount + + + 101.17 + 15 + 21.59 + + RocketHEAT + Bullet_70mmAPKWS_HEAT + - + - - - TransparentPostLight - - - 173 - Artillery_HitThickRoof - MortarBomb_Explode - MortarRound_PreImpact - MortarRound_Ambient - true - false - Fleck_BigShell - Filth_CannonAmmoCasings - - -
  • - -
  • - Fleck_CERocketFlame - 14 - 3 - 1 - 25~35 - 0.1 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 5 - 0~360 - 2 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 173 + Artillery_HitThickRoof + MortarBomb_Explode + MortarRound_PreImpact + MortarRound_Ambient + true + false + Fleck_BigShell + Filth_CannonAmmoCasings + + +
  • + +
  • + Fleck_CERocketFlame + 14 + 3 + 1 + 25~35 + 0.1 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 5 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_70mmAPKWS_HEAT - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/70mmAPKWS - Graphic_Single - - - Bullet - 248 - 300 - 44.285 - - -
  • - 148 - Bomb - 1.5 - MortarBomb_Explode - true -
    • -
  • - - 26 - 12 - -
    • -     -     + + Bullet_70mmAPKWS_HEAT + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/70mmAPKWS + Graphic_Single + + + Bullet + 248 + 300 + 44.285 + + +
  • + 148 + Bomb + 1.5 + MortarBomb_Explode + true +
    • +
  • + + 26 + 12 + +
    • +     +     - + - - MakeAmmo_70mmAPKWS_HEAT - - Craft 70mm APKWS HEAT rockets. - Making 70mm APKWS HEAT rockets. - 21400 - -
  • - - -
  • Steel
    • - - - 150 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_70mmAPKWS_HEAT + + Craft 70mm APKWS HEAT rockets. + Making 70mm APKWS HEAT rockets. + 21400 + +
  • + + +
  • Steel
    • + + + 150 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/83mmSMAW.xml b/Defs/Ammo/Rocket/83mmSMAW.xml index 1b2606327d..b92310dc98 100644 --- a/Defs/Ammo/Rocket/83mmSMAW.xml +++ b/Defs/Ammo/Rocket/83mmSMAW.xml @@ -1,334 +1,334 @@  - - Ammo83mmSMAW - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + Ammo83mmSMAW + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_83mmSMAW - - - Bullet_83mmSMAW_HEAT - Bullet_83mmSMAW_HE - Bullet_83mmSMAW_Thermobaric - - + + AmmoSet_83mmSMAW + + + Bullet_83mmSMAW_HEAT + Bullet_83mmSMAW_HE + Bullet_83mmSMAW_Thermobaric + + - + - - 83mm rocket designed for the Shoulder-Launched Multipurpose Assault Weapon (SMAW). After being fired a rocket motor kicks in to propel the warhead further. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo83mmSMAW
    • -     - 25 - 40 - MortarBomb_Explode -     + + 83mm rocket designed for the Shoulder-Launched Multipurpose Assault Weapon (SMAW). After being fired a rocket motor kicks in to propel the warhead further. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo83mmSMAW
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_83mmSMAW_HEAT - - - Things/Ammo/Rocket/SMAW_HEAT - Graphic_StackCount - - - 63.92 - 6.3 - 17.91 - - RocketHEAT - Bullet_83mmSMAW_HEAT - + + Ammo_83mmSMAW_HEAT + + + Things/Ammo/Rocket/SMAW_HEAT + Graphic_StackCount + + + 63.92 + 6.3 + 17.91 + + RocketHEAT + Bullet_83mmSMAW_HEAT + - - Ammo_83mmSMAW_HE - - - Things/Ammo/Rocket/SMAW_HEAT - Graphic_StackCount - - - 65.47 - 5.9 - 15.87 - - GrenadeHE - Bullet_83mmSMAW_HE - + + Ammo_83mmSMAW_HE + + + Things/Ammo/Rocket/SMAW_HEAT + Graphic_StackCount + + + 65.47 + 5.9 + 15.87 + + GrenadeHE + Bullet_83mmSMAW_HE + - - Ammo_83mmSMAW_Thermobaric - - - Things/Ammo/Rocket/SMAW_Thermobaric - Graphic_StackCount - - - 102.28 - 5.76 - 17.27 - - RocketThermobaric - Bullet_83mmSMAW_Thermobaric - + + Ammo_83mmSMAW_Thermobaric + + + Things/Ammo/Rocket/SMAW_Thermobaric + Graphic_StackCount + + + 102.28 + 5.76 + 17.27 + + RocketThermobaric + Bullet_83mmSMAW_Thermobaric + - + - - - TransparentPostLight - - - 58 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1 - 25~30 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 58 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 25~30 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_83mmSMAW_HEAT - - - Things/Projectile/Rocket/SMAW_HEAT - Graphic_Single - - - Bullet - 248 - 600 - 39.494 - - -
  • - 132 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 7 - 10 - -
    • -     -     + + Bullet_83mmSMAW_HEAT + + + Things/Projectile/Rocket/SMAW_HEAT + Graphic_Single + + + Bullet + 248 + 600 + 39.494 + + +
  • + 132 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 7 + 10 + +
    • +     +     - - Bullet_83mmSMAW_HE - - - Things/Projectile/Rocket/SMAW_HEAT - Graphic_Single - - - Bomb - 154 - 2.5 - MortarBomb_Explode - true - - -
  • - - 12 - 25 - -
    • -     -     + + Bullet_83mmSMAW_HE + + + Things/Projectile/Rocket/SMAW_HEAT + Graphic_Single + + + Bomb + 154 + 2.5 + MortarBomb_Explode + true + + +
  • + + 12 + 25 + +
    • +     +     - - Bullet_83mmSMAW_Thermobaric - - CombatExtended.ProjectileCE_Explosive - - Things/Projectile/Rocket/SMAW_Thermobaric - Graphic_Single - - - 5 - Thermobaric - 260 - MortarBomb_Explode - true - - + + Bullet_83mmSMAW_Thermobaric + + CombatExtended.ProjectileCE_Explosive + + Things/Projectile/Rocket/SMAW_Thermobaric + Graphic_Single + + + 5 + Thermobaric + 260 + MortarBomb_Explode + true + + - + - - MakeAmmo_83mmSMAW_HEAT - - Craft 5 83mm SMAW HEAT rockets. - Making 83mm SMAW HEAT rockets. - 12000 - -
  • - - -
  • Steel
    • - - - 64 - -
  • - - -
  • FSX
    • - - - 8 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_83mmSMAW_HEAT + + Craft 5 83mm SMAW HEAT rockets. + Making 83mm SMAW HEAT rockets. + 12000 + +
  • + + +
  • Steel
    • + + + 64 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_83mmSMAW_HE - - Craft 5 83mm SMAW HE rockets. - Making 83mm SMAW HE rockets. - 12400 - -
  • - - -
  • Steel
    • - - - 60 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_83mmSMAW_HE + + Craft 5 83mm SMAW HE rockets. + Making 83mm SMAW HE rockets. + 12400 + +
  • + + +
  • Steel
    • + + + 60 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_83mmSMAW_Thermobaric - - Craft 5 83mm SMAW Thermobaric rockets. - Making 83mm SMAW Thermobaric rockets. - 21800 - -
  • - - -
  • Steel
    • - - - 58 - -
  • - - -
  • FSX
    • - - - 34 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_83mmSMAW_Thermobaric + + Craft 5 83mm SMAW Thermobaric rockets. + Making 83mm SMAW Thermobaric rockets. + 21800 + +
  • + + +
  • Steel
    • + + + 58 + +
  • + + +
  • FSX
    • + + + 34 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index 75e4de556c..f58c056b88 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -1,251 +1,251 @@  - - Ammo84x246mmR - - AmmoRockets - UI/Icons/ThingCategories/CaliberCannon - + + Ammo84x246mmR + + AmmoRockets + UI/Icons/ThingCategories/CaliberCannon + - + - - AmmoSet_84x246mmR - - - Bullet_84x246mmR_HEAT - Bullet_84x246mmR_HE - - + + AmmoSet_84x246mmR + + + Bullet_84x246mmR_HEAT + Bullet_84x246mmR_HE + + - + - - Recoilless cartridge designed for use with the Carl Gustav rifle. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo84x246mmR
    • -     - 25 - 40 - MortarBomb_Explode -     + + Recoilless cartridge designed for use with the Carl Gustav rifle. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo84x246mmR
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_84x246mmR_HEAT - - - Things/Ammo/Cannon/HEAT - Graphic_Single - - - 49.66 - 3.2 - 9.66 - - RocketHEAT - Bullet_84x246mmR_HEAT - + + Ammo_84x246mmR_HEAT + + + Things/Ammo/Cannon/HEAT + Graphic_Single + + + 49.66 + 3.2 + 9.66 + + RocketHEAT + Bullet_84x246mmR_HEAT + - - Ammo_84x246mmR_HE - - - Things/Ammo/Cannon/HE - Graphic_Single - - - 54.36 - 3.1 - 7.26 - - GrenadeHE - Bullet_84x246mmR_HE - + + Ammo_84x246mmR_HE + + + Things/Ammo/Cannon/HE + Graphic_Single + + + 54.36 + 3.1 + 7.26 + + GrenadeHE + Bullet_84x246mmR_HE + - + - - - Things/Projectile/Rocket_Big - Graphic_Single - TransparentPostLight - - - 64 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1 - 15~30 - 0.8 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 25~60 -
    • - - -     -     + + + Things/Projectile/Rocket_Big + Graphic_Single + TransparentPostLight + + + 64 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 15~30 + 0.8 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_84x246mmR_HEAT - - - Bullet - 248 - 400 - 37.075 - - -
  • - 124 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 4 - 9 - -
    • -     -     + + Bullet_84x246mmR_HEAT + + + Bullet + 248 + 400 + 37.075 + + +
  • + 124 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 4 + 9 + +
    • +     +     - - Bullet_84x246mmR_HE - - - Bomb - 151 - 61 - 2.5 - MortarBomb_Explode - true - - -
  • - - 5 - 24 - -
    • -     -     + + Bullet_84x246mmR_HE + + + Bomb + 151 + 61 + 2.5 + MortarBomb_Explode + true + + +
  • + + 5 + 24 + +
    • +     +     - + - - MakeAmmo_84x246mmR_HEAT - - Craft 5 84x246mmR HEAT cartridges. - Making 84x246mmR HEAT cartridge. - 8400 - -
  • - - -
  • Steel
    • - - - 32 - -
  • - - -
  • FSX
    • - - - 7 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_84x246mmR_HEAT + + Craft 5 84x246mmR HEAT cartridges. + Making 84x246mmR HEAT cartridge. + 8400 + +
  • + + +
  • Steel
    • + + + 32 + +
  • + + +
  • FSX
    • + + + 7 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_84x246mmR_HE - - Craft 5 84x246mmR HE cartridges. - Making 84x246mmR HE cartridges. - 9600 - -
  • - - -
  • Steel
    • - - - 32 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_84x246mmR_HE + + Craft 5 84x246mmR HE cartridges. + Making 84x246mmR HE cartridges. + 9600 + +
  • + + +
  • Steel
    • + + + 32 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/88mmRPzB.xml b/Defs/Ammo/Rocket/88mmRPzB.xml index a16adc4f4e..0c86f9cf6e 100644 --- a/Defs/Ammo/Rocket/88mmRPzB.xml +++ b/Defs/Ammo/Rocket/88mmRPzB.xml @@ -1,171 +1,171 @@  - - Ammo88mmRPzBRockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + Ammo88mmRPzBRockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_88mmRPzBRocket - - - Bullet_88mmRPzB_HEAT - - + + AmmoSet_88mmRPzBRocket + + + Bullet_88mmRPzB_HEAT + + - + - - Outdated 88mm rocket. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo88mmRPzBRockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + Outdated 88mm rocket. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo88mmRPzBRockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_88mmRPzB_HEAT - - - Things/Ammo/RPG/HEAT - Graphic_StackCount - - - 48.08 - 2.7 - 11.59 - - RocketHEAT - Bullet_88mmRPzB_HEAT - + + Ammo_88mmRPzB_HEAT + + + Things/Ammo/RPG/HEAT + Graphic_StackCount + + + 48.08 + 2.7 + 11.59 + + RocketHEAT + Bullet_88mmRPzB_HEAT + - + - - - TransparentPostLight - - - 34 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1 - 15~30 - 0.8 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 34 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 15~30 + 0.8 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_88mmRPzB_HEAT - - - Things/Projectile/RPG/HEAT - Graphic_Single - - - Bullet - 208 - 220 - 37.321 - - -
  • - 124 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 3 - 9 - -
    • -     -     + + Bullet_88mmRPzB_HEAT + + + Things/Projectile/RPG/HEAT + Graphic_Single + + + Bullet + 208 + 220 + 37.321 + + +
  • + 124 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 3 + 9 + +
    • +     +     - + - - MakeAmmo_88mmRPzB_HEAT - - Craft 5 88mm RPzB HEAT rockets. - Making 88mm RPzB HEAT rockets. - 8000 - -
  • - - -
  • Steel
    • - - - 28 - -
  • - - -
  • FSX
    • - - - 7 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_88mmRPzB_HEAT + + Craft 5 88mm RPzB HEAT rockets. + Making 88mm RPzB HEAT rockets. + 8000 + +
  • + + +
  • Steel
    • + + + 28 + +
  • + + +
  • FSX
    • + + + 7 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/90mmRecoilless.xml b/Defs/Ammo/Rocket/90mmRecoilless.xml index 95e1a355a9..9bdd1d5449 100644 --- a/Defs/Ammo/Rocket/90mmRecoilless.xml +++ b/Defs/Ammo/Rocket/90mmRecoilless.xml @@ -1,242 +1,242 @@ - - Ammo90mmRecoilless - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + Ammo90mmRecoilless + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_90mmRecoilless - - - Bullet_90mmRCR_HEAT - Bullet_90mmRCR_CAN - - + + AmmoSet_90mmRecoilless + + + Bullet_90mmRCR_HEAT + Bullet_90mmRCR_CAN + + - + - - Rocket-propelled ammunition desinged for use with the M67 recoilless rifle - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • Ammo90mmRecoilless
    • -     - 25 - 40 - MortarBomb_Explode -     + + Rocket-propelled ammunition desinged for use with the M67 recoilless rifle + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • Ammo90mmRecoilless
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_90mmRCR_HEAT - - - Things/Ammo/Rocket/90mmHEAT - Graphic_StackCount - - - 52.86 - 4.196 - 13.63 - - RocketHEAT - Bullet_90mmRCR_HEAT - + + Ammo_90mmRCR_HEAT + + + Things/Ammo/Rocket/90mmHEAT + Graphic_StackCount + + + 52.86 + 4.196 + 13.63 + + RocketHEAT + Bullet_90mmRCR_HEAT + - - Ammo_90mmRCR_CAN - - - Things/Ammo/Rocket/90mmCanister - Graphic_StackCount - - - 25.7 - 3.08 - 9.3 - - Grapeshot - Bullet_90mmRCR_CAN - + + Ammo_90mmRCR_CAN + + + Things/Ammo/Rocket/90mmCanister + Graphic_StackCount + + + 25.7 + 3.08 + 9.3 + + Grapeshot + Bullet_90mmRCR_CAN + - + - - - TransparentPostLight - - - 56 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1 - 25~30 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 56 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 25~30 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_90mmRCR_HEAT - - - Things/Projectile/RPG/HEAT - Graphic_Single - - - Bullet - 239 - 350 - 31.885 - - -
  • - 106 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 5 - 7 - -
    • -     -     + + Bullet_90mmRCR_HEAT + + + Things/Projectile/RPG/HEAT + Graphic_Single + + + Bullet + 239 + 350 + 31.885 + + +
  • + 106 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 5 + 7 + +
    • +     +     - - Bullet_90mmRCR_CAN - - - Things/Projectile/Shotgun_Pellet - Graphic_Single - - - 87 - 27 - 120 - - 5 - 14.52 - 35.6 - - - + + Bullet_90mmRCR_CAN + + + Things/Projectile/Shotgun_Pellet + Graphic_Single + + + 87 + 27 + 120 + + 5 + 14.52 + 35.6 + + + - + - - MakeAmmo_90mmRCR_HEAT - - Craft 5 90mm recoilless HEAT rockets. - Making 90mm recoilless HEAT rockets. - 9200 - -
  • - - -
  • Steel
    • - - - 44 - -
  • - - -
  • FSX
    • - - - 6 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_90mmRCR_HEAT + + Craft 5 90mm recoilless HEAT rockets. + Making 90mm recoilless HEAT rockets. + 9200 + +
  • + + +
  • Steel
    • + + + 44 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_90mmRCR_CAN - - Craft 90mm recoilless canister shells. - Making 90mm recoilless canister shells. - 7400 - -
  • - - -
  • Steel
    • - - - 32 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_90mmRCR_CAN + + Craft 90mm recoilless canister shells. + Making 90mm recoilless canister shells. + 7400 + +
  • + + +
  • Steel
    • + + + 32 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/M6.xml b/Defs/Ammo/Rocket/M6.xml index b779dd0ebd..506598110f 100644 --- a/Defs/Ammo/Rocket/M6.xml +++ b/Defs/Ammo/Rocket/M6.xml @@ -1,174 +1,174 @@  - - AmmoM6Rockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoM6Rockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_M6Rocket - - - Bullet_M6_HEAT - Bullet_M6A1_HEAT - Bullet_M6A3_HEAT - Bullet_M6A3_Incendiary - - + + AmmoSet_M6Rocket + + + Bullet_M6_HEAT + Bullet_M6A1_HEAT + Bullet_M6A3_HEAT + Bullet_M6A3_Incendiary + + - + - - Outdated 60mm rocket-propelled grenade designed for the M1 Bazooka. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoM6Rockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + Outdated 60mm rocket-propelled grenade designed for the M1 Bazooka. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoM6Rockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_M6_HEAT - - - Things/Ammo/RPG/HEAT - Graphic_StackCount - - - 47.24 - 1.59 - 4.66 - - RocketHEAT - Bullet_M6_HEAT - + + Ammo_M6_HEAT + + + Things/Ammo/RPG/HEAT + Graphic_StackCount + + + 47.24 + 1.59 + 4.66 + + RocketHEAT + Bullet_M6_HEAT + - + - - - TransparentPostLight - - - 27 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 0.5 - 25~50 - 0.8 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 27 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 0.5 + 25~50 + 0.8 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     - - Bullet_M6_HEAT - - - Things/Projectile/RPG/HEAT - Graphic_Single - - - Bullet - 208 - 76 - 42.273 - - -
  • - 141 - Bomb - 1.5 - MortarBomb_Explode - true -
    • -
  • - - 1 - 11 - -
    • -     -     + + Bullet_M6_HEAT + + + Things/Projectile/RPG/HEAT + Graphic_Single + + + Bullet + 208 + 76 + 42.273 + + +
  • + 141 + Bomb + 1.5 + MortarBomb_Explode + true +
    • +
  • + + 1 + 11 + +
    • +     +     - + - - MakeAmmo_M6_HEAT - - Craft 5 M6 HEAT rockets. - Making M6 HEAT rockets. - 7800 - -
  • - - -
  • Steel
    • - - - 18 - -
  • - - -
  • FSX
    • - - - 9 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_M6_HEAT + + Craft 5 M6 HEAT rockets. + Making M6 HEAT rockets. + 7800 + +
  • + + +
  • Steel
    • + + + 18 + +
  • + + +
  • FSX
    • + + + 9 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/M6A1.xml b/Defs/Ammo/Rocket/M6A1.xml index 1f4b744432..62178c2d97 100644 --- a/Defs/Ammo/Rocket/M6A1.xml +++ b/Defs/Ammo/Rocket/M6A1.xml @@ -1,163 +1,163 @@  - - AmmoM6A1Rockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoM6A1Rockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - + - - Outdated 60mm rocket-propelled grenade designed for the M1A1 Bazooka. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoM6A1Rockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + Outdated 60mm rocket-propelled grenade designed for the M1A1 Bazooka. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoM6A1Rockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_M6A1_HEAT - - - Things/Ammo/RPG/HEAT - Graphic_StackCount - - - 47.24 - 1.59 - 4.66 - - RocketHEAT - Bullet_M6A1_HEAT - + + Ammo_M6A1_HEAT + + + Things/Ammo/RPG/HEAT + Graphic_StackCount + + + 47.24 + 1.59 + 4.66 + + RocketHEAT + Bullet_M6A1_HEAT + - + - - - TransparentPostLight - - - 27 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 0.5 - 25~50 - 1 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 27 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 0.5 + 25~50 + 1 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     - - Bullet_M6A1_HEAT - - - Things/Projectile/RPG/HEAT - Graphic_Single - - - Bullet - 208 - 76 - 42.273 - - -
  • - 141 - Bomb - 1.5 - MortarBomb_Explode - true -
    • -
  • - - 1 - 11 - -
    • -     -     + + Bullet_M6A1_HEAT + + + Things/Projectile/RPG/HEAT + Graphic_Single + + + Bullet + 208 + 76 + 42.273 + + +
  • + 141 + Bomb + 1.5 + MortarBomb_Explode + true +
    • +
  • + + 1 + 11 + +
    • +     +     - + - - MakeAmmo_M6A1_HEAT - - Craft 5 M6A1 HEAT rockets. - Making M6A1 HEAT rockets. - 7800 - -
  • - - -
  • Steel
    • - - - 18 - -
  • - - -
  • FSX
    • - - - 9 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_M6A1_HEAT + + Craft 5 M6A1 HEAT rockets. + Making M6A1 HEAT rockets. + 7800 + +
  • + + +
  • Steel
    • + + + 18 + +
  • + + +
  • FSX
    • + + + 9 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/M6A3.xml b/Defs/Ammo/Rocket/M6A3.xml index 1a9d951407..ca4ff1e49f 100644 --- a/Defs/Ammo/Rocket/M6A3.xml +++ b/Defs/Ammo/Rocket/M6A3.xml @@ -1,162 +1,162 @@  - - AmmoM6A3Rockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoM6A3Rockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - + - - Outdated 60mm rocket-propelled grenade designed for the M9 Bazooka. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoM6A3Rockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + Outdated 60mm rocket-propelled grenade designed for the M9 Bazooka. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoM6A3Rockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_M6A3_HEAT - - - Things/Ammo/RPG/HEAT - Graphic_StackCount - - - 51.74 - 1.53 - 4.19 - - RocketHEAT - Bullet_M6A3_HEAT - + + Ammo_M6A3_HEAT + + + Things/Ammo/RPG/HEAT + Graphic_StackCount + + + 51.74 + 1.53 + 4.19 + + RocketHEAT + Bullet_M6A3_HEAT + - - Ammo_M6A3_Incendiary - - - Things/Ammo/RPG/Thermobaric - Graphic_StackCount - - - 38.21 - 1.59 - 3.81 - - GrenadeIncendiary - Bullet_M6A3_Incendiary - -
  • - - 1 - 11 - -
    • -     -     + + Ammo_M6A3_Incendiary + + + Things/Ammo/RPG/Thermobaric + Graphic_StackCount + + + 38.21 + 1.59 + 3.81 + + GrenadeIncendiary + Bullet_M6A3_Incendiary + +
  • + + 1 + 11 + +
    • +     +     - + - - - TransparentPostLight - - - 27 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 0.5 - 15~50 - 1 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 27 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 0.5 + 15~50 + 1 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     - - Bullet_M6A3_HEAT - - - Things/Projectile/RPG/HEAT - Graphic_Single - - - Bullet - 208 - 76 - 42.273 - - -
  • - 141 - Bomb - 1.5 - MortarBomb_Explode - true -
    • -
  • - - 1 - 43 - -
    • -     -     + + Bullet_M6A3_HEAT + + + Things/Projectile/RPG/HEAT + Graphic_Single + + + Bullet + 208 + 76 + 42.273 + + +
  • + 141 + Bomb + 1.5 + MortarBomb_Explode + true +
    • +
  • + + 1 + 43 + +
    • +     +     - - Bullet_M6A3_Incendiary - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/RPG/Thermobaric - Graphic_Single - - - PrometheumFlame - 12 - 6.5 - FilthPrometheum - 0.5 - MortarBomb_Explode - - + + Bullet_M6A3_Incendiary + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/RPG/Thermobaric + Graphic_Single + + + PrometheumFlame + 12 + 6.5 + FilthPrometheum + 0.5 + MortarBomb_Explode + + - - + - - MakeAmmo_M6A3_HEAT - - Craft 5 M6A3 HEAT rockets. - Making M6A3 HEAT rockets. - 7800 - -
  • - - -
  • Steel
    • - - - 18 - -
  • - - -
  • FSX
    • - - - 9 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_M6A3_HEAT + + Craft 5 M6A3 HEAT rockets. + Making M6A3 HEAT rockets. + 7800 + +
  • + + +
  • Steel
    • + + + 18 + +
  • + + +
  • FSX
    • + + + 9 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_M6A3_Incendiary - - Craft 5 M6A3 Incendiary rockets. - Making M6A3 Incendiary rockets. - 5800 - -
  • - - -
  • Steel
    • - - - 18 - -
  • - - -
  • Prometheum
    • - - - 4 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_M6A3_Incendiary + + Craft 5 M6A3 Incendiary rockets. + Making M6A3 Incendiary rockets. + 5800 + +
  • + + +
  • Steel
    • + + + 18 + +
  • + + +
  • Prometheum
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/M72LAW.xml b/Defs/Ammo/Rocket/M72LAW.xml index b51e095c35..e0633b553c 100644 --- a/Defs/Ammo/Rocket/M72LAW.xml +++ b/Defs/Ammo/Rocket/M72LAW.xml @@ -1,44 +1,44 @@  - + - - Bullet_M72LAW - - - Things/Projectile/Rocket/M72LAW - Graphic_Single - TransparentPostLight - - - 42 - Bullet - 248 - 300 - 31.584 - RocketPropelledLoop_Small - true - Fleck_DisposableLauncherCasing - Filth_DisposableLauncherCasings - - -
  • - 105 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 3 - 7 - -
    • -
  • - - -
  • - Fleck_CERocketFlame - 7 - 3 - 1 - 25~30 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 2 - 25~60 -
    • - - -     -     +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 25~30 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 2 + 25~60 +
    • + + + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/M74.xml b/Defs/Ammo/Rocket/M74.xml index b11f07fa9d..ac96ff31ae 100644 --- a/Defs/Ammo/Rocket/M74.xml +++ b/Defs/Ammo/Rocket/M74.xml @@ -1,114 +1,114 @@  - - AmmoM74Rockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoM74Rockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_M74 - - - Bullet_M74_Incendiary - - + + AmmoSet_M74 + + + Bullet_M74_Incendiary + + - + - - 66mm incendiary rocket based upon the rocket used in the M72 LAW, for use in the quadruple-tubed M202 FLASH. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoM74Rockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + 66mm incendiary rocket based upon the rocket used in the M72 LAW, for use in the quadruple-tubed M202 FLASH. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoM74Rockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_M74_Incendiary - - - Things/Ammo/Rocket/M74 - CombatExtended.Graphic_StackCountRanged - - - 45.19 - 1.71 - 10.43 - - GrenadeIncendiary - Bullet_M74_Incendiary - + + Ammo_M74_Incendiary + + + Things/Ammo/Rocket/M74 + CombatExtended.Graphic_StackCountRanged + + + 45.19 + 1.71 + 10.43 + + GrenadeIncendiary + Bullet_M74_Incendiary + - + - - - TransparentPostLight - - - 35 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 0.5 - 20~45 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 35 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 0.5 + 20~45 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     - - Bullet_M74_Incendiary - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/M74 - Graphic_Single - - - PrometheumFlame - 0 - 8 - FilthPrometheum - 0.5 - MortarBomb_Explode - true - - - + - + - - MakeAmmo_M74_Incendiary - - Craft 4 M74 Incendiary rockets. - Making M74 Incendiary rockets. - 5200 - -
  • - - -
  • Steel
    • - - - 16 - -
  • - - -
  • Prometheum
    • - - - 3 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 4 - -     + + MakeAmmo_M74_Incendiary + + Craft 4 M74 Incendiary rockets. + Making M74 Incendiary rockets. + 5200 + +
  • + + +
  • Steel
    • + + + 16 + +
  • + + +
  • Prometheum
    • + + + 3 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 4 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/RPG28.xml b/Defs/Ammo/Rocket/RPG28.xml index 6b944c2421..787030481c 100644 --- a/Defs/Ammo/Rocket/RPG28.xml +++ b/Defs/Ammo/Rocket/RPG28.xml @@ -1,64 +1,64 @@  - + - - Bullet_RPG28Klyukva - - - Things/Projectile/RPG/RPG28 - Graphic_Single - TransparentPostLight - - - Bullet - 279 - 1000 - 46.227 - 65 - RocketPropelledLoop_Small - - -
  • - 154 - Bomb - 1.5 - MortarBomb_Explode - true -
    • -
  • - - 20 - 13 - -
    • -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 0.5 - 15~25 - 0.3 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + Bullet_RPG28Klyukva + + + Things/Projectile/RPG/RPG28 + Graphic_Single + TransparentPostLight + + + Bullet + 279 + 1000 + 46.227 + 65 + RocketPropelledLoop_Small + + +
  • + 154 + Bomb + 1.5 + MortarBomb_Explode + true +
    • +
  • + + 20 + 13 + +
    • +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 0.5 + 15~25 + 0.3 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/RPG32.xml b/Defs/Ammo/Rocket/RPG32.xml index 0899088f51..73238c006b 100644 --- a/Defs/Ammo/Rocket/RPG32.xml +++ b/Defs/Ammo/Rocket/RPG32.xml @@ -1,246 +1,246 @@  - - AmmoRPG32Rockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoRPG32Rockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_RPG32Rocket - - - Bullet_RPG32Rocket_HEAT - Bullet_RPG32Rocket_Thermobaric - - + + AmmoSet_RPG32Rocket + + + Bullet_RPG32Rocket_HEAT + Bullet_RPG32Rocket_Thermobaric + + - + - - Rocket-propelled grenade designed for the RPG-32 launcher. After being fired, a rocket motor kicks in to propel the grenade further. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoRPG32Rockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + Rocket-propelled grenade designed for the RPG-32 launcher. After being fired, a rocket motor kicks in to propel the grenade further. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoRPG32Rockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_RPG32Rocket_HEAT - - - Things/Ammo/RPG/RPG32_HEAT - Graphic_StackCount - - - 67.87 - 7 - 23.95 - - RocketHEAT - Bullet_RPG32Rocket_HEAT - + + Ammo_RPG32Rocket_HEAT + + + Things/Ammo/RPG/RPG32_HEAT + Graphic_StackCount + + + 67.87 + 7 + 23.95 + + RocketHEAT + Bullet_RPG32Rocket_HEAT + - - Ammo_RPG32Rocket_Thermobaric - - - Things/Ammo/RPG/RPG32_Thermobaric - Graphic_StackCount - - - 114.87 - 7 - 23.95 - - RocketThermobaric - Bullet_RPG32Rocket_Thermobaric - + + Ammo_RPG32Rocket_Thermobaric + + + Things/Ammo/RPG/RPG32_Thermobaric + Graphic_StackCount + + + 114.87 + 7 + 23.95 + + RocketThermobaric + Bullet_RPG32Rocket_Thermobaric + - + - - - TransparentPostLight - - - 41 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 15~30 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 41 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 15~30 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     - - Bullet_RPG32Rocket_HEAT - - - Things/Projectile/RPG/RPG32_HEAT - Graphic_Single - - - Bullet - 264 - 650 - 41.818 - - -
  • - 139 - Bomb - 1 - MortarBomb_Explode - true -
    • -
  • - - 6 - 11 - -
    • -     -     + + Bullet_RPG32Rocket_HEAT + + + Things/Projectile/RPG/RPG32_HEAT + Graphic_Single + + + Bullet + 264 + 650 + 41.818 + + +
  • + 139 + Bomb + 1 + MortarBomb_Explode + true +
    • +
  • + + 6 + 11 + +
    • +     +     - - Bullet_RPG32Rocket_Thermobaric - - CombatExtended.ProjectileCE_Explosive - - Things/Projectile/RPG/RPG32_Thermobaric - Graphic_Single - - - 5 - Thermobaric - 280 - true - - + + Bullet_RPG32Rocket_Thermobaric + + CombatExtended.ProjectileCE_Explosive + + Things/Projectile/RPG/RPG32_Thermobaric + Graphic_Single + + + 5 + Thermobaric + 280 + true + + - + - - MakeAmmo_RPG32Rocket_HEAT - - Craft 5 RPG-32 HEAT rockets. - Making RPG-32 HEAT rockets. - 13000 - -
  • - - -
  • Steel
    • - - - 70 - -
  • - - -
  • FSX
    • - - - 9 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_RPG32Rocket_HEAT + + Craft 5 RPG-32 HEAT rockets. + Making RPG-32 HEAT rockets. + 13000 + +
  • + + +
  • Steel
    • + + + 70 + +
  • + + +
  • FSX
    • + + + 9 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_RPG32Rocket_Thermobaric - - Craft 5 RPG-32 thermobaric rockets. - Making RPG-32 thermobaric rockets. - 25000 - -
  • - - -
  • Steel
    • - - - 70 - -
  • - - -
  • FSX
    • - - - 39 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_RPG32Rocket_Thermobaric + + Craft 5 RPG-32 thermobaric rockets. + Making RPG-32 thermobaric rockets. + 25000 + +
  • + + +
  • Steel
    • + + + 70 + +
  • + + +
  • FSX
    • + + + 39 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/RPG7.xml b/Defs/Ammo/Rocket/RPG7.xml index f104deb78d..459568e9fe 100644 --- a/Defs/Ammo/Rocket/RPG7.xml +++ b/Defs/Ammo/Rocket/RPG7.xml @@ -1,352 +1,352 @@  - - AmmoRPG7Grenades - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoRPG7Grenades + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_RPG7Grenade - - - Bullet_RPG7Grenade_HEAT - Bullet_RPG7Grenade_Thermobaric - Bullet_RPG7Grenade_Frag - - + + AmmoSet_RPG7Grenade + + + Bullet_RPG7Grenade_HEAT + Bullet_RPG7Grenade_Thermobaric + Bullet_RPG7Grenade_Frag + + - + - - Rocket-propelled grenade designed for the RPG-7 launcher. After being fired a rocket motor kicks in to propel the grenade further. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoRPG7Grenades
    • -     - 25 - 40 - MortarBomb_Explode -     + + Rocket-propelled grenade designed for the RPG-7 launcher. After being fired a rocket motor kicks in to propel the grenade further. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoRPG7Grenades
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_RPG7Grenade_HEAT - - - Things/Ammo/RPG/HEAT - Graphic_StackCount - - - 52.78 - 2.8 - 7.14 - - RocketHEAT - Bullet_RPG7Grenade_HEAT - + + Ammo_RPG7Grenade_HEAT + + + Things/Ammo/RPG/HEAT + Graphic_StackCount + + + 52.78 + 2.8 + 7.14 + + RocketHEAT + Bullet_RPG7Grenade_HEAT + - - Ammo_RPG7Grenade_Thermobaric - - - Things/Ammo/RPG/Thermobaric - Graphic_StackCount - - - 104.58 - 4.7 - 8.61 - - RocketThermobaric - Bullet_RPG7Grenade_Thermobaric - + + Ammo_RPG7Grenade_Thermobaric + + + Things/Ammo/RPG/Thermobaric + Graphic_StackCount + + + 104.58 + 4.7 + 8.61 + + RocketThermobaric + Bullet_RPG7Grenade_Thermobaric + - - Ammo_RPG7Grenade_Frag - - - Things/Ammo/RPG/Frag - Graphic_StackCount - - - 37.86 - 2.2 - 3.4 - - 100 - RocketFrag - Bullet_RPG7Grenade_Frag - + + Ammo_RPG7Grenade_Frag + + + Things/Ammo/RPG/Frag + Graphic_StackCount + + + 37.86 + 2.2 + 3.4 + + 100 + RocketFrag + Bullet_RPG7Grenade_Frag + - + - - - TransparentPostLight - - - 73 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 1 - 25~30 - 0.4 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 0.5 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 73 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 1 + 25~30 + 0.4 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 0.5 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 25~60 +
    • + + +     +     - - Bullet_RPG7Grenade_HEAT - - - Things/Projectile/RPG/HEAT - Graphic_Single - - - Bullet - 275 - 500 - 44.956 - - -
  • - 150 - Bomb - 1.5 - MortarBomb_Explode - true -
    • -
  • - - 3 - 12 - -
    • -     -     + + Bullet_RPG7Grenade_HEAT + + + Things/Projectile/RPG/HEAT + Graphic_Single + + + Bullet + 275 + 500 + 44.956 + + +
  • + 150 + Bomb + 1.5 + MortarBomb_Explode + true +
    • +
  • + + 3 + 12 + +
    • +     +     - - Bullet_RPG7Grenade_Thermobaric - - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/RPG/Thermobaric - Graphic_Single - - - 5 - Thermobaric - 300 - 0 - 0 - true - true - + + Things/Projectile/RPG/Thermobaric + Graphic_Single + + + 5 + Thermobaric + 300 + 0 + 0 + true + true + - - + + - - Bullet_RPG7Grenade_Frag - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/RPG/Frag - Graphic_Single - - - 1.5 - Bomb - 0 - 58 - 0 - true - - -
  • - - 50 - -
    • -     -     + + Bullet_RPG7Grenade_Frag + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/RPG/Frag + Graphic_Single + + + 1.5 + Bomb + 0 + 58 + 0 + true + + +
  • + + 50 + +
    • +     +     - + - - MakeAmmo_RPG7Grenade_HEAT - - Craft 5 RPG-7 HEAT grenades. - Making RPG-7 HEAT grenades. - 9200 - -
  • - - -
  • Steel
    • - - - 28 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_RPG7Grenade_HEAT + + Craft 5 RPG-7 HEAT grenades. + Making RPG-7 HEAT grenades. + 9200 + +
  • + + +
  • Steel
    • + + + 28 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_RPG7Grenade_Thermobaric - - Craft 5 RPG-7 thermobaric grenades. - Making RPG-7 thermobaric grenades. - 20400 - -
  • - - -
  • Steel
    • - - - 48 - -
  • - - -
  • FSX
    • - - - 16 - -
  • - - -
  • Prometheum
    • - - - 22 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_RPG7Grenade_Thermobaric + + Craft 5 RPG-7 thermobaric grenades. + Making RPG-7 thermobaric grenades. + 20400 + +
  • + + +
  • Steel
    • + + + 48 + +
  • + + +
  • FSX
    • + + + 16 + +
  • + + +
  • Prometheum
    • + + + 22 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_RPG7Grenade_Frag - - Craft 5 RPG-7 frag grenades. - Making RPG-7 frag grenades. - 5400 - -
  • - - -
  • Steel
    • - - - 22 - -
  • - - -
  • FSX
    • - - - 2 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_RPG7Grenade_Frag + + Craft 5 RPG-7 frag grenades. + Making RPG-7 frag grenades. + 5400 + +
  • + + +
  • Steel
    • + + + 22 + +
  • + + +
  • FSX
    • + + + 2 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/RPO.xml b/Defs/Ammo/Rocket/RPO.xml index 9e5f0d58ed..b888c8136f 100644 --- a/Defs/Ammo/Rocket/RPO.xml +++ b/Defs/Ammo/Rocket/RPO.xml @@ -1,93 +1,93 @@  - - AmmoRPOGrenades - - AmmoRockets - + + AmmoRPOGrenades + + AmmoRockets + - + - - - Things/Projectile/Rocket_Big - Graphic_Single - TransparentPostLight - - - 38 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 0.5 - 15~25 - 0.3 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 1 - 25~60 -
    • - - -     -     + + + Things/Projectile/Rocket_Big + Graphic_Single + TransparentPostLight + + + 38 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 0.5 + 15~25 + 0.3 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 1 + 25~60 +
    • + + +     +     - - Bullet_RPO_A_Grenade - CombatExtended.ProjectileCE_Explosive - - - 5 - Thermobaric - 293 - true - true - - + + Bullet_RPO_A_Grenade + CombatExtended.ProjectileCE_Explosive + + + 5 + Thermobaric + 293 + true + true + + - - Bullet_RPO_Z_Grenade - CombatExtended.ProjectileCE_Explosive - - - PrometheumFlame - 21 - 9.5 - FilthPrometheum - 0.5 - MortarIncendiary_Explode - true - - + + Bullet_RPO_Z_Grenade + CombatExtended.ProjectileCE_Explosive + + + PrometheumFlame + 21 + 9.5 + FilthPrometheum + 0.5 + MortarIncendiary_Explode + true + + - - Bullet_RPO_D_Grenade - CombatExtended.ProjectileCE_Explosive - - - Smoke - 0.0 - 0.0 - 8 - BlindSmoke - 1 - - + + Bullet_RPO_D_Grenade + CombatExtended.ProjectileCE_Explosive + + + Smoke + 0.0 + 0.0 + 8 + BlindSmoke + 1 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/SPG9.xml b/Defs/Ammo/Rocket/SPG9.xml index b0a471d291..09e025dd22 100644 --- a/Defs/Ammo/Rocket/SPG9.xml +++ b/Defs/Ammo/Rocket/SPG9.xml @@ -1,412 +1,412 @@  - - AmmoSPG9Rockets - - AmmoRockets - UI/Icons/ThingCategories/CaliberRocket - + + AmmoSPG9Rockets + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + - + - - AmmoSet_SPG9Rocket - - - Bullet_SPG9Rocket_HEAT - Bullet_SPG9Rocket_Thermobaric - Bullet_SPG9Rocket_Frag - Bullet_SPG9Rocket_EMP - - + + AmmoSet_SPG9Rocket + + + Bullet_SPG9Rocket_HEAT + Bullet_SPG9Rocket_Thermobaric + Bullet_SPG9Rocket_Frag + Bullet_SPG9Rocket_EMP + + - + - - Tube launched rocket-propelled grenade used by SPG-9 recoilless launcher and the BMP-1's 2A28 Grom cannon. After being fired, a rocket motor kicks in to propel the grenade further. - - 150 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoSPG9Rockets
    • -     - 25 - 40 - MortarBomb_Explode -     + + Tube launched rocket-propelled grenade used by SPG-9 recoilless launcher and the BMP-1's 2A28 Grom cannon. After being fired, a rocket motor kicks in to propel the grenade further. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoSPG9Rockets
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_SPG9Rocket_HEAT - - - Things/Ammo/Rocket/SPG9/HEAT - Graphic_StackCount - - - 53.69 - 5.35 - 11.56 - - RocketHEAT - Bullet_SPG9Rocket_HEAT - + + Ammo_SPG9Rocket_HEAT + + + Things/Ammo/Rocket/SPG9/HEAT + Graphic_StackCount + + + 53.69 + 5.35 + 11.56 + + RocketHEAT + Bullet_SPG9Rocket_HEAT + - - Ammo_SPG9Rocket_Thermobaric - - - Things/Ammo/Rocket/SPG9/Thermobaric - Graphic_StackCount - - - 110.13 - 6.2 - 11.56 - - RocketThermobaric - Bullet_SPG9Rocket_Thermobaric - + + Ammo_SPG9Rocket_Thermobaric + + + Things/Ammo/Rocket/SPG9/Thermobaric + Graphic_StackCount + + + 110.13 + 6.2 + 11.56 + + RocketThermobaric + Bullet_SPG9Rocket_Thermobaric + - - Ammo_SPG9Rocket_Frag - - - Things/Ammo/Rocket/SPG9/Frag - Graphic_StackCount - - - 61.58 - 5.5 - 13.34 - - RocketFrag - Bullet_SPG9Rocket_Frag - + + Ammo_SPG9Rocket_Frag + + + Things/Ammo/Rocket/SPG9/Frag + Graphic_StackCount + + + 61.58 + 5.5 + 13.34 + + RocketFrag + Bullet_SPG9Rocket_Frag + - - Ammo_SPG9Rocket_EMP - - - Things/Ammo/Rocket/SPG9/EMP - Graphic_StackCount - - - 93.72 - 5.5 - 11.5 - - GrenadeEMP - Bullet_SPG9Rocket_EMP - + + Ammo_SPG9Rocket_EMP + + + Things/Ammo/Rocket/SPG9/EMP + Graphic_StackCount + + + 93.72 + 5.5 + 11.5 + + GrenadeEMP + Bullet_SPG9Rocket_EMP + - + - - - TransparentPostLight - - - 75 - RocketPropelledLoop_Small - - -
  • - -
  • - Fleck_CERocketFlame - 9 - 2 - 25~30 - 0.2 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 3 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 75 + RocketPropelledLoop_Small + + +
  • + +
  • + Fleck_CERocketFlame + 9 + 2 + 25~30 + 0.2 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 3 + 25~60 +
    • + + +     +     - - Bullet_SPG9Rocket_HEAT - - - Things/Projectile/Rocket/SPG9/HEAT - Graphic_Single - - - 96 - Bullet - 248 - 400 - 26.53 - - -
  • - 88 - Bomb - 1.0 - MortarBomb_Explode - true -
    • -
  • - - 9 - 5 - -
    • -     -     + + Bullet_SPG9Rocket_HEAT + + + Things/Projectile/Rocket/SPG9/HEAT + Graphic_Single + + + 96 + Bullet + 248 + 400 + 26.53 + + +
  • + 88 + Bomb + 1.0 + MortarBomb_Explode + true +
    • +
  • + + 9 + 5 + +
    • +     +     - - Bullet_SPG9Rocket_Thermobaric - - CombatExtended.ProjectileCE_Explosive - - Things/Projectile/Rocket/SPG9/Thermobaric - Graphic_Single - - - 5 - Thermobaric - 277 - 0 - 0 - true - true - - + + Bullet_SPG9Rocket_Thermobaric + + CombatExtended.ProjectileCE_Explosive + + Things/Projectile/Rocket/SPG9/Thermobaric + Graphic_Single + + + 5 + Thermobaric + 277 + 0 + 0 + true + true + + - - Bullet_SPG9Rocket_Frag - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/SPG9/Frag - Graphic_Single - - - 2.0 - Bomb - 0 - 111 - 0 - true - MortarBomb_Explode - - -
  • - - 80 - -
    • -     -     + + Bullet_SPG9Rocket_Frag + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/SPG9/Frag + Graphic_Single + + + 2.0 + Bomb + 0 + 111 + 0 + true + MortarBomb_Explode + + +
  • + + 80 + +
    • +     +     - - Bullet_SPG9Rocket_EMP - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/SPG9/EMP - Graphic_Single - - - EMP - 111 - 0 - 0 - 4.5 - - + + Bullet_SPG9Rocket_EMP + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/SPG9/EMP + Graphic_Single + + + EMP + 111 + 0 + 0 + 4.5 + + - + - - MakeAmmo_SPG9Rocket_HEAT - - Craft 5 SPG-9 HEAT rockets. - Making SPG-9 HEAT rockets. - 9400 - -
  • - - -
  • Steel
    • - - - 54 - -
  • - - -
  • FSX
    • - - - 4 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_SPG9Rocket_HEAT + + Craft 5 SPG-9 HEAT rockets. + Making SPG-9 HEAT rockets. + 9400 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_SPG9Rocket_Thermobaric - - Craft 5 SPG-9 thermobaric rockets. - Making SPG-9 thermobaric rockets. - 23800 - -
  • - - -
  • Steel
    • - - - 62 - -
  • - - -
  • FSX
    • - - - 38 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_SPG9Rocket_Thermobaric + + Craft 5 SPG-9 thermobaric rockets. + Making SPG-9 thermobaric rockets. + 23800 + +
  • + + +
  • Steel
    • + + + 62 + +
  • + + +
  • FSX
    • + + + 38 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_SPG9Rocket_Frag - - Craft 5 SPG-9 HE rockets. - Making SPG-9 HE rockets. - 11400 - -
  • - - -
  • Steel
    • - - - 66 - -
  • - - -
  • FSX
    • - - - 6 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_SPG9Rocket_Frag + + Craft 5 SPG-9 HE rockets. + Making SPG-9 HE rockets. + 11400 + +
  • + + +
  • Steel
    • + + + 66 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     - - MakeAmmo_SPG9Rocket_EMP - - Craft 5 SPG-9 EMP rockets. - Making SPG-9 EMP rockets. - -
  • MicroelectronicsBasics
    • -
  • CE_Launchers
    • -     - 12200 - -
  • - - -
  • Steel
    • - - - 56 - -
  • - - -
  • ComponentIndustrial
    • - - - 11 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - -     + + MakeAmmo_SPG9Rocket_EMP + + Craft 5 SPG-9 EMP rockets. + Making SPG-9 EMP rockets. + +
  • MicroelectronicsBasics
    • +
  • CE_Launchers
    • +     + 12200 + +
  • + + +
  • Steel
    • + + + 56 + +
  • + + +
  • ComponentIndustrial
    • + + + 11 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     \ No newline at end of file diff --git a/Defs/Ammo/Rocket/TomahawkLAM.xml b/Defs/Ammo/Rocket/TomahawkLAM.xml index 8657b6a500..629ede4f3c 100644 --- a/Defs/Ammo/Rocket/TomahawkLAM.xml +++ b/Defs/Ammo/Rocket/TomahawkLAM.xml @@ -1,174 +1,174 @@  - + - + - - AmmoSet_TomahawkLAM - - - Bullet_TomahawkLAM - - + + AmmoSet_TomahawkLAM + + + Bullet_TomahawkLAM + + - + - - Long-range, all-weather, jet-powered, surface-launched subsonic cruise missile designed to attack land targets. - - 500 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoMissiles
    • -     - 25 - 40 - MortarBomb_Explode -     + + Long-range, all-weather, jet-powered, surface-launched subsonic cruise missile designed to attack land targets. + + 500 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoMissiles
    • +     + 25 + 40 + MortarBomb_Explode +     - - Ammo_TomahawkLAM - - - Things/Ammo/Missile/TomahawkLAM - Graphic_StackCount - 4,4 - - - 12046 - 1440 - 3830.29 - - 4,1 - TomahawkLAM - Bullet_TomahawkLAM - + + Ammo_TomahawkLAM + + + Things/Ammo/Missile/TomahawkLAM + Graphic_StackCount + 4,4 + + + 12046 + 1440 + 3830.29 + + 4,1 + TomahawkLAM + Bullet_TomahawkLAM + - + - - - TransparentPostLight - - - 63 - Explosion_GiantBomb - Explosion_GiantBomb - MortarRound_PreImpact - RocketPropelledLoop_Big - true - false - Fleck_BigShell - Filth_CannonAmmoCasings - - -
  • - -
  • - Fleck_CERocketFlame - 3 - 3 - 2 - 100~150 - 1.5 -
    • -
  • - Fleck_CERocketSmokeTrail - 2 - 0~360 - 3 - 1 -
    • -
  • - Fleck_CERocketSmoke - 2 - 0~360 - 2 - 3 - 25~60 -
    • - - -     -     + + + TransparentPostLight + + + 63 + Explosion_GiantBomb + Explosion_GiantBomb + MortarRound_PreImpact + RocketPropelledLoop_Big + true + false + Fleck_BigShell + Filth_CannonAmmoCasings + + +
  • + +
  • + Fleck_CERocketFlame + 3 + 3 + 2 + 100~150 + 1.5 +
    • +
  • + Fleck_CERocketSmokeTrail + 2 + 0~360 + 3 + 1 +
    • +
  • + Fleck_CERocketSmoke + 2 + 0~360 + 2 + 3 + 25~60 +
    • + + +     +     - - Bullet_TomahawkLAM - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Missile/TomahawkLAM - Graphic_Single - 2,4 - - - 19.5 - Bomb - 5653 - Explosion_GiantBomb - true - - -
  • - - 40 - 80 - -
    • -     -     + + Bullet_TomahawkLAM + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Missile/TomahawkLAM + Graphic_Single + 2,4 + + + 19.5 + Bomb + 5653 + Explosion_GiantBomb + true + + +
  • + + 40 + 80 + +
    • +     +     - + - - MakeAmmo_TomahawkLAM - - CE_AdvancedLaunchers - Craft a single Tomahawk Missile. - Making Tomahawk Missile. - 607200 - -
  • - - -
  • Steel
    • - - - 2880 - -
  • - - -
  • FSX
    • - - - 792 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 1 - -     + + MakeAmmo_TomahawkLAM + + CE_AdvancedLaunchers + Craft a single Tomahawk Missile. + Making Tomahawk Missile. + 607200 + +
  • + + +
  • Steel
    • + + + 2880 + +
  • + + +
  • FSX
    • + + + 792 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 1 + +     \ No newline at end of file diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml index a675115911..ae648f445b 100644 --- a/Defs/Ammo/Shell/60mmMortar.xml +++ b/Defs/Ammo/Shell/60mmMortar.xml @@ -477,4 +477,4 @@ 3600 - + \ No newline at end of file diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index de75b586f9..d37958e6b4 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/Defs/Ammo/Shell/81mmMortar.xml @@ -1,642 +1,743 @@  - - Ammo81mmMortarShells - - AmmoShells - UI/Icons/ThingCategories/CaliberMortar - - - - - - AmmoSet_81mmMortarShell - - - - Bullet_81mmMortarShell_HE - Bullet_81mmMortarShell_Incendiary - Bullet_81mmMortarShell_EMP - Bullet_81mmMortarShell_Firefoam - Bullet_81mmMortarShell_Smoke - Bullet_81mmMortarShell_Antigrain - Bullet_81mmMortarShell_Tox - - true - - - - - - Low-velocity shell designed to be fired from a mortar. - - 200 - - -
  • Ammo81mmMortarShells
    • -     - 25 - 30 - MortarBomb_Explode - true -     - - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     -     - - - - Shell_HighExplosive - - - Things/Ammo/Mortar/HE - Graphic_StackCount - - - 50.09 - 5.27 - 8.17 - - GrenadeHE - Bullet_81mmMortarShell_HE - - - - Shell_Incendiary - - - Things/Ammo/Mortar/Incendiary - Graphic_StackCount - - - 42.34 - 5.65 - 9.0 - - GrenadeIncendiary - Bullet_81mmMortarShell_Incendiary - - - - Shell_EMP - - - Things/Ammo/Mortar/EMP - Graphic_StackCount - - - 112.42 - 5.27 - 8.17 - - GrenadeEMP - Bullet_81mmMortarShell_EMP - - - - Shell_Firefoam - - - Things/Ammo/Mortar/Firefoam - Graphic_StackCount - - - 37.03 - 4.1 - 10.01 - - FoamFuel - Bullet_81mmMortarShell_Firefoam - - - - Shell_Smoke - - - Things/Ammo/Mortar/Smoke - Graphic_StackCount - - - 37.03 - 4.1 - 10.01 - - Smoke - Bullet_81mmMortarShell_Smoke - - - - Shell_AntigrainWarhead - - - Things/Ammo/Mortar/Antigrain - Graphic_StackCount - - - 1500 - 6.5 - 6 - - -
  • RewardStandardCore
    • -     - -
  • CE_AutoEnableTrade_Sellable
    • -     - Antigrain - - -
  • - 14.9 - BombSuper - 0.7 - 0.22 - true - GiantExplosion - Explosion_GiantBomb - 60~120 - True - true -
    • -     -     - - - Shell_Toxic - - - Things/Ammo/Mortar/Toxic - Graphic_StackCount - - - 37.03 - 4.1 - 10.01 - - Toxic - Bullet_81mmMortarShell_Tox - - - - - - CombatExtended.ProjectileCE_Explosive - - TransparentPostLight - - - 0 - Artillery_HitThickRoof - MortarRound_PreImpact - MortarRound_Ambient - true - false - 5 - - Things/WorldObjects/Munitions/Mortar - 0.06 - 10 - - - - - - Bullet_81mmMortarShell_HE - - - Things/Projectile/Mortar/HE - Graphic_Single - - - Bomb - 156 - 2.5 - true - MortarBomb_Explode - true - true - - -
  • - - 16 - 25 - -
    • -     -     - - - Bullet_81mmMortarShell_Incendiary - - - Things/Projectile/Mortar/Incendiary - Graphic_Single - - - PrometheumFlame - 11 - 6.5 - true - FilthPrometheum - 0.15 - MortarIncendiary_Explode - - - - - Bullet_81mmMortarShell_EMP - - - Things/Projectile/Mortar/EMP - Graphic_Single - - - EMP - 156 - true - 5.5 - - - - - Bullet_81mmMortarShell_Firefoam - - - Things/Projectile/Mortar/Firefoam - Graphic_Single - - - Extinguish - 0.0 - 0.0 - 5 - true - Artillery_HitThickRoof - Explosion_EMP - MortarRound_PreImpact - MortarRound_Ambient - Filth_FireFoam - 1 - 3 - true - ExtinguisherExplosion - - - - - Bullet_81mmMortarShell_Smoke - - - Things/Projectile/Mortar/Smoke - Graphic_Single - - - Smoke - 0.0 - 0.0 - 6 - true - Artillery_HitThickRoof - Explosion_EMP - MortarRound_PreImpact - MortarRound_Ambient - BlindSmoke - 1 - true - ExtinguisherExplosion - - - - - Bullet_81mmMortarShell_Antigrain - - - Things/Projectile/Mortar/Antigrain - Graphic_Single - - - BombSuper - 50 - 0.22 - true - true - GiantExplosion - Artillery_HitThickRoof - Explosion_GiantBomb - MortarRound_PreImpact - MortarRound_Ambient - - 0.85 - - - - - - Bullet_81mmMortarShell_Tox - - - Things/Projectile/Mortar/Toxic - Graphic_Single - - - ToxGas - 0 - 0 - 0.1 - true - Artillery_HitThickRoof - ToxicShellLanded - MortarRound_PreImpact - MortarRound_Ambient - Shell_Toxic_Releasing - Shell_Toxic_Releasing_Water - - - - - - - MakeShell_HighExplosive - - Craft 5 81mm HE mortar shells. - Making 81mm HE mortar shells. - -
  • - - -
  • Steel
    • - - - 54 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 10600 -     - - - MakeShell_Incendiary - - Craft 5 81mm incendiary mortar shells. - Making 81mm incendiary mortar shells. - -
  • - - -
  • Steel
    • - - - 58 - -
  • - - -
  • Prometheum
    • - - - 5 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 9000 -     - - - MakeShell_EMP - - Craft 5 81mm EMP mortar shells. - Making 81mm EMP mortar shells. - MicroelectronicsBasics - -
  • - - -
  • Steel
    • - - - 54 - -
  • - - -
  • ComponentIndustrial
    • - - - 14 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 13800 -     - - - MakeShell_Firefoam - - Craft 5 81mm firefoam mortar shells. - Making 81mm firefoam mortar shells. - Firefoam - -
  • - - -
  • Steel
    • - - - 42 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -
  • - - -
  • MeatRaw
    • - - - 17 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -     - -
  • MeatRaw
    • -     -     - - 5 - - - 4 - - 8800 -     - - - MakeShell_Smoke - - Craft 5 81mm smoke mortar shells. - Making 81mm smoke mortar shells. - -
  • - - -
  • Steel
    • - - - 42 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -
  • - - -
  • Prometheum
    • - - - 2 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 6600 -     - - - MakeShell_Toxic - - Craft 5 81mm tox mortar shells. - Making 81mm tox mortar shells. - ToxGas - -
  • - - -
  • Steel
    • - - - 42 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -
  • - - -
  • Prometheum
    • - - - 2 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 6600 -     + + Ammo81mmMortarShells + + AmmoShells + UI/Icons/ThingCategories/CaliberMortar + + + + + + AmmoSet_81mmMortarShell + + + + Bullet_81mmMortarShell_HE + Bullet_81mmMortarShell_HE_HF + Bullet_81mmMortarShell_HE_HiF + Bullet_81mmMortarShell_Incendiary + Bullet_81mmMortarShell_EMP + Bullet_81mmMortarShell_Firefoam + Bullet_81mmMortarShell_Smoke + Bullet_81mmMortarShell_Antigrain + Bullet_81mmMortarShell_Tox + + true + + + + + + Low-velocity shell designed to be fired from a mortar. + + 200 + + +
  • Ammo81mmMortarShells
    • +     + 25 + 30 + MortarBomb_Explode + true +     + + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     +     + + + + Shell_HighExplosive + + + Things/Ammo/Mortar/HE + Graphic_StackCount + + + 50.09 + 5.27 + 8.17 + + GrenadeHE + Bullet_81mmMortarShell_HE + + + + Shell_HighExplosive_HF + + + Things/Ammo/Mortar/HE + Graphic_StackCount + + + 50.09 + 5.27 + 8.17 + + RocketFrag + Bullet_81mmMortarShell_HE + + + + Shell_HighExplosive_HiF + + + Things/Ammo/Mortar/HE + Graphic_StackCount + + + 50.09 + 5.27 + 8.17 + + GrenadeHETF + Bullet_81mmMortarShell_HE + + + + Shell_Incendiary + + + Things/Ammo/Mortar/Incendiary + Graphic_StackCount + + + 42.34 + 5.65 + 9.0 + + GrenadeIncendiary + Bullet_81mmMortarShell_Incendiary + + + + Shell_EMP + + + Things/Ammo/Mortar/EMP + Graphic_StackCount + + + 112.42 + 5.27 + 8.17 + + GrenadeEMP + Bullet_81mmMortarShell_EMP + + + + Shell_Firefoam + + + Things/Ammo/Mortar/Firefoam + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + FoamFuel + Bullet_81mmMortarShell_Firefoam + + + + Shell_Smoke + + + Things/Ammo/Mortar/Smoke + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Smoke + Bullet_81mmMortarShell_Smoke + + + + Shell_AntigrainWarhead + + + Things/Ammo/Mortar/Antigrain + Graphic_StackCount + + + 1500 + 6.5 + 6 + + +
  • RewardStandardCore
    • +     + +
  • CE_AutoEnableTrade_Sellable
    • +     + Antigrain + + +
  • + 14.9 + BombSuper + 0.7 + 0.22 + true + GiantExplosion + Explosion_GiantBomb + 60~120 + True + true +
    • +     +     + + + Shell_Toxic + + + Things/Ammo/Mortar/Toxic + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Toxic + Bullet_81mmMortarShell_Tox + + + + + + CombatExtended.ProjectileCE_Explosive + + TransparentPostLight + + + 0 + Artillery_HitThickRoof + MortarRound_PreImpact + MortarRound_Ambient + true + false + 5 + + Things/WorldObjects/Munitions/Mortar + 0.06 + 10 + + + + + + Bullet_81mmMortarShell_HE + + + Things/Projectile/Mortar/HE + Graphic_Single + + + Bomb + 156 + 2.5 + true + MortarBomb_Explode + true + true + + +
  • + + 16 + 25 + +
    • +     +     + + + Bullet_81mmMortarShell_HE_HF + + CombatExtended.ProjectileCE_HeightFuse + + Things/Projectile/Mortar/HE + Graphic_Single + + + Bomb + 156 + 2.5 + true + MortarBomb_Explode + true + true + Mote_BigExplode + 0.6 + + +
  • + + 6 + 45 + + -0.5~0.1 +
    • +     +     + + + Bullet_81mmMortarShell_HE_HiF + + CombatExtended.ProjectileCE_HeightFuse + + Things/Projectile/Mortar/HE + Graphic_Single + + + Smoke + 0 + 0.5 + true + MortarBomb_Explode + true + true + 6 + Mote_BigExplode + 5 + + +
  • + + 11 + 35 + + -89~-60 +
    • +
  • + + 15 + + -60~-30 +
    • +     +     + + + Bullet_81mmMortarShell_Incendiary + + + Things/Projectile/Mortar/Incendiary + Graphic_Single + + + PrometheumFlame + 11 + 6.5 + true + FilthPrometheum + 0.15 + MortarIncendiary_Explode + + + + + Bullet_81mmMortarShell_EMP + + + Things/Projectile/Mortar/EMP + Graphic_Single + + + EMP + 156 + true + 5.5 + + + + + Bullet_81mmMortarShell_Firefoam + + + Things/Projectile/Mortar/Firefoam + Graphic_Single + + + Extinguish + 0.0 + 0.0 + 5 + true + Artillery_HitThickRoof + Explosion_EMP + MortarRound_PreImpact + MortarRound_Ambient + Filth_FireFoam + 1 + 3 + true + ExtinguisherExplosion + + + + + Bullet_81mmMortarShell_Smoke + + + Things/Projectile/Mortar/Smoke + Graphic_Single + + + Smoke + 0.0 + 0.0 + 6 + true + Artillery_HitThickRoof + Explosion_EMP + MortarRound_PreImpact + MortarRound_Ambient + BlindSmoke + 1 + true + ExtinguisherExplosion + + + + + Bullet_81mmMortarShell_Antigrain + + + Things/Projectile/Mortar/Antigrain + Graphic_Single + + + BombSuper + 50 + 0.22 + true + true + GiantExplosion + Artillery_HitThickRoof + Explosion_GiantBomb + MortarRound_PreImpact + MortarRound_Ambient + + 0.85 + + + + + + Bullet_81mmMortarShell_Tox + + + Things/Projectile/Mortar/Toxic + Graphic_Single + + + ToxGas + 0 + 0 + 0.1 + true + Artillery_HitThickRoof + ToxicShellLanded + MortarRound_PreImpact + MortarRound_Ambient + Shell_Toxic_Releasing + Shell_Toxic_Releasing_Water + + + + + + + MakeShell_HighExplosive + + Craft 5 81mm HE mortar shells. + Making 81mm HE mortar shells. + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 10600 +     + + + MakeShell_Incendiary + + Craft 5 81mm incendiary mortar shells. + Making 81mm incendiary mortar shells. + +
  • + + +
  • Steel
    • + + + 58 + +
  • + + +
  • Prometheum
    • + + + 5 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 9000 +     + + + MakeShell_EMP + + Craft 5 81mm EMP mortar shells. + Making 81mm EMP mortar shells. + MicroelectronicsBasics + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • ComponentIndustrial
    • + + + 14 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 13800 +     + + + MakeShell_Firefoam + + Craft 5 81mm firefoam mortar shells. + Making 81mm firefoam mortar shells. + Firefoam + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • MeatRaw
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     + +
  • MeatRaw
    • +     +     + + 5 + + + 4 + + 8800 +     + + + MakeShell_Smoke + + Craft 5 81mm smoke mortar shells. + Making 81mm smoke mortar shells. + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 6600 +     + + + MakeShell_Toxic + + Craft 5 81mm tox mortar shells. + Making 81mm tox mortar shells. + ToxGas + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 6600 +     \ No newline at end of file diff --git a/Defs/Ammo/Shotgun/10Gauge.xml b/Defs/Ammo/Shotgun/10Gauge.xml index 9d89e6f7c8..4308289948 100644 --- a/Defs/Ammo/Shotgun/10Gauge.xml +++ b/Defs/Ammo/Shotgun/10Gauge.xml @@ -171,7 +171,7 @@ Things/Projectile/Bullet_big Graphic_Single - (68,210,215) + (68,210,215) 43 diff --git a/Defs/DamageDefs/Damages_LocalInjury.xml b/Defs/DamageDefs/Damages_LocalInjury.xml index b7f8325f0c..345e079d55 100644 --- a/Defs/DamageDefs/Damages_LocalInjury.xml +++ b/Defs/DamageDefs/Damages_LocalInjury.xml @@ -60,11 +60,11 @@ DamageWorker_Flame 6 6 - -
  • - 1.6 -
    • -     + +
  • + 1.6 +
    • +     diff --git a/Defs/Effects/Flecks.xml b/Defs/Effects/Flecks.xml index 624c3a01e7..5ed7bbdf79 100644 --- a/Defs/Effects/Flecks.xml +++ b/Defs/Effects/Flecks.xml @@ -1,249 +1,249 @@  - - CombatExtended.FleckSystem_Casing - (0,0,-5) - - - - - - Fleck_EmptyCasing - - Things/Flecks/Fleck_BulletCasing - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_BulletCasing - true - - - - Fleck_PistolAmmoCasings - - Things/Flecks/Fleck_PistolAmmoCasings - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_BulletCasing - true - - - - Fleck_RifleAmmoCasings_Steel - - Things/Flecks/Fleck_SteelRifleAmmoCasings - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_BulletCasing - true - - - - Fleck_RifleAmmoCasings_HighCal - - Things/Flecks/Fleck_RifleAmmoCasings_HighCal - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_BulletCasing - true - - - - Fleck_ShotgunShell - - Things/Flecks/Fleck_ShotgunShell - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_ShotgunCasingImpact - true - - - - Fleck_ShotgunShell_Green - - Things/Flecks/Fleck_ShotgunShell_Green - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_ShotgunCasingImpact - true - - - - Fleck_ShotgunShell_White - - Things/Flecks/Fleck_ShotgunShell_White - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_ShotgunCasingImpact - true - - - - Fleck_ShotgunShell_Black - - Things/Flecks/Fleck_ShotgunShell_Black - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_ShotgunCasingImpact - true - - - - Fleck_GrenadeLauncherAmmoCasings - - Things/Flecks/Fleck_GrenadeLauncherAmmoCasings - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_CannonShellCasing - true - - - - Fleck_BigShell - - Things/Flecks/Fleck_BigShell - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_CannonShellCasing - true - - - - Fleck_GrenadePin - - Things/Flecks/Fleck_GrenadePin - true - - MoteOverhead - 3.0 - 0.2 - C_Impact_BulletCasing - true - - - - Fleck_DisposableLauncherCasing - - Things/Filth/Filth_DisposableLauncherCasings/Filth_DisposableLauncherCasings - true - (1.5,1.5) - - MoteOverhead - 3.0 - 0.2 - C_Impact_BulletCasing - true - - - - - - - Mote_BolterCasing - - ThirdParty/Warhammer/Casings/Mote_CasingBolterSmall - - MoteOverhead - 1.0 - 0.2 - C_Impact_BulletCasing - true - - - - Mote_HeavyBolterCasing - - ThirdParty/Warhammer/Casings/Mote_CasingBolterLarge - - MoteOverhead - 1.0 - 0.2 - C_Impact_BulletCasing - true - - - - - Mote_MeltaFlash - MoteOverhead - - - 0.15 - 0.2 - - - ThirdParty/Warhammer/MeltaProjectile - MoteGlow - - - - - Fleck_CERocketSmoke - - Things/Mote/Smoke - Transparent - (1, 1, 1,0.6) - - MoteOverhead - 0.14 - 0.05 - 1.5 - 2 - - - - Fleck_CERocketSmokeTrail - - Things/Mote/Smoke - Transparent - (1, 1, 1,0.3) - - MoteOverhead - 0.14 - 0.05 - 5 - 1 - - - - Fleck_CERocketFlame - - Things/Mote/FireGlow - MoteGlow - - MoteOverhead - 0 - 0.03 - 0.05 - -5 - + + CombatExtended.FleckSystem_Casing + (0,0,-5) + + + + + + Fleck_EmptyCasing + + Things/Flecks/Fleck_BulletCasing + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_BulletCasing + true + + + + Fleck_PistolAmmoCasings + + Things/Flecks/Fleck_PistolAmmoCasings + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_BulletCasing + true + + + + Fleck_RifleAmmoCasings_Steel + + Things/Flecks/Fleck_SteelRifleAmmoCasings + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_BulletCasing + true + + + + Fleck_RifleAmmoCasings_HighCal + + Things/Flecks/Fleck_RifleAmmoCasings_HighCal + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_BulletCasing + true + + + + Fleck_ShotgunShell + + Things/Flecks/Fleck_ShotgunShell + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_ShotgunCasingImpact + true + + + + Fleck_ShotgunShell_Green + + Things/Flecks/Fleck_ShotgunShell_Green + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_ShotgunCasingImpact + true + + + + Fleck_ShotgunShell_White + + Things/Flecks/Fleck_ShotgunShell_White + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_ShotgunCasingImpact + true + + + + Fleck_ShotgunShell_Black + + Things/Flecks/Fleck_ShotgunShell_Black + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_ShotgunCasingImpact + true + + + + Fleck_GrenadeLauncherAmmoCasings + + Things/Flecks/Fleck_GrenadeLauncherAmmoCasings + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_CannonShellCasing + true + + + + Fleck_BigShell + + Things/Flecks/Fleck_BigShell + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_CannonShellCasing + true + + + + Fleck_GrenadePin + + Things/Flecks/Fleck_GrenadePin + true + + MoteOverhead + 3.0 + 0.2 + C_Impact_BulletCasing + true + + + + Fleck_DisposableLauncherCasing + + Things/Filth/Filth_DisposableLauncherCasings/Filth_DisposableLauncherCasings + true + (1.5,1.5) + + MoteOverhead + 3.0 + 0.2 + C_Impact_BulletCasing + true + + + + + + + Mote_BolterCasing + + ThirdParty/Warhammer/Casings/Mote_CasingBolterSmall + + MoteOverhead + 1.0 + 0.2 + C_Impact_BulletCasing + true + + + + Mote_HeavyBolterCasing + + ThirdParty/Warhammer/Casings/Mote_CasingBolterLarge + + MoteOverhead + 1.0 + 0.2 + C_Impact_BulletCasing + true + + + + + Mote_MeltaFlash + MoteOverhead + + + 0.15 + 0.2 + + + ThirdParty/Warhammer/MeltaProjectile + MoteGlow + + + + + Fleck_CERocketSmoke + + Things/Mote/Smoke + Transparent + (1, 1, 1,0.6) + + MoteOverhead + 0.14 + 0.05 + 1.5 + 2 + + + + Fleck_CERocketSmokeTrail + + Things/Mote/Smoke + Transparent + (1, 1, 1,0.3) + + MoteOverhead + 0.14 + 0.05 + 5 + 1 + + + + Fleck_CERocketFlame + + Things/Mote/FireGlow + MoteGlow + + MoteOverhead + 0 + 0.03 + 0.05 + -5 + \ No newline at end of file diff --git a/Defs/Effects/Motes.xml b/Defs/Effects/Motes.xml index af76427197..5ffc0df201 100644 --- a/Defs/Effects/Motes.xml +++ b/Defs/Effects/Motes.xml @@ -1,97 +1,97 @@  - + - - Mote_SuppressIcon - - Things/Mote/Mote_SuppressIcon - - MoteThrownAttached - MetaOverlays - - 0.25 - 1 - 1.4 - (0.45, 0, 0.45) - - + + Mote_SuppressIcon + + Things/Mote/Mote_SuppressIcon + + MoteThrownAttached + MetaOverlays + + 0.25 + 1 + 1.4 + (0.45, 0, 0.45) + + - - Mote_HunkerIcon - - Things/Mote/Mote_HunkerDownIcon - - MoteThrownAttached - MetaOverlays - - 0.25 - 1 - 1.4 - (0.45, 0, 0.45) - - + + Mote_HunkerIcon + + Things/Mote/Mote_HunkerDownIcon + + MoteThrownAttached + MetaOverlays + + 0.25 + 1 + 1.4 + (0.45, 0, 0.45) + + - + - - Mote_BigExplode - - Things/Mote/BigExplode - - MoteOverhead - - 0.05 - 0.4 - 0.45 - 15 - - + + Mote_BigExplode + + Things/Mote/BigExplode + + MoteOverhead + + 0 + 0.4 + 0.45 + 0 + + - - Mote_Firetrail - - Things/Mote/Mote_FireSmoked - - MoteOverhead - - 0.083 - 0.083 - 1 - 0.035 - - + + Mote_Firetrail + + Things/Mote/Mote_FireSmoked + + MoteOverhead + + 0.083 + 0.083 + 1 + 0.035 + + - + - - Mote_FlareGlow - CombatExtended.MoteThrownCE - - Things/Mote/FireGlow - MoteGlow - - MoteOverhead - - 0.75 - 1.08 - 0.8 - - + + Mote_FlareGlow + CombatExtended.MoteThrownCE + + Things/Mote/FireGlow + MoteGlow + + MoteOverhead + + 0.75 + 1.08 + 0.8 + + - - Mote_FlareSmoke - CombatExtended.MoteThrownCE - - Things/Mote/Smoke - - MoteOverhead - - 0.50 - 6 - 3.2 - 0.005 - - + + Mote_FlareSmoke + CombatExtended.MoteThrownCE + + Things/Mote/Smoke + + MoteOverhead + + 0.50 + 6 + 3.2 + 0.005 + + \ No newline at end of file diff --git a/Defs/Effects/ProjectileFX_Flecks.xml b/Defs/Effects/ProjectileFX_Flecks.xml index ecf826ae90..56d2f24987 100644 --- a/Defs/Effects/ProjectileFX_Flecks.xml +++ b/Defs/Effects/ProjectileFX_Flecks.xml @@ -1,7 +1,7 @@  - - + + Fleck_ElectricGlow_EMP @@ -13,7 +13,7 @@ 0.1 - + Fleck_HeatGlow_API Things/Mote/HeatGlow @@ -25,7 +25,7 @@ - + Fleck_SparkThrownFast Things/Mote/SparkThrown @@ -38,7 +38,7 @@ - + Fleck_BulletHole Things/Flecks/Fleck_BulletHole diff --git a/Defs/HediffDefs/Hediffs_CE.xml b/Defs/HediffDefs/Hediffs_CE.xml index 95177a0fe1..909ecfc319 100644 --- a/Defs/HediffDefs/Hediffs_CE.xml +++ b/Defs/HediffDefs/Hediffs_CE.xml @@ -576,4 +576,4 @@ - + \ No newline at end of file diff --git a/Defs/RulePackDefs/RulePacks_DamageEvent.xml b/Defs/RulePackDefs/RulePacks_DamageEvent.xml index 1523ceb17f..1cc986b950 100644 --- a/Defs/RulePackDefs/RulePacks_DamageEvent.xml +++ b/Defs/RulePackDefs/RulePacks_DamageEvent.xml @@ -42,7 +42,7 @@ - + DamageEvent_Shelling diff --git a/Defs/SoundDefs/AutoLoader_Sustainer.xml b/Defs/SoundDefs/AutoLoader_Sustainer.xml index fe2669c741..8a78a3f1b2 100644 --- a/Defs/SoundDefs/AutoLoader_Sustainer.xml +++ b/Defs/SoundDefs/AutoLoader_Sustainer.xml @@ -1,22 +1,22 @@  - - CE_AutoLoaderAmbient - True - MapOnly - PrioritizeNearest - -
  • - -
  • - AmmoContainer/AmmoContainerAmbient -
    • - - 10 - 10~38 - -     -     + + CE_AutoLoaderAmbient + True + MapOnly + PrioritizeNearest + +
  • + +
  • + AmmoContainer/AmmoContainerAmbient +
    • + + 10 + 10~38 + +     +     \ No newline at end of file diff --git a/Defs/ThingDefs_Buildings/AutoLoaderExample.xml b/Defs/ThingDefs_Buildings/AutoLoaderExample.xml index 1ca7370284..a8bcec7417 100644 --- a/Defs/ThingDefs_Buildings/AutoLoaderExample.xml +++ b/Defs/ThingDefs_Buildings/AutoLoaderExample.xml @@ -1,6 +1,6 @@ - + - - Turret_Blaster - - 8 - - Things/Building/Turrets/MachineGunBase - - (0.27,0.25,0.27) - (0,0,0) - - - UI/Icons/Turrets/ChargeBlaster_uiIcon - - 46000 - 150 - 20 - 25 - 0.75 - 1.25 - 0.5 - - Spacer - -
  • - CompPowerTrader - 400 -
    • -     - Automatic turret equipped with a charge blaster. - - 125 - 40 - 6 - 1 - - - Gun_BlasterTurret - true - - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - -
  • CE_ChargeTurret
    • -     - MinifiedThing -     + + Turret_Blaster + + 8 + + Things/Building/Turrets/MachineGunBase + + (0.27,0.25,0.27) + (0,0,0) + + + UI/Icons/Turrets/ChargeBlaster_uiIcon + + 46000 + 150 + 20 + 25 + 0.75 + 1.25 + 0.5 + + Spacer + +
  • + CompPowerTrader + 400 +
    • +     + Automatic turret equipped with a charge blaster. + + 125 + 40 + 6 + 1 + + + Gun_BlasterTurret + true + + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + +
  • CE_ChargeTurret
    • +     + MinifiedThing +     - + - - Turret_Heavy - - 6 - - Things/Building/Turrets/MachineGunBase - - (0.27,0.25,0.27) - (0,0,0) - - - UI/Icons/Turrets/HeavyAutoTurret_uiIcon - - 80000 - 350 - 0.5 - 60 - 80 - 0.5 - 1 - - Plated automatic turret equiped with a high caliber machine gun. Very resistant to damage. - - 275 - 8 - - - true - Gun_HeavyTurret - - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - Medium - -
  • - CompPowerTrader - 300 -
    • -     - MinifiedThing - -
  • CE_HeavyTurret
    • -     -     + + Turret_Heavy + + 6 + + Things/Building/Turrets/MachineGunBase + + (0.27,0.25,0.27) + (0,0,0) + + + UI/Icons/Turrets/HeavyAutoTurret_uiIcon + + 80000 + 350 + 0.5 + 60 + 80 + 0.5 + 1 + + Plated automatic turret equiped with a high caliber machine gun. Very resistant to damage. + + 275 + 8 + + + true + Gun_HeavyTurret + + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + Medium + +
  • + CompPowerTrader + 300 +
    • +     + MinifiedThing + +
  • CE_HeavyTurret
    • +     +     - + - - Turret_Medium - - 6 - - Things/Building/Turrets/MachineGunBase - - (0.27,0.25,0.27) - (0,0,0) - - - UI/Icons/Turrets/MediumAutoTurret_uiIcon - - 40000 - 200 - 0.6 - 30 - 40 - 0.5 - 0.75 - - Automatic turret equiped with a full powered cartridge machine gun. Fairly resistant to damage. - - 150 - 8 - - - true - Gun_MediumTurret - - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - -
  • - CompPowerTrader - 150 -
    • -     - MinifiedThing - -
  • GunTurrets
    • -
  • PrecisionRifling
    • -     -     + + Turret_Medium + + 6 + + Things/Building/Turrets/MachineGunBase + + (0.27,0.25,0.27) + (0,0,0) + + + UI/Icons/Turrets/MediumAutoTurret_uiIcon + + 40000 + 200 + 0.6 + 30 + 40 + 0.5 + 0.75 + + Automatic turret equiped with a full powered cartridge machine gun. Fairly resistant to damage. + + 150 + 8 + + + true + Gun_MediumTurret + + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + +
  • + CompPowerTrader + 150 +
    • +     + MinifiedThing + +
  • GunTurrets
    • +
  • PrecisionRifling
    • +     +     - + - - Turret_KPV - - 7 - - Things/Building/Turrets/KPV_base - (2,2) - - (0.27,0.25,0.6) - (0,0,0) - - - UI/Icons/Turrets/KPV_uiIcon - - 150 - 50500 - 88 - 100 - - KPV heavy machine gun mounted on a tripod. - - 275 - 6 - - - Gun_KPV - true - 0.37 - -
  • CE_TurretHeavy
    • -     -     - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - Medium - -
  • CE_TurretHeavyWeapons
    • -
  • PrecisionRifling
    • -     - MinifiedThing -     + + Turret_KPV + + 7 + + Things/Building/Turrets/KPV_base + (2,2) + + (0.27,0.25,0.6) + (0,0,0) + + + UI/Icons/Turrets/KPV_uiIcon + + 150 + 50500 + 88 + 100 + + KPV heavy machine gun mounted on a tripod. + + 275 + 6 + + + Gun_KPV + true + 0.37 + +
  • CE_TurretHeavy
    • +     +     + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + Medium + +
  • CE_TurretHeavyWeapons
    • +
  • PrecisionRifling
    • +     + MinifiedThing +     - + - - Turret_M240B - - 6 - - Things/Building/Turrets/M240_base - (2,2) - - (0.27,0.25,0.45) - (0,0,0) - - - UI/Icons/Turrets/M240B_uiIcon - - 31500 - 16.5 - 20 - - M240B medium machine gun mounted on a tripod. - - 150 - 6 - - - Gun_M240B - true - 0.36 - - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - MinifiedThing - -
  • PrecisionRifling
    • -     -     + + Turret_M240B + + 6 + + Things/Building/Turrets/M240_base + (2,2) + + (0.27,0.25,0.45) + (0,0,0) + + + UI/Icons/Turrets/M240B_uiIcon + + 31500 + 16.5 + 20 + + M240B medium machine gun mounted on a tripod. + + 150 + 6 + + + Gun_M240B + true + 0.36 + + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + MinifiedThing + +
  • PrecisionRifling
    • +     +     - + - - Turret_AGSThirty - - 6 - - Things/Building/Turrets/AGS30_base - (2,2) - - (0.27,0.25,0.35) - (0,0,0) - - - UI/Icons/Turrets/AGS30_uiIcon - - 33500 - 16 - 20 - - Lightweight automatic grenade launcher mounted on a tripod. - - 115 - 5 - - - Gun_AGSThirty - true - 0.40 - - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - -
  • CE_TurretHeavyWeapons
    • -
  • CE_Launchers
    • -     - MinifiedThing -     + + Turret_AGSThirty + + 6 + + Things/Building/Turrets/AGS30_base + (2,2) + + (0.27,0.25,0.35) + (0,0,0) + + + UI/Icons/Turrets/AGS30_uiIcon + + 33500 + 16 + 20 + + Lightweight automatic grenade launcher mounted on a tripod. + + 115 + 5 + + + Gun_AGSThirty + true + 0.40 + + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + +
  • CE_TurretHeavyWeapons
    • +
  • CE_Launchers
    • +     + MinifiedThing +     - + - - Turret_Flak - - Old school anti-aircraft cannon. Ineffective against modern aviation but still popular on rimworlds for use against entrenched enemies and vehicles. - 8 - - Things/Building/Turrets/FlakTurret_Base - - (-0.13,-0.87,-0.1) - (0.5,0.4,1.05) - - - UI/Icons/Turrets/FlakTurret_uiIcon - - 500 - 0.4 - 79500 - 1000 - 1000 - - - 500 - 5 - - - classicMortars - true - - 5 - 1 - 350 - - - - Gun_FlakTurret - true - 4 - 2.5 - - -
  • PlaceWorker_TurretTop
    • -
  • PlaceWorker_ShowTurretRadius
    • -     - Heavy - (3,3) - (-1,0,-1) - MinifiedThing - -
  • CE_TurretHeavyWeapons
    • -     - Security -     + + Turret_Flak + + Old school anti-aircraft cannon. Ineffective against modern aviation but still popular on rimworlds for use against entrenched enemies and vehicles. + 8 + + Things/Building/Turrets/FlakTurret_Base + + (-0.13,-0.87,-0.1) + (0.5,0.4,1.05) + + + UI/Icons/Turrets/FlakTurret_uiIcon + + 500 + 0.4 + 79500 + 1000 + 1000 + + + 500 + 5 + + + classicMortars + true + + 5 + 1 + 350 + + + + Gun_FlakTurret + true + 4 + 2.5 + + +
  • PlaceWorker_TurretTop
    • +
  • PlaceWorker_ShowTurretRadius
    • +     + Heavy + (3,3) + (-1,0,-1) + MinifiedThing + +
  • CE_TurretHeavyWeapons
    • +     + Security +     \ No newline at end of file diff --git a/Defs/ThingDefs_Items/Items_Resource_Ammo.xml b/Defs/ThingDefs_Items/Items_Resource_Ammo.xml index ce629d7581..8cb512fcaf 100644 --- a/Defs/ThingDefs_Items/Items_Resource_Ammo.xml +++ b/Defs/ThingDefs_Items/Items_Resource_Ammo.xml @@ -85,4 +85,4 @@ - + \ No newline at end of file diff --git a/Defs/ThingDefs_Misc/Apparel_Carrying.xml b/Defs/ThingDefs_Misc/Apparel_Carrying.xml index a207050753..3e275bbb75 100644 --- a/Defs/ThingDefs_Misc/Apparel_Carrying.xml +++ b/Defs/ThingDefs_Misc/Apparel_Carrying.xml @@ -436,31 +436,67 @@ true (0.05,0) - (0.2,0) - (0,0) - (0,0) - (0.125,0) - (0.125,0) + + (0.2,0) + + + (0,0) + + + (0,0) + + + (0.125,0) + + + (0.125,0) + (-0.05,0) - (-0.2,0) - (0,0) - (0,0) - (-0.125,0) - (-0.125,0) + + (-0.2,0) + + + (0,0) + + + (0,0) + + + (-0.125,0) + + + (-0.125,0) + (0,-0.1) - (0,0) - (0,-0.05) - (0,-0.05) + + (0,0) + + + (0,-0.05) + + + (0,-0.05) + - (1,1) - (1,1) - (1,1) - (1,1) - (1,1) + + (1,1) + + + (1,1) + + + (1,1) + + + (1,1) + + + (1,1) + diff --git a/Defs/ThingDefs_Misc/Filth_Various.xml b/Defs/ThingDefs_Misc/Filth_Various.xml index 54dca45637..efdcb76fb8 100644 --- a/Defs/ThingDefs_Misc/Filth_Various.xml +++ b/Defs/ThingDefs_Misc/Filth_Various.xml @@ -65,4 +65,4 @@ - + \ No newline at end of file diff --git a/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Defs/ThingDefs_Misc/Weapons_Ranged.xml index 4dceb41046..252b891009 100644 --- a/Defs/ThingDefs_Misc/Weapons_Ranged.xml +++ b/Defs/ThingDefs_Misc/Weapons_Ranged.xml @@ -1,568 +1,568 @@ - + - - CE_GrenadeLauncher - - A simple, locally produced break-action grenade launcher, capable of firing a variety of different projectiles. - - Things/Weapons/CE_GrenadeLauncher - Graphic_Single - - Interact_Rifle - -
  • RangedHeavy
    • -     - - 9000 - 1 - 0.16 - 1.00 - 7.31 - 2.70 - 0.93 - - - 40 - 1 - 10 - - -
  • GunGrenadeLauncher
    • -
  • GunHeavy
    • -
  • GrenadeEMP
    • -
  • CE_AI_SMOKE
    • -
  • CE_AI_AOE
    • -     - -
  • - 3.28 - CombatExtended.Verb_ShootCE - true - Bullet_40x46mmGrenade_HE - true - 1.1 - 44 - 5 - - true - - InfernoCannon_Fire - 14 - true -
    • -     - -
  • - 1 - 3 - 2.2 - AmmoSet_40x46mmGrenade -
    • -
  • - FALSE - SuppressFire -
    • -     - - CE_Launchers - - 4 - - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - -     -     + + CE_GrenadeLauncher + + A simple, locally produced break-action grenade launcher, capable of firing a variety of different projectiles. + + Things/Weapons/CE_GrenadeLauncher + Graphic_Single + + Interact_Rifle + +
  • RangedHeavy
    • +     + + 9000 + 1 + 0.16 + 1.00 + 7.31 + 2.70 + 0.93 + + + 40 + 1 + 10 + + +
  • GunGrenadeLauncher
    • +
  • GunHeavy
    • +
  • GrenadeEMP
    • +
  • CE_AI_SMOKE
    • +
  • CE_AI_AOE
    • +     + +
  • + 3.28 + CombatExtended.Verb_ShootCE + true + Bullet_40x46mmGrenade_HE + true + 1.1 + 44 + 5 + + true + + InfernoCannon_Fire + 14 + true +
    • +     + +
  • + 1 + 3 + 2.2 + AmmoSet_40x46mmGrenade +
    • +
  • + FALSE + SuppressFire +
    • +     + + CE_Launchers + + 4 + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     - + - - CE_DisposableRocketLauncher - - A lightweight single-use anti-tank launcher. Designed to provide soldiers in the field with a compact anti-armor weapon. - - Things/Weapons/CE_M72 - Graphic_Single - - Interact_Rifle - -
  • RangedHeavy
    • -     - ThingWithComps - Normal - First - Industrial - 25 - - 91 - 1.0 - 0.2 - 1.24 - 6.30 - 2.5 - 1.5 - - -
  • GunHeavy
    • -     - -
  • WeaponsRanged
    • -     - -
  • - CombatExtended.Verb_ShootCEOneUse - true - Bullet_M72LAW - false - 1.9 - 31 - 5 - - true - - InfernoCannon_Fire - 14 -
    • -     - -
  • - FALSE - AimedShot -
    • -     - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - -     - -
  • - 1.0,1.0 - -0.3,0.0 -
    • -     - -
  • CE_HeavyAmmo
    • -     -     + + CE_DisposableRocketLauncher + + A lightweight single-use anti-tank launcher. Designed to provide soldiers in the field with a compact anti-armor weapon. + + Things/Weapons/CE_M72 + Graphic_Single + + Interact_Rifle + +
  • RangedHeavy
    • +     + ThingWithComps + Normal + First + Industrial + 25 + + 91 + 1.0 + 0.2 + 1.24 + 6.30 + 2.5 + 1.5 + + +
  • GunHeavy
    • +     + +
  • WeaponsRanged
    • +     + +
  • + CombatExtended.Verb_ShootCEOneUse + true + Bullet_M72LAW + false + 1.9 + 31 + 5 + + true + + InfernoCannon_Fire + 14 +
    • +     + +
  • + FALSE + AimedShot +
    • +     + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     + +
  • + 1.0,1.0 + -0.3,0.0 +
    • +     + +
  • CE_HeavyAmmo
    • +     +     - - MakeDisposableRocketLauncher - - Craft 5 disposable rocket launchers. - Making disposable rocket launchers. - 32500 - - 4 - - -
  • - - -
  • Steel
    • - - - 100 - -
  • - - -
  • FSX
    • - - - 6 - -
  • - - -
  • ComponentIndustrial
    • - - - 5 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - CE_Launchers -     + + MakeDisposableRocketLauncher + + Craft 5 disposable rocket launchers. + Making disposable rocket launchers. + 32500 + + 4 + + +
  • + + +
  • Steel
    • + + + 100 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + CE_Launchers +     - - MakeDisposableRocketLauncher_x1 - - Craft one disposable rocket launcher. - Making disposable rocket launcher. - 8125 - - 4 - - -
  • - - -
  • Steel
    • - - - 25 - -
  • - - -
  • FSX
    • - - - 2 - -
  • - - -
  • ComponentIndustrial
    • - - - 1 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 1 - - CE_Launchers -     + + MakeDisposableRocketLauncher_x1 + + Craft one disposable rocket launcher. + Making disposable rocket launcher. + 8125 + + 4 + + +
  • + + +
  • Steel
    • + + + 25 + +
  • + + +
  • FSX
    • + + + 2 + +
  • + + +
  • ComponentIndustrial
    • + + + 1 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 1 + + CE_Launchers +     - + - - CE_ThermalBoltProjector - - A medium-velocity, low-trajectory fire support system deployed by mechanoids. While inaccurate and slow-firing, it remains a potent weapon against static targets. - 0 - - Things/Weapons/ExplosiveBoltProjector - Graphic_Single - - -45 - Interact_Rifle - - 1 - 0.16 - 1.00 - 7.5 - 10.00 - 3 - 1400 - - Spacer - None - true - -
  • - CombatExtended.Verb_ShootMortarCE - false - true - Bullet_66mmThermalBolt_Incendiary - 4 - 10 - 55 - 1 - Mortar_LaunchA - 16 - 3 - 0.3 - - true - -
    • -     - -
  • - -
  • 30
    • -
  • 50
    • -
  • 70
    • -
  • 90
    • - - -
  • - 3 - 12 - AmmoSet_66mmThermalBolt -
    • -
  • - FALSE -
    • -     - -
  • MechanoidGunIndirect
    • -
  • NoSwitch
    • -     - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     - -
  • - True -
    • -     -     + + CE_ThermalBoltProjector + + A medium-velocity, low-trajectory fire support system deployed by mechanoids. While inaccurate and slow-firing, it remains a potent weapon against static targets. + 0 + + Things/Weapons/ExplosiveBoltProjector + Graphic_Single + + -45 + Interact_Rifle + + 1 + 0.16 + 1.00 + 7.5 + 10.00 + 3 + 1400 + + Spacer + None + true + +
  • + CombatExtended.Verb_ShootMortarCE + false + true + Bullet_66mmThermalBolt_Incendiary + 4 + 10 + 55 + 1 + Mortar_LaunchA + 16 + 3 + 0.3 + + true + +
    • +     + +
  • + +
  • 30
    • +
  • 50
    • +
  • 70
    • +
  • 90
    • + + +
  • + 3 + 12 + AmmoSet_66mmThermalBolt +
    • +
  • + FALSE +
    • +     + +
  • MechanoidGunIndirect
    • +
  • NoSwitch
    • +     + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     + +
  • + True +
    • +     +     - + - - CE_FlareGun - - An ancient, single-shot flare gun, used for signaling or illumination. Loaded from the breech, its barrel is too thin to fire anything but flares. - - Things/Weapons/CE_FlareGun - Graphic_Single - - Interact_Autopistol - - 6000 - 0.7 - 0.18 - 0.87 - 1.75 - 0.85 - 0.38 - - - 35 - 1 - - -
  • - CombatExtended.Verb_ShootFlareCE - false - true - Bullet_Flare - 1.1 - 45 - InfernoCannon_Fire - 16 - 3 - 0.5 - - true - -
    • -     - -
  • - 1 - 2.2 - AmmoSet_Flare -
    • -
  • - False - SuppressFire -
    • -
  • - -
  • 60
    • - - -     - - Gunsmithing - - 4 - - - -
  • CE_FlareLauncher
    • -
  • CE_OneHandedWeapon
    • -     - -
  • - - -
  • Blunt
    • - - 2 - 1.54 - 1.5 - 0.555 - Grip - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.555 - Muzzle - -     - - - -     +     + - + - - CE_MechanoidMinigun - - A multi-barrel machine gun. It looks menacing with its long barrels and once it starts firing it fires very fast. Where most self-loading guns are powered by the energy from the gunpowder, the minigun uses an electric motor powered by the mechanoid it's mounted on to rapidly cycle cartridges through the weapon. - 0 - - Things/Weapons/MechanoidMinigun - Graphic_Single - - Interact_Rifle - - 1 - 0.01 - 1.25 - 12.0 - 30.0 - 0.35 - 1250 - - Spacer - None - true - -
  • - 0.55 - CombatExtended.Verb_ShootCE - true - Bullet_762x51mmNATO_FMJ - 2.3 - 68 - 3 - 50 - Shot_Minigun - GunTail_Medium - 9 -
    • -     - -
  • - 250 - 9.2 - AmmoSet_762x51mmNATO -
    • -
  • - Snapshot - 25 -
    • -     - -
  • MechanoidMinigun
    • -
  • NoSwitch
    • -     - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     - -
  • - 1.4,1.4 - 0.0,0.0 -
    • -
  • - True -
    • -     -     + + CE_MechanoidMinigun + + A multi-barrel machine gun. It looks menacing with its long barrels and once it starts firing it fires very fast. Where most self-loading guns are powered by the energy from the gunpowder, the minigun uses an electric motor powered by the mechanoid it's mounted on to rapidly cycle cartridges through the weapon. + 0 + + Things/Weapons/MechanoidMinigun + Graphic_Single + + Interact_Rifle + + 1 + 0.01 + 1.25 + 12.0 + 30.0 + 0.35 + 1250 + + Spacer + None + true + +
  • + 0.55 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 2.3 + 68 + 3 + 50 + Shot_Minigun + GunTail_Medium + 9 +
    • +     + +
  • + 250 + 9.2 + AmmoSet_762x51mmNATO +
    • +
  • + Snapshot + 25 +
    • +     + +
  • MechanoidMinigun
    • +
  • NoSwitch
    • +     + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     + +
  • + 1.4,1.4 + 0.0,0.0 +
    • +
  • + True +
    • +     +     \ No newline at end of file diff --git a/Defs/ThingDefs_Misc/Weapons_Turrets.xml b/Defs/ThingDefs_Misc/Weapons_Turrets.xml index 265677914a..40c006b420 100644 --- a/Defs/ThingDefs_Misc/Weapons_Turrets.xml +++ b/Defs/ThingDefs_Misc/Weapons_Turrets.xml @@ -1,462 +1,462 @@ - - - 1 - - 0 - Interact_Rifle - -
  • Gun
    • -
  • TurretGun
    • -     - None - True - 0 - false - -
  • - True -
    • -     -     + + + 1 + + 0 + Interact_Rifle + +
  • Gun
    • +
  • TurretGun
    • +     + None + True + 0 + false + +
  • + True +
    • +     +     - - -
  • - FALSE - AimedShot - true - true -
    • -     -     + + +
  • + FALSE + AimedShot + true + true +
    • +     +     - + - - Gun_BlasterTurret - - - Things/Building/Turrets/BlasterTurret_Top - Graphic_Single - - Charge blaster attached to a turret mount. - Interact_ChargeRifle - - 1 - 0.06 - 0.86 - 0.36 - 10 - - -
  • - 0.90 - CombatExtended.Verb_ShootCE - true - Bullet_8x35mmCharged - 1.3 - 55 - 5 - 10 - Shot_ChargeBlaster - GunTail_Heavy - 9 - Mounted -
    • -     - -
  • - 100 - 7.8 - AmmoSet_8x35mmCharged -
    • -     -     + + Gun_BlasterTurret + + + Things/Building/Turrets/BlasterTurret_Top + Graphic_Single + + Charge blaster attached to a turret mount. + Interact_ChargeRifle + + 1 + 0.06 + 0.86 + 0.36 + 10 + + +
  • + 0.90 + CombatExtended.Verb_ShootCE + true + Bullet_8x35mmCharged + 1.3 + 55 + 5 + 10 + Shot_ChargeBlaster + GunTail_Heavy + 9 + Mounted +
    • +     + +
  • + 100 + 7.8 + AmmoSet_8x35mmCharged +
    • +     +     - + - - Gun_HeavyTurret - - - Things/Building/Turrets/HeavyTurret_Top - Graphic_Single - - High caliber gun on a turret mount. - - 1 - 0.01 - 1.31 - 0.37 - 30 - - -
  • - 1.54 - CombatExtended.Verb_ShootCE - true - Bullet_145x114mm_FMJ - 1.6 - 55 - 6 - 5 - HeavyMG - GunTail_Heavy - 16 - Mounted -
    • -     - -
  • - 40 - 7.8 - AmmoSet_145x114mm -
    • -     -     + + Gun_HeavyTurret + + + Things/Building/Turrets/HeavyTurret_Top + Graphic_Single + + High caliber gun on a turret mount. + + 1 + 0.01 + 1.31 + 0.37 + 30 + + +
  • + 1.54 + CombatExtended.Verb_ShootCE + true + Bullet_145x114mm_FMJ + 1.6 + 55 + 6 + 5 + HeavyMG + GunTail_Heavy + 16 + Mounted +
    • +     + +
  • + 40 + 7.8 + AmmoSet_145x114mm +
    • +     +     - + - - Gun_MediumTurret - - - Things/Building/Turrets/MediumTurret_Top - Graphic_Single - - Full powered cartridge gun on a turret mount. - - 1 - 0.05 - 0.94 - 0.36 - 15 - - -
  • - 0.77 - CombatExtended.Verb_ShootCE - true - Bullet_762x51mmNATO_FMJ - 1.3 - 55 - 6 - 10 - MediumMG - GunTail_Medium - 11 - Mounted -
    • -     - -
  • - 80 - 7.8 - AmmoSet_762x51mmNATO -
    • -     -     + + Gun_MediumTurret + + + Things/Building/Turrets/MediumTurret_Top + Graphic_Single + + Full powered cartridge gun on a turret mount. + + 1 + 0.05 + 0.94 + 0.36 + 15 + + +
  • + 0.77 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.3 + 55 + 6 + 10 + MediumMG + GunTail_Medium + 11 + Mounted +
    • +     + +
  • + 80 + 7.8 + AmmoSet_762x51mmNATO +
    • +     +     - + - - Gun_AutocannonTurret - - - Things/Building/Security/TurretAutocannon_Top - Graphic_Single - - An automated heavy machine gun designed to be mounted on a turret, effective against infantry and light vehicles. - - 1 - 0.01 - 1.61 - 0.37 - 50 - - -
  • - 1.50 - CombatExtended.Verb_ShootCE - true - Bullet_20x102mmNATO_AP - 2.3 - 78 - 7 - 10 - HeavyMG - GunTail_Heavy - 16 - Mounted -
    • -     - -
  • - 100 - 7.8 - AmmoSet_20x102mmNATO -
    • -
  • - AimedShot - true - true -
    • -     -     + + Gun_AutocannonTurret + + + Things/Building/Security/TurretAutocannon_Top + Graphic_Single + + An automated heavy machine gun designed to be mounted on a turret, effective against infantry and light vehicles. + + 1 + 0.01 + 1.61 + 0.37 + 50 + + +
  • + 1.50 + CombatExtended.Verb_ShootCE + true + Bullet_20x102mmNATO_AP + 2.3 + 78 + 7 + 10 + HeavyMG + GunTail_Heavy + 16 + Mounted +
    • +     + +
  • + 100 + 7.8 + AmmoSet_20x102mmNATO +
    • +
  • + AimedShot + true + true +
    • +     +     - + - - Gun_TurretSniper - - A self-loading heavy autocannon designed to attach to a turret. - Artillery_ShellLoaded - - Things/Building/Security/TurretSniper_Top - Graphic_Single - (2,2) - - - 2.36 - 0.01 - 1.89 - 0.5 - 50 - - -
  • - 4.15 - CombatExtended.Verb_ShootCE - true - Bullet_40x311mmR_AP - 4.6 - 5 - 86 - Shot_TurretSniper - GunTail_Heavy - 20 - Mounted -
    • -     - -
  • - 20 - 6.8 - AmmoSet_40x311mmR -
    • -
  • - AimedShot - true -
    • -     -     + + Gun_TurretSniper + + A self-loading heavy autocannon designed to attach to a turret. + Artillery_ShellLoaded + + Things/Building/Security/TurretSniper_Top + Graphic_Single + (2,2) + + + 2.36 + 0.01 + 1.89 + 0.5 + 50 + + +
  • + 4.15 + CombatExtended.Verb_ShootCE + true + Bullet_40x311mmR_AP + 4.6 + 5 + 86 + Shot_TurretSniper + GunTail_Heavy + 20 + Mounted +
    • +     + +
  • + 20 + 6.8 + AmmoSet_40x311mmR +
    • +
  • + AimedShot + true +
    • +     +     - + - - Gun_KPV - - - Things/Building/Turrets/KPV_gun - Graphic_Single - - Heavy machine gun for use against light vehicles. - - 1 - 0.01 - 1.42 - 0.37 - 35 - - -
  • - 1.43 - CombatExtended.Verb_ShootCE - true - Bullet_145x114mm_FMJ - 1.3 - 75 - 6 - 10 - HeavyMG - GunTail_Heavy - 16 - Mounted -
    • -     - -
  • - 50 - 7.8 - AmmoSet_145x114mm -
    • -
  • - 5 - SuppressFire -
    • -     - -
  • - - -110 -
    • -     -     + + Gun_KPV + + + Things/Building/Turrets/KPV_gun + Graphic_Single + + Heavy machine gun for use against light vehicles. + + 1 + 0.01 + 1.42 + 0.37 + 35 + + +
  • + 1.43 + CombatExtended.Verb_ShootCE + true + Bullet_145x114mm_FMJ + 1.3 + 75 + 6 + 10 + HeavyMG + GunTail_Heavy + 16 + Mounted +
    • +     + +
  • + 50 + 7.8 + AmmoSet_145x114mm +
    • +
  • + 5 + SuppressFire +
    • +     + +
  • + + -110 +
    • +     +     - + - - Gun_M240B - - - Things/Building/Turrets/M240_gun - Graphic_Single - - M240B machine gun mounted on a tripod. - - 1 - 0.04 - 0.96 - 0.36 - 12 - - -
  • - 0.86 - CombatExtended.Verb_ShootCE - true - Bullet_762x51mmNATO_FMJ - 1.3 - 62 - 6 - 10 - MediumMG - GunTail_Medium - 10 - Mounted -
    • -     - -
  • - 200 - 7.8 - AmmoSet_762x51mmNATO -
    • -
  • - 5 - SuppressFire -
    • -     -     + + Gun_M240B + + + Things/Building/Turrets/M240_gun + Graphic_Single + + M240B machine gun mounted on a tripod. + + 1 + 0.04 + 0.96 + 0.36 + 12 + + +
  • + 0.86 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.3 + 62 + 6 + 10 + MediumMG + GunTail_Medium + 10 + Mounted +
    • +     + +
  • + 200 + 7.8 + AmmoSet_762x51mmNATO +
    • +
  • + 5 + SuppressFire +
    • +     +     - + - - Gun_FlakTurret - - 90mm Flak cannon on a stationary emplacement. - - Things/Building/Turrets/FlakTurret_Top - Graphic_Single - - Artillery_ShellLoaded - - 2.3 - 0.01 - 1.41 - 2.5 - 500 - - -
  • - 4.74 - CombatExtended.Verb_ShootCE - true - Bullet_90mmCannonShell_HEAT - 3.5 - 16 - 92 - - 120mm - GunTail_Heavy - 20 - - true - - Mounted -
    • -     - -
  • - 1 - 9.8 - AmmoSet_90mmCannonShell -
    • -
  • - AimedShot -
    • -     - -
  • - 0,-1 - 90 -
    • -     -     + + Gun_FlakTurret + + 90mm Flak cannon on a stationary emplacement. + + Things/Building/Turrets/FlakTurret_Top + Graphic_Single + + Artillery_ShellLoaded + + 2.3 + 0.01 + 1.41 + 2.5 + 500 + + +
  • + 4.74 + CombatExtended.Verb_ShootCE + true + Bullet_90mmCannonShell_HEAT + 3.5 + 16 + 92 + + 120mm + GunTail_Heavy + 20 + + true + + Mounted +
    • +     + +
  • + 1 + 9.8 + AmmoSet_90mmCannonShell +
    • +
  • + AimedShot +
    • +     + +
  • + 0,-1 + 90 +
    • +     +     - + - - Gun_AGSThirty - - - Things/Building/Turrets/AGS30_gun - Graphic_Single - - AGS-30 attached to a tripod. - - 2.16 - 0.15 - 0.92 - 0.40 - 13 - - -
  • - 2.38 - CombatExtended.Verb_ShootCE - true - Bullet_30x29mmGrenade_HE - 1.435 - 8 - 62 - 9 - 6 - AGS - GunTail_Heavy - 14 - - true - - Mounted - true -
    • -     - -
  • - 30 - 7.8 - AmmoSet_30x29mmGrenade -
    • -
  • - FALSE - SuppressFire - 3 -
    • -     -     + + Gun_AGSThirty + + + Things/Building/Turrets/AGS30_gun + Graphic_Single + + AGS-30 attached to a tripod. + + 2.16 + 0.15 + 0.92 + 0.40 + 13 + + +
  • + 2.38 + CombatExtended.Verb_ShootCE + true + Bullet_30x29mmGrenade_HE + 1.435 + 8 + 62 + 9 + 6 + AGS + GunTail_Heavy + 14 + + true + + Mounted + true +
    • +     + +
  • + 30 + 7.8 + AmmoSet_30x29mmGrenade +
    • +
  • + FALSE + SuppressFire + 3 +
    • +     +     \ No newline at end of file diff --git a/Languages/ChineseTraditional/DefInjected/ThingDef/Apparel_Carrying.xml b/Languages/ChineseTraditional/DefInjected/ThingDef/Apparel_Carrying.xml index 80ff161836..2b70399aff 100644 --- a/Languages/ChineseTraditional/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Languages/ChineseTraditional/DefInjected/ThingDef/Apparel_Carrying.xml @@ -1,8 +1,10 @@ - 戰術背心 - 一件載荷背心，有多個口袋存放彈藥和其他裝備。 \n\n加快換彈速度，但穿起來很笨重。 + 戰術背心 + + 一件載荷背心，有多個口袋存放彈藥和其他裝備。 \n\n加快換彈速度，但穿起來很笨重。 + 背包 diff --git a/Languages/English/Keyed/AmmoContainerKeyed.xml b/Languages/English/Keyed/AmmoContainerKeyed.xml index 231e47ae96..31e1c1e07f 100644 --- a/Languages/English/Keyed/AmmoContainerKeyed.xml +++ b/Languages/English/Keyed/AmmoContainerKeyed.xml @@ -1,23 +1,23 @@ - Unload contents - Unload this autoloader's contents onto the floor. + Unload contents + Unload this autoloader's contents onto the floor. - Reload turrets - Reload adjacent turrets immediately. Forbidden turrets and currently firing turrets will be ignored. + Reload turrets + Reload adjacent turrets immediately. Forbidden turrets and currently firing turrets will be ignored. - {0} cannot find any adjacent available {1} turrets. + {0} cannot find any adjacent available {1} turrets. - Ammo replacement: on - The autoloader will replace turret's current ammo with the ammo type in the loader. + Ammo replacement: on + The autoloader will replace turret's current ammo with the ammo type in the loader. - Ammo replacement: off - The autoloader will only reload turret with the same ammo type in the loader. + Ammo replacement: off + The autoloader will only reload turret with the same ammo type in the loader. - Reload time remaining: {0} seconds - Ammo type replacement: {0} + Reload time remaining: {0} seconds + Ammo type replacement: {0} - Autoloader is reloading or being reloaded. + Autoloader is reloading or being reloaded. \ No newline at end of file diff --git a/Languages/English/Keyed/ArmorDurability.xml b/Languages/English/Keyed/ArmorDurability.xml index 0bbdac949a..366abe85ca 100644 --- a/Languages/English/Keyed/ArmorDurability.xml +++ b/Languages/English/Keyed/ArmorDurability.xml @@ -1,10 +1,10 @@ - - Armor durability: - Repair armor - Can't repair natural armor, armor is undamaged - Can't repair natural armor, no resources + + Armor durability: + Repair armor + Can't repair natural armor, armor is undamaged + Can't repair natural armor, no resources \ No newline at end of file diff --git a/Languages/English/Keyed/BipodStatWorker.xml b/Languages/English/Keyed/BipodStatWorker.xml index 7b50ccc48f..3cc341d30a 100644 --- a/Languages/English/Keyed/BipodStatWorker.xml +++ b/Languages/English/Keyed/BipodStatWorker.xml @@ -1,12 +1,12 @@ - Time to set up bipod: - Auto sets up in firemode: - Stats when set up: - Stats when NOT set up: - Range - Warm up - Hover over to display + Time to set up bipod: + Auto sets up in firemode: + Stats when set up: + Stats when NOT set up: + Range + Warm up + Hover over to display \ No newline at end of file diff --git a/Languages/English/Keyed/Descriptions.xml b/Languages/English/Keyed/Descriptions.xml index 8c5983f134..2d918db487 100644 --- a/Languages/English/Keyed/Descriptions.xml +++ b/Languages/English/Keyed/Descriptions.xml @@ -26,6 +26,6 @@ Site belonging to {0} was destroyed Strengthened after an enemy of {0} was weakened - Whether or not this item can be used to spot for artillery fire between maps. + Whether or not this item can be used to spot for artillery fire between maps. \ No newline at end of file diff --git a/Languages/English/Keyed/ModMenu.xml b/Languages/English/Keyed/ModMenu.xml index bc9992ed04..2359eef82b 100644 --- a/Languages/English/Keyed/ModMenu.xml +++ b/Languages/English/Keyed/ModMenu.xml @@ -45,7 +45,7 @@ When turned on some armor might have different stats on different body parts Show recoil animations - When enabled, ranged weapons and turrets will play recoil animations when they fire. + When enabled, ranged weapons and turrets will play recoil animations when they fire. @@ -105,5 +105,4 @@ Use New Vehicle Armor Vehicle Armor reduces damage based on relative values, but can be penetrated by high AP attacks.. - - + \ No newline at end of file diff --git a/Languages/English/Keyed/Stats.xml b/Languages/English/Keyed/Stats.xml index 7130a7079e..0fe035aee1 100644 --- a/Languages/English/Keyed/Stats.xml +++ b/Languages/English/Keyed/Stats.xml @@ -8,6 +8,6 @@ Carried weight: Additional material toughness multiplier: Wielder skill effect: - Long range radio + Long range radio \ No newline at end of file diff --git a/Languages/Korean/defInjected/ThingDefs/Apparel_Carrying.xml b/Languages/Korean/defInjected/ThingDefs/Apparel_Carrying.xml index 6c7924c13e..ba5c1c6006 100644 --- a/Languages/Korean/defInjected/ThingDefs/Apparel_Carrying.xml +++ b/Languages/Korean/defInjected/ThingDefs/Apparel_Carrying.xml @@ -1,8 +1,10 @@  - 전술 조끼 - 탄창 및 기타 장비를 보관할 수 있는 많은 파우치가 달린 장비.\n\n재장전 속도를 높여주고 허용부피가 증가합니다. + 전술 조끼 + + 탄창 및 기타 장비를 보관할 수 있는 많은 파우치가 달린 장비.\n\n재장전 속도를 높여주고 허용부피가 증가합니다. + 백팩 diff --git a/Languages/PortugueseBrazilian/Keyed/AmmoContainerKeyed.xml b/Languages/PortugueseBrazilian/Keyed/AmmoContainerKeyed.xml index 61e6d2335a..bc09896d3c 100644 --- a/Languages/PortugueseBrazilian/Keyed/AmmoContainerKeyed.xml +++ b/Languages/PortugueseBrazilian/Keyed/AmmoContainerKeyed.xml @@ -1,23 +1,23 @@ - Descarregar conteúdo - Descarregar o conteúdo deste carregador automático no chão. + Descarregar conteúdo + Descarregar o conteúdo deste carregador automático no chão. - Recarregar torretas - Recarregar imediatamente as torretas adjacentes. Torretas proibidas e torretas atualmente em funcionamento serão ignoradas. + Recarregar torretas + Recarregar imediatamente as torretas adjacentes. Torretas proibidas e torretas atualmente em funcionamento serão ignoradas. - {0} não consegue encontrar nenhuma torreta {1} disponível adjacente. + {0} não consegue encontrar nenhuma torreta {1} disponível adjacente. - Substituição de munição: ligada - O carregador automático substituirá a munição atual da torreta pelo tipo de munição no carregador. + Substituição de munição: ligada + O carregador automático substituirá a munição atual da torreta pelo tipo de munição no carregador. - Substituição de munição: desligada - O carregador automático apenas recarregará a torreta com o mesmo tipo de munição no carregador. + Substituição de munição: desligada + O carregador automático apenas recarregará a torreta com o mesmo tipo de munição no carregador. - Tempo de recarga restante: {0} segundos - Substituição de tipo de munição: {0} + Tempo de recarga restante: {0} segundos + Substituição de tipo de munição: {0} - O carregador automático está em processo de recarga ou sendo recarregado. + O carregador automático está em processo de recarga ou sendo recarregado. - + \ No newline at end of file diff --git a/Languages/PortugueseBrazilian/Keyed/ArmorDurability.xml b/Languages/PortugueseBrazilian/Keyed/ArmorDurability.xml index ada9e7b081..b30c8d3559 100644 --- a/Languages/PortugueseBrazilian/Keyed/ArmorDurability.xml +++ b/Languages/PortugueseBrazilian/Keyed/ArmorDurability.xml @@ -1,10 +1,10 @@ - - Durabilidade da armadura: - Reparar armadura - Não é possível reparar a armadura natural, a armadura está sem danos - Não é possível reparar a armadura natural, sem recursos disponíveis + + Durabilidade da armadura: + Reparar armadura + Não é possível reparar a armadura natural, a armadura está sem danos + Não é possível reparar a armadura natural, sem recursos disponíveis \ No newline at end of file diff --git a/Languages/PortugueseBrazilian/Keyed/BipodStatWorker.xml b/Languages/PortugueseBrazilian/Keyed/BipodStatWorker.xml index fe114d4f90..bf4f7419c8 100644 --- a/Languages/PortugueseBrazilian/Keyed/BipodStatWorker.xml +++ b/Languages/PortugueseBrazilian/Keyed/BipodStatWorker.xml @@ -1,12 +1,12 @@ - Tempo para montar o bipé: - Configuração automática no modo de disparo: - Estatísticas quando montado: - Estatísticas quando NÃO montado: - Alcance - Aquecimento - Passe o mouse para exibir + Tempo para montar o bipé: + Configuração automática no modo de disparo: + Estatísticas quando montado: + Estatísticas quando NÃO montado: + Alcance + Aquecimento + Passe o mouse para exibir \ No newline at end of file diff --git a/Languages/PortugueseBrazilian/Keyed/Descriptions.xml b/Languages/PortugueseBrazilian/Keyed/Descriptions.xml index 0b878333e1..6123c80010 100644 --- a/Languages/PortugueseBrazilian/Keyed/Descriptions.xml +++ b/Languages/PortugueseBrazilian/Keyed/Descriptions.xml @@ -26,6 +26,6 @@ Local pertencente a {0} foi destruído Fortalecido após um inimigo de {0} ser enfraquecido - Se este item pode ou não ser usado para marcar alvos para fogo de artilharia entre mapas. + Se este item pode ou não ser usado para marcar alvos para fogo de artilharia entre mapas. - + \ No newline at end of file diff --git a/Languages/PortugueseBrazilian/Keyed/MechTakeAmmoKeyed.xml b/Languages/PortugueseBrazilian/Keyed/MechTakeAmmoKeyed.xml index 9be108eb9c..6d3637cf1a 100644 --- a/Languages/PortugueseBrazilian/Keyed/MechTakeAmmoKeyed.xml +++ b/Languages/PortugueseBrazilian/Keyed/MechTakeAmmoKeyed.xml @@ -7,4 +7,4 @@ Não é necessário reabastecer munição Cada unidade é um carregador, {0} tiros. Não é possível definir o equipamento para mecanoides com armas diferentes. Tente selecionar vários mecanoides semelhantes. - + \ No newline at end of file diff --git a/Languages/PortugueseBrazilian/Keyed/Messages.xml b/Languages/PortugueseBrazilian/Keyed/Messages.xml index bb98abfe1a..47ff63ce67 100644 --- a/Languages/PortugueseBrazilian/Keyed/Messages.xml +++ b/Languages/PortugueseBrazilian/Keyed/Messages.xml @@ -14,4 +14,4 @@ Fogo de artilharia vindo de {0} ({1}). Um grupo de {0} está planejando atacar {1} em breve, em retaliação pelos eventos recentes. - + \ No newline at end of file diff --git a/Languages/PortugueseBrazilian/Keyed/ModMenu.xml b/Languages/PortugueseBrazilian/Keyed/ModMenu.xml index 027b3d45cc..218a99e9df 100644 --- a/Languages/PortugueseBrazilian/Keyed/ModMenu.xml +++ b/Languages/PortugueseBrazilian/Keyed/ModMenu.xml @@ -45,7 +45,7 @@ Quando ativado, algumas armaduras podem ter estatísticas diferentes em partes diferentes do corpo. Mostrar animações de recuo - Quando ativado, armas de longo alcance e torres reproduzirão animações de recuo ao disparar. + Quando ativado, armas de longo alcance e torres reproduzirão animações de recuo ao disparar. diff --git a/Languages/PortugueseBrazilian/Keyed/Stats.xml b/Languages/PortugueseBrazilian/Keyed/Stats.xml index a9adaadd6c..1f1fcda0d8 100644 --- a/Languages/PortugueseBrazilian/Keyed/Stats.xml +++ b/Languages/PortugueseBrazilian/Keyed/Stats.xml @@ -10,4 +10,4 @@ Efeito da habilidade do portador: Rádio de longo alcance - + \ No newline at end of file diff --git a/Languages/Russian/DefInjected/StatDef/Stats_Basics_Inventory.xml b/Languages/Russian/DefInjected/StatDef/Stats_Basics_Inventory.xml index 03de188e56..285aa86125 100644 --- a/Languages/Russian/DefInjected/StatDef/Stats_Basics_Inventory.xml +++ b/Languages/Russian/DefInjected/StatDef/Stats_Basics_Inventory.xml @@ -7,7 +7,7 @@ калибр Оружие, использующее данный тип боеприпасов - дистанция - Дистанция, измеряемая в клетках мира, которую может пролететь снаряд + дистанция + Дистанция, измеряемая в клетках мира, которую может пролететь снаряд \ No newline at end of file diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml index c38f9aa300..d8b7d82746 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml @@ -1,8 +1,10 @@  - тактический жилет - Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. + тактический жилет + + Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. + рюкзак diff --git a/Languages/Russian/Keyed/Descriptions.xml b/Languages/Russian/Keyed/Descriptions.xml index 5cd057078c..3657e94cb5 100644 --- a/Languages/Russian/Keyed/Descriptions.xml +++ b/Languages/Russian/Keyed/Descriptions.xml @@ -11,7 +11,7 @@ Кол-во дробинок Фактор разброса Осколки - Наличие возможности отправлять координаты для удара на большие растояния + Наличие возможности отправлять координаты для удара на большие растояния diff --git a/Languages/Russian/Keyed/Stats.xml b/Languages/Russian/Keyed/Stats.xml index 05ea7ac182..5e54e8ee9a 100644 --- a/Languages/Russian/Keyed/Stats.xml +++ b/Languages/Russian/Keyed/Stats.xml @@ -1,6 +1,6 @@ - Радио дальнего действия + Радио дальнего действия \ No newline at end of file diff --git a/Languages/Spanish/DefInjected/ThingDef/Apparel_Carrying.xml b/Languages/Spanish/DefInjected/ThingDef/Apparel_Carrying.xml index 1c11da3d23..2fc9655be3 100644 --- a/Languages/Spanish/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Languages/Spanish/DefInjected/ThingDef/Apparel_Carrying.xml @@ -1,8 +1,10 @@  - tactical vest - A loadbearing vest with a number of pouches to store magazines and other equipment.\n\nSpeeds up reloading but is quite bulky to wear. + tactical vest + + A loadbearing vest with a number of pouches to store magazines and other equipment.\n\nSpeeds up reloading but is quite bulky to wear. + backpack diff --git a/Languages/SpanishLatin/DefInjected/ThingDef/Apparel_Carrying.xml b/Languages/SpanishLatin/DefInjected/ThingDef/Apparel_Carrying.xml index 1c11da3d23..2fc9655be3 100644 --- a/Languages/SpanishLatin/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Languages/SpanishLatin/DefInjected/ThingDef/Apparel_Carrying.xml @@ -1,8 +1,10 @@  - tactical vest - A loadbearing vest with a number of pouches to store magazines and other equipment.\n\nSpeeds up reloading but is quite bulky to wear. + tactical vest + + A loadbearing vest with a number of pouches to store magazines and other equipment.\n\nSpeeds up reloading but is quite bulky to wear. + backpack diff --git a/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml b/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml index 9abf0d400a..d987710fa9 100644 --- a/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml +++ b/Patches/Alpha Genes/GeneDefs/GeneDefs_Archite.xml @@ -2,22 +2,22 @@ - -
  • Alpha Genes
    • -     + +
  • Alpha Genes
    • +     - - -
  • - Defs/GeneDef[defName="AG_HeatImmunity"]/damageFactors - - 0.0 - 0.0 - -
    • - -     + + +
  • + Defs/GeneDef[defName="AG_HeatImmunity"]/damageFactors + + 0.0 + 0.0 + +
    • + +     - -     + + \ No newline at end of file diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml index f2587a5599..08870d571d 100644 --- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml +++ b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Apparel.xml @@ -729,4 +729,4 @@ - + \ No newline at end of file diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml index 0c81071e10..4374c760d1 100644 --- a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml +++ b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml @@ -726,22 +726,22 @@
  • Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"] - - Spacer + + Spacer None true 0
  • RangedHeavy
  • LongShots
    • - +
  • Defs/ThingDef[defName="AM_MechanoidGunRotaryNeedle"]/graphicData - Graphic_Single + Graphic_Single
    • @@ -781,7 +781,7 @@ AimedShot true - +
  • diff --git a/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml b/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml index 6e47299f0a..4cd98a61d2 100644 --- a/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml +++ b/Patches/Alpha Vehicle/Alpha_Vehicle_WarChariot.xml @@ -8,7 +8,7 @@ - +
  • @@ -46,7 +46,7 @@
    • - -
  • - Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel - - true - -
    • -
  • - Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel/layers - -
  • OnHead
    • -
  • StrappedHead
    • - - - -
  • - Defs/ThingDef[@Name="AC_HuntersArmourBase"]/apparel/bodyPartGroups - -
  • Hands
    • + + + + +
  • + Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel + + true + +
    • +
  • + Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • + + + +
  • + Defs/ThingDef[@Name="AC_HuntersArmourBase"]/apparel/bodyPartGroups + +
  • Hands
  • Feet
    • - - - - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases - - 5 - 1 - 0.7 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Flammability - - 0 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/MaxHitPoints - - 275 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Mass - - 3.0 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Sharp - - 20 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Blunt - - 45 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"] - -
  • - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - - - - - - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets - - 0.50 - -1 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/ComponentSpacer - - 2 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/Plasteel - - 75 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList - - 30 - -
    • - - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases - - 100 - 15 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Flammability - - 0 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/MaxHitPoints - - 600 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Mass - - 50 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Sharp - - 24 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Blunt - - 56 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"] - -
  • - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.70 - -
  • Hand
    • - - -
  • - 0.70 - -
  • Hand
    • - - - - - - - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/equippedStatOffsets - - 80 - 10 - 0.50 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/ComponentSpacer - - 5 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Plasteel - - 200 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Uranium - - 50 - -
    • - -
  • - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList - - 60 - -
    • - - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases - - 6 - 1 - 0.75 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Flammability - - 0 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/MaxHitPoints - - 300 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Mass - - 6.6 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Sharp - - 25 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Blunt - - 56 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"] - -
  • - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - - - - - - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets - - 0.20 - 0.50 - -1 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/ComponentSpacer - - 3 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/Plasteel - - 115 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList - - 35 - -
    • - - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases - - 100 - 15 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Flammability - - 0 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/MaxHitPoints - - 700 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass - - 80 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Sharp - - 30 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Blunt - - 68 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"] - -
  • - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.70 - -
  • Hand
    • - - -
  • - 0.70 - -
  • Hand
    • - - - - - - - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/equippedStatOffsets - - 100 - 20 - 0.50 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/ComponentSpacer - - 8 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Plasteel - - 270 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Uranium - - 95 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList - - 75 - -
    • - - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases - - 6 - 1 - 0.75 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Flammability - - 0 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/MaxHitPoints - - 300 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Mass - - 6.6 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Sharp - - 28 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Blunt - - 62 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"] - -
  • - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - - - - - - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/equippedStatOffsets - - 0.50 - -1 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/ComponentSpacer - - 2 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/Plasteel - - 125 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList - - 35 - -
    • - - -
  • - -
  • Royalty
    • - - - - - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases - - 100 - 15 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Flammability - - 0 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/MaxHitPoints - - 700 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Mass - - 80 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Sharp - - 32 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Blunt - - 75 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"] - -
  • - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.70 - -
  • Hand
    • - - -
  • - 0.70 - -
  • Hand
    • - - - - - - - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets - - 100 - 20 - 0.50 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/ComponentSpacer - - 8 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Plasteel - - 275 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Uranium - - 90 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList - - 75 - -
    • - - -
  • - Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases - - 10 - 3 - -
    • -
  • - Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases/JumpRange - - 20 - -
    • - -     -     - - - + + + + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases + + 5 + 1 + 0.7 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Flammability + + 0 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/MaxHitPoints + + 275 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Mass + + 3.0 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Sharp + + 20 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Blunt + + 45 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + + + + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets + + 0.50 + -1 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/ComponentSpacer + + 2 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/Plasteel + + 75 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList + + 30 + +
    • + + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases + + 100 + 15 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Flammability + + 0 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/MaxHitPoints + + 600 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Mass + + 50 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Sharp + + 24 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Blunt + + 56 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + + + + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/equippedStatOffsets + + 80 + 10 + 0.50 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/ComponentSpacer + + 5 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Plasteel + + 200 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Uranium + + 50 + +
    • + +
  • + Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList + + 60 + +
    • + + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases + + 6 + 1 + 0.75 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Flammability + + 0 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/MaxHitPoints + + 300 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Mass + + 6.6 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Sharp + + 25 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Blunt + + 56 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + + + + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets + + 0.20 + 0.50 + -1 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/ComponentSpacer + + 3 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/Plasteel + + 115 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList + + 35 + +
    • + + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases + + 100 + 15 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Flammability + + 0 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/MaxHitPoints + + 700 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass + + 80 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Sharp + + 30 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Blunt + + 68 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + + + + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/equippedStatOffsets + + 100 + 20 + 0.50 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/ComponentSpacer + + 8 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Plasteel + + 270 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Uranium + + 95 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList + + 75 + +
    • + + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases + + 6 + 1 + 0.75 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Flammability + + 0 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/MaxHitPoints + + 300 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Mass + + 6.6 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Sharp + + 28 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Blunt + + 62 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + + + + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/equippedStatOffsets + + 0.50 + -1 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/ComponentSpacer + + 2 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/Plasteel + + 125 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList + + 35 + +
    • + + +
  • + +
  • Royalty
    • + + + + + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases + + 100 + 15 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Flammability + + 0 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/MaxHitPoints + + 700 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Mass + + 80 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Sharp + + 32 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Blunt + + 75 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + + + + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets + + 100 + 20 + 0.50 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/ComponentSpacer + + 8 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Plasteel + + 275 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Uranium + + 90 + +
    • + +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList + + 75 + +
    • + + +
  • + Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases + + 10 + 3 + +
    • +
  • + Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases/JumpRange + + 20 + +
    • + +     +     + + +
  • Defs/ThingDef[defName="AC_CuirassierBelt"]/statBases @@ -742,15 +742,15 @@
    • -
  • - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass - - 2 - -
    • +
  • + Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass + + 2 + +
    • - -
  • + +
  • AC_Gun_Autorevolver 0.49 @@ -820,7 +820,7 @@
    • -     -     - + + + \ No newline at end of file diff --git a/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml b/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml index beaaa2e097..e59e711bb8 100644 --- a/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml +++ b/Patches/Ancient Eastern Armory/AsianArmory_Apparel.xml @@ -3,7 +3,7 @@ -
  • Ancient Eastern Armory
    • +
  • Ancient Eastern Armory (Continued)
    •  diff --git a/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml b/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml index 61ea96a631..fbfb90570e 100644 --- a/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml +++ b/Patches/Ancient Eastern Armory/AsianArmory_Armour.xml @@ -3,7 +3,7 @@ -
  • Ancient Eastern Armory
    • +
  • Ancient Eastern Armory (Continued)
    •  diff --git a/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml b/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml index 2b07be3cc2..c3014e6b20 100644 --- a/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml +++ b/Patches/Ancient Eastern Armory/AsianArmory_Weapons.xml @@ -4,7 +4,7 @@ -
  • Ancient Eastern Armory
    • +
  • Ancient Eastern Armory (Continued)
    •  @@ -12,7 +12,7 @@
  • - Defs/ThingDef[defName="Ancient_TwoHandedFlair"]/tools + Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/tools
  • @@ -41,7 +41,7 @@
  • - Defs/ThingDef[defName="Ancient_TwoHandedFlair"]/statBases + Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/statBases 14 0.28 @@ -49,7 +49,7 @@
  • - Defs/ThingDef[defName="Ancient_TwoHandedFlair"]/equippedStatOffsets + Defs/ThingDef[defName="Ancient_TwoHandedFlail"]/equippedStatOffsets 1.6 0.38 @@ -130,10 +130,10 @@
    • - +
  • - Defs/ThingDef[defName="Ancient_GuanDo"]/tools + Defs/ThingDef[defName="Ancient_GuanDao"]/tools
  • @@ -175,7 +175,7 @@
  • - Defs/ThingDef[defName="Ancient_GuanDo"]/statBases + Defs/ThingDef[defName="Ancient_GuanDao"]/statBases 12 0.98 @@ -183,7 +183,7 @@
  • - Defs/ThingDef[defName="Ancient_GuanDo"] + Defs/ThingDef[defName="Ancient_GuanDao"] 0.11 diff --git a/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml b/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml index fa94299749..b90dc3d7be 100644 --- a/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml +++ b/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml @@ -644,7 +644,7 @@ 1.8
    • - +
  • Defs/ThingDef[defName="AnimaMegaspider"]/comps @@ -661,5 +661,5 @@ - - + + \ No newline at end of file diff --git a/Patches/Archotech Weaponry/RangedArchotech.xml b/Patches/Archotech Weaponry/RangedArchotech.xml index 47b1eb2810..829590faa1 100644 --- a/Patches/Archotech Weaponry/RangedArchotech.xml +++ b/Patches/Archotech Weaponry/RangedArchotech.xml @@ -45,7 +45,7 @@ Defs/ThingDef[ defName = "AW_ArchotechRifle" or defName = "AW_ArchotechSniper" - ]/tools + ]/tools
  • diff --git a/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml b/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml index 6e4bb3f4b2..715636a86c 100644 --- a/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml +++ b/Patches/Big and Small/Big and Small Genes/Genes/GeneDefs_Temperature.xml @@ -2,22 +2,22 @@ - -
  • Big and Small Genes
    • - + +
  • Big and Small Genes
    • +     - + -
  • - Defs/GeneDef[defName="FireImmunity"]/damageFactors - - 0.0 - 0.0 - -
    • +
  • + Defs/GeneDef[defName="FireImmunity"]/damageFactors + + 0.0 + 0.0 + +
    • -     +     - - + + \ No newline at end of file diff --git a/Patches/Core/HediffDefs/BloodLoss.xml b/Patches/Core/HediffDefs/BloodLoss.xml index 4e377e4a4e..d9f1c3b888 100644 --- a/Patches/Core/HediffDefs/BloodLoss.xml +++ b/Patches/Core/HediffDefs/BloodLoss.xml @@ -55,4 +55,4 @@     - + \ No newline at end of file diff --git a/Patches/Core/ThingDefs_Misc/Apparel_Hats.xml b/Patches/Core/ThingDefs_Misc/Apparel_Hats.xml index 1286c7a795..d72b61253d 100644 --- a/Patches/Core/ThingDefs_Misc/Apparel_Hats.xml +++ b/Patches/Core/ThingDefs_Misc/Apparel_Hats.xml @@ -9,7 +9,7 @@ 2     - + diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml index d333ceaeea..ab6664922c 100644 --- a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml +++ b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml @@ -1,1506 +1,1506 @@ - - Defs/ThingDef[defName="Gun_ChargeLance"] - - 0 - - - - - Defs/ThingDef[@Name="BaseWeaponTurret"] - - 0 - - - - - - - Defs/ThingDef[defName="Gun_Revolver" or defName="Gun_Autopistol" or defName="Gun_MachinePistol"]/tools - - -
  • - - -
  • Blunt
    • - - 2 - 1.54 - 1.5 - 0.555 - Grip - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.555 - Muzzle - -     -     -     - - - - Defs/ThingDef[ - defName="Gun_PumpShotgun" or - defName="Gun_ChainShotgun" or - defName="Gun_BoltActionRifle" or - defName="Gun_AssaultRifle" or - defName="Gun_SniperRifle" or - defName="Gun_HeavySMG" or - defName="Gun_IncendiaryLauncher" or - defName="Gun_LMG" or - defName="Gun_ChargeRifle" - ]/tools - - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - -     -     -     - - - Defs/ThingDef[defName="Gun_TripleRocket" or defName="Gun_DoomsdayRocket"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     -     -     - - - - - Gun_Revolver - - 1.39 - 0.49 - 0.7 - 0.18 - 1.27 - 2.41 - - 7000 - - - 30 - 2 - - - 2.96 - CombatExtended.Verb_ShootCE - true - Bullet_44Magnum_FMJ - 0.6 - 12 - Shot_Revolver - GunTail_Light - 9 - - - 6 - 4.6 - AmmoSet_44Magnum - - - FALSE - Snapshot - - -
  • CE_Sidearm
    • -
  • CE_AI_BROOM
    • -
  • CE_OneHandedWeapon
    • -     - Gunsmithing -     - - - Defs/ThingDef[defName="Gun_Revolver"] - -
  • - 1.00,1.00 - 0.0,0.0 -
    • -     -     - - - - - Gun_Autopistol - - 1.11 - 0.38 - 0.7 - 0.17 - 1.07 - 2.10 - 7000 - - - 25 - 3 - - - 2.72 - CombatExtended.Verb_ShootCE - true - Bullet_45ACP_FMJ - 0.6 - 12 - Shot_Autopistol - GunTail_Light - 9 - - - 7 - 4 - AmmoSet_45ACP - - - FALSE - Snapshot - - -
  • CE_Sidearm
    • -
  • CE_AI_BROOM
    • -
  • CE_OneHandedWeapon
    • -     - BlowbackOperation -     - - - Defs/ThingDef[defName="Gun_Autopistol"] - -
  • - 0.93,0.93 - 0.0,0.0 -
    • -     -     - - - - - Gun_PumpShotgun - - 3.00 - 1.0 - 0.14 - 1.20 - 9.0 - 1 - 9500 - - - 45 - 10 - 1 - - - 2.75 - CombatExtended.Verb_ShootCE - true - Bullet_12Gauge_Buck - 0.6 - 16 - Shot_Shotgun - GunTail_Heavy - 9 - - - 5 - true - 0.85 - AmmoSet_12Gauge - - - Snapshot - - -
  • SimpleGun
    • -
  • CE_AI_BROOM
    • -     - Gunsmithing -     - - - Defs/ThingDef[defName="Gun_PumpShotgun"] - -
  • - 1.03,1.25 - 0.05,0.0 -
    • -     -     - - - - - Defs/ThingDef[defName="Gun_ChainShotgun"]/description - - A magazine-fed semi-automatic shotgun. It has the same range as a typical shotgun, but is extraordinarily dangerous due to being semi-automatic. - - - - - Gun_ChainShotgun - - 3.50 - 0.39 - 0.15 - 1.26 - 6.7 - 1 - 22500 - - - 40 - 3 - 10 - - - 2.54 - CombatExtended.Verb_ShootCE - true - Bullet_12Gauge_Buck - 0.6 - 16 - Shot_Shotgun_NoRack - GunTail_Heavy - 9 - 15 - - - 8 - 4 - AmmoSet_12Gauge - - - Snapshot - - -
  • CE_AI_BROOM
    • -     - GasOperation -     - - - Defs/ThingDef[defName="Gun_ChainShotgun"] - -
  • - 1.04,1.23 - 0.05,-0.05 - 0,0.2 - -30 -
    • -     -     - - - - - Gun_BoltActionRifle - - 4.19 - 1.17 - 1 - 0.02 - 1.68 - 12.60 - 12000 - - - 55 - 15 - 1 - - - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_303British_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 - - - 10 - 4.3 - AmmoSet_303British - - - AimedShot - - -
  • SimpleGun
    • -
  • CE_AI_SR
    • -     - Gunsmithing - false -     - - - Defs/ThingDef[defName="Gun_BoltActionRifle"] - -
  • - 1.3,1.3 - 0.12,0.04 - -0.1,0.1 -
    • -     -     - - - - - Gun_AssaultRifle - - 3.26 - 0.36 - 1 - 0.07 - 1.33 - 10.03 - 30000 - - - 50 - 5 - 10 - - - 1.50 - CombatExtended.Verb_ShootCE - true - Bullet_556x45mmNATO_FMJ - 1.1 - 55 - 6 - 4 - Shot_AssaultRifle - GunTail_Medium - 9 - - - 30 - 4 - AmmoSet_556x45mmNATO - - - 3 - TRUE - AimedShot - - -
  • CE_AI_AR
    • -     - PrecisionRifling -     - - - Defs/ThingDef[defName="Gun_AssaultRifle"] - -
  • - 1.16,1.16 - 0.08,0.0 - -0.05,0 -
    • -     -     - - - - - Gun_SniperRifle - - 7.30 - 1.36 - 2.6 - 0.05 - 1.35 - 11.92 - 30000 - - - 60 - 5 - 15 - - - 1.50 - CombatExtended.Verb_ShootCE - true - Bullet_762x51mmNATO_FMJ - 1.8 - 75 - Shot_SniperRifle - GunTail_Heavy - 9 - - - 5 - 4 - AmmoSet_762x51mmNATO - - - AimedShot - - -
  • CE_AI_SR
    • -
  • Bipod_DMR
    • -     - PrecisionRifling - false -     - - - Defs/ThingDef[defName="Gun_SniperRifle"] - -
  • - 1.25,1.45 - 0.15,-0.05 - -0.3,0.1 -
    • -     -     - - - - - Gun_MachinePistol - - 2.84 - 0.36 - 0.7 - 0.16 - 1.93 - 2.95 - 24500 - - - 35 - 3 - - - 1.71 - CombatExtended.Verb_ShootCE - true - Bullet_45ACP_FMJ - 0.6 - 12 - 6 - 3 - Shot_MachinePistol - GunTail_Light - 9 - - - 30 - 4 - AmmoSet_45ACP - - - 3 - FALSE - Snapshot - - -
  • CE_SMG
    • -
  • CE_AI_BROOM
    • -
  • CE_OneHandedWeapon
    • -     - BlowbackOperation -     - - - Defs/ThingDef[defName="Gun_MachinePistol"] - -
  • - 0.84,0.84 - -0.10,-0.07 - 0.1,0.1 - -30 -
    • -     -     - - - - - Gun_HeavySMG - - 2.50 - 0.37 - 1.00 - 0.14 - 0.94 - 4.50 - 24500 - - - 30 - 10 - 5 - - - 1.79 - CombatExtended.Verb_ShootCE - true - Bullet_45ACP_FMJ - 0.6 - 25 - 6 - 6 - Shot_HeavySMG - GunTail_Heavy - 9 - - - 25 - 4 - AmmoSet_45ACP - - - 3 - FALSE - Snapshot - - -
  • CE_SMG
    • -
  • CE_AI_BROOM
    • -     - BlowbackOperation -     - - - Defs/ThingDef[defName="Gun_HeavySMG"] - -
  • - 0.85,0.85 - 0.00,-0.03 - 0.1,0 -
    • -     -     - - - - - Gun_IncendiaryLauncher - - 8 - 0.43 - 1 - 0.15 - 1.8 - 10 - 39500 - - - 65 - 30 - 7 - 10 - - - 1.0 - CombatExtended.Verb_ShootCE - true - Bullet_30x64mmFuel_Incendiary - 1.1 - 40 - 0 - Shot_IncendiaryLauncher - GunTail_Medium - 14 - - true - - - - 5 - 4 - AmmoSet_30x64mmFuel - - - FALSE - SuppressFire - - -
  • CE_AI_AOE
    • -
  • EliteGun
    • -     - CE_AdvancedLaunchers - false -     - - - Defs/ThingDef[defName="Gun_IncendiaryLauncher"] - -
  • - 1.16,1.16 - 0.1,-0.05 -
    • -     -     - - - - - Gun_LMG - - 8.7 - 0.56 - 1 - 0.05 - 1.37 - 12.9 - 31500 - - - 80 - 10 - 5 - - - 1.38 - CombatExtended.Verb_ShootCE - true - Bullet_303British_FMJ - 1.3 - 62 - 7 - 10 - Shot_CE_BattleRifle - GunTail_Medium - 9 - - true - - Mounted - - - 50 - 4.9 - AmmoSet_303British - - - 5 - FALSE - SuppressFire - - -
  • CE_MachineGun
    • -
  • CE_AI_LMG
    • -
  • Bipod_LMG
    • -     - GasOperation - false -     - - - Defs/ThingDef[defName="Gun_LMG"] - -
  • - 1.35,1.18 - 0.13,-0.03 -
    • -     -     - - - - - Gun_ChargeRifle - - 3.0 - 0.36 - 1.10 - 0.08 - 1.20 - 7.00 - 49000 - - - 45 - 25 - 4 - 1 - 10 - - - 1.46 - CombatExtended.Verb_ShootCE - true - Bullet_6x24mmCharged - 1.0 - 55 - 5 - 6 - Shot_ChargeRifle - GunTail_Medium - 9 - - - 30 - 4 - AmmoSet_6x24mmCharged - - - 3 - TRUE - AimedShot - - -
  • CE_AI_AR
    • -
  • AdvancedGun
    • -     - ChargedShot -     - - - Defs/ThingDef[defName="Gun_ChargeRifle"] - -
  • - 1.03,1.03 - 0.05,0.0 -
    • -     -     - - - - - Gun_MiniTurret - - 0.36 - 1 - 0.07 - 0.69 - - - 0.91 - CombatExtended.Verb_ShootCE - true - Bullet_556x45mmNATO_FMJ - 1.3 - 48 - 5 - 10 - GunShotA - GunTail_Light - 9 - Mounted - - - 100 - 7.8 - AmmoSet_556x45mmNATO - - - AimedShot - true - true - - - - - - - Defs/ThingDef[defName ="Gun_Minigun"]/weaponTags/li[.="GunHeavy"] - - - - Gun_Minigun - - 20.00 - 0.35 - 1 - 0.06 - 3.22 - 10 - 52000 - - - 110 - 11 - - - 0.97 - CombatExtended.Verb_ShootCE - true - Bullet_762x51mmNATO_FMJ - 2.1 - 62 - 50 - 2 - Shot_Minigun - GunTail_Medium - 9 - - - 250 - 9.2 - AmmoSet_762x51mmNATO - - - 25 - Snapshot - - -
  • CE_AI_Suppressive
    • -     -     - - - Defs/ThingDef[defName="Gun_Minigun"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrels - -     -     -     - - - Defs/ThingDef[defName="Gun_Minigun"]/equippedStatOffsets - - - - Defs/ThingDef[defName="Gun_Minigun"] - -
  • - 1.00,1.00 - 0.1,-0.15 - -0.2,0 - -30 -
    • -     -     - - - - - - - Defs/ThingDef[defName="Gun_DoomsdayRocket" or defName="Gun_TripleRocket"]/weaponTags/li[.="Gun"] - - - - Defs/ThingDef[defName="Gun_DoomsdayRocket" or defName="Gun_TripleRocket"] - ParentName - BaseMakeableGun - - - - Defs/ThingDef[defName="Gun_DoomsdayRocket" or defName="Gun_TripleRocket"]/statBases/MarketValue - - - - - - Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/thingClass - - CombatExtended.ProjectileCE_Explosive - - - - - Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/projectile - - - Bomb - 250 - 7.8 - 3.0 - 2.0 - 100 - - - - - - Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/comps - - Defs/ThingDef[defName="Bullet_DoomsdayRocket"] - - - - - - - - Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/comps - -
  • - 1 - - 400 - -
    • -     -     - - - - - Gun_DoomsdayRocket - - 20.00 - 1.5 - 2.24 - 0.2 - 3.24 - 13.0 - 49500 - - - 125 - 8 - 5 - - - CombatExtended.Verb_ShootCEOneUse - true - Bullet_DoomsdayRocket - 2.1 - 48 - 1 - InfernoCannon_Fire - GunTail_Heavy - true - - true - - 14 - - - AimedShot - - -
  • CE_AI_AOE
    • -     - CE_AdvancedLaunchers - false -     - - - Defs/ThingDef[defName="Gun_DoomsdayRocket"] - -
  • - 1.45,1.45 - -0.15,0 -
    • -     -     - - - - - - - Defs/ThingDef[defName="Bullet_Rocket"]/thingClass - - CombatExtended.ProjectileCE_Explosive - - - - - Defs/ThingDef[defName="Bullet_Rocket"]/projectile - - - Bomb - 180 - 3.0 - 3.0 - 2.0 - 100 - - - - - - Defs/ThingDef[defName="Bullet_Rocket"]/comps - - Defs/ThingDef[defName="Bullet_Rocket"] - - - - - - - - Defs/ThingDef[defName="Bullet_Rocket"]/comps - -
  • - 1 - - 150 - -
    • -     -     - - - - - Gun_TripleRocket - - 12.00 - 1.5 - 1 - 0.2 - 2.20 - 13.00 - 43000 - - - 90 - 7 - 3 - - - CombatExtended.Verb_ShootCEOneUse - true - Bullet_Rocket - 1.9 - 40 - 20 - 3 - InfernoCannon_Fire - GunTail_Heavy - true - false - - true - - 14 - - - AimedShot - true - - -
  • CE_AI_AOE
    • -     - CE_AdvancedLaunchers - false -     - - - Defs/ThingDef[defName="Gun_TripleRocket"] - -
  • - 1.16,1.16 - -0.25,0 -
    • -     -     - - - - - Gun_ChargeBlasterHeavy - - 35.00 - 0.36 - 1 - 0.01 - 1.33 - 13.00 - - - 1.08 - CombatExtended.Verb_ShootCE - true - Bullet_12x64mmCharged - 2.3 - 75 - 6 - 20 - Shot_ChargeBlaster - GunTail_Heavy - 9 - - - 100 - 9.2 - AmmoSet_12x64mmCharged - - - 10 - SuppressFire - - -
  • CE_AI_Suppressive
    • -
  • NoSwitch
    • -     -     - - - Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     -     -     - - - - - Gun_InfernoCannon - - 50.00 - 2.54 - 1 - 0.01 - 0.14 - 20.00 - - - 2.01 - CombatExtended.Verb_ShootCE - true - Bullet_80x256mmFuel_Incendiary - 3.5 - 86 - 1 - InfernoCannon_Fire - GunTail_Light - 14 - 5 - 5 - true - - - 1 - 2 - 9.8 - AmmoSet_80x256mmFuel - - - AimedShot - - -
  • CE_AI_Launcher
    • -
  • NoSwitch
    • -     -     - - - Defs/ThingDef[@Name="Gun_InfernoCannonBase"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     -     -     - - - - - Gun_ThumpCannon - - 75.00 - 2.2 - 1 - 0.01 - 0.21 - 20.00 - - - 0.1 - CombatExtended.Verb_ShootCE - true - Bullet_164x284mmDemo - 3.3 - 42 - 1 - ThumpCannon_Fire - GunTail_Heavy - 14 - 3 - 4 - true - - - 1 - 2 - 9.8 - AmmoSet_164x284mmDemo - - - AimedShot - - -
  • CE_AI_Launcher
    • -
  • NoSwitch
    • -     -     - - - Defs/ThingDef[defName="Gun_ThumpCannon"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     -     -     - - - - - Gun_ChargeLance - - 0.35 - 1 - 0.01 - 1 - 13.00 - - - 0.75 - CombatExtended.Verb_ShootCE - true - Bullet_5x35mmCharged - 1.3 - 62 - 1 - ChargeLance_Fire - GunTail_Heavy - 9 - - - 5 - 3 - AmmoSet_5x35mmCharged - - - AimedShot - - -
  • CE_AI_Rifle
    • -
  • NoSwitch
    • -     -     - - - Defs/ThingDef[defName="Gun_ChargeLance"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     -     -     - - - Defs/ThingDef[defName="Gun_ChargeLance"] - -
  • - True -
    • -     -     - - - - Defs/ThingDef[defName="Gun_ChargeLance"] - ParentName - BaseGun - - - - Defs/ThingDef[defName="Gun_ChargeLance"]/costList - - - - Defs/ThingDef[defName="Gun_ChargeLance"]/recipeMaker - - - - Defs/ThingDef[defName="Gun_ChargeLance"]/statBases - - 1400 - - - - - Defs/ThingDef[defName="Gun_ChargeLance"] - - None - True - - - - - Defs/ThingDef[defName="Gun_ChargeLance"]/weaponTags/li[contains(.,"SpacerGun")] - - - - - - Gun_Needle - - 0.38 - 1 - 0.01 - 0.81 - 15.00 - - - 1.80 - CombatExtended.Verb_ShootCE - true - Bullet_5x100mmCaseless_Sabot - 1.3 - 75 - 1 - Shot_NeedleGun - GunTail_Heavy - 9 - - - 10 - 4 - AmmoSet_5x100mmCaseless - - - AimedShot - - -
  • CE_AI_Rifle
    • -
  • NoSwitch
    • -     -     - - - Defs/ThingDef[defName="Gun_Needle"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - -     -     -     - - - - Defs/ThingDef[defName="OrbitalTargeterBombardment" or defName="OrbitalTargeterPowerBeam"]/verbs/li/range - - 60 - - - - - - Defs/ThingDef[defName="Gun_SmokeLauncher"] - - - - Defs/ThingDef[defName="Gun_EmpLauncher"] - + + Defs/ThingDef[defName="Gun_ChargeLance"] + + 0 + + + + + Defs/ThingDef[@Name="BaseWeaponTurret"] + + 0 + + + + + + + Defs/ThingDef[defName="Gun_Revolver" or defName="Gun_Autopistol" or defName="Gun_MachinePistol"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + +     +     +     + + + + Defs/ThingDef[ + defName="Gun_PumpShotgun" or + defName="Gun_ChainShotgun" or + defName="Gun_BoltActionRifle" or + defName="Gun_AssaultRifle" or + defName="Gun_SniperRifle" or + defName="Gun_HeavySMG" or + defName="Gun_IncendiaryLauncher" or + defName="Gun_LMG" or + defName="Gun_ChargeRifle" + ]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + Defs/ThingDef[defName="Gun_TripleRocket" or defName="Gun_DoomsdayRocket"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + Gun_Revolver + + 1.39 + 0.49 + 0.7 + 0.18 + 1.27 + 2.41 + + 7000 + + + 30 + 2 + + + 2.96 + CombatExtended.Verb_ShootCE + true + Bullet_44Magnum_FMJ + 0.6 + 12 + Shot_Revolver + GunTail_Light + 9 + + + 6 + 4.6 + AmmoSet_44Magnum + + + FALSE + Snapshot + + +
  • CE_Sidearm
    • +
  • CE_AI_BROOM
    • +
  • CE_OneHandedWeapon
    • +     + Gunsmithing +     + + + Defs/ThingDef[defName="Gun_Revolver"] + +
  • + 1.00,1.00 + 0.0,0.0 +
    • +     +     + + + + + Gun_Autopistol + + 1.11 + 0.38 + 0.7 + 0.17 + 1.07 + 2.10 + 7000 + + + 25 + 3 + + + 2.72 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 + + + 7 + 4 + AmmoSet_45ACP + + + FALSE + Snapshot + + +
  • CE_Sidearm
    • +
  • CE_AI_BROOM
    • +
  • CE_OneHandedWeapon
    • +     + BlowbackOperation +     + + + Defs/ThingDef[defName="Gun_Autopistol"] + +
  • + 0.93,0.93 + 0.0,0.0 +
    • +     +     + + + + + Gun_PumpShotgun + + 3.00 + 1.0 + 0.14 + 1.20 + 9.0 + 1 + 9500 + + + 45 + 10 + 1 + + + 2.75 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Shotgun + GunTail_Heavy + 9 + + + 5 + true + 0.85 + AmmoSet_12Gauge + + + Snapshot + + +
  • SimpleGun
    • +
  • CE_AI_BROOM
    • +     + Gunsmithing +     + + + Defs/ThingDef[defName="Gun_PumpShotgun"] + +
  • + 1.03,1.25 + 0.05,0.0 +
    • +     +     + + + + + Defs/ThingDef[defName="Gun_ChainShotgun"]/description + + A magazine-fed semi-automatic shotgun. It has the same range as a typical shotgun, but is extraordinarily dangerous due to being semi-automatic. + + + + + Gun_ChainShotgun + + 3.50 + 0.39 + 0.15 + 1.26 + 6.7 + 1 + 22500 + + + 40 + 3 + 10 + + + 2.54 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Shotgun_NoRack + GunTail_Heavy + 9 + 15 + + + 8 + 4 + AmmoSet_12Gauge + + + Snapshot + + +
  • CE_AI_BROOM
    • +     + GasOperation +     + + + Defs/ThingDef[defName="Gun_ChainShotgun"] + +
  • + 1.04,1.23 + 0.05,-0.05 + 0,0.2 + -30 +
    • +     +     + + + + + Gun_BoltActionRifle + + 4.19 + 1.17 + 1 + 0.02 + 1.68 + 12.60 + 12000 + + + 55 + 15 + 1 + + + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 + + + 10 + 4.3 + AmmoSet_303British + + + AimedShot + + +
  • SimpleGun
    • +
  • CE_AI_SR
    • +     + Gunsmithing + false +     + + + Defs/ThingDef[defName="Gun_BoltActionRifle"] + +
  • + 1.3,1.3 + 0.12,0.04 + -0.1,0.1 +
    • +     +     + + + + + Gun_AssaultRifle + + 3.26 + 0.36 + 1 + 0.07 + 1.33 + 10.03 + 30000 + + + 50 + 5 + 10 + + + 1.50 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1.1 + 55 + 6 + 4 + Shot_AssaultRifle + GunTail_Medium + 9 + + + 30 + 4 + AmmoSet_556x45mmNATO + + + 3 + TRUE + AimedShot + + +
  • CE_AI_AR
    • +     + PrecisionRifling +     + + + Defs/ThingDef[defName="Gun_AssaultRifle"] + +
  • + 1.16,1.16 + 0.08,0.0 + -0.05,0 +
    • +     +     + + + + + Gun_SniperRifle + + 7.30 + 1.36 + 2.6 + 0.05 + 1.35 + 11.92 + 30000 + + + 60 + 5 + 15 + + + 1.50 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.8 + 75 + Shot_SniperRifle + GunTail_Heavy + 9 + + + 5 + 4 + AmmoSet_762x51mmNATO + + + AimedShot + + +
  • CE_AI_SR
    • +
  • Bipod_DMR
    • +     + PrecisionRifling + false +     + + + Defs/ThingDef[defName="Gun_SniperRifle"] + +
  • + 1.25,1.45 + 0.15,-0.05 + -0.3,0.1 +
    • +     +     + + + + + Gun_MachinePistol + + 2.84 + 0.36 + 0.7 + 0.16 + 1.93 + 2.95 + 24500 + + + 35 + 3 + + + 1.71 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 12 + 6 + 3 + Shot_MachinePistol + GunTail_Light + 9 + + + 30 + 4 + AmmoSet_45ACP + + + 3 + FALSE + Snapshot + + +
  • CE_SMG
    • +
  • CE_AI_BROOM
    • +
  • CE_OneHandedWeapon
    • +     + BlowbackOperation +     + + + Defs/ThingDef[defName="Gun_MachinePistol"] + +
  • + 0.84,0.84 + -0.10,-0.07 + 0.1,0.1 + -30 +
    • +     +     + + + + + Gun_HeavySMG + + 2.50 + 0.37 + 1.00 + 0.14 + 0.94 + 4.50 + 24500 + + + 30 + 10 + 5 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 25 + 6 + 6 + Shot_HeavySMG + GunTail_Heavy + 9 + + + 25 + 4 + AmmoSet_45ACP + + + 3 + FALSE + Snapshot + + +
  • CE_SMG
    • +
  • CE_AI_BROOM
    • +     + BlowbackOperation +     + + + Defs/ThingDef[defName="Gun_HeavySMG"] + +
  • + 0.85,0.85 + 0.00,-0.03 + 0.1,0 +
    • +     +     + + + + + Gun_IncendiaryLauncher + + 8 + 0.43 + 1 + 0.15 + 1.8 + 10 + 39500 + + + 65 + 30 + 7 + 10 + + + 1.0 + CombatExtended.Verb_ShootCE + true + Bullet_30x64mmFuel_Incendiary + 1.1 + 40 + 0 + Shot_IncendiaryLauncher + GunTail_Medium + 14 + + true + + + + 5 + 4 + AmmoSet_30x64mmFuel + + + FALSE + SuppressFire + + +
  • CE_AI_AOE
    • +
  • EliteGun
    • +     + CE_AdvancedLaunchers + false +     + + + Defs/ThingDef[defName="Gun_IncendiaryLauncher"] + +
  • + 1.16,1.16 + 0.1,-0.05 +
    • +     +     + + + + + Gun_LMG + + 8.7 + 0.56 + 1 + 0.05 + 1.37 + 12.9 + 31500 + + + 80 + 10 + 5 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.3 + 62 + 7 + 10 + Shot_CE_BattleRifle + GunTail_Medium + 9 + + true + + Mounted + + + 50 + 4.9 + AmmoSet_303British + + + 5 + FALSE + SuppressFire + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +
  • Bipod_LMG
    • +     + GasOperation + false +     + + + Defs/ThingDef[defName="Gun_LMG"] + +
  • + 1.35,1.18 + 0.13,-0.03 +
    • +     +     + + + + + Gun_ChargeRifle + + 3.0 + 0.36 + 1.10 + 0.08 + 1.20 + 7.00 + 49000 + + + 45 + 25 + 4 + 1 + 10 + + + 1.46 + CombatExtended.Verb_ShootCE + true + Bullet_6x24mmCharged + 1.0 + 55 + 5 + 6 + Shot_ChargeRifle + GunTail_Medium + 9 + + + 30 + 4 + AmmoSet_6x24mmCharged + + + 3 + TRUE + AimedShot + + +
  • CE_AI_AR
    • +
  • AdvancedGun
    • +     + ChargedShot +     + + + Defs/ThingDef[defName="Gun_ChargeRifle"] + +
  • + 1.03,1.03 + 0.05,0.0 +
    • +     +     + + + + + Gun_MiniTurret + + 0.36 + 1 + 0.07 + 0.69 + + + 0.91 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1.3 + 48 + 5 + 10 + GunShotA + GunTail_Light + 9 + Mounted + + + 100 + 7.8 + AmmoSet_556x45mmNATO + + + AimedShot + true + true + + + + + + + Defs/ThingDef[defName ="Gun_Minigun"]/weaponTags/li[.="GunHeavy"] + + + + Gun_Minigun + + 20.00 + 0.35 + 1 + 0.06 + 3.22 + 10 + 52000 + + + 110 + 11 + + + 0.97 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 2.1 + 62 + 50 + 2 + Shot_Minigun + GunTail_Medium + 9 + + + 250 + 9.2 + AmmoSet_762x51mmNATO + + + 25 + Snapshot + + +
  • CE_AI_Suppressive
    • +     +     + + + Defs/ThingDef[defName="Gun_Minigun"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrels + +     +     +     + + + Defs/ThingDef[defName="Gun_Minigun"]/equippedStatOffsets + + + + Defs/ThingDef[defName="Gun_Minigun"] + +
  • + 1.00,1.00 + 0.1,-0.15 + -0.2,0 + -30 +
    • +     +     + + + + + + + Defs/ThingDef[defName="Gun_DoomsdayRocket" or defName="Gun_TripleRocket"]/weaponTags/li[.="Gun"] + + + + Defs/ThingDef[defName="Gun_DoomsdayRocket" or defName="Gun_TripleRocket"] + ParentName + BaseMakeableGun + + + + Defs/ThingDef[defName="Gun_DoomsdayRocket" or defName="Gun_TripleRocket"]/statBases/MarketValue + + + + + + Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/thingClass + + CombatExtended.ProjectileCE_Explosive + + + + + Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/projectile + + + Bomb + 250 + 7.8 + 3.0 + 2.0 + 100 + + + + + + Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/comps + + Defs/ThingDef[defName="Bullet_DoomsdayRocket"] + + + + + + + + Defs/ThingDef[defName="Bullet_DoomsdayRocket"]/comps + +
  • + 1 + + 400 + +
    • +     +     + + + + + Gun_DoomsdayRocket + + 20.00 + 1.5 + 2.24 + 0.2 + 3.24 + 13.0 + 49500 + + + 125 + 8 + 5 + + + CombatExtended.Verb_ShootCEOneUse + true + Bullet_DoomsdayRocket + 2.1 + 48 + 1 + InfernoCannon_Fire + GunTail_Heavy + true + + true + + 14 + + + AimedShot + + +
  • CE_AI_AOE
    • +     + CE_AdvancedLaunchers + false +     + + + Defs/ThingDef[defName="Gun_DoomsdayRocket"] + +
  • + 1.45,1.45 + -0.15,0 +
    • +     +     + + + + + + + Defs/ThingDef[defName="Bullet_Rocket"]/thingClass + + CombatExtended.ProjectileCE_Explosive + + + + + Defs/ThingDef[defName="Bullet_Rocket"]/projectile + + + Bomb + 180 + 3.0 + 3.0 + 2.0 + 100 + + + + + + Defs/ThingDef[defName="Bullet_Rocket"]/comps + + Defs/ThingDef[defName="Bullet_Rocket"] + + + + + + + + Defs/ThingDef[defName="Bullet_Rocket"]/comps + +
  • + 1 + + 150 + +
    • +     +     + + + + + Gun_TripleRocket + + 12.00 + 1.5 + 1 + 0.2 + 2.20 + 13.00 + 43000 + + + 90 + 7 + 3 + + + CombatExtended.Verb_ShootCEOneUse + true + Bullet_Rocket + 1.9 + 40 + 20 + 3 + InfernoCannon_Fire + GunTail_Heavy + true + false + + true + + 14 + + + AimedShot + true + + +
  • CE_AI_AOE
    • +     + CE_AdvancedLaunchers + false +     + + + Defs/ThingDef[defName="Gun_TripleRocket"] + +
  • + 1.16,1.16 + -0.25,0 +
    • +     +     + + + + + Gun_ChargeBlasterHeavy + + 35.00 + 0.36 + 1 + 0.01 + 1.33 + 13.00 + + + 1.08 + CombatExtended.Verb_ShootCE + true + Bullet_12x64mmCharged + 2.3 + 75 + 6 + 20 + Shot_ChargeBlaster + GunTail_Heavy + 9 + + + 100 + 9.2 + AmmoSet_12x64mmCharged + + + 10 + SuppressFire + + +
  • CE_AI_Suppressive
    • +
  • NoSwitch
    • +     +     + + + Defs/ThingDef[@Name="Gun_ChargeBlasterHeavyBase"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + Gun_InfernoCannon + + 50.00 + 2.54 + 1 + 0.01 + 0.14 + 20.00 + + + 2.01 + CombatExtended.Verb_ShootCE + true + Bullet_80x256mmFuel_Incendiary + 3.5 + 86 + 1 + InfernoCannon_Fire + GunTail_Light + 14 + 5 + 5 + true + + + 1 + 2 + 9.8 + AmmoSet_80x256mmFuel + + + AimedShot + + +
  • CE_AI_Launcher
    • +
  • NoSwitch
    • +     +     + + + Defs/ThingDef[@Name="Gun_InfernoCannonBase"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + Gun_ThumpCannon + + 75.00 + 2.2 + 1 + 0.01 + 0.21 + 20.00 + + + 0.1 + CombatExtended.Verb_ShootCE + true + Bullet_164x284mmDemo + 3.3 + 42 + 1 + ThumpCannon_Fire + GunTail_Heavy + 14 + 3 + 4 + true + + + 1 + 2 + 9.8 + AmmoSet_164x284mmDemo + + + AimedShot + + +
  • CE_AI_Launcher
    • +
  • NoSwitch
    • +     +     + + + Defs/ThingDef[defName="Gun_ThumpCannon"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + Gun_ChargeLance + + 0.35 + 1 + 0.01 + 1 + 13.00 + + + 0.75 + CombatExtended.Verb_ShootCE + true + Bullet_5x35mmCharged + 1.3 + 62 + 1 + ChargeLance_Fire + GunTail_Heavy + 9 + + + 5 + 3 + AmmoSet_5x35mmCharged + + + AimedShot + + +
  • CE_AI_Rifle
    • +
  • NoSwitch
    • +     +     + + + Defs/ThingDef[defName="Gun_ChargeLance"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + Defs/ThingDef[defName="Gun_ChargeLance"] + +
  • + True +
    • +     +     + + + + Defs/ThingDef[defName="Gun_ChargeLance"] + ParentName + BaseGun + + + + Defs/ThingDef[defName="Gun_ChargeLance"]/costList + + + + Defs/ThingDef[defName="Gun_ChargeLance"]/recipeMaker + + + + Defs/ThingDef[defName="Gun_ChargeLance"]/statBases + + 1400 + + + + + Defs/ThingDef[defName="Gun_ChargeLance"] + + None + True + + + + + Defs/ThingDef[defName="Gun_ChargeLance"]/weaponTags/li[contains(.,"SpacerGun")] + + + + + + Gun_Needle + + 0.38 + 1 + 0.01 + 0.81 + 15.00 + + + 1.80 + CombatExtended.Verb_ShootCE + true + Bullet_5x100mmCaseless_Sabot + 1.3 + 75 + 1 + Shot_NeedleGun + GunTail_Heavy + 9 + + + 10 + 4 + AmmoSet_5x100mmCaseless + + + AimedShot + + +
  • CE_AI_Rifle
    • +
  • NoSwitch
    • +     +     + + + Defs/ThingDef[defName="Gun_Needle"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + Defs/ThingDef[defName="OrbitalTargeterBombardment" or defName="OrbitalTargeterPowerBeam"]/verbs/li/range + + 60 + + + + + + Defs/ThingDef[defName="Gun_SmokeLauncher"] + + + + Defs/ThingDef[defName="Gun_EmpLauncher"] +     \ No newline at end of file diff --git a/Patches/Core/ThingDefs_Misc/Weapons_RangedNeolithic.xml b/Patches/Core/ThingDefs_Misc/Weapons_RangedNeolithic.xml index a1b6f1130c..aa48f71477 100644 --- a/Patches/Core/ThingDefs_Misc/Weapons_RangedNeolithic.xml +++ b/Patches/Core/ThingDefs_Misc/Weapons_RangedNeolithic.xml @@ -130,7 +130,6 @@     - @@ -186,7 +185,7 @@ - + Defs/ThingDef[defName="Bow_Great"] diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Base.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Base.xml index 1b1b0acccd..b0e1d2ecb1 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Base.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Base.xml @@ -35,4 +35,4 @@ - + \ No newline at end of file diff --git a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML index 4676cb10a3..f5fbb37126 100644 --- a/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML +++ b/Patches/Det's Energy Weapons/EnergyBoltAmmoSet.XML @@ -7,73 +7,73 @@ Defs - - - - AmmoSet_LaserBoltPistol - - - Bullet_Bolt_LaserPistol - - + - - AmmoSet_LaserBoltRifle - - - Bullet_Bolt_LaserRifle - - + + AmmoSet_LaserBoltPistol + + + Bullet_Bolt_LaserPistol + + - - AmmoSet_LaserBoltSniperRifle - - - Bullet_Bolt_LaserSniperRifle - - - - - - - - Things/EnergyBolt - Graphic_Single - - - Bullet - 156 - false - - + + AmmoSet_LaserBoltRifle + + + Bullet_Bolt_LaserRifle + + - - Bullet_Bolt_LaserPistol - - 10 - 17.5 - 1 - - + + AmmoSet_LaserBoltSniperRifle + + + Bullet_Bolt_LaserSniperRifle + + - - Bullet_Bolt_LaserRifle - - 18 - 17.5 - 1 - - + + + + + Things/EnergyBolt + Graphic_Single + + + Bullet + 156 + false + + - - Bullet_Bolt_LaserSniperRifle - - 20 - 20.25 - 1 - - + + Bullet_Bolt_LaserPistol + + 10 + 17.5 + 1 + + + + + Bullet_Bolt_LaserRifle + + 18 + 17.5 + 1 + + + + + Bullet_Bolt_LaserSniperRifle + + 20 + 20.25 + 1 + + diff --git a/Patches/Det's Energy Weapons/Guns_Defs.XML b/Patches/Det's Energy Weapons/Guns_Defs.XML index a3dd908bb3..389216c12b 100644 --- a/Patches/Det's Energy Weapons/Guns_Defs.XML +++ b/Patches/Det's Energy Weapons/Guns_Defs.XML @@ -5,248 +5,248 @@
  • Det's Energy Weapons
    •  - + - -
  • - Defs/DamageDef[defName="EnergyDamage"] - ParentName - Flame -
    • + +
  • + Defs/DamageDef[defName="EnergyDamage"] + ParentName + Flame +
    • - -
  • - Energy_Rifle - - 6 - 9 - 1.30 - 0.07 - 1.10 - 1.3 - - - 1.24 - CombatExtended.Verb_ShootCE - True - Bullet_Bolt_LaserRifle - 1.2 - 52 - 3 - 12 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 20 - 4 - AmmoSet_LaserBoltRifle - - - AimedShot - True - 3 - -
    • - -
  • - Energy_Gattler - - 10 - 15.0 - 2.0 - 0.3 - 1.10 - 3 - - - 2.09 - CombatExtended.Verb_ShootCE - True - Bullet_Bolt_LaserRifle - 2 - 48 - 20 - 7 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 80 - 6 - AmmoSet_LaserBoltRifle - - - AimedShot - True - 10 - -
    • - -
  • - Energy_Revolver - - 1.8 - 3.0 - 1.0 - 0.1 - 1.10 - 0.5 - - - 1.6 - CombatExtended.Verb_ShootCE - True - Bullet_Bolt_LaserPistol - 0.6 - 12 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 9 - 3.50 - AmmoSet_LaserBoltPistol - - - AimedShot - FALSE - -
    • - -
  • - Energy_PrecisionRifle - - 8 - 13.0 - 1.70 - 0.04 - 2.10 - 0.50 - - - 1.4 - CombatExtended.Verb_ShootCE - True - Bullet_Bolt_LaserSniperRifle - 1.4 - 70 - Shot_EnergyRifle - GunTail_Medium - 9 - - - 12 - 4 - AmmoSet_LaserBoltSniperRifle - - - AimedShot - FALSE - -
    • - - -
  • - Defs/ThingDef[defName = "Energy_Rifle" or defName="Energy_PrecisionRifle"]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - - - - - -
  • - Defs/ThingDef[defName = "Energy_Gattler"]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - - - - - -
  • - Defs/ThingDef[defName = "Energy_Revolver"]/tools - - + +
  • + Energy_Rifle + + 6 + 9 + 1.30 + 0.07 + 1.10 + 1.3 + + + 1.24 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserRifle + 1.2 + 52 + 3 + 12 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 20 + 4 + AmmoSet_LaserBoltRifle + + + AimedShot + True + 3 + +
    • + +
  • + Energy_Gattler + + 10 + 15.0 + 2.0 + 0.3 + 1.10 + 3 + + + 2.09 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserRifle + 2 + 48 + 20 + 7 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 80 + 6 + AmmoSet_LaserBoltRifle + + + AimedShot + True + 10 + +
    • + +
  • + Energy_Revolver + + 1.8 + 3.0 + 1.0 + 0.1 + 1.10 + 0.5 + + + 1.6 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserPistol + 0.6 + 12 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 9 + 3.50 + AmmoSet_LaserBoltPistol + + + AimedShot + FALSE + +
    • + +
  • + Energy_PrecisionRifle + + 8 + 13.0 + 1.70 + 0.04 + 2.10 + 0.50 + + + 1.4 + CombatExtended.Verb_ShootCE + True + Bullet_Bolt_LaserSniperRifle + 1.4 + 70 + Shot_EnergyRifle + GunTail_Medium + 9 + + + 12 + 4 + AmmoSet_LaserBoltSniperRifle + + + AimedShot + FALSE + +
    • + + +
  • + Defs/ThingDef[defName = "Energy_Rifle" or defName="Energy_PrecisionRifle"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[defName = "Energy_Gattler"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[defName = "Energy_Revolver"]/tools + +
  • - - -
  • Blunt
    • - - 2 - 1.54 - 1.5 - 0.555 - Grip - - - - + + +
  • Blunt
    • +     + 2 + 1.54 + 1.5 + 0.555 + Grip + + + +     diff --git a/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml b/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml index 3bd4c81a35..8e329fad93 100644 --- a/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml +++ b/Patches/Divine Order/PawnKindDefs/Divine_Order_CE_Pawnkinds.xml @@ -31,7 +31,6 @@ -
  • Defs/PawnKindDef[defName="BotchJob_DivineOrderSharpshooter" or defName="BotchJob_DivineOrderInquisitor"] @@ -53,7 +52,6 @@
    • -
  • Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald" or defName="BotchJob_DivineOrderMerchant"] @@ -74,13 +72,26 @@
    • - + +
  • + Defs/PawnKindDef[defName="BotchJob_DivineOrderConscript"] + +
  • + + 30 + 40 + +
    • + + +
  • Defs/PawnKindDef[ defName="BotchJob_DivineOrderScout" or defName="BotchJob_DivineOrderSharpshooter" or defName="BotchJob_DivineOrderInquisitor" or - defName="BotchJob_DivineOrderMerchant"] + defName="BotchJob_DivineOrderMerchant" or + defName="BotchJob_DivineOrderConscript"] @@ -110,24 +121,11 @@
    • -
  • - -
  • Medieval Fantasy Themed Quest Rewards
    • - - - Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald"]/apparelRequired - -
  • CE_Apparel_TribalBackpack
    • -     -     - - Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald"] - - -
  • CE_Apparel_TribalBackpack
    • -     -     -     +
  • + Defs/PawnKindDef[defName="BotchJob_DivineOrderHerald"]/apparelRequired + +
  • CE_Apparel_TribalBackpack
    • + diff --git a/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml b/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml new file mode 100644 index 0000000000..8956a6ab4b --- /dev/null +++ b/Patches/Divine Order/Scenario/DivineOrder_CE_Scenario_Patch.xml @@ -0,0 +1,20 @@ + + + + + +
  • Divine Order
    • +     + + Defs/ScenarioDef[defName="BotchJob_DivineOrderStart"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_CrossbowBolt_Steel + 50 +
    • +     +     +     + +     \ No newline at end of file diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml index a8d03e2387..7b5823577a 100644 --- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml +++ b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Apparel.xml @@ -40,10 +40,26 @@ 5 + + +
  • + Defs/ThingDef[defName="BotchJob_DivineOrderZealotRobes"]/statBases + + 20 + 6 + +
    • + +
  • + Defs/ThingDef[defName="BotchJob_DivineOrderZealotRobes"]/statBases/StuffEffectMultiplierArmor + + 3 + +
  • - Defs/ThingDef[defName="BotchJob_DivineOrderHood"]/statBases + Defs/ThingDef[defName="BotchJob_DivineOrderHood" or defName="BotchJob_DivineOrderFurHood"]/statBases 3 0.5 @@ -51,7 +67,7 @@
  • - Defs/ThingDef[defName="BotchJob_DivineOrderHood"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[defName="BotchJob_DivineOrderHood" or defName="BotchJob_DivineOrderFurHood"]/statBases/StuffEffectMultiplierArmor 3 diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml index 388064711f..a96a6696d4 100644 --- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml +++ b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Armor.xml @@ -25,15 +25,15 @@
    • -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases +
  • + Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/ArmorRating_Sharp 1
    • -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases +
  • + Defs/ThingDef[defName="BotchJob_DivineOrderSkirmisherArmor"]/statBases/ArmorRating_Blunt 1.5 diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml index 4e3a2ec21b..84597f2466 100644 --- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml +++ b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Headgear.xml @@ -117,18 +117,18 @@
    • - +
  • Defs/ThingDef[defName="BotchJob_CrusaderHelmet"]/equippedStatOffsets - -0.4 - -0.20 + -0.4 + -0.20
    • - +
  • Defs/ThingDef[defName="BotchJob_HeraldHelmet"]/equippedStatOffsets diff --git a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml index bd9ce42059..17c62f04d5 100644 --- a/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml +++ b/Patches/Divine Order/ThingDef_Misc/Divine_Order_CE_Shield.xml @@ -9,98 +9,102 @@ -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/thingClass - - CombatExtended.Apparel_Shield - -
    • - - -
  • Defs/ThingDef[defName="BotchJob_DivineOrderShield"] - ParentName - ArmorSmithableBase -
    • - - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/apparel/layers - -
  • Shield
    • - - - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/apparel/bodyPartGroups - - -
  • LeftShoulder
    • - - - - - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/tools -
    • - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/comps/li[@Class="VFECore.CompProperties_Shield"] -
    • + + BotchJob_DivineOrderShield + + A sturdy, reinforced shield that bears the insignia of the Divine Order. + Medieval + + Things/Pawn/Humanlike/Apparel/Other/DivineOrderShield + Graphic_Single + 1 + CutoutComplex + + +
  • Shields
    • +     + +
  • Metallic
    • +     + 150 + + 5 + + + BotchJob_DivineOrderSmithing + +
  • FueledSmithy
    • +
  • ElectricSmithy
    • +     + + 8 + +     + + 3000 + 145 + 2.5 + 8 + 9 + 6 + + + -0.2 + -1 + -0.15 + -0.08 + -0.25 + -0.05 + 1.0 + + + +
  • KiteShield
    • +     + +
  • Soldier
    • +     + false + false +     + +
  • + CompColorable +
    • +     + +
  • + +
  • Hands
    • +
  • Arms
    • +
  • Shoulders
    • +
  • Torso
    • +
  • Neck
    • + + false + +     +     - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"] - -
  • - -
  • Hands
    • -
  • Arms
    • -
  • Shoulders
    • -
  • Torso
    • -
  • Neck
    • - - - - - - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/statBases - - 8 - 5 - -
    • - - - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"] - - - -0.2 - -1 - -0.15 - -0.08 - -0.25 - -0.05 - 1.0 -
    • - - -
  • - Defs/ThingDef[defName="BotchJob_DivineOrderShield"]/statBases/StuffEffectMultiplierArmor - - 2.5 - +
  • + +
  • Vanilla Expanded Framework
    • + + + Defs/PawnKindDef[defName="BotchJob_DivineOrderKnight"] + + +
  • BotchJob_DivineOrderShield
    • +     +     +     diff --git a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml index b096478544..7ce2a46383 100644 --- a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml +++ b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml @@ -201,6 +201,13 @@ + +
  • + Defs/ThingDef[defName="BotchJob_DivineOrderLongsword"]/weaponTags + +
  • CE_OneHandedWeapon
    • + + diff --git a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml index 9b3b709b88..626bd020ab 100644 --- a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml +++ b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Ranged.xml @@ -50,7 +50,7 @@
  • - Defs/ThingDef[defName="BotchJob_DivineOrderCrossbow"]/tools + Defs/ThingDef[defName="BotchJob_DivineOrderCrossbow" or defName="BotchJob_DivineOrderHandCrossbow"]/tools
  • @@ -133,6 +133,37 @@
    • + +
  • + BotchJob_DivineOrderHandCrossbow + + 2.5 + 1.2 + 0.35 + 1 + 1 + + + CombatExtended.Verb_ShootCE + True + Projectile_CrossbowBolt_Steel + 1 + 10 + Bow_Large + + + 1 + 3.5 + AmmoSet_CrossbowBolt + + + AimedShot + + +
  • CE_OneHandedWeapon
    • + + +     diff --git a/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml b/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml new file mode 100644 index 0000000000..eb1830ec47 --- /dev/null +++ b/Patches/Divine Order/TraderDefs/Divine_Order_CE_Traders.xml @@ -0,0 +1,88 @@ + + + + + +
  • Divine Order
    • +     + + + + +
  • + Defs/TraderKindDef[defName="BotchJob_DivineOrderBaseTrader"]/stockGenerators + +
  • + CannonBall + + 12 + 36 + + Expensive + + 1 + 3 + +
    • +
  • + MiniCannonBall + + 50 + 100 + + Normal + + 1 + 2 + +
    • +
  • + CE_PreIndustrialAmmo + + 300 + 1200 + + Cheap + + 2 + 4 + +
    • + + + +
  • + Defs/TraderKindDef[defName="BotchJob_DivineOrderCaravanTrader"]/stockGenerators + +
  • + MiniCannonBall + + 25 + 50 + + Normal + + 1 + 2 + +
    • +
  • + CE_PreIndustrialAmmo + + 100 + 200 + + Cheap + + 1 + 3 + +
    • + + + +     +     +     + +     \ No newline at end of file diff --git a/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml b/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml index d89f82fba8..292490b33f 100644 --- a/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml +++ b/Patches/Dubs Rimatomics/Turrets_Rimatomics.xml @@ -155,4 +155,4 @@ - + \ No newline at end of file diff --git a/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml b/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml index f5be31a876..9d1aee70ab 100644 --- a/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml +++ b/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml @@ -9,16 +9,16 @@ -
  • - Defs/ScenarioDef[defName="ESCP_SprigganScenario"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_Arrow_Stone - 100 -
    • - - +
  • + Defs/ScenarioDef[defName="ESCP_SprigganScenario"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + +     diff --git a/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml b/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml index a7ec17f327..681615c534 100644 --- a/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml +++ b/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml @@ -7,94 +7,94 @@ - -
  • - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 0 - -
    • - -
  • - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 0 - 0.80 - -
    • +
  • + Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases + + 0 + +
    • -
  • - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 30 - 40 - 1.0 - 1 - 0.03 - 0.06 - 0.12 - 100 - -
    • + +
  • + Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases + + 0 + 0.80 + +
    • -
  • - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 3 - -
    • +
  • + Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases + + 30 + 40 + 1.0 + 1 + 0.03 + 0.06 + 0.12 + 100 + +
    • -
  • - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 1 - -
    • +
  • + Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases + + 3 + +
    • + +
  • + Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases + + 1 + +
    • + +
  • + Defs/ThingDef[defName="RM_Mech_Matriarch"]/tools + + +
  • + + +
  • Blunt
    • + + 9 + 3.51 + HeadAttackTool + 6 + false + +
  • + + +
  • Blunt
    • + + 5 + 2.51 + LeftHand + 3 + true + +
  • + + +
  • Blunt
    • + + 5 + 2.51 + RightHand + 3 + true + + + + -
  • - Defs/ThingDef[defName="RM_Mech_Matriarch"]/tools - - -
  • - - -
  • Blunt
    • - - 9 - 3.51 - HeadAttackTool - 6 - false - -
  • - - -
  • Blunt
    • - - 5 - 2.51 - LeftHand - 3 - true - -
  • - - -
  • Blunt
    • - - 5 - 2.51 - RightHand - 3 - true - - - - -     - + \ No newline at end of file diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml index 006391059e..7b0d9695f8 100644 --- a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml +++ b/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Apparel.xml @@ -92,7 +92,7 @@ 1.5 - +
  • Defs/ThingDef[defName="DR_PsychicDress"]/statBases/StuffEffectMultiplierArmor diff --git a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml b/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml index 50660c813a..45eaaaea3e 100644 --- a/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml +++ b/Patches/Gloomy Dragonian Race/ThingDefs_Misc/DR_Weapon.xml @@ -66,7 +66,7 @@ 0.30
    • - +
  • Defs/ThingDef[defName="DR_Battlesword"]/tools @@ -125,7 +125,7 @@ 0.50
    • - +
  • Defs/ThingDef[defName="DR_BattleStaff"]/tools diff --git a/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml b/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml index b2b0efad83..a38ae380ae 100644 --- a/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml +++ b/Patches/Imperial Arsenal Royal Warcasket/RangedWeapons.xml @@ -8,97 +8,97 @@ - -
  • - Defs/ThingDef[defName = "RWC_Halberd"]/tools - - -
  • - - -
  • VFEP_GravityHammerAttack
    • - - 135 - 2.14 - 16 - Point - -
  • - - -
  • Cut
    • - - 75 - 1.34 - 16 - Blade - -
  • - Flame - 25 - 1 -
    • -     - - - - + +
  • + Defs/ThingDef[defName = "RWC_Halberd"]/tools + + +
  • + + +
  • VFEP_GravityHammerAttack
    • + + 135 + 2.14 + 16 + Point + +
  • + + +
  • Cut
    • + + 75 + 1.34 + 16 + Blade + +
  • + Flame + 25 + 1 +
    • +     + + + + - -
  • - /Defs/ThingDef[defName="RWC_Halberd"]/verbs -
    • + +
  • + /Defs/ThingDef[defName="RWC_Halberd"]/verbs +
    • -
  • - /Defs/ThingDef[defName="RWC_Halberd"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"] -
    • +
  • + /Defs/ThingDef[defName="RWC_Halberd"]/comps/li[@Class="CompToggleFireMode.CompProperties_ToggleFireMode"] +
    • -
  • - RWC_Halberd - - 15 - 1.2 - 0.08 - 2.20 - 0.40 - - - 1.19 - CombatExtended.Verb_ShootCE - True - Bullet_BoltXonus_Standard - 0.8 - 68 - Xonus_ShotHeavy - GunTail_Heavy - 16 - - - 25 - 3.0 - AmmoSet_BoltXonus - - - AimedShot - -
    • +
  • + RWC_Halberd + + 15 + 1.2 + 0.08 + 2.20 + 0.40 + + + 1.19 + CombatExtended.Verb_ShootCE + True + Bullet_BoltXonus_Standard + 0.8 + 68 + Xonus_ShotHeavy + GunTail_Heavy + 16 + + + 25 + 3.0 + AmmoSet_BoltXonus + + + AimedShot + +
    • -
  • - /Defs/ThingDef[defName="RWC_Halberd"] - - -90 - -
    • +
  • + /Defs/ThingDef[defName="RWC_Halberd"] + + -90 + +
    • -
  • - /Defs/ThingDef[defName="RWC_Halberd"] - -
  • - 1.9,1.9 - 0.0,0.0 -
    • - - +
  • + /Defs/ThingDef[defName="RWC_Halberd"] + +
  • + 1.9,1.9 + 0.0,0.0 +
    • + + diff --git a/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml b/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml index 5a05c8a2b2..b6125e02fd 100644 --- a/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml +++ b/Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml @@ -11,13 +11,13 @@ - -
  • - Defs/BodyDef[defName="Skeletal"]//*/groups - -
  • CoveredByNaturalArmor
    • - - + +
  • + Defs/BodyDef[defName="Skeletal"]//*/groups + +
  • CoveredByNaturalArmor
    • + +     diff --git a/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml b/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml index 49de2eacfa..f9cfed1802 100644 --- a/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml +++ b/Patches/Jernalk's Skeletal Legion/PawnKindDefs/Skeleton_PawnKind.xml @@ -7,8 +7,8 @@
  • Jernalk's Skeletal Legion (continued)
  • Jernalk's Skeletal Legion
    • - - + +
  • Defs/PawnKindDef[ @@ -108,7 +108,7 @@
    • - +     diff --git a/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml b/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml index b634cd0bb2..07fff395cf 100644 --- a/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml +++ b/Patches/Jernalk's Skeletal Legion/ThingDefs_Races/Skeletons.xml @@ -7,8 +7,8 @@
  • Jernalk's Skeletal Legion (continued)
  • Jernalk's Skeletal Legion
    • - - + +
  • Defs/ThingDef[@Name="BaseSkeleton"] diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml index e46a31e8e7..2664061325 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentAllies.xml @@ -8,204 +8,204 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentAllies" or defName="K4G_WW2FinnishMedicCoBelligerentAllies"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentAllies" or defName="K4G_WW2FinnishMedicCoBelligerentAllies"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishRiflemanCoBelligerentAllies" or - defName="K4G_WW2FinnishRiflemanSharedCoBelligerentAllies" or - defName="K4G_WW2FinnishInfantryCoBelligerentAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishRiflemanCoBelligerentAllies" or + defName="K4G_WW2FinnishRiflemanSharedCoBelligerentAllies" or + defName="K4G_WW2FinnishInfantryCoBelligerentAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishMachineGunnerCoBelligerentAllies" or - defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishMachineGunnerCoBelligerentAllies" or + defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentAllies"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FinlandPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentAllies"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FinlandPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentAllies" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FinlandPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentAllies" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FinlandPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishOfficerCoBelligerentAllies" or - defName="K4G_WW2FinnishOfficerSharedCoBelligerentAllies" or - defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentAllies" or - defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentAllies" or - defName="K4G_WW2FinnishLeaderCoBelligerentAllies" or - defName="K4G_WW2FinnishLeaderSharedCoBelligerentAllies" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2FinlandMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishOfficerCoBelligerentAllies" or + defName="K4G_WW2FinnishOfficerSharedCoBelligerentAllies" or + defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentAllies" or + defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentAllies" or + defName="K4G_WW2FinnishLeaderCoBelligerentAllies" or + defName="K4G_WW2FinnishLeaderSharedCoBelligerentAllies" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2FinlandMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml index 5f43707bde..05645bd8ba 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandCoBelligerentGermany.xml @@ -8,204 +8,204 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentGermany" or defName="K4G_WW2FinnishMedicCoBelligerentGermany"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishPrivateCoBelligerentGermany" or defName="K4G_WW2FinnishMedicCoBelligerentGermany"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishRiflemanCoBelligerentGermany" or - defName="K4G_WW2FinnishRiflemanSharedCoBelligerentGermany" or - defName="K4G_WW2FinnishInfantryCoBelligerentGermany" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishRiflemanCoBelligerentGermany" or + defName="K4G_WW2FinnishRiflemanSharedCoBelligerentGermany" or + defName="K4G_WW2FinnishInfantryCoBelligerentGermany" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishMachineGunnerCoBelligerentGermany" or - defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentGermany" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishMachineGunnerCoBelligerentGermany" or + defName="K4G_WW2FinnishMachineGunnerSharedCoBelligerentGermany" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentGermany"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishSniperCoBelligerentGermany"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentGermany"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FinlandPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierCoBelligerentGermany"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FinlandPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentGermany" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentGermany"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FinlandPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankCoBelligerentGermany" or defName="K4G_WW2FinnishAntiTankSharedCoBelligerentGermany"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FinlandPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishOfficerCoBelligerentGermany" or - defName="K4G_WW2FinnishOfficerSharedCoBelligerentGermany" or - defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentGermany" or - defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentGermany" or - defName="K4G_WW2FinnishLeaderCoBelligerentGermany" or - defName="K4G_WW2FinnishLeaderSharedCoBelligerentGermany" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2FinlandMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishOfficerCoBelligerentGermany" or + defName="K4G_WW2FinnishOfficerSharedCoBelligerentGermany" or + defName="K4G_WW2FinnishLogisticsOfficerCoBelligerentGermany" or + defName="K4G_WW2FinnishLogisticsOfficerSharedCoBelligerentGermany" or + defName="K4G_WW2FinnishLeaderCoBelligerentGermany" or + defName="K4G_WW2FinnishLeaderSharedCoBelligerentGermany" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2FinlandMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml index 296e5cca44..315b108376 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FinlandIndependent.xml @@ -8,209 +8,209 @@ - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishPrivateIndependent" or - defName="K4G_WW2FinnishPrivateSharedIndependent" or - defName="K4G_WW2FinnishMedicIndependent" - ] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishPrivateIndependent" or + defName="K4G_WW2FinnishPrivateSharedIndependent" or + defName="K4G_WW2FinnishMedicIndependent" + ] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishRiflemanIndependent" or - defName="K4G_WW2FinnishRiflemanSharedIndependent" or - defName="K4G_WW2FinnishInfantryIndependent" or - defName="K4G_WW2FinnishInfantrySharedIndependent" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishRiflemanIndependent" or + defName="K4G_WW2FinnishRiflemanSharedIndependent" or + defName="K4G_WW2FinnishInfantryIndependent" or + defName="K4G_WW2FinnishInfantrySharedIndependent" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishMachineGunnerIndependent" or - defName="K4G_WW2FinnishMachineGunnerSharedIndependent" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishMachineGunnerIndependent" or + defName="K4G_WW2FinnishMachineGunnerSharedIndependent" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishSniperIndependent" or defName="K4G_WW2FinnishSniperSharedIndependent"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2FinlandMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishSniperIndependent" or defName="K4G_WW2FinnishSniperSharedIndependent"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2FinlandMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierIndependent" or defName="K4G_WW2FinnishGrenadierSharedIndependent"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FinlandPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishGrenadierIndependent" or defName="K4G_WW2FinnishGrenadierSharedIndependent"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FinlandPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankIndependent" or defName="K4G_WW2FinnishAntiTankSharedIndependent"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FinlandPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FinnishAntiTankIndependent" or defName="K4G_WW2FinnishAntiTankSharedIndependent"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FinlandPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FinnishOfficerIndependent" or - defName="K4G_WW2FinnishOfficerSharedIndependent" or - defName="K4G_WW2FinnishLogisticsOfficerIndependent" or - defName="K4G_WW2FinnishLogisticsOfficerSharedIndependent" or - defName="K4G_WW2FinnishLeaderIndependent" or - defName="K4G_WW2FinnishLeaderSharedIndependent" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2FinlandMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FinnishOfficerIndependent" or + defName="K4G_WW2FinnishOfficerSharedIndependent" or + defName="K4G_WW2FinnishLogisticsOfficerIndependent" or + defName="K4G_WW2FinnishLogisticsOfficerSharedIndependent" or + defName="K4G_WW2FinnishLeaderIndependent" or + defName="K4G_WW2FinnishLeaderSharedIndependent" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2FinlandMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml index 48708006f1..87c447165e 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAllies.xml @@ -8,207 +8,206 @@ - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchPrivateAllies" or - defName="K4G_WW2FrenchMedicAllies" or - defName="K4G_WW2FrenchPrivateSharedAllies" - ] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchPrivateAllies" or + defName="K4G_WW2FrenchMedicAllies" or + defName="K4G_WW2FrenchPrivateSharedAllies" + ] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchRiflemanAllies" or - defName="K4G_WW2FrenchRiflemanSharedAllies" or - defName="K4G_WW2FrenchInfantryAllies" or - defName="K4G_WW2FrenchInfantrySharedAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchRiflemanAllies" or + defName="K4G_WW2FrenchRiflemanSharedAllies" or + defName="K4G_WW2FrenchInfantryAllies" or + defName="K4G_WW2FrenchInfantrySharedAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchMachineGunnerAllies" or - defName="K4G_WW2FrenchMachineGunnerSharedAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchMachineGunnerAllies" or + defName="K4G_WW2FrenchMachineGunnerSharedAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierAllies"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FrancePistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierAllies"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FrancePistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FrancePistol
    • - - - 3 - 5 - - - - - - - - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchOfficerAllies" or - defName="K4G_WW2FrenchLogisticsOfficerAllies" or - defName="K4G_WW2FrenchLeaderAllies" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2FranceMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FrancePistol
    • + + + 3 + 5 + + + + + + + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchOfficerAllies" or + defName="K4G_WW2FrenchLogisticsOfficerAllies" or + defName="K4G_WW2FrenchLeaderAllies" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2FranceMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml index ac79fd50ee..4cafa549bd 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceAxis.xml @@ -8,219 +8,219 @@ - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchPrivateAxis" or - defName="K4G_WW2FrenchPrivateSharedAxis" or - defName="K4G_WW2FrenchMedicAxis" or - defName="K4G_WW2FrenchMedicSharedAxis" - ] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchPrivateAxis" or + defName="K4G_WW2FrenchPrivateSharedAxis" or + defName="K4G_WW2FrenchMedicAxis" or + defName="K4G_WW2FrenchMedicSharedAxis" + ] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchRiflemanAxis" or - defName="K4G_WW2FrenchRiflemanSharedAxis" or - defName="K4G_WW2FrenchInfantryAxis" or - defName="K4G_WW2FrenchInfantrySharedAxis" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchRiflemanAxis" or + defName="K4G_WW2FrenchRiflemanSharedAxis" or + defName="K4G_WW2FrenchInfantryAxis" or + defName="K4G_WW2FrenchInfantrySharedAxis" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchMachineGunnerAxis" or - defName="K4G_WW2FrenchMachineGunnerSharedAxis" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchMachineGunnerAxis" or + defName="K4G_WW2FrenchMachineGunnerSharedAxis" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAxis" or defName="K4G_WW2FrenchGrenadierSharedAxis"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FrenchSniperSharedAxis" or defName="K4G_WW2FrenchGrenadierSharedAxis"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchGrenadierAxis" or - defName="K4G_WW2FrenchGrenadierSharedAxis" - ] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FrancePistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchGrenadierAxis" or + defName="K4G_WW2FrenchGrenadierSharedAxis" + ] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FrancePistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchAntiTankSharedAxis" or - defName="K4G_WW2FrenchAntiTankBSharedAxis" - ] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FrancePistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchAntiTankSharedAxis" or + defName="K4G_WW2FrenchAntiTankBSharedAxis" + ] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FrancePistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchOfficerAxis" or - defName="K4G_WW2FrenchOfficerSharedAxis" or - defName="K4G_WW2FrenchOfficerBSharedAxis" or - defName="K4G_WW2FrenchLogisticsOfficerAxis" or - defName="K4G_WW2FrenchLogisticsOfficerSharedAxis" or - defName="K4G_WW2FrenchLogisticsOfficerBSharedAxis" or - defName="K4G_WW2FrenchLeaderAxis" or - defName="K4G_WW2FrenchLeaderSharedAxis" or - defName="K4G_WW2FrenchLeaderBSharedAxis" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2FranceMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchOfficerAxis" or + defName="K4G_WW2FrenchOfficerSharedAxis" or + defName="K4G_WW2FrenchOfficerBSharedAxis" or + defName="K4G_WW2FrenchLogisticsOfficerAxis" or + defName="K4G_WW2FrenchLogisticsOfficerSharedAxis" or + defName="K4G_WW2FrenchLogisticsOfficerBSharedAxis" or + defName="K4G_WW2FrenchLeaderAxis" or + defName="K4G_WW2FrenchLeaderSharedAxis" or + defName="K4G_WW2FrenchLeaderBSharedAxis" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2FranceMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml index bece0ee0f0..a31cffa573 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_FranceExile.xml @@ -8,216 +8,216 @@ - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchPrivateExile" or - defName="K4G_WW2FrenchPrivateSharedExile" or - defName="K4G_WW2FrenchMedicExile" or - defName="K4G_WW2FrenchMedicSharedExile" - ] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchPrivateExile" or + defName="K4G_WW2FrenchPrivateSharedExile" or + defName="K4G_WW2FrenchMedicExile" or + defName="K4G_WW2FrenchMedicSharedExile" + ] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchRiflemanExile" or - defName="K4G_WW2FrenchRiflemanSharedExile" or - defName="K4G_WW2FrenchInfantryExile" or - defName="K4G_WW2FrenchInfantrySharedExile" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchRiflemanExile" or + defName="K4G_WW2FrenchRiflemanSharedExile" or + defName="K4G_WW2FrenchInfantryExile" or + defName="K4G_WW2FrenchInfantrySharedExile" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchMachineGunnerExile" or - defName="K4G_WW2FrenchMachineGunnerSharedExile" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchMachineGunnerExile" or + defName="K4G_WW2FrenchMachineGunnerSharedExile" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchSniperExile" or - defName="K4G_WW2FrenchSniperBSharedExile" - ] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2FranceMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchSniperExile" or + defName="K4G_WW2FrenchSniperBSharedExile" + ] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2FranceMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierExile" or defName="K4G_WW2FrenchGrenadierSharedExile"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FrancePistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FrenchGrenadierExile" or defName="K4G_WW2FrenchGrenadierSharedExile"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FrancePistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedExile" or defName="K4G_WW2FrenchAntiTankSharedExile"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2FrancePistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2FrenchAntiTankSharedExile" or defName="K4G_WW2FrenchAntiTankSharedExile"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2FrancePistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2FrenchOfficerExile" or - defName="K4G_WW2FrenchOfficerSharedExile" or - defName="K4G_WW2FrenchOfficerBSharedExile" or - defName="K4G_WW2FrenchLogisticsOfficerExile" or - defName="K4G_WW2FrenchLogisticsOfficerSharedExile" or - defName="K4G_WW2FrenchLogisticsOfficerBSharedExile" or - defName="K4G_WW2FrenchLeaderExile" or - defName="K4G_WW2FrenchLeaderSharedExile" or - defName="K4G_WW2FrenchLeaderBSharedExile" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2FranceMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2FrenchOfficerExile" or + defName="K4G_WW2FrenchOfficerSharedExile" or + defName="K4G_WW2FrenchOfficerBSharedExile" or + defName="K4G_WW2FrenchLogisticsOfficerExile" or + defName="K4G_WW2FrenchLogisticsOfficerSharedExile" or + defName="K4G_WW2FrenchLogisticsOfficerBSharedExile" or + defName="K4G_WW2FrenchLeaderExile" or + defName="K4G_WW2FrenchLeaderSharedExile" or + defName="K4G_WW2FrenchLeaderBSharedExile" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2FranceMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml index 9ba65cef12..71b826760b 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Germany.xml @@ -7,205 +7,205 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2GermanPrivate" or defName="K4G_WW2GermanMedic"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2GermanPrivate" or defName="K4G_WW2GermanMedic"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2GermanRifleman" or - defName="K4G_WW2GermanRiflemanShared" or - defName="K4G_WW2GermanInfantry" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2GermanyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2GermanRifleman" or + defName="K4G_WW2GermanRiflemanShared" or + defName="K4G_WW2GermanInfantry" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2GermanyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2GermanMachineGunner" or - defName="K4G_WW2GermanMachineGunnerShared" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2GermanyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2GermanMachineGunner" or + defName="K4G_WW2GermanMachineGunnerShared" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2GermanyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2GermanSniper"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2GermanyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2GermanSniper"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2GermanyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2GermanGrenadier"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2GermanyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2GermanGrenadier"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2GermanyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2GermanAntiTank" or defName="K4G_WW2GermanAntiTankShared"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2GermanyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2GermanAntiTank" or defName="K4G_WW2GermanAntiTankShared"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2GermanyPistol
    • + + + 3 + 5 + + + + + + + + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2GermanOfficer" or + defName="K4G_WW2GermanOfficerB" or + defName="K4G_WW2GermanLogisticsOfficer" or + defName="K4G_WW2GermanLogisticsOfficerB" or + defName="K4G_WW2GermanLeader" or + defName="K4G_WW2GermanLeaderB" + ] + +
  • + + 6 + 7 + + +
  • + 0.25 + + 20 + 120 + + +
  • K4GWW2GermanyMelee
    • + + +
  • + 0.075 + + 10 + 100 + + +
  • CE_FlareLauncher
    • + + + 1 + 3 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2GermanOfficer" or - defName="K4G_WW2GermanOfficerB" or - defName="K4G_WW2GermanLogisticsOfficer" or - defName="K4G_WW2GermanLogisticsOfficerB" or - defName="K4G_WW2GermanLeader" or - defName="K4G_WW2GermanLeaderB" - ] - -
  • - - 6 - 7 - - -
  • - 0.25 - - 20 - 120 - - -
  • K4GWW2GermanyMelee
    • - - -
  • - 0.075 - - 10 - 100 - - -
  • CE_FlareLauncher
    • - - - 1 - 3 - - - - - - -     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml index 4ea2da11ff..143fc9df4e 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxis.xml @@ -8,214 +8,214 @@ - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianPrivateAxis" or - defName="K4G_WW2ItalianMedicAxis" or - defName="K4G_WW2ItalianMedicSharedAxis" - ] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianPrivateAxis" or + defName="K4G_WW2ItalianMedicAxis" or + defName="K4G_WW2ItalianMedicSharedAxis" + ] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianRiflemanAxis" or - defName="K4G_WW2ItalianRiflemanSharedAxis" or - defName="K4G_WW2ItalianInfantryAxis" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianRiflemanAxis" or + defName="K4G_WW2ItalianRiflemanSharedAxis" or + defName="K4G_WW2ItalianInfantryAxis" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianMachineGunnerAxis" or - defName="K4G_WW2ItalianMachineGunnerSharedAxis" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianMachineGunnerAxis" or + defName="K4G_WW2ItalianMachineGunnerSharedAxis" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxis"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxis"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxis"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2ItalyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxis"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2ItalyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxis"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2ItalyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxis"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2ItalyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianOfficerAxis" or - defName="K4G_WW2ItalianOfficerSharedAxis" or - defName="K4G_WW2ItalianOfficerBAxis" or - defName="K4G_WW2ItalianOfficerBSharedAxis" or - defName="K4G_WW2ItalianLogisticsOfficerAxis" or - defName="K4G_WW2ItalianLogisticsOfficerSharedAxis" or - defName="K4G_WW2ItalianLogisticsOfficerBAxis" or - defName="K4G_WW2ItalianLogisticsOfficerBSharedAxis" or - defName="K4G_WW2ItalianLeaderAxis" or - defName="K4G_WW2ItalianLeaderSharedAxis" or - defName="K4G_WW2ItalianLeaderBAxis" or - defName="K4G_WW2ItalianLeaderBSharedAxis" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2ItalyMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianOfficerAxis" or + defName="K4G_WW2ItalianOfficerSharedAxis" or + defName="K4G_WW2ItalianOfficerBAxis" or + defName="K4G_WW2ItalianOfficerBSharedAxis" or + defName="K4G_WW2ItalianLogisticsOfficerAxis" or + defName="K4G_WW2ItalianLogisticsOfficerSharedAxis" or + defName="K4G_WW2ItalianLogisticsOfficerBAxis" or + defName="K4G_WW2ItalianLogisticsOfficerBSharedAxis" or + defName="K4G_WW2ItalianLeaderAxis" or + defName="K4G_WW2ItalianLeaderSharedAxis" or + defName="K4G_WW2ItalianLeaderBAxis" or + defName="K4G_WW2ItalianLeaderBSharedAxis" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2ItalyMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml index e9d16dc062..a0bd60d46e 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyAxisB.xml @@ -8,214 +8,214 @@ - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianPrivateAxisB" or - defName="K4G_WW2ItalianMedicAxisB" or - defName="K4G_WW2ItalianMedicSharedAxisB" - ] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianPrivateAxisB" or + defName="K4G_WW2ItalianMedicAxisB" or + defName="K4G_WW2ItalianMedicSharedAxisB" + ] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianRiflemanAxisB" or - defName="K4G_WW2ItalianRiflemanSharedAxisB" or - defName="K4G_WW2ItalianInfantryAxisB" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianRiflemanAxisB" or + defName="K4G_WW2ItalianRiflemanSharedAxisB" or + defName="K4G_WW2ItalianInfantryAxisB" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianMachineGunnerAxisB" or - defName="K4G_WW2ItalianMachineGunnerSharedAxisB" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianMachineGunnerAxisB" or + defName="K4G_WW2ItalianMachineGunnerSharedAxisB" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxisB"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedAxisB"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxisB"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2ItalyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierAxisB"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2ItalyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxisB"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2ItalyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankSharedAxisB"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2ItalyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianOfficerAxisB" or - defName="K4G_WW2ItalianOfficerSharedAxisB" or - defName="K4G_WW2ItalianOfficerBAxisB" or - defName="K4G_WW2ItalianOfficerBSharedAxisB" or - defName="K4G_WW2ItalianLogisticsOfficerAxisB" or - defName="K4G_WW2ItalianLogisticsOfficerSharedAxisB" or - defName="K4G_WW2ItalianLogisticsOfficerBAxisB" or - defName="K4G_WW2ItalianLogisticsOfficerBSharedAxisB" or - defName="K4G_WW2ItalianLeaderAxisB" or - defName="K4G_WW2ItalianLeaderSharedAxisB" or - defName="K4G_WW2ItalianLeaderBAxisB" or - defName="K4G_WW2ItalianLeaderBSharedAxisB" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2ItalyMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianOfficerAxisB" or + defName="K4G_WW2ItalianOfficerSharedAxisB" or + defName="K4G_WW2ItalianOfficerBAxisB" or + defName="K4G_WW2ItalianOfficerBSharedAxisB" or + defName="K4G_WW2ItalianLogisticsOfficerAxisB" or + defName="K4G_WW2ItalianLogisticsOfficerSharedAxisB" or + defName="K4G_WW2ItalianLogisticsOfficerBAxisB" or + defName="K4G_WW2ItalianLogisticsOfficerBSharedAxisB" or + defName="K4G_WW2ItalianLeaderAxisB" or + defName="K4G_WW2ItalianLeaderSharedAxisB" or + defName="K4G_WW2ItalianLeaderBAxisB" or + defName="K4G_WW2ItalianLeaderBSharedAxisB" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2ItalyMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml index 0ab4c8ad97..8b51a34faf 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_ItalyCoBelligerentAllies.xml @@ -8,205 +8,205 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianPrivateCoBelligerentAllies" or defName="K4G_WW2ItalianMedicCoBelligerentAllies"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianPrivateCoBelligerentAllies" or defName="K4G_WW2ItalianMedicCoBelligerentAllies"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianRiflemanCoBelligerentAllies" or - defName="K4G_WW2ItalianRiflemanSharedCoBelligerentAllies" or - defName="K4G_WW2ItalianInfantryCoBelligerentAllies" or - defName="K4G_WW2ItalianInfantrySharedCoBelligerentAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianRiflemanCoBelligerentAllies" or + defName="K4G_WW2ItalianRiflemanSharedCoBelligerentAllies" or + defName="K4G_WW2ItalianInfantryCoBelligerentAllies" or + defName="K4G_WW2ItalianInfantrySharedCoBelligerentAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianMachineGunnerCoBelligerentAllies" or - defName="K4G_WW2ItalianMachineGunnerSharedCoBelligerentAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianMachineGunnerCoBelligerentAllies" or + defName="K4G_WW2ItalianMachineGunnerSharedCoBelligerentAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedCoBelligerentAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2ItalyMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianSniperSharedCoBelligerentAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2ItalyMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierCoBelligerentAllies"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2ItalyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianGrenadierCoBelligerentAllies"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2ItalyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankCoBelligerentAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2ItalyPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2ItalianAntiTankCoBelligerentAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2ItalyPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2ItalianOfficerCoBelligerentAllies" or - defName="K4G_WW2ItalianOfficerBCoBelligerentAllies" or - defName="K4G_WW2ItalianLogisticsOfficerCoBelligerentAllies" or - defName="K4G_WW2ItalianLogisticsOfficerBCoBelligerentAllies" or - defName="K4G_WW2ItalianLeaderCoBelligerentAllies" or - defName="K4G_WW2ItalianLeaderBCoBelligerentAllies" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2ItalyMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2ItalianOfficerCoBelligerentAllies" or + defName="K4G_WW2ItalianOfficerBCoBelligerentAllies" or + defName="K4G_WW2ItalianLogisticsOfficerCoBelligerentAllies" or + defName="K4G_WW2ItalianLogisticsOfficerBCoBelligerentAllies" or + defName="K4G_WW2ItalianLeaderCoBelligerentAllies" or + defName="K4G_WW2ItalianLeaderBCoBelligerentAllies" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2ItalyMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml index eb3cdb4890..ee853bbcfc 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_Japan.xml @@ -8,204 +8,204 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2JapanesePrivate" or defName="K4G_WW2JapaneseMedic"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2JapanesePrivate" or defName="K4G_WW2JapaneseMedic"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2JapaneseRifleman" or - defName="K4G_WW2JapaneseRiflemanShared" or - defName="K4G_WW2JapaneseInfantry" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2JapanMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2JapaneseRifleman" or + defName="K4G_WW2JapaneseRiflemanShared" or + defName="K4G_WW2JapaneseInfantry" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2JapanMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2JapaneseMachineGunner" or - defName="K4G_WW2JapaneseMachineGunnerShared" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2JapanMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2JapaneseMachineGunner" or + defName="K4G_WW2JapaneseMachineGunnerShared" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2JapanMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2JapaneseSniper"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2JapanMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2JapaneseSniper"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2JapanMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2JapaneseGrenadier"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2JapanPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2JapaneseGrenadier"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2JapanPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2JapaneseAntiTank" or defName="K4G_WW2JapaneseAntiTankShared"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2JapanPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2JapaneseAntiTank" or defName="K4G_WW2JapaneseAntiTankShared"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2JapanPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2JapaneseOfficer" or - defName="K4G_WW2JapaneseOfficerB" or - defName="K4G_WW2JapaneseLogisticsOfficer" or - defName="K4G_WW2JapaneseLogisticsOfficerB" or - defName="K4G_WW2JapaneseLeader" or - defName="K4G_WW2JapaneseLeaderB" - ] - -
  • - - 6 - 7 - - -
  • - 0.25 - - 20 - 120 - - -
  • K4GWW2JapanMelee
    • - - -
  • - 0.075 - - 10 - 100 - - -
  • CE_FlareLauncher
    • - - - 1 - 3 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2JapaneseOfficer" or + defName="K4G_WW2JapaneseOfficerB" or + defName="K4G_WW2JapaneseLogisticsOfficer" or + defName="K4G_WW2JapaneseLogisticsOfficerB" or + defName="K4G_WW2JapaneseLeader" or + defName="K4G_WW2JapaneseLeaderB" + ] + +
  • + + 6 + 7 + + +
  • + 0.25 + + 20 + 120 + + +
  • K4GWW2JapanMelee
    • + + +
  • + 0.075 + + 10 + 100 + + +
  • CE_FlareLauncher
    • + + + 1 + 3 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml index 9211999ab5..0582608e31 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaAllies.xml @@ -8,207 +8,207 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianPrivateAllies" or defName="K4G_WW2RussianMedicAllies"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianPrivateAllies" or defName="K4G_WW2RussianMedicAllies"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2RussianRiflemanAllies" or - defName="K4G_WW2RussianRiflemanSharedAllies" or - defName="K4G_WW2RussianInfantryAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2RussiaMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2RussianRiflemanAllies" or + defName="K4G_WW2RussianRiflemanSharedAllies" or + defName="K4G_WW2RussianInfantryAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2RussiaMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2RussianMachineGunnerAllies" or - defName="K4G_WW2RussianMachineGunnerSharedAllies" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2RussiaMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2RussianMachineGunnerAllies" or + defName="K4G_WW2RussianMachineGunnerSharedAllies" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2RussiaMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianSniperAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2RussiaMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianSniperAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2RussiaMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierAllies"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2RussiaPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierAllies"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2RussiaPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankAllies" or defName="K4G_WW2RussianAntiTankSharedAllies"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2RussiaPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankAllies" or defName="K4G_WW2RussianAntiTankSharedAllies"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2RussiaPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2RussianOfficerAllies" or - defName="K4G_WW2RussianOfficerBAllies" or - defName="K4G_WW2RussianOfficerCAllies" or - defName="K4G_WW2RussianLogisticsOfficerAllies" or - defName="K4G_WW2RussianLogisticsOfficerBAllies" or - defName="K4G_WW2RussianLogisticsOfficerCAllies" or - defName="K4G_WW2RussianLeaderAllies" or - defName="K4G_WW2RussianLeaderBAllies" or - defName="K4G_WW2RussianLeaderCAllies" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2RussiaMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2RussianOfficerAllies" or + defName="K4G_WW2RussianOfficerBAllies" or + defName="K4G_WW2RussianOfficerCAllies" or + defName="K4G_WW2RussianLogisticsOfficerAllies" or + defName="K4G_WW2RussianLogisticsOfficerBAllies" or + defName="K4G_WW2RussianLogisticsOfficerCAllies" or + defName="K4G_WW2RussianLeaderAllies" or + defName="K4G_WW2RussianLeaderBAllies" or + defName="K4G_WW2RussianLeaderCAllies" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2RussiaMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml index 8bfd3db98a..190348a633 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_RussiaCoBelligerentGermany.xml @@ -8,207 +8,207 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianPrivateCoBelligerentGermany" or defName="K4G_WW2RussianMedicCoBelligerentGermany"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianPrivateCoBelligerentGermany" or defName="K4G_WW2RussianMedicCoBelligerentGermany"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2RussianRiflemanCoBelligerentGermany" or - defName="K4G_WW2RussianRiflemanSharedCoBelligerentGermany" or - defName="K4G_WW2RussianInfantryCoBelligerentGermany" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2RussiaMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2RussianRiflemanCoBelligerentGermany" or + defName="K4G_WW2RussianRiflemanSharedCoBelligerentGermany" or + defName="K4G_WW2RussianInfantryCoBelligerentGermany" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2RussiaMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2RussianMachineGunnerCoBelligerentGermany" or - defName="K4G_WW2RussianMachineGunnerSharedCoBelligerentGermany" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2RussiaMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2RussianMachineGunnerCoBelligerentGermany" or + defName="K4G_WW2RussianMachineGunnerSharedCoBelligerentGermany" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2RussiaMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianSniperCoBelligerentGermany"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2RussiaMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianSniperCoBelligerentGermany"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2RussiaMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierCoBelligerentGermany"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2RussiaPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianGrenadierCoBelligerentGermany"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2RussiaPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankCoBelligerentGermany" or defName="K4G_WW2RussianAntiTankSharedCoBelligerentGermany"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2RussiaPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2RussianAntiTankCoBelligerentGermany" or defName="K4G_WW2RussianAntiTankSharedCoBelligerentGermany"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2RussiaPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2RussianOfficerCoBelligerentGermany" or - defName="K4G_WW2RussianOfficerBCoBelligerentGermany" or - defName="K4G_WW2RussianOfficerCCoBelligerentGermany" or - defName="K4G_WW2RussianLogisticsOfficerCoBelligerentGermany" or - defName="K4G_WW2RussianLogisticsOfficerBCoBelligerentGermany" or - defName="K4G_WW2RussianLogisticsOfficerCCoBelligerentGermany" or - defName="K4G_WW2RussianLeaderCoBelligerentGermany" or - defName="K4G_WW2RussianLeaderBCoBelligerentGermany" or - defName="K4G_WW2RussianLeaderCCoBelligerentGermany" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2RussiaMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2RussianOfficerCoBelligerentGermany" or + defName="K4G_WW2RussianOfficerBCoBelligerentGermany" or + defName="K4G_WW2RussianOfficerCCoBelligerentGermany" or + defName="K4G_WW2RussianLogisticsOfficerCoBelligerentGermany" or + defName="K4G_WW2RussianLogisticsOfficerBCoBelligerentGermany" or + defName="K4G_WW2RussianLogisticsOfficerCCoBelligerentGermany" or + defName="K4G_WW2RussianLeaderCoBelligerentGermany" or + defName="K4G_WW2RussianLeaderBCoBelligerentGermany" or + defName="K4G_WW2RussianLeaderCCoBelligerentGermany" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2RussiaMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml index 1a33646512..3759dc4c66 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedKingdom.xml @@ -8,204 +8,204 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2BritishPrivate" or defName="K4G_WW2BritishMedic"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2BritishPrivate" or defName="K4G_WW2BritishMedic"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2BritishRifleman" or - defName="K4G_WW2BritishRiflemanShared" or - defName="K4G_WW2BritishInfantry" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2UnitedKingdomMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2BritishRifleman" or + defName="K4G_WW2BritishRiflemanShared" or + defName="K4G_WW2BritishInfantry" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2UnitedKingdomMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2BritishMachineGunner" or - defName="K4G_WW2BritishMachineGunnerShared" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2UnitedKingdomMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2BritishMachineGunner" or + defName="K4G_WW2BritishMachineGunnerShared" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2UnitedKingdomMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2BritishSniper"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2UnitedKingdomMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2BritishSniper"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2UnitedKingdomMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2BritishGrenadier"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2UnitedKingdomPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2BritishGrenadier"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2UnitedKingdomPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2BritishAntiTank" or defName="K4G_WW2BritishAntiTankShared"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2UnitedKingdomPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2BritishAntiTank" or defName="K4G_WW2BritishAntiTankShared"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2UnitedKingdomPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2BritishOfficer" or - defName="K4G_WW2BritishOfficerB" or - defName="K4G_WW2BritishLogisticsOfficer" or - defName="K4G_WW2BritishLogisticsOfficerB" or - defName="K4G_WW2BritishLeader" or - defName="K4G_WW2BritishLeaderB" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2UnitedStatesMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2BritishOfficer" or + defName="K4G_WW2BritishOfficerB" or + defName="K4G_WW2BritishLogisticsOfficer" or + defName="K4G_WW2BritishLogisticsOfficerB" or + defName="K4G_WW2BritishLeader" or + defName="K4G_WW2BritishLeaderB" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2UnitedStatesMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml index 3916debc8d..2fb4df6a39 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_UnitedStates.xml @@ -8,204 +8,204 @@ - -
  • - Defs/PawnKindDef[defName="K4G_WW2AmericanPrivate" or defName="K4G_WW2AmericanMedic"] - -
  • - - 4 - 6 - -
    • - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2AmericanPrivate" or defName="K4G_WW2AmericanMedic"] + +
  • + + 4 + 6 + +
    • + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2AmericanRifleman" or - defName="K4G_WW2AmericanRiflemanShared" or - defName="K4G_WW2AmericanInfantry" - ] - -
  • - - 6 - 8 - - -
  • - 0.25 - - 75 - 185 - - -
  • K4GWW2UnitedStatesMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2AmericanRifleman" or + defName="K4G_WW2AmericanRiflemanShared" or + defName="K4G_WW2AmericanInfantry" + ] + +
  • + + 6 + 8 + + +
  • + 0.25 + + 75 + 185 + + +
  • K4GWW2UnitedStatesMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2AmericanMachineGunner" or - defName="K4G_WW2AmericanMachineGunnerShared" - ] - -
  • - - 6 - 8 - - -
  • - 0.5 - - 85 - 195 - - -
  • K4GWW2UnitedStatesMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2AmericanMachineGunner" or + defName="K4G_WW2AmericanMachineGunnerShared" + ] + +
  • + + 6 + 8 + + +
  • + 0.5 + + 85 + 195 + + +
  • K4GWW2UnitedStatesMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2AmericanSniper"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 95 - 195 - - -
  • K4GWW2UnitedStatesMelee
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2AmericanSniper"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 95 + 195 + + +
  • K4GWW2UnitedStatesMelee
    • + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2AmericanGrenadier"] - -
  • - - 8 - 14 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2UnitedStatesPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2AmericanGrenadier"] + +
  • + + 8 + 14 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2UnitedStatesPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[defName="K4G_WW2AmericanAntiTank" or defName="K4G_WW2AmericanAntiTankShared"] - -
  • - - 6 - 8 - - -
  • - 0.75 - - 25 - 100 - - -
  • K4GWW2UnitedStatesPistol
    • - - - 3 - 5 - - - - - - + +
  • + Defs/PawnKindDef[defName="K4G_WW2AmericanAntiTank" or defName="K4G_WW2AmericanAntiTankShared"] + +
  • + + 6 + 8 + + +
  • + 0.75 + + 25 + 100 + + +
  • K4GWW2UnitedStatesPistol
    • + + + 3 + 5 + + + + + + - -
  • - Defs/PawnKindDef[ - defName="K4G_WW2AmericanOfficer" or - defName="K4G_WW2AmericanOfficerB" or - defName="K4G_WW2AmericanLogisticsOfficer" or - defName="K4G_WW2AmericanLogisticsOfficerB" or - defName="K4G_WW2AmericanLeader" or - defName="K4G_WW2AmericanLeaderB" - ] - -
  • - - 5 - 6 - - -
  • - 0.33 - - 20 - 120 - - -
  • K4GWW2UnitedStatesMelee
    • - - -
  • - 0.1 - - 100 - 300 - - -
  • CE_FlareLauncher
    • - - - 2 - 4 - - - - - - + +
  • + Defs/PawnKindDef[ + defName="K4G_WW2AmericanOfficer" or + defName="K4G_WW2AmericanOfficerB" or + defName="K4G_WW2AmericanLogisticsOfficer" or + defName="K4G_WW2AmericanLogisticsOfficerB" or + defName="K4G_WW2AmericanLeader" or + defName="K4G_WW2AmericanLeaderB" + ] + +
  • + + 5 + 6 + + +
  • + 0.33 + + 20 + 120 + + +
  • K4GWW2UnitedStatesMelee
    • + + +
  • + 0.1 + + 100 + 300 + + +
  • CE_FlareLauncher
    • + + + 2 + 4 + + + + + +     diff --git a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml index c88d75962f..0a6cf7fa66 100644 --- a/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml +++ b/Patches/K4G Rimworld War 2/PawnKinds_Defs/PawnKinds_WW2Base.xml @@ -8,19 +8,19 @@ - + -
  • - Defs/PawnKindDef[@Name="WW2SoldierBase"] - -
  • - - 4 - 6 - -
    • - - +
  • + Defs/PawnKindDef[@Name="WW2SoldierBase"] + +
  • + + 4 + 6 + +
    • + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml index e04c3b5f07..c8f78f037f 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/BaseWeapons.xml @@ -8,198 +8,197 @@ - + -
  • - Defs/ThingDef[ - @Name="WW2ServiceRevolver" or - @Name="WW2ServicePistol" or - @Name="WW2ServiceSemiAutomaticPistol" or - @Name="WW2ServiceRifle" or - @Name="WW2ServiceSemiAutomaticRifle" or - @Name="WW2ServiceCarbine" or - @Name="WW2ServiceShotgun" or - @Name="WW2ServiceSMG" or - @Name="WW2ServiceLMG" or - @Name="WW2ServiceAutomaticRifle" or - @Name="WW2ServiceSniperRifle" or - @Name="WW2ServiceSemiAutomaticSniperRifle" or - @Name="WW2ServiceAntiTankRifle" - ]/verbs -
    • +
  • + Defs/ThingDef[ + @Name="WW2ServiceRevolver" or + @Name="WW2ServicePistol" or + @Name="WW2ServiceSemiAutomaticPistol" or + @Name="WW2ServiceRifle" or + @Name="WW2ServiceSemiAutomaticRifle" or + @Name="WW2ServiceCarbine" or + @Name="WW2ServiceShotgun" or + @Name="WW2ServiceSMG" or + @Name="WW2ServiceLMG" or + @Name="WW2ServiceAutomaticRifle" or + @Name="WW2ServiceSniperRifle" or + @Name="WW2ServiceSemiAutomaticSniperRifle" or + @Name="WW2ServiceAntiTankRifle" + ]/verbs +
    • + - +
  • + Defs/ThingDef[ + @Name="WW2ServiceRevolver" or + @Name="WW2SingleShotPistol" or + @Name="WW2ServicePistol" or + @Name="WW2ServiceSemiAutomaticPistol" + ] + + +
  • CE_OneHandedWeapon
    • + + + -
  • - Defs/ThingDef[ - @Name="WW2ServiceRevolver" or - @Name="WW2SingleShotPistol" or - @Name="WW2ServicePistol" or - @Name="WW2ServiceSemiAutomaticPistol" - ] - - -
  • CE_OneHandedWeapon
    • - - - + - + - +
  • + Defs/ThingDef[ + @Name="WW2ServiceRevolver" or + @Name="WW2SingleShotPistol" or + @Name="WW2ServicePistol" or + @Name="WW2ServiceSemiAutomaticPistol" + ]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + + + + -
  • - Defs/ThingDef[ - @Name="WW2ServiceRevolver" or - @Name="WW2SingleShotPistol" or - @Name="WW2ServicePistol" or - @Name="WW2ServiceSemiAutomaticPistol" - ]/tools - - -
  • - - -
  • Blunt
    • - - 2 - 1.54 - 1.5 - 0.555 - Grip - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.555 - Muzzle - - - - + - +
  • + + Defs/ThingDef[ + @Name="WW2ServiceRifle" or + @Name="WW2ServiceSemiAutomaticRifle" or + @Name="WW2ServiceSMG" or + @Name="WW2ServiceLMG" or + @Name="WW2ServiceCarbine" or + @Name="WW2ServiceShotgun" or + @Name="WW2ServiceAutomaticRifle" or + @Name="WW2ServiceSniperRifle" or + @Name="WW2ServiceSemiAutomaticSniperRifle" + ]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + -
  • - - Defs/ThingDef[ - @Name="WW2ServiceRifle" or - @Name="WW2ServiceSemiAutomaticRifle" or - @Name="WW2ServiceSMG" or - @Name="WW2ServiceLMG" or - @Name="WW2ServiceCarbine" or - @Name="WW2ServiceShotgun" or - @Name="WW2ServiceAutomaticRifle" or - @Name="WW2ServiceSniperRifle" or - @Name="WW2ServiceSemiAutomaticSniperRifle" - ]/tools - - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - - - - + +
  • + Defs/ThingDef[ + @Name="WW2ServiceRifleBayonet" or + @Name="WW2ServiceSemiAutomaticRifleBayonet" or + @Name="WW2ServiceShotgunBayonet" + ]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Cut
    • + + 17 + 2.14 + 1.688 + 0.5 + Barrel + +
  • + + +
  • Stab
    • + + 6 + 1.49 + 2.16 + 1.44 + Muzzle + + + + - -
  • - Defs/ThingDef[ - @Name="WW2ServiceRifleBayonet" or - @Name="WW2ServiceSemiAutomaticRifleBayonet" or - @Name="WW2ServiceShotgunBayonet" - ]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Cut
    • - - 17 - 2.14 - 1.688 - 0.5 - Barrel - -
  • - - -
  • Stab
    • - - 6 - 1.49 - 2.16 - 1.44 - Muzzle - - - - - - -
  • - Defs/ThingDef[@Name="WW2ServiceAntiTankRifle"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - - - - + +
  • + Defs/ThingDef[@Name="WW2ServiceAntiTankRifle"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + + + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml index f4119e7fd7..b5ee6d22e8 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/BritishWeapons_Ranged.xml @@ -8,434 +8,434 @@ - + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRocketLauncher"]/tools - - -
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel - - - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRocketLauncher"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + + + + - + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolver"] - - - 0.7 - 0.18 - 1.2 - 2.2 - 1.1 - 0.50 - - -
  • - 2.57 - CombatExtended.Verb_ShootCE - true - Bullet_455Webley_FMJ - 0.6 - 12 - Shot_Revolver - GunTail_Light - 9 -
    • - - -
  • - 6 - 4 - AmmoSet_455Webley -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolver"] + + + 0.7 + 0.18 + 1.2 + 2.2 + 1.1 + 0.50 + + +
  • + 2.57 + CombatExtended.Verb_ShootCE + true + Bullet_455Webley_FMJ + 0.6 + 12 + Shot_Revolver + GunTail_Light + 9 +
    • + + +
  • + 6 + 4 + AmmoSet_455Webley +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolverB"] - - - 0.7 - 0.18 - 1.2 - 2.2 - 1.1 - 0.50 - - -
  • - 2.62 - CombatExtended.Verb_ShootCE - true - Bullet_38SW_FMJ - 0.6 - 12 - Shot_Revolver - GunTail_Light - 9 -
    • - - -
  • - 6 - 4 - AmmoSet_38SW -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRevolverB"] + + + 0.7 + 0.18 + 1.2 + 2.2 + 1.1 + 0.50 + + +
  • + 2.62 + CombatExtended.Verb_ShootCE + true + Bullet_38SW_FMJ + 0.6 + 12 + Shot_Revolver + GunTail_Light + 9 +
    • + + +
  • + 6 + 4 + AmmoSet_38SW +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifle"] - - - 4.19 - 1.17 - 1 - 0.02 - 1.68 - 12.60 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_303British_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 10 - 4.3 - AmmoSet_303British -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifle"] + + + 4.19 + 1.17 + 1 + 0.02 + 1.68 + 12.60 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 10 + 4.3 + AmmoSet_303British +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifleBayonet"] - - - 4.30 - 1.17 - 1 - 0.02 - 1.74 - 12.80 - - -
  • - 2.03 - CombatExtended.Verb_ShootCE - true - Bullet_303British_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 10 - 4.3 - AmmoSet_303British -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceRifleBayonet"] + + + 4.30 + 1.17 + 1 + 0.02 + 1.74 + 12.80 + + +
  • + 2.03 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 10 + 4.3 + AmmoSet_303British +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMG"] - - - 4.3 - 0.36 - 1.00 - 0.14 - 1.21 - 8.43 - - -
  • - 0.95 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 24 - 5 - 6 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 32 - 4 - AmmoSet_9x19mmPara -
    • -
  • - Snapshot - 4 -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMG"] + + + 4.3 + 0.36 + 1.00 + 0.14 + 1.21 + 8.43 + + +
  • + 0.95 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 24 + 5 + 6 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 32 + 4 + AmmoSet_9x19mmPara +
    • +
  • + Snapshot + 4 +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMGB"] - - - 4.3 - 0.36 - 1.00 - 0.16 - 0.80 - 8.43 - - -
  • - 0.95 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 24 - 5 - 6 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 32 - 4 - AmmoSet_9x19mmPara -
    • -
  • - Snapshot - 4 -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"] - - - 8.7 - 0.56 - 1 - 0.05 - 1.37 - 12.9 - - -
  • - 1.38 - CombatExtended.Verb_ShootCE - true - Bullet_303British_FMJ - 1.3 - 62 - 7 - 10 - Shot_CE_BattleRifle - GunTail_Medium - 9 - - true - - Mounted -
    • - - -
  • - 50 - 4.9 - AmmoSet_303British -
    • -
  • - 5 - FALSE - SuppressFire -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSMGB"] + + + 4.3 + 0.36 + 1.00 + 0.16 + 0.80 + 8.43 + + +
  • + 0.95 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 24 + 5 + 6 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 32 + 4 + AmmoSet_9x19mmPara +
    • +
  • + Snapshot + 4 +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"]/weaponTags - -
  • Bipod_LMG
    • - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"] + + + 8.7 + 0.56 + 1 + 0.05 + 1.37 + 12.9 + + +
  • + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.3 + 62 + 7 + 10 + Shot_CE_BattleRifle + GunTail_Medium + 9 + + true + + Mounted +
    • + + +
  • + 50 + 4.9 + AmmoSet_303British +
    • +
  • + 5 + FALSE + SuppressFire +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSniperRifle"] - - - 5.19 - 1.17 - 2.21 - 0.02 - 1.68 - 12.60 - - -
  • - 2 - CombatExtended.Verb_ShootCE - true - Bullet_303British_FMJ - 1.27 - 75 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 10 - True - 0.85 - AmmoSet_303British -
    • -
  • - AimedShot -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceLMG"]/weaponTags + +
  • Bipod_LMG
    • + + - -
  • - K4G_Gun_WW2BritishServiceRocketLauncher - - 15.00 - 1.50 - 1.00 - 0.2 - 2.49 - 10.90 - - - CombatExtended.Verb_ShootCE - true - Bullet_83mmPIATGrenade_HEAT - 1.9 - 20 - InfernoCannon_Fire - GunTail_Heavy - 14 - true - false - - true - - - - 1 - 5.6 - AmmoSet_83mmPIATGrenade - - - AimedShot - -
    • + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceSniperRifle"] + + + 5.19 + 1.17 + 2.21 + 0.02 + 1.68 + 12.60 + + +
  • + 2 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.27 + 75 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 10 + True + 0.85 + AmmoSet_303British +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"] - + +
  • + K4G_Gun_WW2BritishServiceRocketLauncher - 1.0 - 0.01 - 2.89 - 22.0 - 20.30 - 0.58 + 15.00 + 1.50 + 1.00 + 0.2 + 2.49 + 10.90 - -
  • - CombatExtended.Verb_ShootCE - true - Bullet_55Boys_FMJ - 2.8 - 62 - HeavyMG - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_55Boys -
    • -
  • - AimedShot -
    • -     - - + + CombatExtended.Verb_ShootCE + true + Bullet_83mmPIATGrenade_HEAT + 1.9 + 20 + InfernoCannon_Fire + GunTail_Heavy + 14 + true + false + + true + + + + 1 + 5.6 + AmmoSet_83mmPIATGrenade + + + AimedShot + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"] + + + 1.0 + 0.01 + 2.89 + 22.0 + 20.30 + 0.58 + + +
  • + CombatExtended.Verb_ShootCE + true + Bullet_55Boys_FMJ + 2.8 + 62 + HeavyMG + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_55Boys +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"]/weaponTags - -
  • Bipod_ATR
    • - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2BritishServiceAntiTankRifle"]/weaponTags + +
  • Bipod_ATR
    • + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml index 8d547ade66..902b82b91b 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/FinnishWeapons_Ranged.xml @@ -8,532 +8,531 @@ - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServicePistol"] - - - 0.87 - 0.38 - 0.7 - 0.16 - 1.07 - 1.9 - - -
  • - 2.57 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.5 - 12 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 8 - 4 - AmmoSet_9x19mmPara -
    • -
  • - AimedShot -
    • -     - - + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleB"] - - - 4.00 - 1.17 - 1.00 - 0.05 - 1.68 - 12.32 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServicePistol"] + + + 0.87 + 0.38 + 0.7 + 0.16 + 1.07 + 1.9 + + +
  • + 2.57 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.5 + 12 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 8 + 4 + AmmoSet_9x19mmPara +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleC"] - - - 4.00 - 1.17 - 1.00 - 0.05 - 1.63 - 12.32 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleB"] + + + 4.00 + 1.17 + 1.00 + 0.05 + 1.68 + 12.32 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleC"] + + + 4.00 + 1.17 + 1.00 + 0.05 + 1.63 + 12.32 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonet"] - - - 4.2 - 1.17 - 1.00 - 0.05 - 1.68 - 12.5 - - -
  • - 2 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonet"] + + + 4.2 + 1.17 + 1.00 + 0.05 + 1.68 + 12.5 + + +
  • + 2 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetB"] - - - 4.2 - 1.17 - 1.00 - 0.05 - 1.68 - 12.5 - - -
  • - 2 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetB"] + + + 4.2 + 1.17 + 1.00 + 0.05 + 1.68 + 12.5 + + +
  • + 2 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetC"] - - - 4.2 - 1.17 - 1.00 - 0.05 - 1.68 - 12.5 - - -
  • - 2 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceRifleBayonetC"] + + + 4.2 + 1.17 + 1.00 + 0.05 + 1.68 + 12.5 + + +
  • + 2 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMG"] - - - 3.63 - 0.36 - 1.00 - 0.14 - 1.21 - 8.43 - - -
  • - 1.22 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 23 - 6 - 4 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 71 - 4.9 - AmmoSet_9x19mmPara -
    • -
  • - Snapshot - 3 -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMG"] + + + 3.63 + 0.36 + 1.00 + 0.14 + 1.21 + 8.43 + + +
  • + 1.22 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 23 + 6 + 4 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 71 + 4.9 + AmmoSet_9x19mmPara +
    • +
  • + Snapshot + 3 +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMGB"] - - - 3.9 - 0.36 - 1.00 - 0.14 - 1.21 - 7 - - -
  • - 0.8 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 23 - 6 - 7 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 36 - 4 - AmmoSet_9x19mmPara -
    • -
  • - Snapshot - 3 -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSMGB"] + + + 3.9 + 0.36 + 1.00 + 0.14 + 1.21 + 7 + + +
  • + 0.8 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 23 + 6 + 7 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 36 + 4 + AmmoSet_9x19mmPara +
    • +
  • + Snapshot + 3 +
    • +     + + - + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"] - - - 8.72 - 0.56 - 1 - 0.05 - 1.43 - 14.3 - - -
  • - 1.32 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.3 - 62 - 7 - 5 - Shot_Minigun - GunTail_Medium - 9 - - true - - Mounted -
    • - - -
  • - 20 - 4.3 - AmmoSet_762x54mmR -
    • -
  • - 5 - FALSE - SuppressFire -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"] + + + 8.72 + 0.56 + 1 + 0.05 + 1.43 + 14.3 + + +
  • + 1.32 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.3 + 62 + 7 + 5 + Shot_Minigun + GunTail_Medium + 9 + + true + + Mounted +
    • + + +
  • + 20 + 4.3 + AmmoSet_762x54mmR +
    • +
  • + 5 + FALSE + SuppressFire +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"]/weaponTags - -
  • Bipod_LMG
    • - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceLMG"]/weaponTags + +
  • Bipod_LMG
    • + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifle"] - - - 4.1 - 1.17 - 2.3 - 0.05 - 1.53 - 11.00 - - -
  • - 2.1 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.5 - 75 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - True - 0.85 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifle"] + + + 4.1 + 1.17 + 2.3 + 0.05 + 1.53 + 11.00 + + +
  • + 2.1 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.5 + 75 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + True + 0.85 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleB"] - - - 4.1 - 1.17 - 2.3 - 0.05 - 1.53 - 11.00 - - -
  • - 2.1 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.5 - 75 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - True - 0.85 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleB"] + + + 4.1 + 1.17 + 2.3 + 0.05 + 1.53 + 11.00 + + +
  • + 2.1 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.5 + 75 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + True + 0.85 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleC"] - - - 4.1 - 1.17 - 2.3 - 0.05 - 1.48 - 11.00 - - -
  • - 2.1 - CombatExtended.Verb_ShootCE - true - Bullet_762x54mmR_FMJ - 1.5 - 75 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - True - 0.85 - AmmoSet_762x54mmR -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceSniperRifleC"] + + + 4.1 + 1.17 + 2.3 + 0.05 + 1.48 + 11.00 + + +
  • + 2.1 + CombatExtended.Verb_ShootCE + true + Bullet_762x54mmR_FMJ + 1.5 + 75 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + True + 0.85 + AmmoSet_762x54mmR +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceAntiTankRifle"] - - - 1.0 - 0.01 - 2.79 - 24.0 - 20.80 - 0.58 - - -
  • - 2.52 - CombatExtended.Verb_ShootCE - true - Bullet_20x138mmB_AP - 2.8 - 62 - HeavyMG - GunTail_Heavy - 9 -
    • - - -
  • - 10 - 4.7 - AmmoSet_20x138mmB -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FinnishServiceAntiTankRifle"] + + + 1.0 + 0.01 + 2.79 + 24.0 + 20.80 + 0.58 + + +
  • + 2.52 + CombatExtended.Verb_ShootCE + true + Bullet_20x138mmB_AP + 2.8 + 62 + HeavyMG + GunTail_Heavy + 9 +
    • + + +
  • + 10 + 4.7 + AmmoSet_20x138mmB +
    • +
  • + AimedShot +
    • +     + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml index 4e60354d8c..2dcec6c6f2 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/FrenchWeapons_Ranged.xml @@ -9,493 +9,492 @@ - + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolver"] - - - 0.7 - 0.18 - 1.2 - 2.2 - 1.1 - 0.50 - - -
  • - 2.57 - CombatExtended.Verb_ShootCE - true - Bullet_765x20mmLongue_FMJ - 0.6 - 12 - Shot_Revolver - GunTail_Light - 9 -
    • - - -
  • - 6 - 4 - AmmoSet_765x20mmLongue -
    • -
  • - AimedShot -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolver"] + + + 0.7 + 0.18 + 1.2 + 2.2 + 1.1 + 0.50 + + +
  • + 2.57 + CombatExtended.Verb_ShootCE + true + Bullet_765x20mmLongue_FMJ + 0.6 + 12 + Shot_Revolver + GunTail_Light + 9 +
    • + + +
  • + 6 + 4 + AmmoSet_765x20mmLongue +
    • +
  • + AimedShot +
    • +     + + - + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolverB"] - - - 0.7 - 0.18 - 1.2 - 2.2 - 1.1 - 0.50 - - -
  • - 2.57 - CombatExtended.Verb_ShootCE - true - Bullet_765x20mmLongue_FMJ - 0.6 - 12 - Shot_Revolver - GunTail_Light - 9 -
    • - - -
  • - 6 - 4 - AmmoSet_765x20mmLongue -
    • -
  • - AimedShot -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRevolverB"] + + + 0.7 + 0.18 + 1.2 + 2.2 + 1.1 + 0.50 + + +
  • + 2.57 + CombatExtended.Verb_ShootCE + true + Bullet_765x20mmLongue_FMJ + 0.6 + 12 + Shot_Revolver + GunTail_Light + 9 +
    • + + +
  • + 6 + 4 + AmmoSet_765x20mmLongue +
    • +
  • + AimedShot +
    • +     + + - + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServicePistol"] - - - 0.87 - 0.38 - 0.7 - 0.16 - 1.07 - 1.9 - - -
  • - 2.57 - CombatExtended.Verb_ShootCE - true - Bullet_765x20mmLongue_FMJ - 0.6 - 12 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 8 - 4 - AmmoSet_765x20mmLongue -
    • -
  • - AimedShot -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServicePistol"] + + + 0.87 + 0.38 + 0.7 + 0.16 + 1.07 + 1.9 + + +
  • + 2.57 + CombatExtended.Verb_ShootCE + true + Bullet_765x20mmLongue_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 8 + 4 + AmmoSet_765x20mmLongue +
    • +
  • + AimedShot +
    • +     + + - + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifle"] - - - 4.19 - 1.17 - 1.00 - 0.05 - 1.39 - 12.60 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_8x50mmRLebel_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 8 - 4.3 - AmmoSet_8x50mmRLebel -
    • -
  • - AimedShot -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifle"] + + + 4.19 + 1.17 + 1.00 + 0.05 + 1.39 + 12.60 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_8x50mmRLebel_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 8 + 4.3 + AmmoSet_8x50mmRLebel +
    • +
  • + AimedShot +
    • +     + + - + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleB"] - - - 4.19 - 1.17 - 1.00 - 0.05 - 1.39 - 12.60 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_8x50mmRLebel_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 8 - 4.3 - AmmoSet_8x50mmRLebel -
    • -
  • - AimedShot -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleB"] + + + 4.19 + 1.17 + 1.00 + 0.05 + 1.39 + 12.60 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_8x50mmRLebel_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 8 + 4.3 + AmmoSet_8x50mmRLebel +
    • +
  • + AimedShot +
    • +     + + + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonet"] + + + 4.19 + 1.17 + 1.00 + 0.05 + 1.39 + 12.60 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_8x50mmRLebel_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 8 + 4.3 + AmmoSet_8x50mmRLebel +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonet"] - - - 4.19 - 1.17 - 1.00 - 0.05 - 1.39 - 12.60 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_8x50mmRLebel_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 8 - 4.3 - AmmoSet_8x50mmRLebel -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonetB"] + + + 4.6 + 1.17 + 1.00 + 0.05 + 1.39 + 12.60 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_8x50mmRLebel_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 8 + 4.3 + AmmoSet_8x50mmRLebel +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBayonetB"] - - - 4.6 - 1.17 - 1.00 - 0.05 - 1.39 - 12.60 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_8x50mmRLebel_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 8 - 4.3 - AmmoSet_8x50mmRLebel -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBBayonet"] + + + 4.6 + 1.17 + 1.00 + 0.05 + 1.39 + 12.60 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_75x54mmFrench_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_75x54mmFrench +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceRifleBBayonet"] - - - 4.6 - 1.17 - 1.00 - 0.05 - 1.39 - 12.60 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_75x54mmFrench_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_75x54mmFrench -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceCarbine"] + + + 3.7 + 1 + 0.06 + 1.25 + 9 + 0.30 + + +
  • + 2.4 + CombatExtended.Verb_ShootCE + true + Bullet_8x50mmRLebel_FMJ + 1.1 + 47 + Shot_AssaultRifle + GunTail_Medium + 9 +
    • + + +
  • + 5 + 4 + AmmoSet_8x50mmRLebel +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceCarbine"] - - - 3.7 - 1 - 0.06 - 1.25 - 9 - 0.30 - - -
  • - 2.4 - CombatExtended.Verb_ShootCE - true - Bullet_8x50mmRLebel_FMJ - 1.1 - 47 - Shot_AssaultRifle - GunTail_Medium - 9 -
    • - - -
  • - 5 - 4 - AmmoSet_8x50mmRLebel -
    • -
  • - AimedShot -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceSMG"] + + + 4.3 + 0.36 + 1.00 + 0.14 + 1.21 + 8.43 + + +
  • + 0.90 + CombatExtended.Verb_ShootCE + true + Bullet_765x20mmLongue_FMJ + 0.6 + 27 + 6 + 5 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 32 + 4 + AmmoSet_765x20mmLongue +
    • +
  • + Snapshot + 3 +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceSMG"] - - - 4.3 - 0.36 - 1.00 - 0.14 - 1.21 - 8.43 - - -
  • - 0.90 - CombatExtended.Verb_ShootCE - true - Bullet_765x20mmLongue_FMJ - 0.6 - 27 - 6 - 5 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 32 - 4 - AmmoSet_765x20mmLongue -
    • -
  • - Snapshot - 3 -
    • -     - - + - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMG"] + + + 8.68 + 16.56 + 0.05 + 1.42 + 1.2 + 0.56 + + +
  • + 1.28 + CombatExtended.Verb_ShootCE + true + Bullet_75x54mmFrench_FMJ + 1.3 + 62 + 8 + 10 + Shot_Minigun + GunTail_Medium + 9 + + true + + Mounted +
    • + + +
  • + 25 + 4 + AmmoSet_75x54mmFrench +
    • +
  • + 5 + FALSE + SuppressFire +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMG"] - - - 8.68 - 16.56 - 0.05 - 1.42 - 1.2 - 0.56 - - -
  • - 1.28 - CombatExtended.Verb_ShootCE - true - Bullet_75x54mmFrench_FMJ - 1.3 - 62 - 8 - 10 - Shot_Minigun - GunTail_Medium - 9 - - true - - Mounted -
    • - - -
  • - 25 - 4 - AmmoSet_75x54mmFrench -
    • -
  • - 5 - FALSE - SuppressFire -
    • -     - - + - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMGB"] - - - 8.68 - 16.56 - 0.05 - 1.42 - 1.2 - 0.56 - - -
  • - 1.32 - CombatExtended.Verb_ShootCE - true - Bullet_8x50mmRLebel_FMJ - 1.3 - 65 - 15 - 10 - Shot_Minigun - GunTail_Medium - 9 - - true - - Mounted -
    • - - -
  • - 19 - 4 - AmmoSet_8x50mmRLebel -
    • -
  • - 5 - FALSE - SuppressFire -
    • -     - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2FrenchServiceLMGB"] + + + 8.68 + 16.56 + 0.05 + 1.42 + 1.2 + 0.56 + + +
  • + 1.32 + CombatExtended.Verb_ShootCE + true + Bullet_8x50mmRLebel_FMJ + 1.3 + 65 + 15 + 10 + Shot_Minigun + GunTail_Medium + 9 + + true + + Mounted +
    • + + +
  • + 19 + 4 + AmmoSet_8x50mmRLebel +
    • +
  • + 5 + FALSE + SuppressFire +
    • +     + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml index 7d60276512..387b953307 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/GermanWeapons_Ranged.xml @@ -7,789 +7,789 @@ - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistol"] - - - 0.38 - 0.7 - 0.16 - 1.07 - 1.9 - - -
  • - 2.57 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 12 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 8 - 4 - AmmoSet_9x19mmPara -
    • -
  • - Snapshot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistol"] + + + 0.38 + 0.7 + 0.16 + 1.07 + 1.9 + + +
  • + 2.57 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 8 + 4 + AmmoSet_9x19mmPara +
    • +
  • + Snapshot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolB"] - - - 0.38 - 0.7 - 0.16 - 1.07 - 1.9 - - -
  • - 2.55 - CombatExtended.Verb_ShootCE - true - Bullet_32ACP_FMJ - 0.5 - 14 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 8 - 4 - AmmoSet_32ACP -
    • -
  • - Snapshot -
    • -     - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolC"] - - - 0.38 - 0.7 - 0.16 - 1.07 - 1.9 - - -
  • - 2.55 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.5 - 12 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 8 - 4 - AmmoSet_9x19mmPara -
    • -
  • - Snapshot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolB"] + + + 0.38 + 0.7 + 0.16 + 1.07 + 1.9 + + +
  • + 2.55 + CombatExtended.Verb_ShootCE + true + Bullet_32ACP_FMJ + 0.5 + 14 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 8 + 4 + AmmoSet_32ACP +
    • +
  • + Snapshot +
    • +     + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServicePistolC"] + + + 0.38 + 0.7 + 0.16 + 1.07 + 1.9 + + +
  • + 2.55 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.5 + 12 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 8 + 4 + AmmoSet_9x19mmPara +
    • +
  • + Snapshot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticPistol"] - - - 0.05 - 0.7 - 0.16 - 1.4 - 1.9 - - -
  • - 1.2 - CombatExtended.Verb_ShootCE - true - Bullet_763x25mmMauser_FMJ - 0.5 - 12 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 20 - 4.3 - AmmoSet_763x25mmMauser -
    • -
  • - Snapshot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticPistol"] + + + 0.05 + 0.7 + 0.16 + 1.4 + 1.9 + + +
  • + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_763x25mmMauser_FMJ + 0.5 + 12 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 20 + 4.3 + AmmoSet_763x25mmMauser +
    • +
  • + Snapshot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifle"] - - - 4.30 - 1.16 - 1.0 - 0.05 - 1.48 - 11 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_792x57mmMauser -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifle"] + + + 4.30 + 1.16 + 1.0 + 0.05 + 1.48 + 11 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_792x57mmMauser +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifleBayonet"] - - - 4.30 - 1.16 - 1.0 - 0.05 - 1.48 - 13 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - 4.3 - AmmoSet_792x57mmMauser -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceRifleBayonet"] + + + 4.30 + 1.16 + 1.0 + 0.05 + 1.48 + 13 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + 4.3 + AmmoSet_792x57mmMauser +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifle"] - - - 4.20 - 0.37 - 1.00 - 0.04 - 1.61 - 12.26 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.1 - 55 - Shot_HeavySMG - GunTail_Heavy - 7 -
    • - - -
  • - 10 - 4 - AmmoSet_792x57mmMauser -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifle"] + + + 4.20 + 0.37 + 1.00 + 0.04 + 1.61 + 12.26 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.1 + 55 + Shot_HeavySMG + GunTail_Heavy + 7 +
    • + + +
  • + 10 + 4 + AmmoSet_792x57mmMauser +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifleBayonet"] - - - 4.20 - 0.37 - 1.00 - 0.04 - 1.61 - 12.26 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.1 - 55 - Shot_HeavySMG - GunTail_Heavy - 7 -
    • - - -
  • - 10 - 4 - AmmoSet_792x57mmMauser -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticRifleBayonet"] + + + 4.20 + 0.37 + 1.00 + 0.04 + 1.61 + 12.26 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.1 + 55 + Shot_HeavySMG + GunTail_Heavy + 7 +
    • + + +
  • + 10 + 4 + AmmoSet_792x57mmMauser +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMG"] - - - 3.9 - 0.36 - 1.00 - 0.14 - 1.21 - 7 - - -
  • - 0.6 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 1.1 - 6 - 7 - 23 - Shot_HeavySMG - GunTail_Light - 7 -
    • - - -
  • - 32 - 4 - AmmoSet_9x19mmPara -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMG"] + + + 3.9 + 0.36 + 1.00 + 0.14 + 1.21 + 7 + + +
  • + 0.6 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 1.1 + 6 + 7 + 23 + Shot_HeavySMG + GunTail_Light + 7 +
    • + + +
  • + 32 + 4 + AmmoSet_9x19mmPara +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGB"] - - - 3.9 - 0.36 - 1.00 - 0.14 - 1.21 - 7 - - -
  • - 0.6 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 1.1 - 6 - 7 - 21 - Shot_HeavySMG - GunTail_Light - 7 -
    • - - -
  • - 32 - 4 - AmmoSet_9x19mmPara -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGB"] + + + 3.9 + 0.36 + 1.00 + 0.14 + 1.21 + 7 + + +
  • + 0.6 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 1.1 + 6 + 7 + 21 + Shot_HeavySMG + GunTail_Light + 7 +
    • + + +
  • + 32 + 4 + AmmoSet_9x19mmPara +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGC"] - - - 3.9 - 0.36 - 1.00 - 0.14 - 1.21 - 7 - - -
  • - 0.6 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 1.1 - 6 - 7 - 23 - Shot_HeavySMG - GunTail_Light - 7 -
    • - - -
  • - 32 - 4 - AmmoSet_9x19mmPara -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGC"] + + + 3.9 + 0.36 + 1.00 + 0.14 + 1.21 + 7 + + +
  • + 0.6 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 1.1 + 6 + 7 + 23 + Shot_HeavySMG + GunTail_Light + 7 +
    • + + +
  • + 32 + 4 + AmmoSet_9x19mmPara +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGD"] - - - 3.9 - 0.36 - 1.00 - 0.14 - 1.21 - 7 - - -
  • - 0.6 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 1.1 - 6 - 7 - 21 - Shot_HeavySMG - GunTail_Light - 7 -
    • - - -
  • - 32 - 4 - AmmoSet_9x19mmPara -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSMGD"] + + + 3.9 + 0.36 + 1.00 + 0.14 + 1.21 + 7 + + +
  • + 0.6 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 1.1 + 6 + 7 + 21 + Shot_HeavySMG + GunTail_Light + 7 +
    • + + +
  • + 32 + 4 + AmmoSet_9x19mmPara +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"] - - - 11.60 - 0.56 - 1.00 - 0.06 - 1.67 - 15.20 - - -
  • - 1.36 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.1 - 6 - 7 - 64 - Shot_Minigun - GunTail_Medium - 9 -
    • - - -
  • - 150 - 7.8 - AmmoSet_792x57mmMauser -
    • -
  • - 5 - FALSE - SuppressFire -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"] + + + 11.60 + 0.56 + 1.00 + 0.06 + 1.67 + 15.20 + + +
  • + 1.36 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.1 + 6 + 7 + 64 + Shot_Minigun + GunTail_Medium + 9 +
    • + + +
  • + 150 + 7.8 + AmmoSet_792x57mmMauser +
    • +
  • + 5 + FALSE + SuppressFire +
    • +     + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"]/weaponTags + +
  • Bipod_LMG
    • + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAutomaticRifle"] + + + 4.60 + 0.36 + 1.00 + 0.07 + 1.40 + 9.40 + + +
  • + 1.54 + CombatExtended.Verb_ShootCE + true + Bullet_792x33mmKurz_FMJ + 1.1 + 48 + 6 + 7 + Shot_AssaultRifle + GunTail_Medium + 9 +
    • + + +
  • + 30 + 4 + AmmoSet_792x33mmKurz +
    • +
  • + TRUE + AimedShot + 3 +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceLMG"]/weaponTags - -
  • Bipod_LMG
    • - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSniperRifle"] + + + 4.1 + 1.17 + 2.3 + 0.05 + 1.48 + 11.00 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.5 + 75 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 5 + True + 0.85 + AmmoSet_792x57mmMauser +
    • +
  • + AimedShot +
    • +     + + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAutomaticRifle"] - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticSniperRifle"] + + + 3.85 + 0.37 + 1.00 + 0.04 + 1.61 + 12.26 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_792x57mmMauser_FMJ + 1.5 + 75 + Shot_HeavySMG + GunTail_Heavy + 7 +
    • + + +
  • + 10 + 4 + AmmoSet_792x57mmMauser +
    • +
  • + AimedShot +
    • +     + + + + +
  • + K4G_Gun_WW2GermanServiceRocketLauncher - 4.60 - 0.36 - 1.00 - 0.07 - 1.40 - 9.40 + 11 + 1.50 + 1.15 + 0.2 + 1.68 + 12.50 - -
  • - 1.54 - CombatExtended.Verb_ShootCE - true - Bullet_792x33mmKurz_FMJ - 1.1 - 48 - 6 - 7 - Shot_AssaultRifle - GunTail_Medium - 9 -
    • - - -
  • - 30 - 4 - AmmoSet_792x33mmKurz -
    • -
  • - TRUE - AimedShot - 3 -
    • -     - - + + CombatExtended.Verb_ShootCE + true + Bullet_88mmRPzB_HEAT + true + 2.01 + 40 + 5 + InfernoCannon_Fire + GunTail_Heavy + 14 + + true + + + + 1 + 5.6 + AmmoSet_88mmRPzBRocket + + + FALSE + AimedShot + + false + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSniperRifle"] - + +
  • + K4G_Gun_WW2GermanServiceDisposableRocketLauncher - 4.1 - 1.17 - 2.3 - 0.05 - 1.48 - 11.00 + 5.1 + 1.50 + 1.15 + 0.2 + 1.68 + 12.50 - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.5 - 75 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 5 - True - 0.85 - AmmoSet_792x57mmMauser -
    • -
  • - AimedShot -
    • -     - - + + CombatExtended.Verb_ShootCEOneUse + true + Bullet_K4GPanzerFaust60_HEAT + true + 1.9 + 31 + 5 + InfernoCannon_Fire + GunTail_Heavy + 14 + + true + + + + FALSE + AimedShot + + false + - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceSemiAutomaticSniperRifle"] - + +
  • + K4G_Gun_WW2GermanServiceDisposableRocketLauncherB - 3.85 - 0.37 + 3.4 + 1.50 1.00 - 0.04 - 1.61 - 12.26 + 0.2 + 1.68 + 6.25 - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_792x57mmMauser_FMJ - 1.5 - 75 - Shot_HeavySMG - GunTail_Heavy - 7 -
    • - - -
  • - 10 - 4 - AmmoSet_792x57mmMauser -
    • -
  • - AimedShot -
    • -     - - + + CombatExtended.Verb_ShootCEOneUse + true + Bullet_K4GPanzerFaust50_HEAT + true + 1.9 + 31 + 5 + InfernoCannon_Fire + GunTail_Heavy + 14 + + true + + + + FALSE + AimedShot + + false + - -
  • - K4G_Gun_WW2GermanServiceRocketLauncher - - 11 - 1.50 - 1.15 - 0.2 - 1.68 - 12.50 - - - CombatExtended.Verb_ShootCE - true - Bullet_88mmRPzB_HEAT - true - 2.01 - 40 - 5 - InfernoCannon_Fire - GunTail_Heavy - 14 - - true - - - - 1 - 5.6 - AmmoSet_88mmRPzBRocket - - - FALSE - AimedShot - - false -
    • - - -
  • - K4G_Gun_WW2GermanServiceDisposableRocketLauncher - - 5.1 - 1.50 - 1.15 - 0.2 - 1.68 - 12.50 - - - CombatExtended.Verb_ShootCEOneUse - true - Bullet_K4GPanzerFaust60_HEAT - true - 1.9 - 31 - 5 - InfernoCannon_Fire - GunTail_Heavy - 14 - - true - - - - FALSE - AimedShot - - false -
    • - - -
  • - K4G_Gun_WW2GermanServiceDisposableRocketLauncherB - - 3.4 - 1.50 - 1.00 - 0.2 - 1.68 - 6.25 - - - CombatExtended.Verb_ShootCEOneUse - true - Bullet_K4GPanzerFaust50_HEAT - true - 1.9 - 31 - 5 - InfernoCannon_Fire - GunTail_Heavy - 14 - - true - - - - FALSE - AimedShot - - false -
    • - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"] - - - 1.0 - 0.01 - 2.89 - 22.0 - 16.20 - 0.58 - - -
  • - CombatExtended.Verb_ShootCE - true - Bullet_792x94mmPatronen_FMJ - 2.8 - 62 - HeavyMG - GunTail_Heavy - 9 -
    • - - -
  • - 1 - 8 - 3.8 - AmmoSet_792x94mmPatronen -
    • -
  • - AimedShot -
    • -     - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"] + + + 1.0 + 0.01 + 2.89 + 22.0 + 16.20 + 0.58 + + +
  • + CombatExtended.Verb_ShootCE + true + Bullet_792x94mmPatronen_FMJ + 2.8 + 62 + HeavyMG + GunTail_Heavy + 9 +
    • + + +
  • + 1 + 8 + 3.8 + AmmoSet_792x94mmPatronen +
    • +
  • + AimedShot +
    • +     + + -
  • - Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"]/weaponTags - -
  • Bipod_ATR
    • - - +
  • + Defs/ThingDef[defName="K4G_Gun_WW2GermanServiceAntiTankRifle"]/weaponTags + +
  • Bipod_ATR
    • + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml index 32b7cbf5cf..519bba2d30 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/ItalianWeapons_Ranged.xml @@ -6,371 +6,371 @@ - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRevolver"] - - - 0.95 - 0.38 - 0.7 - 0.17 - 1.03 - 2.22 - - -
  • - CombatExtended.Verb_ShootCE - 2.57 - true - Bullet_45ACP_FMJ - 0.6 - 16 - Shot_Revolver - GunTail_Light - 9 -
    • - - -
  • - 6 - 4.6 - AmmoSet_45ACP -
    • -
  • - AimedShot -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServicePistol"] - - - 0.66 - 0.38 - 0.7 - 0.17 - 1.07 - 1.7 - - -
  • - CombatExtended.Verb_ShootCE - 2.27 - true - Bullet_380ACP_FMJ - 0.6 - 16 - Shot_Autopistol - GunTail_Light - 9 -
    • - - -
  • - 8 - 4 - AmmoSet_380ACP -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifle"] - - - 3.8 - 1.17 - 1.00 - 0.05 - 1.63 - 12.00 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_65x52mmCarcano_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 6 - 4.3 - AmmoSet_65x52mmCarcano -
    • -
  • - AimedShot -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifleBayonet"] - - - 4.05 - 1.17 - 1.00 - 0.05 - 1.63 - 12.00 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_65x52mmCarcano_FMJ - 1.1 - 55 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 6 - 4.3 - AmmoSet_65x52mmCarcano -
    • -
  • - AimedShot -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceCarbine"] - - - 3 - 0.97 - 1.00 - 0.06 - 1.4 - 9.5 - - -
  • - 2.04 - CombatExtended.Verb_ShootCE - true - Bullet_65x52mmCarcano_FMJ - 1.1 - 48 - Shot_BoltActionRifle - GunTail_Heavy - 9 -
    • - - -
  • - 6 - 4.3 - AmmoSet_65x52mmCarcano -
    • -
  • - AimedShot -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMG"] - - - 3.3 - 0.36 - 1.00 - 0.14 - 1.21 - 8.1 - - -
  • - 1.05 - CombatExtended.Verb_ShootCE - true - Bullet_22LR_FMJ - 0.6 - 21 - 6 - 4 - Shot_MachinePistol - GunTail_Light - 9 -
    • - - -
  • - 25 - 4 - AmmoSet_22LR -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGB"] - - - 4.2 - 0.36 - 1.00 - 0.14 - 1.21 - 9.1 - - -
  • - 1.22 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 23 - 6 - 6 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 20 - 4 - AmmoSet_9x19mmPara -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGC"] - - - 3.9 - 0.36 - 1.00 - 0.14 - 1.21 - 7.5 - - -
  • - 1.05 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 23 - 8 - 6 - Shot_HeavySMG - GunTail_Light - 9 -
    • - - -
  • - 20 - 4 - AmmoSet_9x19mmPara -
    • -
  • - FALSE - Snapshot - 3 -
    • -     - - - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"] - - - 10.6 - 0.56 - 1 - 0.05 - 1.53 - 15.7 - - -
  • - 1.22 - CombatExtended.Verb_ShootCE - true - Bullet_65x52mmCarcano_FMJ - 1.3 - 62 - 8 - 6 - Shot_Minigun - GunTail_Medium - 9 - - true - - Mounted -
    • - - -
  • - 20 - 7.5 - AmmoSet_65x52mmCarcano -
    • -
  • - 3 - SuppressFire -
    • -     - - -
  • - Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"]/weaponTags - -
  • Bipod_LMG
    • - - + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRevolver"] + + + 0.95 + 0.38 + 0.7 + 0.17 + 1.03 + 2.22 + + +
  • + CombatExtended.Verb_ShootCE + 2.57 + true + Bullet_45ACP_FMJ + 0.6 + 16 + Shot_Revolver + GunTail_Light + 9 +
    • + + +
  • + 6 + 4.6 + AmmoSet_45ACP +
    • +
  • + AimedShot +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServicePistol"] + + + 0.66 + 0.38 + 0.7 + 0.17 + 1.07 + 1.7 + + +
  • + CombatExtended.Verb_ShootCE + 2.27 + true + Bullet_380ACP_FMJ + 0.6 + 16 + Shot_Autopistol + GunTail_Light + 9 +
    • + + +
  • + 8 + 4 + AmmoSet_380ACP +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifle"] + + + 3.8 + 1.17 + 1.00 + 0.05 + 1.63 + 12.00 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_65x52mmCarcano_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 6 + 4.3 + AmmoSet_65x52mmCarcano +
    • +
  • + AimedShot +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceRifleBayonet"] + + + 4.05 + 1.17 + 1.00 + 0.05 + 1.63 + 12.00 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_65x52mmCarcano_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 6 + 4.3 + AmmoSet_65x52mmCarcano +
    • +
  • + AimedShot +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceCarbine"] + + + 3 + 0.97 + 1.00 + 0.06 + 1.4 + 9.5 + + +
  • + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_65x52mmCarcano_FMJ + 1.1 + 48 + Shot_BoltActionRifle + GunTail_Heavy + 9 +
    • + + +
  • + 6 + 4.3 + AmmoSet_65x52mmCarcano +
    • +
  • + AimedShot +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMG"] + + + 3.3 + 0.36 + 1.00 + 0.14 + 1.21 + 8.1 + + +
  • + 1.05 + CombatExtended.Verb_ShootCE + true + Bullet_22LR_FMJ + 0.6 + 21 + 6 + 4 + Shot_MachinePistol + GunTail_Light + 9 +
    • + + +
  • + 25 + 4 + AmmoSet_22LR +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGB"] + + + 4.2 + 0.36 + 1.00 + 0.14 + 1.21 + 9.1 + + +
  • + 1.22 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 23 + 6 + 6 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 20 + 4 + AmmoSet_9x19mmPara +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceSMGC"] + + + 3.9 + 0.36 + 1.00 + 0.14 + 1.21 + 7.5 + + +
  • + 1.05 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 23 + 8 + 6 + Shot_HeavySMG + GunTail_Light + 9 +
    • + + +
  • + 20 + 4 + AmmoSet_9x19mmPara +
    • +
  • + FALSE + Snapshot + 3 +
    • +     + + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"] + + + 10.6 + 0.56 + 1 + 0.05 + 1.53 + 15.7 + + +
  • + 1.22 + CombatExtended.Verb_ShootCE + true + Bullet_65x52mmCarcano_FMJ + 1.3 + 62 + 8 + 6 + Shot_Minigun + GunTail_Medium + 9 + + true + + Mounted +
    • + + +
  • + 20 + 7.5 + AmmoSet_65x52mmCarcano +
    • +
  • + 3 + SuppressFire +
    • +     + + + +
  • + Defs/ThingDef[defName="K4G_Gun_WW2ItalianServiceLMG"]/weaponTags + +
  • Bipod_LMG
    • + +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml index 0473dbbb04..6fedb79c04 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/JapaneseWeapons_Ranged.xml @@ -40,7 +40,7 @@ - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRevolver"] @@ -74,7 +74,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRifle"] @@ -112,7 +112,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceRifleBayonet"] @@ -150,7 +150,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceCarbine"] @@ -188,7 +188,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceSMG"] @@ -230,7 +230,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceLMG"] @@ -282,7 +282,7 @@
  • Bipod_LMG
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2JapaneseServiceSniperRifle"] @@ -322,7 +322,7 @@
    • - +
  • K4G_Gun_WW2JapaneseServiceRocketLauncher @@ -359,7 +359,7 @@ false
    • - +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml index fa16f5bb14..655cd03db4 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/RussianWeapons_Ranged.xml @@ -42,7 +42,7 @@ - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServicePistol"] @@ -77,7 +77,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRifle"] @@ -115,7 +115,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceRifleBayonet"] @@ -153,7 +153,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticRifle"] @@ -191,7 +191,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticRifleBayonet"] @@ -229,7 +229,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMG"] @@ -271,7 +271,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMGB"] @@ -313,7 +313,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSMGC"] @@ -355,7 +355,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceLMG"] @@ -407,7 +407,7 @@
  • Bipod_LMG
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAutomaticRifle"] @@ -449,7 +449,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSniperRifle"] @@ -488,7 +488,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceSemiAutomaticSniperRifle"] @@ -527,7 +527,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifle"] @@ -572,7 +572,7 @@
  • Bipod_ATR
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2RussianServiceAntiTankRifleB"] @@ -616,7 +616,7 @@
  • Bipod_ATR
    • - +     diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml index c0f9cf91b5..61486007bf 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/UnitedStatesWeapons_Ranged.xml @@ -41,7 +41,7 @@
  • CE_OneHandedWeapon
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRevolver"] @@ -79,7 +79,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServicePistol"] @@ -117,7 +117,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifle"] @@ -156,7 +156,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleB"] @@ -195,7 +195,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleBayonet"] @@ -234,7 +234,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceRifleBBayonet"] @@ -273,7 +273,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSemiAutomaticRifle"] @@ -311,7 +311,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSemiAutomaticRifleBayonet"] @@ -349,7 +349,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceCarbine"] @@ -387,7 +387,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceShotgun"] @@ -424,7 +424,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceShotgunBayonet"] @@ -461,7 +461,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMG"] @@ -503,7 +503,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGB"] @@ -545,7 +545,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGC"] @@ -587,7 +587,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSMGD"] @@ -629,7 +629,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceLMG"] @@ -682,7 +682,7 @@
  • Bipod_LMG
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceAutomaticRifle"] @@ -727,7 +727,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSniperRifle"] @@ -766,7 +766,7 @@
    • - +
  • Defs/ThingDef[defName="K4G_Gun_WW2AmericanServiceSniperRifleB"] @@ -805,7 +805,7 @@
    • - +
  • K4G_Gun_WW2AmericanServiceRocketLauncher @@ -843,7 +843,7 @@ false
    • - + diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml index b0929a12c6..3ae8afcf10 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Apparel.xml @@ -279,9 +279,9 @@
  • Defs/ThingDef[ - @Name="WW2Helmet" or - @Name="WW2StuffableHelmet" or - @Name="WW2StuffablePithHelmet"]/statBases + @Name="WW2Helmet" or + @Name="WW2StuffableHelmet" or + @Name="WW2StuffablePithHelmet"]/statBases 3 1 @@ -360,7 +360,7 @@
  • IndustrialMilitaryBasic
  • GasMask
    • - + @@ -383,12 +383,12 @@
  • Defs/ThingDef[ - @Name="WW2PeakedCap" or - @Name="WW2FieldCap" or - @Name="WW2SideCap" or - @Name="WW2FurHat" or - @Name="WW2Kepi" - ]/statBases + @Name="WW2PeakedCap" or + @Name="WW2FieldCap" or + @Name="WW2SideCap" or + @Name="WW2FurHat" or + @Name="WW2Kepi" + ]/statBases 1 0 @@ -398,10 +398,10 @@
  • Defs/ThingDef[ - @Name="WW2StuffableKepi" or - @Name="WW2StuffablePeakedCap" or - @Name="WW2StuffableFieldCap" or - @Name="WW2StuffableSideCap"]/statBases + @Name="WW2StuffableKepi" or + @Name="WW2StuffablePeakedCap" or + @Name="WW2StuffableFieldCap" or + @Name="WW2StuffableSideCap"]/statBases 1 0 @@ -413,7 +413,7 @@ 2 1 - 0 + 0
    • diff --git a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml index 6cf5d9a613..01537f65ab 100644 --- a/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml +++ b/Patches/K4G Rimworld War 2/ThingDefs_Misc/WW2_Grenades.xml @@ -8,12 +8,12 @@ - + - + -
  • - Defs/ThingDef[ +
  • + Defs/ThingDef[ defName="K4G_Proj_WW2BritishServiceGrenade" or defName="K4G_Proj_WW2FinnishServiceGrenade" or defName="K4G_Proj_WW2FrenchServiceGrenade" or @@ -33,18 +33,17 @@ defName="K4G_Proj_WW2ItalianServiceAntiTankGrenade" or defName="K4G_Proj_WW2RussianServiceAntiTankGrenade" or defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or - defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC" + defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC" ] - - CombatExtended.ProjectileCE_Explosive - -
    • - + + CombatExtended.ProjectileCE_Explosive + + - + -
  • - Defs/ThingDef[ +
  • + Defs/ThingDef[ defName="K4G_Proj_WW2BritishServiceGrenade" or defName="K4G_Proj_WW2FinnishServiceGrenade" or defName="K4G_Proj_WW2FrenchServiceGrenade" or @@ -59,26 +58,26 @@ defName="K4G_Proj_WW2RussianServiceGrenadeC" or defName="K4G_Proj_WW2AmericanServiceGrenade" ] - - - 1.5 - Bomb - 56 - 60 - true - Fleck_GrenadePin - Filth_GrenadeAmmoCasings - true - 12 - 3.0 - 2.0 - 0.25 - - -
    • + + + 1.5 + Bomb + 56 + 60 + true + Fleck_GrenadePin + Filth_GrenadeAmmoCasings + true + 12 + 3.0 + 2.0 + 0.25 + + + -
  • - Defs/ThingDef[ +
  • + Defs/ThingDef[ defName="K4G_Proj_WW2BritishServiceGrenade" or defName="K4G_Proj_WW2FinnishServiceGrenade" or defName="K4G_Proj_WW2FrenchServiceGrenade" or @@ -90,23 +89,23 @@ defName="K4G_Proj_WW2RussianServiceGrenade" or defName="K4G_Proj_WW2RussianServiceGrenadeB" or defName="K4G_Proj_WW2RussianServiceGrenadeC" or - defName="K4G_Proj_WW2AmericanServiceGrenade" + defName="K4G_Proj_WW2AmericanServiceGrenade" ] - - -
  • - - 40 - -
    • - - - + + +
  • + + 40 + +
    • +     +     + - + -
  • - Defs/ThingDef[ +
  • + Defs/ThingDef[ defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or @@ -115,26 +114,26 @@ defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC" ] - - - 1.5 - Bomb - 56 - 60 - true - Fleck_GrenadePin - Filth_GrenadeAmmoCasings - true - 12 - 3.0 - 2.0 - 0.25 - - -
    • + + + 1.5 + Bomb + 56 + 60 + true + Fleck_GrenadePin + Filth_GrenadeAmmoCasings + true + 12 + 3.0 + 2.0 + 0.25 + + + -
  • - Defs/ThingDef[ +
  • + Defs/ThingDef[ defName="K4G_Proj_WW2BritishServiceAntiTankGrenade" or defName="K4G_Proj_WW2BritishServiceAntiTankGrenadeB" or defName="K4G_Proj_WW2GermanServiceAntiTankGrenade" or @@ -143,49 +142,49 @@ defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeB" or defName="K4G_Proj_WW2RussianServiceAntiTankGrenadeC" ] - - -
  • - - 5 - -
    • -
  • - 100 - Bomb - 0.5 - Explosion_Thump - true -
    • - - - + + +
  • + + 5 + +
    • +
  • + 100 + Bomb + 0.5 + Explosion_Thump + true +
    • +     +     +
  • Defs/ThingDef[ - defName="K4G_Weapon_WW2BritishServiceGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2FinnishServiceGrenades" or - defName="K4G_Weapon_WW2FrenchServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenadesB" or - defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or - defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2JapaneseServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceGrenadesC" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or - defName="K4G_Weapon_WW2AmericanServiceGrenades" - ] + defName="K4G_Weapon_WW2BritishServiceGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2FinnishServiceGrenades" or + defName="K4G_Weapon_WW2FrenchServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenadesB" or + defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or + defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2JapaneseServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceGrenadesC" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or + defName="K4G_Weapon_WW2AmericanServiceGrenades" + ] ParentName BaseWeapon
    • @@ -194,27 +193,27 @@
  • Defs/ThingDef[ - defName="K4G_Weapon_WW2BritishServiceGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2FinnishServiceGrenades" or - defName="K4G_Weapon_WW2FrenchServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenadesB" or - defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or - defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2JapaneseServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceGrenadesC" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or - defName="K4G_Weapon_WW2AmericanServiceGrenades" - ] + defName="K4G_Weapon_WW2BritishServiceGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2FinnishServiceGrenades" or + defName="K4G_Weapon_WW2FrenchServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenadesB" or + defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or + defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2JapaneseServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceGrenadesC" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or + defName="K4G_Weapon_WW2AmericanServiceGrenades" + ] CombatExtended.AmmoThing 75 @@ -224,54 +223,54 @@
  • Defs/ThingDef[ - defName="K4G_Weapon_WW2BritishServiceGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2FinnishServiceGrenades" or - defName="K4G_Weapon_WW2FrenchServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenadesB" or - defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or - defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2JapaneseServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceGrenadesC" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or - defName="K4G_Weapon_WW2AmericanServiceGrenades" - ] + defName="K4G_Weapon_WW2BritishServiceGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2FinnishServiceGrenades" or + defName="K4G_Weapon_WW2FrenchServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenadesB" or + defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or + defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2JapaneseServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceGrenadesC" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or + defName="K4G_Weapon_WW2AmericanServiceGrenades" + ] Class CombatExtended.AmmoDef
  • Defs/ThingDef[ - defName="K4G_Weapon_WW2BritishServiceGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2FinnishServiceGrenades" or - defName="K4G_Weapon_WW2FrenchServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenades" or - defName="K4G_Weapon_WW2GermanServiceGrenadesB" or - defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenades" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or - defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or - defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2JapaneseServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenades" or - defName="K4G_Weapon_WW2RussianServiceGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceGrenadesC" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or - defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or - defName="K4G_Weapon_WW2AmericanServiceGrenades" - ]/comps + defName="K4G_Weapon_WW2BritishServiceGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2BritishServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2FinnishServiceGrenades" or + defName="K4G_Weapon_WW2FrenchServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenades" or + defName="K4G_Weapon_WW2GermanServiceGrenadesB" or + defName="K4G_Weapon_WW2GermanServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenades" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesB" or + defName="K4G_Weapon_WW2ItalianServiceGrenadesC" or + defName="K4G_Weapon_WW2ItalianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2JapaneseServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenades" or + defName="K4G_Weapon_WW2RussianServiceGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceGrenadesC" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenades" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesB" or + defName="K4G_Weapon_WW2RussianServiceAntiTankGrenadesC" or + defName="K4G_Weapon_WW2AmericanServiceGrenades" + ]/comps
  • diff --git a/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml b/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml index ec416749c1..94c9a32aae 100644 --- a/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml +++ b/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml @@ -86,7 +86,7 @@ 3 8 -
    • +
  • CE_HeavyAmmo @@ -201,47 +201,47 @@ 2
    • - - + + - -
  • - Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators - -
  • - FSX - - 0 - 15 - -
    • -
  • - Prometheum - - 0 - 15 - -
    • -
  • - CE_Ammo - - 100 - 250 - - - 0 - 4 - -
    • -
  • - Ammo - - 0 - 0 - -
    • - - + +
  • + Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators + +
  • + FSX + + 0 + 15 + +
    • +
  • + Prometheum + + 0 + 15 + +
    • +
  • + CE_Ammo + + 100 + 250 + + + 0 + 4 + +
    • +
  • + Ammo + + 0 + 0 + +
    • + +     diff --git a/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml b/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml index 227cae865e..4952dd650b 100644 --- a/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml +++ b/Patches/Kit's VFE Weapons/Ammo/Ammo_KitPlasma.xml @@ -149,4 +149,4 @@ - + \ No newline at end of file diff --git a/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml b/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml index fc1dd88509..de39839ab4 100644 --- a/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml +++ b/Patches/Kit's VFE Weapons/DamageDefs/DamageDefs_Vikings.xml @@ -43,4 +43,4 @@ - + \ No newline at end of file diff --git a/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml b/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml index 1ff2c29319..7b0565f1ff 100644 --- a/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml +++ b/Patches/Kit's VFE Weapons/ThingDefs_Misc/Weapons.xml @@ -443,4 +443,4 @@ - + \ No newline at end of file diff --git a/Patches/Medicine Supplements (Continued)/Items_Bandages.xml b/Patches/Medicine Supplements (Continued)/Items_Bandages.xml index c8dda5323d..fb29efa59d 100644 --- a/Patches/Medicine Supplements (Continued)/Items_Bandages.xml +++ b/Patches/Medicine Supplements (Continued)/Items_Bandages.xml @@ -12,10 +12,10 @@
  • Defs/ThingDef[ - defName="MSBandage" or - defName="MSASBandage" or - defName="MSNanoBandage" - ]/statBases + defName="MSBandage" or + defName="MSASBandage" or + defName="MSNanoBandage" + ]/statBases 0.1 diff --git a/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml b/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml index 973f7c2abd..16a9adf765 100644 --- a/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml +++ b/Patches/Miho Race/Ammo/Ammo_Miho_Advanced.xml @@ -175,7 +175,7 @@ Bullet_10mmMihogrenade - + AmmoSet_10mmMihogrenadeFlechette @@ -183,7 +183,7 @@ Bullet_10mmMihogrenadeFlechette - + AmmoSet_10mmMihogrenadeBarrier @@ -394,7 +394,7 @@ true - + Fragment_Mihomech @@ -410,7 +410,7 @@ 5 - + Bullet_10mmMihogrenadeFlechette @@ -436,7 +436,7 @@ 8.9 - + Bullet_10mmMihogrenadeBarrier diff --git a/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml b/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml index 82ce4be178..1fc8d456a0 100644 --- a/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml +++ b/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml @@ -320,7 +320,7 @@ Snapshot
    • - +
  • Miho_Weapon_HeavyPistolFlechette @@ -351,7 +351,7 @@ Snapshot
    • - +
  • Miho_Weapon_HeavyPistolHardkill diff --git a/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml b/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml index 95a9601859..9b37f92f19 100644 --- a/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml +++ b/Patches/Miho Race/ThingDefs_Races/Race_MihoMech.xml @@ -10,7 +10,7 @@ - +
  • Defs/ThingDef[defName="Miho_Mech_Sapsal"] @@ -34,7 +34,7 @@
    • - +
  • Defs/ThingDef[defName="Miho_Mech_Sapsal"]/statBases @@ -102,7 +102,7 @@
    • - +
  • Defs/ThingDef[defName="Miho_Mech_DesertSphex"] @@ -171,9 +171,9 @@ 6
    • - +
  • - Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalGrenade"]/comps + Defs/ThingDef[defName="Miho_Mech_Bulgasal" or defName="Miho_Mech_BulgasalGrenade"]/comps
  • 3500 @@ -193,7 +193,7 @@
    • - +
  • Defs/ThingDef[defName="Miho_Mech_BulgasalSiege"] @@ -274,7 +274,7 @@
    • - +
  • Defs/ThingDef[defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/comps @@ -296,7 +296,7 @@
    • - +
  • Defs/ThingDef[defName="Miho_Mech_Cataphract"] @@ -320,7 +320,7 @@
    • - +
  • Defs/ThingDef[defName="Miho_Mech_Cataphract" or defName="Miho_Mech_CataphractRocket" or defName="Miho_Mech_CataphractCluRocket"]/statBases diff --git a/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml b/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml index 4a64084a9f..99dbf7b456 100644 --- a/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -546,4 +546,4 @@ - + \ No newline at end of file diff --git a/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml b/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml index 8f4272cb6b..f6b08a61aa 100644 --- a/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml +++ b/Patches/MorrowRim - Bloodmoon/HediffDef_Disease.xml @@ -1,4 +1,4 @@ - + @@ -15,7 +15,6 @@
    • -
  • Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[2]/statOffsets @@ -23,7 +22,6 @@
    • -
  • Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[3]/statOffsets @@ -31,7 +29,6 @@
    • -
  • Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[4]/statOffsets @@ -39,7 +36,6 @@
    • -
  • Defs/HediffDef[defName="MorrowRim_BloodOfHircine"]/stages/li[5]/statOffsets @@ -80,4 +76,4 @@ - + \ No newline at end of file diff --git a/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml b/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml index 0695f18ae1..220426dd09 100644 --- a/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml +++ b/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml @@ -84,7 +84,7 @@ AmmoSet_DragonFireArrow - +
  • BotchJob_PossessedDragonfireGreatbow
    • @@ -737,7 +737,7 @@ AmmoSet_VerdantArrow - +
  • BotchJob_PossessedVerdantBow
    •  @@ -1285,7 +1285,7 @@ - +
  • @@ -1358,7 +1358,7 @@
    • - +
  • BotchJob_PossessedEarthenGauntlet @@ -1391,7 +1391,7 @@ false
    • - +
  • Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"]/tools @@ -1427,9 +1427,9 @@ Defs/ThingDef[defName="BotchJob_PossessedEarthenGauntlet"] - 1.5 - 0.15 - 0.83 + 1.5 + 0.15 + 0.83
    • diff --git a/Patches/Protoswords/Proto_CE.xml b/Patches/Protoswords/Proto_CE.xml index e91d40bc35..6c2d83cd54 100644 --- a/Patches/Protoswords/Proto_CE.xml +++ b/Patches/Protoswords/Proto_CE.xml @@ -8,209 +8,209 @@ - -
  • - Defs/ThingDef[defName="BON_Protosword"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 0.1 - 1.5 - 0.5 - Handle - -
  • - - -
  • Cut
    • - - 26 - -
  • - Bomb - 6 - 0.3 + +
  • + Defs/ThingDef[defName="BON_Protosword"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.1 + 1.5 + 0.5 + Handle -     - 1.3 - 2.88 - 15 - Edge - -
  • - - -
  • Stab
    • - - 13 - -
  • - Bomb - 6 - 0.3 +
  • + + +
  • Cut
    • + + 26 + +
  • + Bomb + 6 + 0.3 +
    • +     + 1.3 + 2.88 + 15 + Edge -     - 1.35 - 1.28 - 18 - - - - - -
  • - Defs/ThingDef[defName="BON_Protosword"]/statBases - - 6 - 0.36 - -
    • +
  • + + +
  • Stab
    • + + 13 + +
  • + Bomb + 6 + 0.3 +
    • +     + 1.35 + 1.28 + 18 + + + + -
  • - Defs/ThingDef[defName="BON_Protosword"] - - - 0.45 - 0.32 - 0.23 - - -
    • +
  • + Defs/ThingDef[defName="BON_Protosword"]/statBases + + 6 + 0.36 + +
    • -
  • - Defs/ThingDef[defName="BON_Protosword"]/weaponTags - +
  • Defs/ThingDef[defName="BON_Protosword"] - + + 0.45 + 0.32 + 0.23 + - -
    • + -
  • - Defs/ThingDef[defName="BON_Protosword"]/weaponTags - -
  • CE_OneHandedWeapon
    • - - +
  • + Defs/ThingDef[defName="BON_Protosword"]/weaponTags + + Defs/ThingDef[defName="BON_Protosword"] + + + + +
    • - -
  • - Defs/ToolCapacityDef[defName="BON_SearStab"] - -
  • - true -
    • - - +
  • + Defs/ThingDef[defName="BON_Protosword"]/weaponTags + +
  • CE_OneHandedWeapon
    • + + -
  • - Defs/DamageDef[defName="BON_SearDamage"] - -
  • - true -
    • - - + +
  • + Defs/ToolCapacityDef[defName="BON_SearStab"] + +
  • + true +
    • + + - -
  • - Defs/ThingDef[defName="BON_Phasesword"]/tools - - -
  • - - -
  • Poke
    • - - 3 - 0.1 - 1.5 - 0.65 - Handle +
  • + Defs/DamageDef[defName="BON_SearDamage"] + +
  • + true
    • -
  • - - -
  • BON_SearCut
    • - - 36 - -
  • - Flame - 4 - 0.3 + +
    • + + +
  • + Defs/ThingDef[defName="BON_Phasesword"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 0.1 + 1.5 + 0.65 + Handle -     - 1.19 - 3.16 - 20 - Edge - -
  • - - -
  • BON_SearStab
    • - - 18 - -
  • - Flame - 4 - 0.3 +
  • + + +
  • BON_SearCut
    • + + 36 + +
  • + Flame + 4 + 0.3 +
    • +     + 1.19 + 3.16 + 20 + Edge -     - 1.32 - 1.68 - 26 - - - - - -
  • - Defs/ThingDef[defName="BON_Phasesword"]/statBases - - 4 - 0.45 - -
    • +
  • + + +
  • BON_SearStab
    • + + 18 + +
  • + Flame + 4 + 0.3 +
    • +     + 1.32 + 1.68 + 26 + + + + -
  • - Defs/ThingDef[defName="BON_Phasesword"] - - - 0.71 - 0.45 - 0.29 - - -
    • +
  • + Defs/ThingDef[defName="BON_Phasesword"]/statBases + + 4 + 0.45 + +
    • -
  • - Defs/ThingDef[defName="BON_Phasesword"]/weaponTags - +
  • Defs/ThingDef[defName="BON_Phasesword"] - + + 0.71 + 0.45 + 0.29 + - -
    • + -
  • - Defs/ThingDef[defName="BON_Phasesword"]/weaponTags - -
  • CE_OneHandedWeapon
    • - - +
  • + Defs/ThingDef[defName="BON_Phasesword"]/weaponTags + + Defs/ThingDef[defName="BON_Phasesword"] + + + + +
    • + +
  • + Defs/ThingDef[defName="BON_Phasesword"]/weaponTags + +
  • CE_OneHandedWeapon
    • + +     - + \ No newline at end of file diff --git a/Patches/Pulse Weaponry/Apparel_Hats.xml b/Patches/Pulse Weaponry/Apparel_Hats.xml index e4766b211b..171671dc7d 100644 --- a/Patches/Pulse Weaponry/Apparel_Hats.xml +++ b/Patches/Pulse Weaponry/Apparel_Hats.xml @@ -74,7 +74,7 @@ 1.5 - +
  • Defs/ThingDef[defName="DV_Apparel_SuppressorMask"]/apparel diff --git a/Patches/Pulse Weaponry/RangedSpacer.xml b/Patches/Pulse Weaponry/RangedSpacer.xml index 2842f06fe0..6f850eeb1d 100644 --- a/Patches/Pulse Weaponry/RangedSpacer.xml +++ b/Patches/Pulse Weaponry/RangedSpacer.xml @@ -206,7 +206,7 @@ 4 2 10 - + 1.20 CombatExtended.Verb_ShootCE @@ -321,7 +321,7 @@
    • - +
  • Defs/ThingDef[defName = "DV_PulseRifle"]/comps/li[@Class="AthenaFramework.CompProperties_EquippableAbility"]
    • diff --git a/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml b/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml index f918cf087b..affa617a9b 100644 --- a/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml +++ b/Patches/Pulsefire Turret/PulsefireTurret_CombatExtendedPatch.xml @@ -203,4 +203,4 @@ - + \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml new file mode 100644 index 0000000000..0fb059e8c1 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_12Gauge_Dual.xml @@ -0,0 +1,102 @@ + + + + +
  • [RH2] DOOM
    • +     + + + +
  • + Defs + + + + + + Bullet_12Gauge_DoubleBarreled_Buck + + + Things/Projectile/Shotgun_Pellet + Graphic_Single + + + 18 + 18 + 4 + 5.7 + 17.8 + + + + + Bullet_12Gauge_DoubleBarreled_Slug + + + Things/Projectile/Bullet_big + Graphic_Single + + + 92 + 46 + 2 + 6 + 48.04 + + + + + Bullet_12Gauge_DoubleBarreled_Beanbag + + + Things/Projectile/Bullet_big + Graphic_Single + + + 30 + Beanbag + 18 + 2 + 0 + 3.240 + 2 + + + + + Bullet_12Gauge_DoubleBarreled_ElectroSlug + + + Things/Projectile/Bullet_big + Graphic_Single + + + 43 + EMP + 24 + 2 + 0 + 8.509 + + + + + + + AmmoSet_12Gauge_CP_DOOM_SuperShotgun + + + Bullet_12Gauge_DoubleBarreled_Buck + Bullet_12Gauge_DoubleBarreled_Slug + Bullet_12Gauge_DoubleBarreled_Beanbag + Bullet_12Gauge_DoubleBarreled_ElectroSlug + + + + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml new file mode 100644 index 0000000000..d6d0bc3307 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_BfgCell.xml @@ -0,0 +1,146 @@ + + + + +
  • [RH2] DOOM
    • +     + + + Defs + + + + + + + + AmmoSet_Doom2016Bfg9000Gun + + + Bullet_Doom2016Bfg9000Gun + + + + + + + Ammo_Doom2016BfgCell + + Plasma containment power cell developed by the Union Aerospace Corporation for the BFG 9000, utilizing the compression of Argent energy + + 0.5 + 1.21 + 31.92 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • + +     + +
  • AmmoAdvanced
    • +     + 25 + + ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016BfgCell + Graphic_Single + + Plasma + + +
  • + 20 + Bomb + 0.5 + true +
    • +
  • + + 2 + 10 + +
    • +     +     + + + + + + + Bullet_Doom2016Bfg9000Gun + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/BFGPLAZMA + Graphic_Single + + + 200 + Bomb + 500 + 2.5 + 3.0 + 2.0 + RHHit_DOOMBFG + true + +
  • + Flame_Secondary + 600 +
    • +     +     +     + + + + + MakeAmmo_Doom2016BfgCell + + Craft 25 UAC BFG Cells. + Making UAC BFG Cells. + 33000 + +
  • + + +
  • Steel
    • + + + 26 + +
  • + + +
  • Plasteel
    • + + + 73 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Plasteel
    • +
  • ComponentIndustrial
    • +     +     + + 25 + +     + +     + +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml new file mode 100644 index 0000000000..65ba8541e9 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_EmgPistol.xml @@ -0,0 +1,46 @@ + + + + +
  • [RH2] DOOM
    • +     + + + Defs + + + + + + + + + + Bullet_Doom2016EmgPistol + + + Things/Projectile/Charged/ChargeShot + Graphic_Single + + + 140 + Bomb + 2 + 0.5 + 3.0 + 2.0 + true + +
  • + Flame_Secondary + 9 +
    • +     +     +     + +     + +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml new file mode 100644 index 0000000000..aa12b7950c --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_GaussCannonFlechette.xml @@ -0,0 +1,48 @@ + + + + +
  • [RH2] DOOM
    • +     + + + Defs + + + + + + + + AmmoSet_Doom2016GaussCannon + + + Bullet_Doom2016GaussCannonFlechette + + + + + + + + + Bullet_Doom2016GaussCannonFlechette + + + Things/Projectile/GAUSSBeam + Graphic_Single + + + Bullet + 121 + 160 + 11348.10 + 500 + + + + + + +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml new file mode 100644 index 0000000000..a5548c5715 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_PlasmaCell.xml @@ -0,0 +1,211 @@ + + + + +
  • [RH2] DOOM
    • +     + + + Defs + + + + + + + + AmmoSet_Doom2016PlasmaGun + + + Bullet_Doom2016PlasmaGun + + + + + AmmoSet_Doom2016VortexRifle + + + Bullet_Doom2016VortexRifle + + + + + + + + + Ammo_Doom2016PlasmaCell + + Plasma containment power cell developed by the Union Aerospace Corporation for heavy energy weapons, utilizing the compression of Argent energy + + 0.002 + 0.01 + 0.84 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • + +     + +
  • AmmoAdvanced
    • +     + 450 + + ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016PlasmaCell + CombatExtended.Graphic_StackCountRanged + + Plasma + + +
  • + 80 + Bomb + 0.5 + true +
    • +
  • + + 2 + 10 + +
    • +     +     + + + + + + + Bullet_Doom2016PlasmaGun + + + Things/Projectile/Charged/ChargeShot + Graphic_Single + + + 200 + Bomb + 12 + 0.5 + 3.0 + 2.0 + MortarBomb_Explode + true + +
  • + Flame_Secondary + 22 +
    • +     +     +     + + + Bullet_Doom2016VortexRifle + + + Things/Projectile/Charged/ChargeShot + Graphic_Single + + + 200 + Bomb + 12 + 0.5 + 3.0 + 2.0 + MortarBomb_Explode + true + +
  • + Flame_Secondary + 22 +
    • +     +     +     + + + + + + + MakeAmmo_Doom2016PlasmaCell + + Craft 450 shots' worth of UAC Plasma Cells. + Making UAC Plasma Cells. + 12600 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Plasteel
    • + + + 33 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Plasteel
    • +
  • ComponentIndustrial
    • +     +     + + 450 + +     + +     +     + +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml new file mode 100644 index 0000000000..102ad59afd --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Ammo_Rocket.xml @@ -0,0 +1,148 @@ + + + + +
  • [RH2] DOOM
    • +     + + + Defs + + + + AmmoDoom2016Rockets + + AmmoRockets + ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket/Doom2016Rocket_c + + + + + + AmmoSet_Doom2016Rocket + + + Bullet_Doom2016Rocket_HEAT + + + + + + + Compact 60mm rocket developed by the Union Aerospace Corporation for infantry rocket launchers. + + 150 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoDoom2016Rockets
    • +     + 9 + 40 + MortarBomb_Explode +     + + + Ammo_Doom2016Rocket_HEAT + + + ThirdParty/CP DOOM and DOOM Kit Classic/Doom2016Rocket + Graphic_StackCount + + + 22.42 + 0.75 + 1.53 + + RocketHEAT + Bullet_Doom2016Rocket_HEAT + + + + + + + + Bullet_Doom2016Rocket_HEAT + + + Things/Projectile/Dart/Dart + Graphic_Single + + + Bullet + 225 + 76 + 19.178 + + +
  • + 64 + Bomb + 1 + RHHit_DOOMRocketLauncher + true +
    • +
  • + + 1 + 12 + +
    • +     +     + + + + + MakeAmmo_Doom2016Rocket_HEAT + + Craft 9 UAC Rocket Mk VI (HEAT) rockets. + Making UAC Rocket Mk VI (HEAT) rockets. + 6200 + +
  • + + +
  • Steel
    • + + + 14 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 9 + +     + +     + +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml new file mode 100644 index 0000000000..a40bcec662 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor.xml @@ -0,0 +1,67 @@ + + + + +
  • [RH2] DOOM
    • +     + + + + + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases + + 100 + 15 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/equippedStatOffsets + + 40 + 90 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Sharp + + 20 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Blunt + + 40 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases/ArmorRating_Heat + + 1.0 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/statBases + + 0.975 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuit_PowerArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml new file mode 100644 index 0000000000..885952bcd0 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_Apparel_Armor_Headgear.xml @@ -0,0 +1,78 @@ + + + + +
  • [RH2] DOOM
    • +     + + + + + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases + + 6 + 1.5 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Sharp + + 20 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Blunt + + 40 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases/ArmorRating_Heat + + 1.0 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/statBases + + 0.975 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel + + true + + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/equippedStatOffsets + + -1 + +
    • + + + +
  • + Defs/ThingDef[defName="RHApparel_PraetorSuitHelmet_PowerArmor"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml new file mode 100644 index 0000000000..8086f19df7 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_LauncherDOOM_Weapons.xml @@ -0,0 +1,240 @@ + + + + +
  • [RH2] DOOM
    • +     + + + + + +
  • + RHEx_DOOM_GAUSSCannon + + 12.50 + 0.56 + 2.20 + 0.04 + 1.78 + 12 + + + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016GaussCannonFlechette + 0.6 + 30 + 126 + RHShot_DOOMGAUSS + GunTail_Heavy + false + + true + + 15 + + + + 150 + 4.9 + AmmoSet_Doom2016GaussCannon + + + + FALSE + AimedShot + +
    • + + + +
  • + RHEx_DOOM_BFG9000Gun + + 10.00 + 0.35 + 1.00 + 0.01 + 0.88 + 13.00 + + + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016Bfg9000Gun + 1.3 + RHGun_DOOMBFGAiming + 5 + 62 + RHShot_DOOMBFG + GunTail_Heavy + false + 20 + false + + true + + + + + 3 + 4.9 + AmmoSet_Doom2016Bfg9000Gun + + + + AimedShot + +
    • + + + +
  • + RHEx_DOOM_RocketLauncher + + 8.00 + 1.50 + 1.00 + 0.2 + 1.82 + 11.20 + + + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016Rocket_HEAT + 1.9 + 5 + 40 + RHShot_DOOMRocketLauncher + GunTail_Heavy + true + false + 15 + + true + + + + + 6 + 5.1 + AmmoSet_Doom2016Rocket + + + + AimedShot + + +
    • + + + + + +
  • + Defs/ThingDef[ + defName="RHEx_DOOM_GAUSSCannon" or + defName="RHEx_UACGrenadeLauncher" + ]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[ + defName="RHEx_DOOM_BFG9000Gun" or + defName="RHEx_DOOM_RocketLauncher" + ]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + + + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml new file mode 100644 index 0000000000..f91cdd32a4 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_MeleeDOOM_Weapons.xml @@ -0,0 +1,139 @@ + + + + +
  • [RH2] DOOM
    • +     + + + + + + + +
  • + Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.69 + 0.10 + 0.80 + Handle + +
  • + + +
  • Cut
    • + + 40 + +
  • + Flame + 5 + 0.3 +
    • +     + 2.06 + 0.30 + 3.20 + 16 + Edge + +
  • + + +
  • Stab
    • + + 17 + +
  • + Flame + 3 + 0.2 +
    • +     + 0.99 + 3.24 + 32.4 + + + + + +
  • + Defs/ThingDef[defName="RHMelee_DOOMCrucible"]/statBases + + 8.5 + 0.80 + +
    • + +
  • + Defs/ThingDef[defName="RHMelee_DOOMCrucible"] + + + 1.00 + 0.60 + 0.40 + + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml new file mode 100644 index 0000000000..a292cd8c60 --- /dev/null +++ b/Patches/RH2 DOOM/RH2_DOOM_CE_Patch_RangedDOOM_Weapons.xml @@ -0,0 +1,558 @@ + + + + +
  • [RH2] DOOM
    • +     + + + + + +
  • + RHGun_DOOM_UACEMGPistol + + 1.35 + 0.05 + 0.70 + 0.176 + 1.27 + 2.45 + + + 0.57 + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016EmgPistol + 0.0 + 12 + RHShot_DOOMEMGPistol + GunTail_Light + 9 + + + + + + FALSE + Snapshot + + +
    • + + + + + +
  • + RHGun_DOOM_CombatShotgun + + 0.38 + 1 + 0.14 + 1.49 + 7.67 + + + 2.26 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 20 + RHShot_DOOMCombatShotgun + GunTail_Heavy + 9 + + + + 20 + 4.9 + AmmoSet_12Gauge + + + + Snapshot + + +
    • + + + + + +
  • + RHGun_DOOM_SuperShotgun + + 1.90 + 0.93 + 0.7 + 0.17 + 2.73 + 6.29 + + + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_DoubleBarreled_Buck + 0.6 + 2 + 11 + RHShot_DOOMSuperShotgun + GunTail_Heavy + 9 + + + + 2 + 1.7 + AmmoSet_12Gauge_CP_DOOM_SuperShotgun + + + + TRUE + Snapshot + +
    • + + + +
  • + RHGun_DOOM_HeavyAssaultRifle + + 0.56 + 1.10 + 0.07 + 1.27 + 9.00 + + + 1.48 + CombatExtended.Verb_ShootCE + true + Bullet_50BMG_FMJ + 1.2 + 75 + 5 + 6 + RHShot_DOOMHeavyAssaultRifle + GunTail_Medium + 9 + + + + 90 + 7.80 + AmmoSet_50BMG + + + + FALSE + SuppressFire + 3 + true + +
    • + + + + + +
  • + RHGun_DOOM_Chaingun + + 39.00 + 0.35 + 1 + 0.06 + 1.32 + 9.5 + + + 0.58 + Mounted + CombatExtended.Verb_ShootCE + true + Bullet_50BMG_FMJ + 2.3 + 62 + 150 + 1 + RHFire_DOOMChaingun + RHGun_DOOMChaingunAiming + GunTail_Medium + 9 + + + 150 + 9.2 + AmmoSet_50BMG + + + AimedShot + true + +
    • + + + +
  • + RHGun_DOOM_PlasmaRifle + + 8.20 + 0.56 + 1.10 + 0.07 + 1.27 + 13.00 + + + 1.48 + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016PlasmaGun + 1.2 + 75 + 5 + 10 + RHShot_DOOMPlasmaRifle + GunTail_Medium + 9 + + + + 150 + 4.9 + AmmoSet_Doom2016PlasmaGun + + + + FALSE + SuppressFire + 5 + +
    • + + + +
  • + RHGun_DOOM_PlasmaGun + + 8.20 + 0.56 + 1.10 + 0.07 + 1.27 + 10.00 + + + 1.48 + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016PlasmaGun + 1.2 + 75 + 5 + 10 + RHShot_DOOMPlasmaGun + GunTail_Medium + 9 + + + + 150 + 4.9 + AmmoSet_Doom2016PlasmaGun + + + + FALSE + SuppressFire + 5 + +
    • + + + +
  • + RHGun_DOOM_VortexRifle + + 7.51 + 0.36 + 2.60 + 0.04 + 1.76 + 9.05 + + + CombatExtended.Verb_ShootCE + true + Bullet_Doom2016VortexRifle + 1.6 + 68 + RHFire_DOOMVortexRifle + GunTail_Heavy + 9 + + + + 20 + 4.5 + AmmoSet_Doom2016VortexRifle + + + + FALSE + AimedShot + + + + + false +
    • + + + + + +
  • + Defs/ThingDef[ + defName="RHGun_DOOM_UACEMGPistol" or + defName="RHGun_DOOM_UACEMGMarkVPistol" + ]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + + + + + +
  • + Defs/ThingDef[ + defName="RHGun_DOOM_CombatShotgun" or + defName="RHGun_DOOM_CombatShotgunEternal" or + defName="RHGun_DOOM_SuperShotgun" or + defName="RHGun_DOOM_HeavyAssaultRifle" or + defName="RHGun_DOOM_PlasmaRifle" or + defName="RHGun_DOOM_PlasmaGun" or + defName="RHGun_DOOM_VortexRifle" or + defName="RHGun_DOOM_HeavyCannon" or + defName="RHGun_DOOM_Hellshot" + ]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + + + + + +
  • + Defs/ThingDef[ + defName="RHGun_DOOM_Chaingun" + ]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + + + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml index cddf70e441..28f34a91ee 100644 --- a/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml +++ b/Patches/RH2 Faction - The Rangers/Rangers_CE_Patch_Spacer.xml @@ -148,4 +148,4 @@ - + \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml new file mode 100644 index 0000000000..67045460de --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Ammo_NonLethal.xml @@ -0,0 +1,186 @@ + + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + Defs + + + + + + AmmoSet_9x19mmPara_NonLethal + + + Bullet_9x19mmPara_NL + + + + + + + Ammo_9x19mmPara_NL + + + ThirdParty/CP Metal Gear Solid/Pistol/NL + Graphic_StackCount + + + 0.31 + + TranqNonLethal + Bullet_9x19mmPara_NL + + + + + + + Bullet_9x19mmPara_NL + + + Tranquilizer + 1 + 2 + 10.820 + + + + + + + MakeAmmo_9x19mmPara_NL + + Craft 500 9x19mm Parabellum (Tranq) cartridges. + Making 9x19mm Parabellum (Tranq) cartridges. + +
  • + + +
  • Steel
    • + + + 14 + +
  • + + +
  • MedicineHerbal
    • + + + 12 + + + + +
  • Steel
    • +
  • MedicineHerbal
    • +     +     + + 500 + + 5000 + + + + + + + +
  • + Defs + + + + + + AmmoSet_762x51mmNATO_NonLethal + + + Bullet_762x51mmNATO_NL + + + + + + + Ammo_762x51mmNATO_NL + + + ThirdParty/CP Metal Gear Solid/Rifle/NL + Graphic_StackCount + + + 0.5 + + TranqNonLethal + Bullet_762x51mmNATO_NL + + + + + + + Bullet_762x51mmNATO_NL + + + Tranquilizer + 1 + 21 + 86.28 + + + + + + + MakeAmmo_762x51mmNATO_NL + + Craft 500 7.62x51mm NATO (Tranq) cartridges. + Making 7.62x51mm NATO (Tranq) cartridges. + +
  • + + +
  • Steel
    • + + + 22 + +
  • + + +
  • MedicineHerbal
    • + + + 20 + + + + +
  • Steel
    • +
  • MedicineHerbal
    • +     +     + + 500 + + 8200 + + + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml new file mode 100644 index 0000000000..ec8926553f --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor.xml @@ -0,0 +1,61 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • + + + +
  • + Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases + + 15 + 10 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/equippedStatOffsets + + 30 + + 10 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Sharp + + 18 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Blunt + + 40 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoSuit_GrayFox"]/statBases/ArmorRating_Heat + + 0.8 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml new file mode 100644 index 0000000000..d986438f08 --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Armor_Headgear.xml @@ -0,0 +1,64 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + + + +
  • + Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases + + 6 + 1.5 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Sharp + + 15 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Blunt + + 32 + +
    • + +
  • + Defs/ThingDef[defName="RHApparel_ExoHelmet_GrayFox"]/statBases/ArmorRating_Heat + + 1 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml new file mode 100644 index 0000000000..3f78d6bc35 --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_Headgear.xml @@ -0,0 +1,41 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + Defs/ThingDef[defName="RNApparel_MGS_Bandana"]/statBases/StuffEffectMultiplierArmor + + + 1 + +
    • + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml new file mode 100644 index 0000000000..0dff3e1c16 --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Apparel_OnSkin.xml @@ -0,0 +1,67 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + Defs/ThingDef[ + defName="RNApparel_SneakingSuit_A" or + defName="RNApparel_SneakingSuit_B" + ]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • + + + +
  • + Defs/ThingDef[ + defName="RNApparel_SneakingSuit_A" or + defName="RNApparel_SneakingSuit_B" + ]/equippedStatOffsets + + 15 + +
    • + +
  • + Defs/ThingDef[ + defName="RNApparel_SneakingSuit_A" or + defName="RNApparel_SneakingSuit_B" + ]/statBases + + 5 + 3 + +
    • + +
  • + Defs/ThingDef[ + defName="RNApparel_SneakingSuit_A" or + defName="RNApparel_SneakingSuit_B" + ]/statBases + + 6 + +
    • + +
  • + Defs/ThingDef[ + defName="RNApparel_SneakingSuit_A" or + defName="RNApparel_SneakingSuit_B" + ]/statBases + + 13 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml new file mode 100644 index 0000000000..a1f3993ede --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_MeleeWeapon.xml @@ -0,0 +1,73 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + Defs/ThingDef[defName="RHMelee_HF_Katana"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 0.33 + 1.52 + 0.500 + Handle + +
  • + + +
  • RHMelee_HFBladeStab
    • + + 16 + 1 + 10 + 85 + Point + +
  • + + +
  • RHMelee_HFBladeSlash
    • + + 42 + 0.5 + 40 + 75 + Edge + + + + + +
  • + Defs/ThingDef[defName="RHMelee_HF_Katana"]/statBases + + 6 + 0.78 + +
    • + +
  • + Defs/ThingDef[defName="RHMelee_HF_Katana"]/equippedStatOffsets + + 4 + 1.2 + 0.4 + +
    • + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml new file mode 100644 index 0000000000..6b0356d134 --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_PawnKindDefs.xml @@ -0,0 +1,68 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + Defs/PawnKindDef[@Name="RH_MGS_SoldierBase"]/invNutrition + + 1 + +
    • + +
  • + Defs/PawnKindDef[ + defName="RH_FOX_Infiltrator" or + defName="RH_MGS_GenomeSoldierBase" or + defName="RH_MGS_Infiltrator_Elite" or + defname="RH_MGS_CyborgNinja" + ]/inventoryOptions/subOptionsChooseOne/li/countRange + + + 0 + 1 + + +
    • + + + + +
  • + Defs/PawnKindDef[defName="RH_MGS_Infiltrator_Elite"]/weaponTags/li[.="RH2_FOXHOUND"] +
    • + +
  • + Defs/PawnKindDef[defName="RH_MGS_Infiltrator_Elite"] + +
  • + + 6 + 8 + + +
  • + 1 + + 2 + 3 + + +
  • RN_MK23_Loud
    • + + + + + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml new file mode 100644 index 0000000000..e5db466135 --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_RangedIndustrial_Pistols.xml @@ -0,0 +1,131 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + + + +
  • + RNGun_M9A1STranq_Pistol + + 1.13 + 0.38 + 0.70 + 0.17 + 1.64 + 3.80 + 7500 + + + 30 + 3 + + + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_NL + 0.6 + 12 + RNShotWUSPistol + GunTail_Light + 2 + + + + 15 + 4 + AmmoSet_9x19mmPara_NonLethal + + + + FALSE + Snapshot + + + +
    • + + + +
  • + RNGun_MK23SOCOM_Pistol + + 1.35 + 0.38 + 0.70 + 0.176 + 1.27 + 2.45 + 7500 + + + 30 + 3 + + + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 12 + RNShot_1911Hellfighter + GunTail_Light + 9 + + + + 12 + 4 + AmmoSet_45ACP + + + + FALSE + Snapshot + + + +
    • + + + +
  • + Defs/ThingDef[ + defName="RNGun_M9A1STranq_Pistol" or + defName="RNGun_MK23SOCOM_Pistol" + ]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + + + + + +     +     +     +     \ No newline at end of file diff --git a/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml new file mode 100644 index 0000000000..74c2e7bf9c --- /dev/null +++ b/Patches/RH2 Metal Gear Solid/RH2_MGS_CE_Patch_Scenario.xml @@ -0,0 +1,32 @@ + + + + +
  • [RH2] Metal Gear Solid
    • +     + + + +
  • + Defs/ScenarioDef[defName="RH_Scenario_MGS_Infiltration"]/scenario/parts + + +
  • + StartingThing_Defined + Ammo_9x19mmPara_NL + 500 +
    • + +
  • + StartingThing_Defined + Ammo_45ACP_FMJ + 500 +
    • + + + + +     +     +     +     \ No newline at end of file diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml" index f9039985e9..e97ffeb121 100644 --- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml" +++ "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Backpacks_CE.xml" @@ -273,4 +273,4 @@ - + \ No newline at end of file diff --git "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml" "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml" index dc00bc7832..ef9b02331c 100644 --- "a/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml" +++ "b/Patches/RH2 Rimmu-Nation\302\262 - Clothing/Vests_CE.xml" @@ -64,7 +64,7 @@ defName = "RHApparel_SafarilandPoliceBelt_Beretta" or defName = "RHApparel_SafarilandPoliceBelt_Glock" or defName = "RHApparel_MaxpeditionBattleBelt_Olive" - ]/apparel/layers + ]/apparel/layers @@ -230,4 +230,4 @@ - + \ No newline at end of file diff --git a/Patches/Rim Gnoblins/Gnoblins_Grenade.xml b/Patches/Rim Gnoblins/Gnoblins_Grenade.xml index 497a688797..9e2c289b3a 100644 --- a/Patches/Rim Gnoblins/Gnoblins_Grenade.xml +++ b/Patches/Rim Gnoblins/Gnoblins_Grenade.xml @@ -68,7 +68,7 @@
  • Defs/ThingDef[defName="RGWeapon_Toxpot"]/costList
    • - +
  • Defs/ThingDef[defName="RGWeapon_Toxpot"]/graphicData/texPath diff --git a/Patches/Rim Gnoblins/Gnoblins_Scenario.xml b/Patches/Rim Gnoblins/Gnoblins_Scenario.xml index 570e81d92a..2ec8d322f9 100644 --- a/Patches/Rim Gnoblins/Gnoblins_Scenario.xml +++ b/Patches/Rim Gnoblins/Gnoblins_Scenario.xml @@ -9,23 +9,23 @@ -
  • - Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_Arrow_Stone - 100 -
    • -     - +
  • + Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + -
  • - Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts/li[@Class="ScenPart_StartingThing_Defined" and (thingDef="RGWeapon_Toxpot")] - +
  • + Defs/ScenarioDef[defName="LostGnoblins"]/scenario/parts/li[@Class="ScenPart_StartingThing_Defined" and (thingDef="RGWeapon_Toxpot")] + 10 - -
    • + + diff --git a/Patches/Rim-Effect Asari and Reapers/Races_Reapers.xml b/Patches/Rim-Effect Asari and Reapers/Races_Reapers.xml index 51fd72422d..7e1d2de798 100644 --- a/Patches/Rim-Effect Asari and Reapers/Races_Reapers.xml +++ b/Patches/Rim-Effect Asari and Reapers/Races_Reapers.xml @@ -517,4 +517,4 @@ - + \ No newline at end of file diff --git a/Patches/Rim-Elves/Ammo_Elves.xml b/Patches/Rim-Elves/Ammo_Elves.xml index d1c701241d..cecf506bae 100644 --- a/Patches/Rim-Elves/Ammo_Elves.xml +++ b/Patches/Rim-Elves/Ammo_Elves.xml @@ -8,45 +8,45 @@ -
  • - Defs - +
  • + Defs + - - - AmmoSet_ChargedGreatArrow - - - Projectile_ChargedGreatArrow_Plasteel - - + + + AmmoSet_ChargedGreatArrow + + + Projectile_ChargedGreatArrow_Plasteel + + - - - Projectile_ChargedGreatArrow_Plasteel - - - Things/Projectile/Arrows/Arrow_Plasteel - Graphic_Single - - - 19 - -
  • - Bomb_Secondary - 6 -
    • - - 151 - 16 - 57.6 - 0.25 - Ammo_GreatArrow_Plasteel -     - + + + Projectile_ChargedGreatArrow_Plasteel + + + Things/Projectile/Arrows/Arrow_Plasteel + Graphic_Single + + + 19 + +
  • + Bomb_Secondary + 6 +
    • +     + 151 + 16 + 57.6 + 0.25 + Ammo_GreatArrow_Plasteel +     +     - - + + diff --git a/Patches/Rim-Elves/GeneDefs_Elves.xml b/Patches/Rim-Elves/GeneDefs_Elves.xml index 4c10812768..bf24798263 100644 --- a/Patches/Rim-Elves/GeneDefs_Elves.xml +++ b/Patches/Rim-Elves/GeneDefs_Elves.xml @@ -8,13 +8,13 @@ -
  • - Defs/GeneDef[defName="Size_Gigantism"]/statOffsets/CarryingCapacity - - 15 - 10 - -
    • +
  • + Defs/GeneDef[defName="Size_Gigantism"]/statOffsets/CarryingCapacity + + 15 + 10 + +
    • diff --git a/Patches/Rim-Elves/PawnKinds_Elves.xml b/Patches/Rim-Elves/PawnKinds_Elves.xml index b21543f007..d21ad56d89 100644 --- a/Patches/Rim-Elves/PawnKinds_Elves.xml +++ b/Patches/Rim-Elves/PawnKinds_Elves.xml @@ -8,178 +8,178 @@ - -
  • - Defs/PawnKindDef[defName="RE_Elven_Archer"] - -
  • - - 14 - 24 - - -
  • - - 80 - 160 - - -
  • NeolithicMeleeBasic
    • - - - - - - + +
  • + Defs/PawnKindDef[defName="RE_Elven_Archer"] + +
  • + + 14 + 24 + + +
  • + + 80 + 160 + + +
  • NeolithicMeleeBasic
    • + + + + + + -
  • - Defs/PawnKindDef[defName="RE_Elven_Levy"] - -
  • - - 80 - 110 - - -
  • TribalShield
    • - - 0.25 - - - +
  • + Defs/PawnKindDef[defName="RE_Elven_Levy"] + +
  • + + 80 + 110 + + +
  • TribalShield
    • + + 0.25 + + + -
  • - Defs/PawnKindDef[defName="RE_Elven_Swordsman"] - -
  • - - 100 - 140 - - -
  • TribalShield
    • - - 0.25 - - - +
  • + Defs/PawnKindDef[defName="RE_Elven_Swordsman"] + +
  • + + 100 + 140 + + +
  • TribalShield
    • + + 0.25 + + + -
  • - Defs/PawnKindDef[defName="RE_Elven_Ranger"] - -
  • - - 20 - 40 - - -
  • - - 120 - 180 - - -
  • MedievalMeleeBasic
    • -
  • NeolithicMeleeDecent
    • - - - - - - +
  • + Defs/PawnKindDef[defName="RE_Elven_Ranger"] + +
  • + + 20 + 40 + + +
  • + + 120 + 180 + + +
  • MedievalMeleeBasic
    • +
  • NeolithicMeleeDecent
    • + + + + + + -
  • - Defs/PawnKindDef[defName="RE_Elven_Knight"] - -
  • - - 120 - 180 - - -
  • TribalShield
    • - - 0.4 - - - +
  • + Defs/PawnKindDef[defName="RE_Elven_Knight"] + +
  • + + 120 + 180 + + +
  • TribalShield
    • + + 0.4 + + + -
  • - Defs/PawnKindDef[defName="Elven_Supreme_NobleRanged"] - -
  • - - 20 - 40 - - -
  • - - 150 - 240 - - -
  • ElvenMedievalMelee
    • -
  • MedievalMeleeAdvanced
    • - - - - - - +
  • + Defs/PawnKindDef[defName="Elven_Supreme_NobleRanged"] + +
  • + + 20 + 40 + + +
  • + + 150 + 240 + + +
  • ElvenMedievalMelee
    • +
  • MedievalMeleeAdvanced
    • + + + + + + - -
  • - Defs/PawnKindDef[@Name="ElvenSoldierBase" or @Name="ElvenKnightBase"] - -
  • - - 6 - 10 - -
    • - - + +
  • + Defs/PawnKindDef[@Name="ElvenSoldierBase" or @Name="ElvenKnightBase"] + +
  • + + 6 + 10 + +
    • + + -
  • - Defs/PawnKindDef[defName="Elven_Soldier_Grenadier"] - -
  • - - 6 - 12 - - -
  • - 0.8 - - 10 - 100 - - -
  • CE_Sidearm
    • - - - 3 - 6 - - - - - - +
  • + Defs/PawnKindDef[defName="Elven_Soldier_Grenadier"] + +
  • + + 6 + 12 + + +
  • + 0.8 + + 10 + 100 + + +
  • CE_Sidearm
    • + + + 3 + 6 + + + + + + -
  • - Defs/PawnKindDef[defName="Elven_Soldier_Lancer"] - -
  • - - 20 - 40 - -
    • - - +
  • + Defs/PawnKindDef[defName="Elven_Soldier_Lancer"] + +
  • + + 20 + 40 + +
    • + +     diff --git a/Patches/Rim-Elves/Weapons_Elves.xml b/Patches/Rim-Elves/Weapons_Elves.xml index 0c85225f10..b7bedf5603 100644 --- a/Patches/Rim-Elves/Weapons_Elves.xml +++ b/Patches/Rim-Elves/Weapons_Elves.xml @@ -8,228 +8,228 @@ - -
  • - Bow_ElvenLong - - 0.85 - 0.8 - 1.8 - 4.00 - 0.85 - - - CombatExtended.Verb_ShootCE - true - Projectile_GreatArrow_Stone - 1.9 - 33 - Bow_Large - - - AmmoSet_GreatArrow - - -
    • - -
  • - Defs/ThingDef[defName="Bow_ElvenLong"]/tools - - -
  • - -
  • Blunt
    • - - 5 - 1.6 - 0.6 - - - - - - - -
  • - Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.55 - 0.15 - Handle - -
  • - - -
  • Stab
    • - - 20 - 1.54 - 0.5 - 0.28 - 0.33 - Point - -
  • - - -
  • Cut
    • - - 28 - 1.25 - 1.782 - 0.8 - Edge - - - - - -
  • - Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/statBases - - 4 - 0.38 - -
    • - -
  • - Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"] - - - 0.24 - 0.38 - 0.28 - - -
    • - -
  • - Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/weaponTags - -
  • CE_OneHandedWeapon
    • - - - - -
  • - Bow_ElvenCharge - - 1.2 - 0.05 - 1.8 - 3.5 - 0.85 - - - CombatExtended.Verb_ShootCE - true - Projectile_ChargedGreatArrow_Plasteel - 0.85 - 55 - ChargeBowElven_Fire - GunTail_Heavy - - - AmmoSet_ChargedGreatArrow - - -
    • - -
  • - Defs/ThingDef[defName="Bow_ElvenCharge"]/tools - - -
  • - -
  • Blunt
    • - - 5 - 1.6 - 0.6 - - - - - - - -
  • - Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 0.1 - 1.5 - 0.5 - Handle - -
  • - - -
  • Cut
    • - - 33 - 0.78 - 2.84 - 16 - Edge - -
  • - - -
  • Stab
    • - - 12 - 0.94 - 1.28 - 16 - - - - - -
  • - Defs/ThingDef[defName="MeleeWeapon_BaneBrand"] - + +
  • + Bow_ElvenLong - 3 - 0.40 + 0.85 + 0.8 + 1.8 + 4.00 + 0.85 - -
    • - -
  • - Defs/ThingDef[defName="MeleeWeapon_BaneBrand"] - - - 0.90 - 0.40 - 0.32 - - -
    • - -
  • - Defs/ThingDef[defName="MeleeWeapon_BaneBrand"] - - + + CombatExtended.Verb_ShootCE + true + Projectile_GreatArrow_Stone + 1.9 + 33 + Bow_Large + + + AmmoSet_GreatArrow + + +
    • + +
  • + Defs/ThingDef[defName="Bow_ElvenLong"]/tools + + +
  • + +
  • Blunt
    • + + 5 + 1.6 + 0.6 + + + + + + + +
  • + Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.55 + 0.15 + Handle + +
  • + + +
  • Stab
    • + + 20 + 1.54 + 0.5 + 0.28 + 0.33 + Point + +
  • + + +
  • Cut
    • + + 28 + 1.25 + 1.782 + 0.8 + Edge + + + + + +
  • + Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/statBases + + 4 + 0.38 + +
    • + +
  • + Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"] + + + 0.24 + 0.38 + 0.28 + + +
    • + +
  • + Defs/ThingDef[defName="MeleeWeapon_ElvenScimitar"]/weaponTags +
  • CE_OneHandedWeapon
    • - - - + + + + +
  • + Bow_ElvenCharge + + 1.2 + 0.05 + 1.8 + 3.5 + 0.85 + + + CombatExtended.Verb_ShootCE + true + Projectile_ChargedGreatArrow_Plasteel + 0.85 + 55 + ChargeBowElven_Fire + GunTail_Heavy + + + AmmoSet_ChargedGreatArrow + + +
    • + +
  • + Defs/ThingDef[defName="Bow_ElvenCharge"]/tools + + +
  • + +
  • Blunt
    • + + 5 + 1.6 + 0.6 + + + + + + + +
  • + Defs/ThingDef[defName="MeleeWeapon_BaneBrand"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.1 + 1.5 + 0.5 + Handle + +
  • + + +
  • Cut
    • + + 33 + 0.78 + 2.84 + 16 + Edge + +
  • + + +
  • Stab
    • + + 12 + 0.94 + 1.28 + 16 + + + + + +
  • + Defs/ThingDef[defName="MeleeWeapon_BaneBrand"] + + + 3 + 0.40 + + +
    • + +
  • + Defs/ThingDef[defName="MeleeWeapon_BaneBrand"] + + + 0.90 + 0.40 + 0.32 + + +
    • + +
  • + Defs/ThingDef[defName="MeleeWeapon_BaneBrand"] + + +
  • CE_OneHandedWeapon
    • + + +     diff --git a/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml index 9dc24b1a06..0e014c6b3e 100644 --- a/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml +++ b/Patches/Rimsenal - Spacer Faction Pack/Apparel_Spacer_CE.xml @@ -8,7 +8,7 @@ - +
  • @@ -30,7 +30,7 @@
  • Feet
    • - +
  • Defs/ThingDef[defName="Apparel_Unisuit"] @@ -52,9 +52,9 @@
    • - + - +
  • Defs/ThingDef[defName="Apparel_SmartVisor"]/statBases/ArmorRating_Sharp diff --git a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml index 99e1d9ee4c..1b479abf60 100644 --- a/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml +++ b/Patches/Rimsenal - Spacer Faction Pack/Explosives_Smart_CE.xml @@ -25,7 +25,7 @@
  • Defs/ThingDef[defName="Weapon_GrenadeSmart"]/recipeMaker
    • - +
  • Defs/ThingDef[defName="Weapon_GrenadeSmart"]/costList
    • @@ -197,7 +197,7 @@ - + Craft_10_Smartgrenade Craft 10 smart grenades. diff --git a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml index fffbefd203..ef3fc3e682 100644 --- a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml +++ b/Patches/Rimsenal - Spacer Faction Pack/Mechs_Body_CE.xml @@ -39,7 +39,7 @@
  • CoveredByNaturalArmor
    • - +     diff --git a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml index 0654e607fc..56ea279d4b 100644 --- a/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml +++ b/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml @@ -22,7 +22,7 @@ 15 - +
  • Defs/ThingDef[defName="Mech_Tagmaton"]/tools @@ -152,7 +152,7 @@ 6
    • - + diff --git a/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml b/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml index 8638779a21..5f6d149cba 100644 --- a/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml +++ b/Patches/Rimsenal - Spacer Faction Pack/Weapons_Smart_CE.xml @@ -12,9 +12,9 @@
  • Defs/ThingDef[ - defName="Gun_SmartRevolver" or - defName="Gun_SmartAutoPistol" or - defName="Gun_SmartMachinePistol"]/tools + defName="Gun_SmartRevolver" or + defName="Gun_SmartAutoPistol" or + defName="Gun_SmartMachinePistol"]/tools
  • @@ -44,15 +44,15 @@
  • Defs/ThingDef[ - defName="Gun_SmartBoltActionRifle" or - defName="Gun_SmartPumpShotgun" or - defName="Gun_SmartChainShotgun" or - defName="Gun_SmartHeavySMG" or - defName="Gun_SmartLMG" or - defName="Gun_SmartAssaultRifle" or - defName="Gun_SniperRifleSmart" or - defName="Gun_SmartChargeRifle" or - defName="Gun_SmartChargeLance"]/tools + defName="Gun_SmartBoltActionRifle" or + defName="Gun_SmartPumpShotgun" or + defName="Gun_SmartChainShotgun" or + defName="Gun_SmartHeavySMG" or + defName="Gun_SmartLMG" or + defName="Gun_SmartAssaultRifle" or + defName="Gun_SniperRifleSmart" or + defName="Gun_SmartChargeRifle" or + defName="Gun_SmartChargeLance"]/tools
  • @@ -95,14 +95,14 @@
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrels + + +
  • Blunt
    • +     + 10 + 2.44 + 3.5 + Barrels @@ -111,19 +111,19 @@
  • Defs/ThingDef[ - defName="Gun_SmartRevolver" or - defName="Gun_SmartAutoPistol" or - defName="Gun_SmartMachinePistol" or - defName="Gun_SmartBoltActionRifle" or - defName="Gun_SmartPumpShotgun" or - defName="Gun_SmartChainShotgun" or - defName="Gun_SmartHeavySMG" or - defName="Gun_SmartLMG" or - defName="Gun_SmartAssaultRifle" or - defName="Gun_SniperRifleSmart" or - defName="Gun_SmartChargeRifle" or - defName="Gun_SmartChargeLance" or - defName="Gun_SmartMinigun" + defName="Gun_SmartRevolver" or + defName="Gun_SmartAutoPistol" or + defName="Gun_SmartMachinePistol" or + defName="Gun_SmartBoltActionRifle" or + defName="Gun_SmartPumpShotgun" or + defName="Gun_SmartChainShotgun" or + defName="Gun_SmartHeavySMG" or + defName="Gun_SmartLMG" or + defName="Gun_SmartAssaultRifle" or + defName="Gun_SniperRifleSmart" or + defName="Gun_SmartChargeRifle" or + defName="Gun_SmartChargeLance" or + defName="Gun_SmartMinigun" ]/statBases 0.50 @@ -132,19 +132,19 @@
  • Defs/ThingDef[ - defName="Gun_SmartRevolver" or - defName="Gun_SmartAutoPistol" or - defName="Gun_SmartMachinePistol" or - defName="Gun_SmartBoltActionRifle" or - defName="Gun_SmartPumpShotgun" or - defName="Gun_SmartChainShotgun" or - defName="Gun_SmartHeavySMG" or - defName="Gun_SmartLMG" or - defName="Gun_SmartAssaultRifle" or - defName="Gun_SniperRifleSmart" or - defName="Gun_SmartChargeRifle" or - defName="Gun_SmartChargeLance" or - defName="Gun_SmartMinigun" + defName="Gun_SmartRevolver" or + defName="Gun_SmartAutoPistol" or + defName="Gun_SmartMachinePistol" or + defName="Gun_SmartBoltActionRifle" or + defName="Gun_SmartPumpShotgun" or + defName="Gun_SmartChainShotgun" or + defName="Gun_SmartHeavySMG" or + defName="Gun_SmartLMG" or + defName="Gun_SmartAssaultRifle" or + defName="Gun_SniperRifleSmart" or + defName="Gun_SmartChargeRifle" or + defName="Gun_SmartChargeLance" or + defName="Gun_SmartMinigun" ]/equippedStatOffsets 0.5 @@ -329,17 +329,17 @@ 9 - 6 - true - 0.45 - AmmoSet_12Gauge + 6 + true + 0.45 + AmmoSet_12Gauge - Snapshot + Snapshot -
  • AdvancedGun
    • -
  • CE_AI_BROOM
    • +
  • AdvancedGun
    • +
  • CE_AI_BROOM
    • @@ -368,17 +368,17 @@ 9 - 9 - 3 - AmmoSet_12Gauge + 9 + 3 + AmmoSet_12Gauge - 2 - Snapshot + 2 + Snapshot -
  • AdvancedGun
    • -
  • CE_AI_BROOM
    • +
  • AdvancedGun
    • +
  • CE_AI_BROOM
    •  @@ -823,7 +823,7 @@ 5 - +
  • Defs/ThingDef[defName="MeleeWeapon_StunProd"] diff --git a/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml b/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml index 47966c7992..6a099013b6 100644 --- a/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml +++ b/Patches/Rimworld-Style Pilas And Bows Strapped With Grenades and Shells Extended/Javelin.xml @@ -108,7 +108,7 @@ Interact_BeatFire 49.6 - 1.0 + 1.0 1.5 2.5 3.5 diff --git a/Patches/Spartan Foundry/Apparel_Headgear.xml b/Patches/Spartan Foundry/Apparel_Headgear.xml index 31d56140ba..569df207ed 100644 --- a/Patches/Spartan Foundry/Apparel_Headgear.xml +++ b/Patches/Spartan Foundry/Apparel_Headgear.xml @@ -15,7 +15,7 @@ 5 1 240 - 0.6 + 0.6
  • @@ -141,7 +141,7 @@ 5 1 240 - 0.6 + 0.6
  • @@ -205,7 +205,7 @@ 5.6 1.1 240 - 0.6 + 0.6
  • @@ -391,7 +391,7 @@ 5 1 240 - 0.6 + 0.6
  • @@ -455,7 +455,7 @@ 4.5 0.9 240 - 0.6 + 0.6
  • @@ -581,7 +581,7 @@ 5 1 240 - 0.6 + 0.6
  • @@ -646,7 +646,7 @@ 5 1 240 - 0.6 + 0.6
  • diff --git a/Patches/Stoneborn - Delights/Stoneborn_Animal.xml b/Patches/Stoneborn - Delights/Stoneborn_Animal.xml index dfe0e756a1..5afd3de366 100644 --- a/Patches/Stoneborn - Delights/Stoneborn_Animal.xml +++ b/Patches/Stoneborn - Delights/Stoneborn_Animal.xml @@ -7,76 +7,76 @@ - + -
  • - Defs/ThingDef[defName="SD_Fey"]/statBases - - 0.21 - 0.02 - -
    • - -
  • - Defs/ThingDef[defName="SD_Fey"]/tools - - -
  • - - -
  • Bite
    • - - 9 - 1.5 - Mouth - 0.24 - 0.5 - -
  • - - -
  • Blunt
    • - - 1 - 1.26 - HeadAttackTool - 0.2 - 0.250 - - - - +
  • + Defs/ThingDef[defName="SD_Fey"]/statBases + + 0.21 + 0.02 + +
    • -
  • - Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Blunt - - 2.25 - -
    • +
  • + Defs/ThingDef[defName="SD_Fey"]/tools + + +
  • + + +
  • Bite
    • + + 9 + 1.5 + Mouth + 0.24 + 0.5 + +
  • + + +
  • Blunt
    • + + 1 + 1.26 + HeadAttackTool + 0.2 + 0.250 + + + + -
  • - Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Sharp - - 0.7 - -
    • +
  • + Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Blunt + + 2.25 + +
    • -
  • - Defs/ThingDef[defName="SD_Fey"]/race/baseHealthScale - - 0.3 - -
    • +
  • + Defs/ThingDef[defName="SD_Fey"]/statBases/ArmorRating_Sharp + + 0.7 + +
    • -
  • - Defs/ThingDef[defName="SD_Fey"]/comps - - Defs/ThingDef[defName="SD_Fey"] +
  • + Defs/ThingDef[defName="SD_Fey"]/race/baseHealthScale - + 0.3 - -
    • + + +
  • + Defs/ThingDef[defName="SD_Fey"]/comps + + Defs/ThingDef[defName="SD_Fey"] + + + + +
    • diff --git a/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml b/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml index 1420675091..aaaf7e1bfa 100644 --- a/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml +++ b/Patches/Stoneborn - Delights/Stoneborn_Drugs.xml @@ -7,165 +7,165 @@ - - -
  • - Defs/ThingDef[ - defName="SD_BladerootCigar" or - defName="SD_Feywing" or - defName="SD_FeywingJoint" or - defName="SD_MinersDelight" - ]/statBases - - 0.05 - -
    • - -
  • - Defs/ThingDef[defName="SD_Alkahest" or defName="SD_Glimmerquartz"]/statBases - - 0.2 - -
    • - -
  • - Defs/ThingDef[defName="SD_BeardWax"]/statBases - - 0.5 - -
    • - -
  • - Defs/ThingDef[defName="SD_RawShatterbrew" or defName="SD_FermentedShatterbrew"]/statBases - - 5 - -
    • - - - -
  • - Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[1] - - - -0.1 - - -
    • - -
  • - Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[2] - - - -0.25 - - -
    • - -
  • - Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[3] - - - -0.5 - - -
    • - -
  • - Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[4] - - - -10 - - -
    • - -
  • - Defs/HediffDef[defName="SD_MDHigh"]/stages/li[1] - - - 0.75 - - -
    • - - - -
  • - Defs/ThingDef[ - defName="SD_ForgeLiquor" or - defName="SD_HiveMead" or - defName="SD_ShroomAle" or - defName="SD_Sweetwine" - ]/tools - - -
  • - -
  • Blunt
    • - - 2 - 2.22 - 1.33 - 0.338 - Base - -
  • - - -
  • Poke
    • - - 1 - 3.33 - 0.150 - Neck - - - - - -
  • - Defs/ThingDef[ - defName="SD_ForgeLiquor" or - defName="SD_HiveMead" or - defName="SD_ShroomAle" or - defName="SD_Sweetwine" - ]/statBases - - 0.33 - 0.35 - -
    • - -
  • - Defs/ThingDef[ - defName="SD_ForgeLiquor" or - defName="SD_HiveMead" or - defName="SD_ShroomAle" or - defName="SD_Sweetwine" - ] - - - 0.1 - 0.33 - 0.07 - - -
    • - -
  • - Defs/ThingDef[ - defName="SD_ForgeLiquor" or - defName="SD_HiveMead" or - defName="SD_ShroomAle" or - defName="SD_Sweetwine" - ] - - -
  • CE_OneHandedWeapon
    • - - - + + +
  • + Defs/ThingDef[ + defName="SD_BladerootCigar" or + defName="SD_Feywing" or + defName="SD_FeywingJoint" or + defName="SD_MinersDelight" + ]/statBases + + 0.05 + +
    • + +
  • + Defs/ThingDef[defName="SD_Alkahest" or defName="SD_Glimmerquartz"]/statBases + + 0.2 + +
    • + +
  • + Defs/ThingDef[defName="SD_BeardWax"]/statBases + + 0.5 + +
    • + +
  • + Defs/ThingDef[defName="SD_RawShatterbrew" or defName="SD_FermentedShatterbrew"]/statBases + + 5 + +
    • + + + +
  • + Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[1] + + + -0.1 + + +
    • + +
  • + Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[2] + + + -0.25 + + +
    • + +
  • + Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[3] + + + -0.5 + + +
    • + +
  • + Defs/HediffDef[defName="SD_ElixirHigh"]/stages/li[4] + + + -10 + + +
    • + +
  • + Defs/HediffDef[defName="SD_MDHigh"]/stages/li[1] + + + 0.75 + + +
    • + + + +
  • + Defs/ThingDef[ + defName="SD_ForgeLiquor" or + defName="SD_HiveMead" or + defName="SD_ShroomAle" or + defName="SD_Sweetwine" + ]/tools + + +
  • + +
  • Blunt
    • + + 2 + 2.22 + 1.33 + 0.338 + Base + +
  • + + +
  • Poke
    • + + 1 + 3.33 + 0.150 + Neck + + + + + +
  • + Defs/ThingDef[ + defName="SD_ForgeLiquor" or + defName="SD_HiveMead" or + defName="SD_ShroomAle" or + defName="SD_Sweetwine" + ]/statBases + + 0.33 + 0.35 + +
    • + +
  • + Defs/ThingDef[ + defName="SD_ForgeLiquor" or + defName="SD_HiveMead" or + defName="SD_ShroomAle" or + defName="SD_Sweetwine" + ] + + + 0.1 + 0.33 + 0.07 + + +
    • + +
  • + Defs/ThingDef[ + defName="SD_ForgeLiquor" or + defName="SD_HiveMead" or + defName="SD_ShroomAle" or + defName="SD_Sweetwine" + ] + + +
  • CE_OneHandedWeapon
    • + + +     diff --git a/Patches/The Wild Fields/ThingDefs_Apparel.xml b/Patches/The Wild Fields/ThingDefs_Apparel.xml index 1b1511d69c..6f88cae787 100644 --- a/Patches/The Wild Fields/ThingDefs_Apparel.xml +++ b/Patches/The Wild Fields/ThingDefs_Apparel.xml @@ -1,11 +1,11 @@ - +
  • The Wild Fields - apparel and weapons
    •  - + @@ -52,7 +52,7 @@ 3.5 - +
  • Defs/ThingDef[defName="Serek_Apparel_NobleCape"]/costStuffCount @@ -68,7 +68,7 @@ 1 0.5 -
    • +
  • Defs/ThingDef[defName="Serek_Apparel_Vyshyvanka"]/statBases/StuffEffectMultiplierArmor @@ -77,7 +77,6 @@
    • -
  • Defs/ThingDef[defName="Serek_Apparel_Vyshyvanka"]/costStuffCount @@ -89,10 +88,10 @@
  • Defs/ThingDef[ - defName="Serek_Apparel_Birka" or - defName="Serek_Apparel_NobleFurCap" or - defName="Serek_Apparel_NobleCap" - ]/statBases + defName="Serek_Apparel_Birka" or + defName="Serek_Apparel_NobleFurCap" or + defName="Serek_Apparel_NobleCap" + ]/statBases 2 1 @@ -101,10 +100,10 @@
  • Defs/ThingDef[ - defName="Serek_Apparel_Birka" or - defName="Serek_Apparel_NobleFurCap" or - defName="Serek_Apparel_NobleCap" - ]/statBases/StuffEffectMultiplierArmor + defName="Serek_Apparel_Birka" or + defName="Serek_Apparel_NobleFurCap" or + defName="Serek_Apparel_NobleCap" + ]/statBases/StuffEffectMultiplierArmor 3 @@ -116,7 +115,7 @@ 30
    • - +
  • Defs/ThingDef[defName="Serek_Apparel_NobleFurCap" or defName="Serek_Apparel_NobleCap"]/costStuffCount diff --git a/Patches/The Wild Fields/ThingDefs_Weapons.xml b/Patches/The Wild Fields/ThingDefs_Weapons.xml index d3e675e855..43adb69e36 100644 --- a/Patches/The Wild Fields/ThingDefs_Weapons.xml +++ b/Patches/The Wild Fields/ThingDefs_Weapons.xml @@ -1,324 +1,324 @@ - +
  • The Wild Fields - apparel and weapons
    • - + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/equippedStatOffsets - - 0.12 - 1.18 - 0.7 - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/equippedStatOffsets + + 0.12 + 1.18 + 0.7 + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/statBases - - - 1.8 - 10 - 1.53 - 10500 - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/statBases + + + 1.8 + 10 + 1.53 + 10500 + + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/costStuffCount - - 70 - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/costStuffCount + + 70 + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/tools - - -
  • - - -
  • Blunt
    • - - 6 - 0.15 - 1.16 - 1.8 - Shaft - -
  • - - -
  • Cut
    • - - 33 - 1.79 - 4.3 - 0.87 - Edge - -
  • - - -
  • Stab
    • - - 21 - 2 - 1.7 - 5.6 - Point - - - - +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_WarScythe"]/tools + + +
  • + + +
  • Blunt
    • + + 6 + 0.15 + 1.16 + 1.8 + Shaft + +
  • + + +
  • Cut
    • + + 33 + 1.79 + 4.3 + 0.87 + Edge + +
  • + + +
  • Stab
    • + + 21 + 2 + 1.7 + 5.6 + Point + + + + - + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"] - - - 1.25 - 0.75 - 0.40 - 0.2 - - -
    • - +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"] + + + 1.25 + 0.75 + 0.40 + 0.2 + + +
    • + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/statBases - - - 16000 - 1 - 6 - 0.63 - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/statBases + + + 16000 + 1 + 6 + 0.63 + + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.5 - 0.1 - 0.5 - Handle - -
  • - - -
  • Stab
    • - - 18 - 1.27 - 1.96 - 3.92 - Point - -
  • - - -
  • Blunt
    • - - 20 - 2.73 - 7.84 - Head - -
  • - - -
  • Cut
    • - - 29 - 2.37 - 0.60 - 3.24 - 0.72 - Edge - - - - +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_NobleSabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.5 + 0.1 + 0.5 + Handle + +
  • + + +
  • Stab
    • + + 18 + 1.27 + 1.96 + 3.92 + Point + +
  • + + +
  • Blunt
    • + + 20 + 2.73 + 7.84 + Head + +
  • + + +
  • Cut
    • + + 29 + 2.37 + 0.60 + 3.24 + 0.72 + Edge + + + + - + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"] - - - 1 - 0.65 - 0.35 - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"] + + + 1 + 0.65 + 0.35 + + +
    • - + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/statBases - - - 10000 - 1 - 6 - 0.45 - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/statBases + + + 10000 + 1 + 6 + 0.45 + + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/recipeMaker - - - Smithing - - 5 - - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/recipeMaker + + + Smithing + + 5 + + + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.5 - 0.1 - 0.5 - Handle - -
  • - - -
  • Stab
    • - - 18 - 1.27 - 1.96 - 3.92 - Point - -
  • - - -
  • Blunt
    • - - 20 - 2.73 - 7.84 - Head - -
  • - - -
  • Cut
    • - - 29 - 2.37 - 0.60 - 3.24 - 0.72 - Edge - - - - +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.5 + 0.1 + 0.5 + Handle + +
  • + + +
  • Stab
    • + + 18 + 1.27 + 1.96 + 3.92 + Point + +
  • + + +
  • Blunt
    • + + 20 + 2.73 + 7.84 + Head + +
  • + + +
  • Cut
    • + + 29 + 2.37 + 0.60 + 3.24 + 0.72 + Edge + + + + - + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/weaponTags - -
  • CE_OneHandedWeapon
    • - - +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Sabre"]/weaponTags + +
  • CE_OneHandedWeapon
    • + + - + -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/statBases - - - 14000 - 1.12 - 3.5 - 0.24 - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/statBases + + + 14000 + 1.12 + 3.5 + 0.24 + + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"] - - - 0.42 - 0.24 - 0.2 - 0.1 - 0.12 - - -
    • +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"] + + + 0.42 + 0.24 + 0.2 + 0.1 + 0.12 + + +
    • -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/tools - - -
  • - - -
  • Poke
    • - - 3 - 1.70 - 0.33 - 0.825 - Handle - -
  • - - -
  • Blunt
    • - - 18.50 - 2.1 - 0.33 - 6.625 - Head - - - - - -
  • - Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/weaponTags - -
  • CE_OneHandedWeapon
    • - - +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.70 + 0.33 + 0.825 + Handle + +
  • + + +
  • Blunt
    • + + 18.50 + 2.1 + 0.33 + 6.625 + Head + + + + + +
  • + Defs/ThingDef[defName="Serek_MeleeWeapon_Bulava"]/weaponTags + +
  • CE_OneHandedWeapon
    • + +     diff --git a/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml b/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml index ec055bf647..249bd3e686 100644 --- a/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml +++ b/Patches/Thog's Guns - More Brukka Pack/Ranged_Industrial.xml @@ -4,13 +4,13 @@
  • Thog's Guns - More Brukka Pack
    • -
  • Thog's Guns - More Brukka Pack - REPRIMED
    • +
  • Thog's Guns - More Brukka Pack - REPRIMED
    •  - +
  • Defs/ThingDef[ defName="Gun_LightSMG" or diff --git a/Patches/Thrumbo Plushie/ThrumboPlushie.xml b/Patches/Thrumbo Plushie/ThrumboPlushie.xml index e654cbc438..f407ef7c49 100644 --- a/Patches/Thrumbo Plushie/ThrumboPlushie.xml +++ b/Patches/Thrumbo Plushie/ThrumboPlushie.xml @@ -7,48 +7,48 @@ - -
  • - Defs/ThingDef[defName="ThrumboPlushie"]/tools - - -
  • - - -
  • Blunt
    • - - 1 - 2 - 0.05 - Base - - - - - -
  • - Defs/ThingDef[defName="ThrumboPlushie"]/statBases - - 2 - -
    • + +
  • + Defs/ThingDef[defName="ThrumboPlushie"]/tools + + +
  • + + +
  • Blunt
    • + + 1 + 2 + 0.05 + Base + + + + -
  • - Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags - - Defs/ThingDef[defName="ThrumboPlushie"] +
  • + Defs/ThingDef[defName="ThrumboPlushie"]/statBases - + 2 - -
    • + -
  • - Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags - -
  • CE_OneHandedWeapon
    • - - +
  • + Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags + + Defs/ThingDef[defName="ThrumboPlushie"] + + + + +
    • + +
  • + Defs/ThingDef[defName="ThrumboPlushie"]/weaponTags + +
  • CE_OneHandedWeapon
    • + +     diff --git a/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml b/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml index 559a3d7c29..6a44b7f532 100644 --- a/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml +++ b/Patches/UEM More Mechanitor Mechs/Defs/ThingDefs_Races/Races_Mechanoid_Light.xml @@ -156,4 +156,4 @@     -     + \ No newline at end of file diff --git a/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml b/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml index d565c21e6c..8608e93388 100644 --- a/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml +++ b/Patches/Vanilla Factions Expanded - Deserters/Buildings_Special.xml @@ -8,137 +8,137 @@ - -
  • - Defs/ThingDef[@Name="VFED_AmmoBoxBase"] - - CombatExtended.Building_AutoLoaderCE - MapMeshAndRealTime - -
    • + +
  • + Defs/ThingDef[@Name="VFED_AmmoBoxBase"] + + CombatExtended.Building_AutoLoaderCE + MapMeshAndRealTime + +
    • - -
  • - Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"] - - -
  • - 180 - 7.8 - AmmoSet_40x311mmR -
    • - - - + +
  • + Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"] + + +
  • + 180 + 7.8 + AmmoSet_40x311mmR +
    • + + + -
  • - Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]/costList - - - 40 - 2 - - -
    • +
  • + Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"]/costList + + + 40 + 2 + + +
    • -
  • - Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"] - -
  • - -
  • Turret_Sniper
    • -
  • VFED_Turret_Kontarion
    • - - - - +
  • + Defs/ThingDef[defName="VFED_AmmoBox_UraniumSlug"] + +
  • + +
  • Turret_Sniper
    • +
  • VFED_Turret_Kontarion
    • + + + + - -
  • - Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/comps - -
  • - 600 - 7.8 - AmmoSet_20x102mmNATO -
    • - - + +
  • + Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/comps + +
  • + 600 + 7.8 + AmmoSet_20x102mmNATO +
    • + + -
  • - Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/costList - - - 40 - 2 - - -
    • +
  • + Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"]/costList + + + 40 + 2 + + +
    • -
  • - Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"] - -
  • - -
  • Turret_Autocannon
    • -
  • VFED_Turret_Palintone
    • - - - - +
  • + Defs/ThingDef[defName="VFED_AmmoBox_Autocannon"] + +
  • + +
  • Turret_Autocannon
    • +
  • VFED_Turret_Palintone
    • + + + + - -
  • - Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/comps - -
  • - 72 - 7.8 - AmmoSet_50mmRocket -
    • - - + +
  • + Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/comps + +
  • + 72 + 7.8 + AmmoSet_50mmRocket +
    • + + -
  • - Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/costList - - - 40 - 2 - - -
    • +
  • + Defs/ThingDef[defName="VFED_AmmoBox_Missile"]/costList + + + 40 + 2 + + +
    • -
  • - Defs/ThingDef[defName="VFED_AmmoBox_Missile"] - -
  • - -
  • Turret_RocketswarmLauncher
    • -
  • VFED_Turret_Onager
    • - - - - +
  • + Defs/ThingDef[defName="VFED_AmmoBox_Missile"] + +
  • + +
  • Turret_RocketswarmLauncher
    • +
  • VFED_Turret_Onager
    • + + + + - -
  • - Defs/ThingDef[defName="VFED_AerodroneMunitionsCrate"]/comps/li[@Class="VFED.CompProperties_Explosive_Shells"] - -
  • - 1000 - 4 - Bomb - 0.2 - 0.25 -
    • -
  • - - 6 - -
    • - - + +
  • + Defs/ThingDef[defName="VFED_AerodroneMunitionsCrate"]/comps/li[@Class="VFED.CompProperties_Explosive_Shells"] + +
  • + 1000 + 4 + Bomb + 0.2 + 0.25 +
    • +
  • + + 6 + +
    • + +     diff --git a/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml b/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml index 7067c86cad..c65cf6f7b9 100644 --- a/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml +++ b/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml @@ -8,96 +8,96 @@ - + -
  • - Defs/ThingDef[defName="Ammo_6x24mmCharged"] - -
  • - VFED_Imperial - 5 - false - 100 +
  • + Defs/ThingDef[defName="Ammo_6x24mmCharged"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • + - - -
  • - Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"] - -
  • - VFED_Imperial - 5 - false - 100 +
  • + Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • + - - -
  • - Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"] - -
  • - VFED_Imperial - 5 - false - 100 +
  • + Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • + - - -
  • - Defs/ThingDef[defName="CE_Gun_ChargeSniperRifle"] - -
  • - VFED_Imperial - 13 - false +
  • + Defs/ThingDef[defName="CE_Gun_ChargeSniperRifle"] + +
  • + VFED_Imperial + 13 + false +
    • + - - -
  • - Defs/ThingDef[defName="Ammo_8x50mmCharged"] - -
  • - VFED_Imperial - 6 - false - 100 +
  • + Defs/ThingDef[defName="Ammo_8x50mmCharged"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • + - - -
  • - Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] - -
  • - VFED_Imperial - 6 - false - 100 +
  • + Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • + - - -
  • - Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"] - -
  • - VFED_Imperial - 6 - false - 100 +
  • + Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • + - - - + -
  • - Defs/ThingDef[defName="Gun_ChargeLance"]/modExtensions/li[@Class="VFED.ContrabandExtension"] -
    • +
  • + Defs/ThingDef[defName="Gun_ChargeLance"]/modExtensions/li[@Class="VFED.ContrabandExtension"] +
    • diff --git a/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml b/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml index a026195b15..1cd91b0f30 100644 --- a/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml +++ b/Patches/Vanilla Factions Expanded - Empire/Ammo/ChargeThumperRound.xml @@ -45,11 +45,11 @@
  • VFED_Imperial - 5 + 5 false 30
    • -     + diff --git a/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml b/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml index 5ed80fc0d1..8656a657bb 100644 --- a/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml +++ b/Patches/Vanilla Factions Expanded - Empire/Ammo/FletcherRifleRound.xml @@ -51,11 +51,11 @@
  • VFED_Imperial - 5 + 5 true 50
    • -     +     diff --git a/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml b/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml index caa2e54c8a..1eba099254 100644 --- a/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml +++ b/Patches/Vanilla Races Expanded - Archon/Apparel_Various.xml @@ -8,117 +8,117 @@ - -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases - - 50 - 5 - -
    • + +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases + + 50 + 5 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/MaxHitPoints - - 650 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/MaxHitPoints + + 650 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/VEF_EnergyShieldEnergyMaxApparel - - 12 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/VEF_EnergyShieldEnergyMaxApparel + + 12 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Mass - - 25 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Mass + + 25 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Flammability - - 0 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/Flammability + + 0 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Sharp - - 26 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Sharp + + 26 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Blunt - - 54 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/statBases/ArmorRating_Blunt + + 54 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/equippedStatOffsets - - 50 - 20 - -
    • +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/equippedStatOffsets + + 50 + 20 + +
    • -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/apparel/bodyPartGroups - -
  • Hands
    • - - +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"]/apparel/bodyPartGroups + +
  • Hands
    • + + -
  • - Defs/ThingDef[defName="VREA_Apparel_Archoplate"] - -
  • - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.80 - -
  • Neck
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.90 - -
  • Arm
    • - - -
  • - 0.70 - -
  • Hand
    • - - -
  • - 0.70 - -
  • Hand
    • - - - - - - +
  • + Defs/ThingDef[defName="VREA_Apparel_Archoplate"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + + +     diff --git a/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml b/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml index 7a33fd15e4..7fe1c72716 100644 --- a/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml +++ b/Patches/Vanilla Races Expanded - Archon/Archon_Misc.xml @@ -8,33 +8,33 @@ - -
  • - Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Sharp - - 1.5 - -
    • + +
  • + Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Sharp + + 1.5 + +
    • -
  • - Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Blunt - - 1 - -
    • +
  • + Defs/GeneDef[defName="VRE_Leatherskin"]/statOffsets/ArmorRating_Blunt + + 1 + +
    • - -
  • - Defs/PawnKindDef[defName="ArchonWarrior"] - -
  • - - 6 - 12 - -
    • - - + +
  • + Defs/PawnKindDef[defName="ArchonWarrior"] + +
  • + + 6 + 12 + +
    • + +     diff --git a/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml b/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml index d5ea9a54da..2d8063b6f8 100644 --- a/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml +++ b/Patches/Vanilla Races Expanded - Archon/Melee_Archon.xml @@ -8,55 +8,55 @@ - -
  • - Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/tools - - -
  • - - -
  • Poke
    • - - 5 - 1.69 - 0.10 - 0.80 - Handle - -
  • - - -
  • VREA_Sear
    • - - 49 - 1.37 - 4.06 - 50 - Edge - - - - + +
  • + Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/tools + + +
  • + + +
  • Poke
    • + + 5 + 1.69 + 0.10 + 0.80 + Handle + +
  • + + +
  • VREA_Sear
    • + + 49 + 1.37 + 4.06 + 50 + Edge + + + + -
  • - Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/statBases - - 10 - 1.42 - -
    • +
  • + Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"]/statBases + + 10 + 1.42 + +
    • -
  • - Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"] - - - 1.00 - 0.60 - 0.53 - - -
    • +
  • + Defs/ThingDef[defName="VREA_MeleeWeapon_ArchobladeBladelink"] + + + 1.00 + 0.60 + 0.53 + + +
    • diff --git a/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml b/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml index 51a8557f22..8fa383c4e1 100644 --- a/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml +++ b/Patches/Vanilla Races Expanded - Fungoid/Apparel_Various.xml @@ -6,92 +6,92 @@ - - -
  • - Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases - - 40 - 15 - -
    • -
  • - Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Sharp - - 14 - -
    • + +
  • + Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases + + 40 + 15 + +
    • -
  • - Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Blunt - - 28 - -
    • +
  • + Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Sharp + + 14 + +
    • -
  • - Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/equippedStatOffsets/MoveSpeed - - -0.15 - -
    • +
  • + Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/statBases/ArmorRating_Blunt + + 28 + +
    • -
  • - Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/apparel/bodyPartGroups - -
  • Hands
    • -
  • Feet
    • - - +
  • + Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/equippedStatOffsets/MoveSpeed + + -0.15 + +
    • -
  • - Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"] - -
  • - -
  • - 0.60 - -
  • Neck
    • -
  • Hand
    • - - -
  • - 0.60 - -
  • Neck
    • -
  • Hand
    • - - -
  • - 0.90 - -
  • Leg
    • - - -
  • - 0.90 - -
  • Leg
    • - - -
  • - 0.80 - -
  • Arm
    • - - -
  • - 0.80 - -
  • Arm
    • - - - - - - +
  • + Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • + + + +
  • + Defs/ThingDef[@Name="VREF_ApparelArmorAstrosuitBase"] + +
  • + +
  • + 0.60 + +
  • Neck
    • +
  • Hand
    • + + +
  • + 0.60 + +
  • Neck
    • +
  • Hand
    • + + +
  • + 0.90 + +
  • Leg
    • + + +
  • + 0.90 + +
  • Leg
    • + + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + + + + +     diff --git a/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml b/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml index be4831f7cf..f6b2093f67 100644 --- a/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml +++ b/Patches/Vanilla Races Expanded - Fungoid/Fungoid_Hediffs_BodyParts.xml @@ -7,43 +7,43 @@ -
  • - Defs/HediffDef[defName="VRE_InfectorMouth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • VRE_Infection_Bite
    • - - 15 - 1.5 - 0.15 - 1.5 - true - - - - +
  • + Defs/HediffDef[defName="VRE_InfectorMouth"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • VRE_Infection_Bite
    • + + 15 + 1.5 + 0.15 + 1.5 + true + + + + -
  • - Defs/HediffDef[defName="VRE_InfectorHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • VRE_Infection
    • - - 8 - 0.2 - 0.18 - true - 1.5 - - - - +
  • + Defs/HediffDef[defName="VRE_InfectorHands"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • VRE_Infection
    • + + 8 + 0.2 + 0.18 + true + 1.5 + + + +     diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml index 060d780d62..d6ba0c3507 100644 --- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml +++ b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Badger.xml @@ -178,4 +178,4 @@ - + \ No newline at end of file diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml index 79efa57952..db762f978c 100644 --- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml +++ b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Marshal.xml @@ -256,4 +256,4 @@ - + \ No newline at end of file diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml index f026d9b0a5..d5fa8bc3c8 100644 --- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml +++ b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Paladin.xml @@ -151,4 +151,4 @@ - + \ No newline at end of file diff --git a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml index 0cc9c53400..f03bc9f082 100644 --- a/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml +++ b/Patches/Vanilla Vehicles Expanded - Tier 3/VehicleDefs/Udar.xml @@ -29,7 +29,7 @@ 4 - -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/projectile - - Bullet_30x173mmNATO_AP - -
    • + +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/projectile + + Bullet_30x173mmNATO_AP + +
    • -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/reloadTimer - - 7.8 - -
    • +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/reloadTimer + + 7.8 + +
    • -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/warmUpTimer - - 2.5 - -
    • - -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/magazineCapacity - - 80 - -
    • +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/warmUpTimer + + 2.5 + +
    • -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/maxRange - - 95 - -
    • - -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/fireModes - - -
  • - 1 - 6 - 60 - - UI/Gizmos/FireRate_Single -
    • -
  • - 4 - 6 - 60 - - UI/Gizmos/FireRate_Burst -
    • -
  • - 8 - 6 - 60 - - UI/Gizmos/FireRate_Auto -
    • - - - +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/magazineCapacity + + 80 + +
    • -
  • - Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"] - -
  • - AmmoSet_30x173mmNATO - 5 - 181 - 0.9 - 0.08 -
    • - - +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/maxRange + + 95 + +
    • + +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"]/fireModes + + +
  • + 1 + 6 + 60 + + UI/Gizmos/FireRate_Single +
    • +
  • + 4 + 6 + 60 + + UI/Gizmos/FireRate_Burst +
    • +
  • + 8 + 6 + 60 + + UI/Gizmos/FireRate_Auto +
    • + + + + +
  • + Defs/Vehicles.VehicleTurretDef[defName="HighMacs_GatlingCannon"] + +
  • + AmmoSet_30x173mmNATO + 5 + 181 + 0.9 + 0.08 +
    • + + diff --git a/Patches/Vulpine Pack/Race_Frij.xml b/Patches/Vulpine Pack/Race_Frij.xml index 95742f7777..6549d0fea2 100644 --- a/Patches/Vulpine Pack/Race_Frij.xml +++ b/Patches/Vulpine Pack/Race_Frij.xml @@ -26,7 +26,7 @@ - +
  • @@ -42,7 +42,7 @@
    • - + @@ -112,4 +112,4 @@ - + \ No newline at end of file diff --git a/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml b/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml index cfb55f318d..7b0798727e 100644 --- a/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml +++ b/Patches/Warhammer 40.000 - Imperium Materials/GrimForge_CE_Resources.xml @@ -8,159 +8,159 @@ - -
  • - Defs/ThingDef[defName="GF40K_Adamantium"]/stuffProps/categories - -
  • Metallic_Weapon
    • -
  • Steeled
    • - - - -
  • - Defs/ThingDef[defName="GF40K_Adamantium"]/statBases - - 0.03 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Sharp - - 3 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Blunt - - 4.5 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Heat - - 0.15 - -
    • - - -
  • - Defs/ThingDef[defName="GF40K_Auramite"]/stuffProps/categories - -
  • Metallic_Weapon
    • -
  • Steeled
    • - - - -
  • - Defs/ThingDef[defName="GF40K_Auramite"]/statBases - - 0.03 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Sharp - - 2.1 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Blunt - - 3.15 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Heat - - 0.07 - -
    • - - -
  • - Defs/ThingDef[defName="GF40K_Ceramite"]/stuffProps/categories - -
  • Steeled
    • - - - -
  • - Defs/ThingDef[defName="GF40K_Ceramite"]/statBases - - 0.06 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Sharp - - 2.15 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Blunt - - 3.2 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Heat - - 0.12 - -
    • - - -
  • - Defs/ThingDef[defName="GF40K_Diamantine"]/stuffProps/categories - -
  • Steeled
    • - - - -
  • - Defs/ThingDef[defName="GF40K_Diamantine"]/statBases - - 0.03 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Sharp - - 2.35 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Blunt - - 3.55 - -
    • - -
  • - Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Heat - - 0.14 - -
    • - - -
  • - Defs/ThingDef[defName="GF40K_Ferrocrete"]/statBases - - 1 - -
    • + +
  • + Defs/ThingDef[defName="GF40K_Adamantium"]/stuffProps/categories + +
  • Metallic_Weapon
    • +
  • Steeled
    • + + + +
  • + Defs/ThingDef[defName="GF40K_Adamantium"]/statBases + + 0.03 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Sharp + + 3 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Blunt + + 4.5 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Adamantium"]/statBases/StuffPower_Armor_Heat + + 0.15 + +
    • + + +
  • + Defs/ThingDef[defName="GF40K_Auramite"]/stuffProps/categories + +
  • Metallic_Weapon
    • +
  • Steeled
    • + + + +
  • + Defs/ThingDef[defName="GF40K_Auramite"]/statBases + + 0.03 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Sharp + + 2.1 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Blunt + + 3.15 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Auramite"]/statBases/StuffPower_Armor_Heat + + 0.07 + +
    • + + +
  • + Defs/ThingDef[defName="GF40K_Ceramite"]/stuffProps/categories + +
  • Steeled
    • + + + +
  • + Defs/ThingDef[defName="GF40K_Ceramite"]/statBases + + 0.06 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Sharp + + 2.15 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Blunt + + 3.2 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Ceramite"]/statBases/StuffPower_Armor_Heat + + 0.12 + +
    • + + +
  • + Defs/ThingDef[defName="GF40K_Diamantine"]/stuffProps/categories + +
  • Steeled
    • + + + +
  • + Defs/ThingDef[defName="GF40K_Diamantine"]/statBases + + 0.03 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Sharp + + 2.35 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Blunt + + 3.55 + +
    • + +
  • + Defs/ThingDef[defName="GF40K_Diamantine"]/statBases/StuffPower_Armor_Heat + + 0.14 + +
    • + + +
  • + Defs/ThingDef[defName="GF40K_Ferrocrete"]/statBases + + 1 + +
    • diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml index 71ed1ac8fa..f3b7076bb2 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Braizer.xml @@ -8,63 +8,63 @@ Defs - + - + - - Bullet_Braizer - - - Things/Projectile/Fireball - TransparentPostLight - Graphic_Single - - - 38 - Bullet - 16 - 18 - 8 - false - - -
  • - 9 - Flame - 0.9 - MortarBomb_Explode - true -
    • -     -     + + Bullet_Braizer + + + Things/Projectile/Fireball + TransparentPostLight + Graphic_Single + + + 38 + Bullet + 16 + 18 + 8 + false + + +
  • + 9 + Flame + 0.9 + MortarBomb_Explode + true +
    • +     +     - - Bullet_Braizer_Relic - - - Things/Projectile/Fireball - TransparentPostLight - Graphic_Single - - - 38 - Bullet - 20 - 22 - 10 - false - - -
  • - 12 - Flame - 1.4 - MortarBomb_Explode - true -
    • -     -     + + Bullet_Braizer_Relic + + + Things/Projectile/Fireball + TransparentPostLight + Graphic_Single + + + 38 + Bullet + 20 + 22 + 10 + false + + +
  • + 12 + Flame + 1.4 + MortarBomb_Explode + true +
    • +     +     diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml index b2fca76167..9697c9c845 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Galvanic.xml @@ -8,65 +8,65 @@ Defs - + - - AmmoSet_8mmGauss_Galvanic - - - Bullet_Gauss_Galvanic - - + + AmmoSet_8mmGauss_Galvanic + + + Bullet_Gauss_Galvanic + + - - AmmoSet_8mmGauss_Galvanic_Relic - - - Bullet_Gauss_Galvanic_Relic - - + + AmmoSet_8mmGauss_Galvanic_Relic + + + Bullet_Gauss_Galvanic_Relic + + - + - - Bullet_Gauss_Galvanic - - - true - False - GF40K_Gauss - 22 - 50 - 312 - -
  • - EMP - 45 - 0.4 -
    • -     -     -     + + Bullet_Gauss_Galvanic + + + true + False + GF40K_Gauss + 22 + 50 + 312 + +
  • + EMP + 45 + 0.4 +
    • +     +     +     - - Bullet_Gauss_Galvanic_Relic - - - true - False - GF40K_Gauss - 26 - 58 - 322 - -
  • - EMP - 50 - 0.5 -
    • -     -     -     + + Bullet_Gauss_Galvanic_Relic + + + true + False + GF40K_Gauss + 26 + 58 + 322 + +
  • + EMP + 50 + 0.5 +
    • +     +     +     diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml index ef292e200b..b58dab7ac4 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Ammo_Radium.xml @@ -8,171 +8,171 @@ Defs - + - - AmmoSet_Radium_Pistol - - - Bullet_10x18mmCharged - Bullet_10x18mmCharged_AP - Bullet_10x18mmCharged_Ion - Bullet_RadiumPistol_Tox - - + + AmmoSet_Radium_Pistol + + + Bullet_10x18mmCharged + Bullet_10x18mmCharged_AP + Bullet_10x18mmCharged_Ion + Bullet_RadiumPistol_Tox + + - - AmmoSet_Radium_Carbine - - - Bullet_8x35mmCharged - Bullet_8x35mmCharged_AP - Bullet_8x35mmCharged_Ion - Bullet_RadiumCarbine_Tox - - + + AmmoSet_Radium_Carbine + + + Bullet_8x35mmCharged + Bullet_8x35mmCharged_AP + Bullet_8x35mmCharged_Ion + Bullet_RadiumCarbine_Tox + + - + - - Ammo_RadiumPistol_Tox - - - Things/Ammo/Charged/SmallTox - Graphic_StackCount - - - 1.06 - - RadiationIonising - + + Ammo_RadiumPistol_Tox + + + Things/Ammo/Charged/SmallTox + Graphic_StackCount + + + 1.06 + + RadiationIonising + - - Ammo_RadiumCarbine_Tox - - - Things/Ammo/Charged/MediumTox - Graphic_StackCount - - - 0.97 - - RadiationIonising - + + Ammo_RadiumCarbine_Tox + + + Things/Ammo/Charged/MediumTox + Graphic_StackCount + + + 0.97 + + RadiationIonising + - + - - Bullet_RadiumPistol_Tox - - - 15 - GF40K_ToxBullet - 12 - 22.56 - - + + Bullet_RadiumPistol_Tox + + + 15 + GF40K_ToxBullet + 12 + 22.56 + + - - Bullet_RadiumCarbine_Tox - - - 19 - GF40K_ToxBullet - 16 - 57.6 - - + + Bullet_RadiumCarbine_Tox + + + 19 + GF40K_ToxBullet + 16 + 57.6 + + - + - - MakeAmmo_RadiumPistol_Tox - - Craft 500 10x18mm Charged (Tox) cartridges. - Making 10x18mm Charged (Tox) cartridges. - -
  • - - -
  • Uranium
    • - - - 20 - -
  • - - -
  • Steel
    • - - - 8 - -
  • - - -
  • ComponentIndustrial
    • - - - 10 - -     - - -
  • Uranium
    • -
  • Steel
    • -
  • ComponentIndustrial
    • -     -     - - 500 - - 14800 -     + + MakeAmmo_RadiumPistol_Tox + + Craft 500 10x18mm Charged (Tox) cartridges. + Making 10x18mm Charged (Tox) cartridges. + +
  • + + +
  • Uranium
    • + + + 20 + +
  • + + +
  • Steel
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 10 + +     + + +
  • Uranium
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 14800 +     - - MakeAmmo_RadiumCarbine_Tox - - Craft 500 8x35mm Charged (Tox) cartridges. - Making 8x35mm Charged (Tox) cartridges. - -
  • - - -
  • Uranium
    • - - - 18 - -
  • - - -
  • Steel
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 9 - -     - - -
  • Uranium
    • -
  • Steel
    • -
  • ComponentIndustrial
    • -     -     - - 500 - - 13600 -     + + MakeAmmo_RadiumCarbine_Tox + + Craft 500 8x35mm Charged (Tox) cartridges. + Making 8x35mm Charged (Tox) cartridges. + +
  • + + +
  • Uranium
    • + + + 18 + +
  • + + +
  • Steel
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 9 + +     + + +
  • Uranium
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 13600 +     diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml index 41f07b8d6a..788b8e2b25 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/GF40K_Damages_LocalInjury.xml @@ -9,17 +9,17 @@ - + -
  • - Defs/DamageDef[defName="GF40K_Shock"] - -
  • - true - true -
    • - - +
  • + Defs/DamageDef[defName="GF40K_Shock"] + +
  • + true + true +
    • + +     diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml index 4e50bd14fc..bba62abe60 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_ForceWeapons.xml @@ -191,7 +191,7 @@
  • CE_OneHandedWeapon
    • -     +     @@ -200,7 +200,7 @@
  • - false + false
  • Blunt
    • diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml index 803fc6dc75..e76806bbf5 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Melee/GF40K_MechanicusWeapons.xml @@ -42,7 +42,7 @@ EMP 2 - + 2.5 200 @@ -191,8 +191,8 @@ 0.5 -
  • CE_OneHandedWeapon
    • -     +
  • CE_OneHandedWeapon
    • +     diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml index 1e21032ac8..6dc8ecee88 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Braizer.xml @@ -124,7 +124,7 @@ 12 true - + @@ -152,7 +152,7 @@ 12 true - + diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml index e817d09e57..8b423053f3 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_FlamerWeapon.xml @@ -48,7 +48,7 @@ - +
  • Defs/ThingDef[defName="GF40K_RelicFlamer"]/tools @@ -130,7 +130,7 @@
    • - +
  • GF40K_RelicFlamer diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml index f6c494b098..51eff0a582 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_GrenadeLauncherWeapon.xml @@ -48,7 +48,7 @@
    • - +
  • Defs/ThingDef[defName="GF40K_RelicGrenadeLauncher"]/tools @@ -134,7 +134,7 @@
    • - +
  • GF40K_RelicGrenadeLauncher diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml index adb71e06cf..f1137f2884 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_LasWeapons.xml @@ -201,7 +201,7 @@ GunTail_Light 9 5 - 4 + 4 50 @@ -236,7 +236,7 @@ 9 GF40K_LaserPistolShot GunTail_Light - 9 + 9 50 @@ -271,7 +271,7 @@ GunTail_Light 9 6 - 4 + 4 80 @@ -280,7 +280,7 @@ 3 - TRUE + TRUE AimedShot
    • @@ -307,7 +307,7 @@ GunTail_Light 9 6 - 4 + 4 80 @@ -316,7 +316,7 @@ 3 - TRUE + TRUE AimedShot @@ -343,7 +343,7 @@ GunTail_Light 9 6 - 4 + 4 60 @@ -352,7 +352,7 @@ 3 - TRUE + TRUE AimedShot @@ -379,7 +379,7 @@ GunTail_Light 9 6 - 4 + 4 60 @@ -388,7 +388,7 @@ 3 - TRUE + TRUE AimedShot diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml index d3a9f5a66f..420cc72620 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_Meltagun.xml @@ -83,7 +83,7 @@ GunTail_Light 11 6 - 4 + 4 60 @@ -117,7 +117,7 @@ GunTail_Light 11 6 - 4 + 4 60 diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml index b6f351be5f..49e2453c6e 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons.xml @@ -15,7 +15,7 @@ defName = "GF40K_StubShotgun" or defName = "GF40K_StubCarbine" or defName = "GF40K_StubPistol" or - defName = "GF40K_StubSniper" + defName = "GF40K_StubSniper" ]/tools @@ -49,14 +49,14 @@
  • - - -
  • Blunt
    • - - 10 - 2.44 - 3.5 - Barrel + + +
  • Blunt
    • +     + 10 + 2.44 + 3.5 + Barrel     diff --git a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml index 4e67cb1fb5..718df40020 100644 --- a/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml +++ b/Patches/Warhammer 40.000 - Imperium Weaponry/Weapons_Ranged/GF40K_StubberWeapons_Relic.xml @@ -16,7 +16,7 @@ defName = "GF40K_RelicStubHMG" or defName = "GF40K_RelicStubCarbine" or defName = "GF40K_RelicStubPistol" or - defName = "GF40K_RelicStubSniper" + defName = "GF40K_RelicStubSniper" ]/tools diff --git a/Patches/Waster Toxic Breather/WasterBreather.xml b/Patches/Waster Toxic Breather/WasterBreather.xml index 3443f09070..2a7b359471 100644 --- a/Patches/Waster Toxic Breather/WasterBreather.xml +++ b/Patches/Waster Toxic Breather/WasterBreather.xml @@ -1,65 +1,65 @@ - - -
  • Wasters Toxic Breather
    • -     - - + + +
  • Wasters Toxic Breather
    • +     + + - -
  • - Defs/ThingDef[defName="WTM_ToxicBreather"]/statBases - - - 8000 - 100 - 0.5 - 3 - 1 - 0.5 - - -
    • + +
  • + Defs/ThingDef[defName="WTM_ToxicBreather"]/statBases + + + 8000 + 100 + 0.5 + 3 + 1 + 0.5 + + +
    • -
  • - Defs/ThingDef[defName="WTM_ToxicBreather"]/equippedStatOffsets - - -1 - -
    • +
  • + Defs/ThingDef[defName="WTM_ToxicBreather"]/equippedStatOffsets + + -1 + +
    • -
  • - Defs/ThingDef[defName="WTM_ToxicBreather"] - -
  • - WearingGasMask -
    • -
  • - false - true -
    • -     - +
  • + Defs/ThingDef[defName="WTM_ToxicBreather"] + +
  • + WearingGasMask +
    • +
  • + false + true +
    • +     + -
  • - Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/hatRenderedFrontOfFace - - false - -
    • +
  • + Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/hatRenderedFrontOfFace + + false + +
    • -
  • - Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/layers - - -
  • StrappedHead
    • - - - +
  • + Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/layers + + +
  • StrappedHead
    • + + + - - - - + + + + \ No newline at end of file diff --git a/Patches/Zombieland/Zombieland_Patches.xml b/Patches/Zombieland/Zombieland_Patches.xml index bb5a3b0973..3d9f2c24c0 100644 --- a/Patches/Zombieland/Zombieland_Patches.xml +++ b/Patches/Zombieland/Zombieland_Patches.xml @@ -191,4 +191,4 @@ - + \ No newline at end of file diff --git a/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml b/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml index 56d999b121..6a7a7c4b27 100644 --- a/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml +++ b/Patches/pphhyy Expanded Scythers/MechBodies_CE.xml @@ -8,184 +8,184 @@ - + + + + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"] + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"] + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"] + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"] + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"] + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"] + + + + +
    • + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups + + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"] + + + + +
    • + + + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups + +
  • CoveredByNaturalArmor
    • + + + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups + +
  • CoveredByNaturalArmor
    • + + + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups + +
  • CoveredByNaturalArmor
    • + + - +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups + +
  • CoveredByNaturalArmor
    • + + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups - +
  • CoveredByNaturalArmor
    • - - + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups - +
  • CoveredByNaturalArmor
    • - - + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups - +
  • CoveredByNaturalArmor
    • - - + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups - +
  • CoveredByNaturalArmor
    • - - + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups - +
  • CoveredByNaturalArmor
    • - - + + +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups + +
  • CoveredByNaturalArmor
    • + + + + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/coverage - + 0.15 - -
    • + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/coverage - + 0.2 - -
    • + -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups - - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"] +
  • + Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="FluidReprocessor"]/coverage - + 0.05 - -
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/groups - -
  • CoveredByNaturalArmor
    • - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups - -
  • CoveredByNaturalArmor
    • - - - - - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/coverage - - 0.15 - -
    • - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/coverage - - 0.2 - -
    • - -
  • - Defs/BodyDef[defName="ScytherExpanded"]/corePart/parts/li[def="FluidReprocessor"]/coverage - - 0.05 - -
    • +     diff --git a/Patches/pphhyy Expanded Scythers/MechKind_CE.xml b/Patches/pphhyy Expanded Scythers/MechKind_CE.xml index d7de65b768..b872e912c4 100644 --- a/Patches/pphhyy Expanded Scythers/MechKind_CE.xml +++ b/Patches/pphhyy Expanded Scythers/MechKind_CE.xml @@ -8,731 +8,730 @@ -
  • - Defs/ThingDef[ - defName="pphhyy_ScytherExpandedArch" or - defName="pphhyy_ScytherExpandedMono" or - defName="pphhyy_ScytherExpandedSearing" or - defName="pphhyy_ScytherExpandedPrestige" - ] - -
  • - Humanoid -
    • - - - -
  • - Defs/PawnKindDef[ - defName="pphhyy_ScytherExpandedTank" or - defName="pphhyy_ScytherExpandedArch" or - defName="pphhyy_ScytherExpandedSearing" - ]/combatPower - - 190 - -
    • - -
  • - Defs/PawnKindDef[defName="pphhyy_ScytherExpandedMono"]/combatPower - - 240 - -
    • - -
  • - Defs/PawnKindDef[defName="pphhyy_ScytherExpandedPrestige"]/combatPower - - 320 - -
    • - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases - - 50 - 20 - 0.18 - 0.19 - 0.23 - 250 - 0.2 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Blunt - - 8 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Sharp - - 6 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/tools - - -
  • - - -
  • Blunt
    • - - 24 - -
  • - EMP - 4 -
    • -     - 1.33 - LeftBlade - 35 - true - -
  • - - -
  • Blunt
    • - - 24 - -
  • - EMP - 4 -
    • -     - 1.33 - RightBlade - 35 - true - -
  • - - -
  • Blunt
    • - - 6 - -
  • - EMP - 2 -
    • -     - 5.9 - HeadAttackTool - 0.2 - 1.875 +
  • + Defs/ThingDef[ + defName="pphhyy_ScytherExpandedArch" or + defName="pphhyy_ScytherExpandedMono" or + defName="pphhyy_ScytherExpandedSearing" or + defName="pphhyy_ScytherExpandedPrestige" + ] + +
  • + Humanoid
    • - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps - - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"] + +
    • + +
  • + Defs/PawnKindDef[ + defName="pphhyy_ScytherExpandedTank" or + defName="pphhyy_ScytherExpandedArch" or + defName="pphhyy_ScytherExpandedSearing" + ]/combatPower + + 190 + +
    • + +
  • + Defs/PawnKindDef[defName="pphhyy_ScytherExpandedMono"]/combatPower + + 240 + +
    • + +
  • + Defs/PawnKindDef[defName="pphhyy_ScytherExpandedPrestige"]/combatPower + + 320 + +
    • + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases - + 50 + 20 + 0.18 + 0.19 + 0.23 + 250 + 0.2 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps - -
  • - 1225 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 116 - 0.75 -
    • - - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases - - 50 - 20 - 0.07 - 0.04 - 0.65 - 400 - 0.15 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Blunt - - 24 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Sharp - - 16 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/tools - - -
  • - - -
  • Blunt
    • - - 24 - -
  • - Stun - 4 -
    • -     - 1.33 - RightBlade - 16 - true + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Blunt + + 8 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/statBases/ArmorRating_Sharp + + 6 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/tools + + +
  • + + +
  • Blunt
    • + + 24 + +
  • + EMP + 4 +
    • +     + 1.33 + LeftBlade + 35 + true + +
  • + + +
  • Blunt
    • + + 24 + +
  • + EMP + 4 +
    • +     + 1.33 + RightBlade + 35 + true + +
  • + + +
  • Blunt
    • + + 6 + +
  • + EMP + 2 +
    • +     + 5.9 + HeadAttackTool + 0.2 + 1.875 + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps + + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"] + + + + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedArch"]/comps + +
  • + 1225 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 116 + 0.75
    • -
  • - - -
  • Blunt
    • - - 6 - 5.9 - HeadAttackTool - 0.2 - 1.875 + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases + + 50 + 20 + 0.07 + 0.04 + 0.65 + 400 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Blunt + + 24 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/statBases/ArmorRating_Sharp + + 16 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/tools + + +
  • + + +
  • Blunt
    • + + 24 + +
  • + Stun + 4 +
    • +     + 1.33 + RightBlade + 16 + true + +
  • + + +
  • Blunt
    • + + 6 + 5.9 + HeadAttackTool + 0.2 + 1.875 + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps + + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"] + + + + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps + +
  • + 1875 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 140 + 0.65
    • - - - + + -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps - +
  • Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"] - - - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"]/comps - -
  • - 1875 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 140 - 0.65 -
    • - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedTank"] - - -
  • - Humanoid -
    • -
  • - -
  • - false - 0.1 - -
  • SightSensor
    • - + +
  • + Humanoid
    • -
  • - false - 0.1 - -
  • SightSensor
    • - +
  • + +
  • + false + 0.1 + +
  • SightSensor
    • + + +
  • + false + 0.1 + +
  • SightSensor
    • + + +
  • + false + 0.625 + +
  • MechanicalHead
    • + + +
  • + false + 0.625 + +
  • MechanicalHead
    • + + +
  • + false + 0.625 + +
  • MechanicalLeg
    • + + +
  • + false + 0.625 + +
  • MechanicalLeg
    • + + + -
  • - false - 0.625 - -
  • MechanicalHead
    • - +     + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases + + 50 + 20 + 0.43 + 0.41 + 0.36 + 300 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Blunt + + 14 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Sharp + + 10 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/tools + + +
  • + + +
  • Cut
    • + + 45 + 1.84 + LeftBlade + 16 + 5.4 + true -
  • - false - 0.625 - -
  • MechanicalHead
    • - +
  • + + +
  • Stab
    • + + 27 + 1.03 + LeftBlade + 45 + 20 + true -
  • - false - 0.625 - -
  • MechanicalLeg
    • - +
  • + + +
  • Cut
    • + + 45 + 1.84 + RightBlade + 16 + 5.4 + true -
  • - false - 0.625 - -
  • MechanicalLeg
    • - +
  • + + +
  • Stab
    • + + 27 + 1.03 + RightBlade + 45 + 20 + true - - - - - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases - - 50 - 20 - 0.43 - 0.41 - 0.36 - 300 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Blunt - - 14 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/statBases/ArmorRating_Sharp - - 10 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/tools - - -
  • - - -
  • Cut
    • - - 45 - 1.84 - LeftBlade - 16 - 5.4 - true - -
  • - - -
  • Stab
    • - - 27 - 1.03 - LeftBlade - 45 - 20 - true - -
  • - - -
  • Cut
    • - - 45 - 1.84 - RightBlade - 16 - 5.4 - true - -
  • - - -
  • Stab
    • - - 27 - 1.03 - RightBlade - 45 - 20 - true - -
  • - - -
  • Blunt
    • - - 6 - 5.9 - HeadAttackTool - 0.2 - 1.875 +
  • + + +
  • Blunt
    • + + 6 + 5.9 + HeadAttackTool + 0.2 + 1.875 + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps + + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"] + + + + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps + +
  • + 1300 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 116 + 0.75
    • - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps - - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"] + +
    • + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases - + 50 + 20 + 0.18 + 0.23 + 0.19 + 250 + 0.4 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedMono"]/comps - -
  • - 1300 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 116 - 0.75 -
    • - - - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases - - 50 - 20 - 0.18 - 0.23 - 0.19 - 250 - 0.4 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Blunt - - 8 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Sharp - - 6 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/tools - - -
  • - - -
  • Cut
    • - - 43 - -
  • - Flame - 5 - 0.3 -
    • -     - 2.07 - LeftBlade - 2.16 - 5.4 - true - -
  • - - -
  • Stab
    • - - 24 - -
  • - Flame - 5 - 0.3 -
    • -     - 1.33 - LeftBlade - 40 - 20 - true - -
  • - - -
  • Cut
    • - - 43 - -
  • - Flame - 5 - 0.3 -
    • -     - 2.07 - RightBlade - 2.16 - 5.4 - true - -
  • - - -
  • Stab
    • - - 24 - -
  • - Flame - 5 - 0.3 -
    • -     - 1.33 - RightBlade - 40 - 20 - true - -
  • - - -
  • Blunt
    • - - 6 - 5.9 - HeadAttackTool - 0.2 - 1.875 - - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps - - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"] +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Blunt - + 8 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps - -
  • - 1225 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 116 - 0.75 -
    • - - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases - - 50 - 20 - 0.58 - 0.54 - 0.45 - 380 - 0.2 - 0.15 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Blunt - - 24 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Sharp - - 16 - -
    • - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/tools - - -
  • - - -
  • Cut
    • - - 46 - 1.84 - LeftBlade - 20 - 5.4 - true - -
  • - - -
  • Stab
    • - - 28 - 1.03 - LeftBlade - 45 - 20 - true - -
  • - - -
  • Cut
    • - - 46 - 1.84 - RightBlade - 20 - 5.4 - true - -
  • - - -
  • Stab
    • - - 28 - 1.03 - RightBlade - 45 - 20 - true - -
  • - - -
  • Blunt
    • - - 6 - 5.9 - HeadAttackTool - 0.2 - 1.875 + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/statBases/ArmorRating_Sharp + + 6 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/tools + + +
  • + + +
  • Cut
    • + + 43 + +
  • + Flame + 5 + 0.3 +
    • +     + 2.07 + LeftBlade + 2.16 + 5.4 + true + +
  • + + +
  • Stab
    • + + 24 + +
  • + Flame + 5 + 0.3 +
    • +     + 1.33 + LeftBlade + 40 + 20 + true + +
  • + + +
  • Cut
    • + + 43 + +
  • + Flame + 5 + 0.3 +
    • +     + 2.07 + RightBlade + 2.16 + 5.4 + true + +
  • + + +
  • Stab
    • + + 24 + +
  • + Flame + 5 + 0.3 +
    • +     + 1.33 + RightBlade + 40 + 20 + true + +
  • + + +
  • Blunt
    • + + 6 + 5.9 + HeadAttackTool + 0.2 + 1.875 + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps + + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"] + + + + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedSearing"]/comps + +
  • + 1225 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 116 + 0.75
    • - - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps - - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"] + +
    • + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases - + 50 + 20 + 0.58 + 0.54 + 0.45 + 380 + 0.2 + 0.15 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Blunt + + 24 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/statBases/ArmorRating_Sharp + + 16 + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/tools + + +
  • + + +
  • Cut
    • + + 46 + 1.84 + LeftBlade + 20 + 5.4 + true + +
  • + + +
  • Stab
    • + + 28 + 1.03 + LeftBlade + 45 + 20 + true + +
  • + + +
  • Cut
    • + + 46 + 1.84 + RightBlade + 20 + 5.4 + true + +
  • + + +
  • Stab
    • + + 28 + 1.03 + RightBlade + 45 + 20 + true + +
  • + + +
  • Blunt
    • + + 6 + 5.9 + HeadAttackTool + 0.2 + 1.875 + + + + + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps + + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"] + + + + +
    • + +
  • + Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps + +
  • + 1500 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 150 + 0.75 +
    • - - - -
  • - Defs/ThingDef[defName="pphhyy_ScytherExpandedPrestige"]/comps - -
  • - 1500 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 150 - 0.75 -
    • - - +     diff --git a/Source/CombatExtended/CombatExtended/Comps/BipodComp.cs b/Source/CombatExtended/CombatExtended/Comps/BipodComp.cs index 76ab94f5c8..12c73bf63d 100644 --- a/Source/CombatExtended/CombatExtended/Comps/BipodComp.cs +++ b/Source/CombatExtended/CombatExtended/Comps/BipodComp.cs @@ -32,7 +32,8 @@ public bool ShouldSetUp if (Controller.settings.AutoSetUp) { var varA = this.parent.TryGetComp(); - result = (((varA.CurrentAimMode == Props.catDef.autosetMode) | (!Props.catDef.useAutoSetMode && varA.CurrentAimMode != AimMode.Snapshot)) && !IsSetUpRn); + Pawn pawn = ((Pawn_EquipmentTracker)this.ParentHolder).pawn; + result = (((varA.CurrentAimMode == Props.catDef.autosetMode) | (!Props.catDef.useAutoSetMode && varA.CurrentAimMode != AimMode.Snapshot)) && !IsSetUpRn && !PawnUtility.IsCarryingPawn(pawn)); } else { diff --git a/Source/CombatExtended/CombatExtended/Comps/CompExplosiveCE.cs b/Source/CombatExtended/CombatExtended/Comps/CompExplosiveCE.cs index 928c05d5ad..f823953f9e 100644 --- a/Source/CombatExtended/CombatExtended/Comps/CompExplosiveCE.cs +++ b/Source/CombatExtended/CombatExtended/Comps/CompExplosiveCE.cs @@ -32,7 +32,10 @@ public virtual void Explode(Thing instigator, Vector3 pos, Map map, float scaleF } //Try to throw fragments -- increase count by scaleFactor - parent.TryGetComp()?.Throw(pos, map, instigator);//scaleFactor); + foreach (var comp in parent.GetComps()) + { + comp.Throw(pos, map, instigator); + } if (Props.explosiveRadius > 0 //&& Props.damageAmountBase > 0 Disabled to allow flame explosions etc && parent.def != null) diff --git a/Source/CombatExtended/CombatExtended/DefOfs/CE_ThingDefOf.cs b/Source/CombatExtended/CombatExtended/DefOfs/CE_ThingDefOf.cs index b515687e3d..8008f8fa4a 100644 --- a/Source/CombatExtended/CombatExtended/DefOfs/CE_ThingDefOf.cs +++ b/Source/CombatExtended/CombatExtended/DefOfs/CE_ThingDefOf.cs @@ -10,6 +10,8 @@ namespace CombatExtended [DefOf] public static class CE_ThingDefOf { + public static ThingDef Mote_BigExplode; + public static ThingDef Mote_FlareSmoke; public static ThingDef Mote_FlareGlow; diff --git a/Source/CombatExtended/CombatExtended/Defs/AmmoSetDef.cs b/Source/CombatExtended/CombatExtended/Defs/AmmoSetDef.cs index 31e66a2b42..f9e09b209c 100644 --- a/Source/CombatExtended/CombatExtended/Defs/AmmoSetDef.cs +++ b/Source/CombatExtended/CombatExtended/Defs/AmmoSetDef.cs @@ -16,6 +16,8 @@ public class AmmoSetDef : Def public AmmoSetDef similarTo; + public int ammoConsumedPerShot = 1; + public override IEnumerable SpecialDisplayStats(StatRequest req) { foreach (StatDrawEntry entry in base.SpecialDisplayStats(req)) { yield return entry; } diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index db3d61b435..bd639b5bfd 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -128,13 +128,13 @@ public virtual float DamageAmount #endregion - private float suppressionAmount; + protected float suppressionAmount; public Thing mount; // GiddyUp compatibility, ignore collisions with pawns the launcher is mounting public float AccuracyFactor; #region Height - private int lastHeightTick = -1; - private float heightInt = 0f; + protected int lastHeightTick = -1; + protected float heightInt = 0f; /// /// If lastHeightTick is not FlightTicks, Height calculates the quadratic formula (g/2)t^2 + (-v_0y)t + (y-y0) for {g -> gravity, v_0y -> shotSpeed * Mathf.Sin(shotAngle), y0 -> shotHeight, t -> seconds} to find y rounded to the nearest 3 decimals. /// @@ -227,7 +227,7 @@ public float fTicks #endregion #region Position - private Vector2 Vec2Position(float ticks = -1f) + protected virtual Vector2 Vec2Position(float ticks = -1f) { if (ticks < 0) { @@ -258,7 +258,7 @@ public virtual Vector3 ExactPosition } } - public Vector2 DrawPosV2 + public virtual Vector2 DrawPosV2 { get { @@ -278,7 +278,7 @@ public override Vector3 DrawPos private Vector3 lastExactPos = new Vector3(-1000, 0, 0); public Vector3 LastPos { - private set + protected set { lastExactPos = value; } @@ -412,8 +412,8 @@ private float GravityFactor - private Material[] shadowMaterial; - private Material ShadowMaterial + protected Material[] shadowMaterial; + protected Material ShadowMaterial { get { @@ -599,7 +599,7 @@ public virtual void RayCast(Thing launcher, VerbProperties verbProps, Vector2 or } } - private void RayCastSuppression(IntVec3 muzzle, IntVec3 destination, Map map = null) + protected void RayCastSuppression(IntVec3 muzzle, IntVec3 destination, Map map = null) { if (muzzle == destination) { @@ -683,7 +683,7 @@ public virtual void InterceptProjectile(object interceptor, Vector3 shieldPositi InterceptProjectile(interceptor, BlockerRegistry.GetExactPosition(OriginIV3.ToVector3(), ExactPosition, shieldPosition, shieldRadius * shieldRadius)); } - private (Vector3 IntersectionPos, Action OnInterception)? CheckIntercept(IEnumerable interceptorThings) + protected virtual (Vector3 IntersectionPos, Action OnInterception)? CheckIntercept(IEnumerable interceptorThings) { (Vector3 IntersectionPos, Action OnInterception)? result = null; float distToResult = float.MaxValue; @@ -795,7 +795,7 @@ private void OnCompProjectileInterceptorInterception(Thing interceptorThing, Com this.Impact(null); } //Removed minimum collision distance - private bool CheckForCollisionBetween() + protected bool CheckForCollisionBetween() { List<(Vector3 IntersectionPos, Action OnInterception)> possibleIntersections = new List<(Vector3 IntersectionPos, Action OnInterception)>(3); // CompProjectileInterceptor, Interceptor from Blocker registry and interceptor from CollectPossibleTargetsForCell bool collided = false; @@ -876,7 +876,7 @@ private bool CheckForCollisionBetween() /// /// Where to check for collisions in /// True if collision occured, false otherwise - private (Vector3 IntersectionPos, Action OnIntersection)? PossibleTargetForCell(IntVec3 cell) + protected (Vector3 IntersectionPos, Action OnIntersection)? PossibleTargetForCell(IntVec3 cell) { Vector3 roofIntersectionPos; bool roofChecked = false; @@ -954,7 +954,7 @@ private bool CheckForCollisionBetween() return result; } - private bool CanCollideWithRoof(IntVec3 cell, out Vector3 point) + protected bool CanCollideWithRoof(IntVec3 cell, out Vector3 point) { point = Vector3.negativeInfinity; if (!cell.Roofed(Map)) @@ -988,7 +988,7 @@ public void CollideWithRoof(Vector3 point) Impact(null); } - private bool CanCollideWith(Thing thing, out float dist, out Vector3 point) + protected bool CanCollideWith(Thing thing, out float dist, out Vector3 point) { dist = -1f; point = Vector3.negativeInfinity; @@ -1018,7 +1018,7 @@ private bool CanCollideWith(Thing thing, out float dist, out Vector3 point) /// /// What to impact /// True if impact occured, false otherwise - private bool TryCollideWith(Thing thing) + protected bool TryCollideWith(Thing thing) { if (!CanCollideWith(thing, out var dist, out var point)) @@ -1376,14 +1376,27 @@ public virtual void Impact(Thing hitThing) effecter.Trigger(new TargetInfo(explodePos.ToIntVec3(), Map, false), new TargetInfo(explodePos.ToIntVec3(), Map, false)); effecter.Cleanup(); } - + ProjectilePropertiesCE projectileCE = def.projectile as ProjectilePropertiesCE; + float effectScale = projectileCE.detonateEffectsScaleOverride > 0 ? projectileCE.detonateEffectsScaleOverride : projectileCE.explosionRadius * 2; + if (projectileCE.detonateMoteDef != null) + { + MoteMaker.MakeStaticMote(DrawPos, Map, CE_ThingDefOf.Mote_BigExplode, effectScale); + } + if (projectileCE.detonateFleckDef != null) + { + FleckCreationData dataStatic = FleckMaker.GetDataStatic(DrawPos, MapHeld, projectileCE.detonateFleckDef, effectScale); + MapHeld.flecks.CreateFleck(dataStatic); + } var projectilePropsCE = (def.projectile as ProjectilePropertiesCE); var explodingComp = this.TryGetComp(); if (explodingComp == null) { - this.TryGetComp()?.Throw(explodePos, Map, launcher); + foreach (var comp in GetComps()) + { + comp.Throw(explodePos, Map, launcher); + } } //If the comp exists, it'll already call CompFragments @@ -1493,7 +1506,7 @@ public virtual void Impact(Thing hitThing) /// /// Integer ticks, since the only time value which is not an integer (accessed by StartingTicksToImpact) has height zero by definition. /// Projectile height at time ticks in ticks. - private float GetHeightAtTicks(int ticks) + protected virtual float GetHeightAtTicks(int ticks) { var seconds = ((float)ticks) / GenTicks.TicksPerRealSecond; return (float)Math.Round(shotHeight + shotSpeed * Mathf.Sin(shotAngle) * seconds - (GravityFactor * seconds * seconds) / 2f, 3); @@ -1506,7 +1519,7 @@ private float GetHeightAtTicks(int ticks) /// Shot angle in radians off the ground. /// Height from which the projectile is fired in vertical cells. /// Time in seconds that the projectile will take to traverse the given arc. - private float GetFlightTime() + protected float GetFlightTime() { //Calculates quadratic formula (g/2)t^2 + (-v_0y)t + (y-y0) for {g -> gravity, v_0y -> vSin, y -> 0, y0 -> shotHeight} to find t in fractional ticks where height equals zero. return (Mathf.Sin(shotAngle) * shotSpeed + Mathf.Sqrt(Mathf.Pow(Mathf.Sin(shotAngle) * shotSpeed, 2f) + 2f * GravityFactor * shotHeight)) / GravityFactor; @@ -1543,7 +1556,7 @@ public static float GetShotAngle(float velocity, float range, float heightDiffer } #endregion - private static Material[] GetShadowMaterial(Graphic_Collection g) + protected static Material[] GetShadowMaterial(Graphic_Collection g) { var collection = g.subGraphics; var shadows = collection.Select(item => item.GetColoredVersion(ShaderDatabase.Transparent, Color.black, Color.black).MatSingle).ToArray(); diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_BunkerBuster.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_BunkerBuster.cs index 4b2094d852..fa0db8642f 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_BunkerBuster.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_BunkerBuster.cs @@ -43,9 +43,9 @@ public override void Impact(Thing hitThing) postExplosionGasType: props.postExplosionGasType ); - if (this.TryGetComp() != null) + foreach (var comp in GetComps()) { - this.TryGetComp().Throw(finalPos.ToVector3(), this.Map, this); + comp.Throw(finalPos.ToVector3(), this.Map, this); } this.Destroy(); diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_HeightFuse.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_HeightFuse.cs new file mode 100644 index 0000000000..b4139725dd --- /dev/null +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_HeightFuse.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using RimWorld; +using UnityEngine; +using Verse; +using Verse.Sound; +using CombatExtended.Compatibility; +using CombatExtended.Lasers; +using ProjectileImpactFX; +using CombatExtended.Utilities; + +namespace CombatExtended +{ + class ProjectileCE_HeightFuse : ProjectileCE + { + float detonationHeight => (def.projectile as ProjectilePropertiesCE).aimHeightOffset; + + bool armed; + + public override void ExposeData() + { + base.ExposeData(); + Scribe_Values.Look(ref armed, "armed", false); + } + + public override void Tick() + { + base.Tick(); + if (!armed && LastPos.y > detonationHeight) + { + armed = true; + } + if (armed && Height <= detonationHeight) + { + HeightFuseAirBurst(); + } + } + + public override void Impact(Thing hitThing) + { + //intercept impact if it hit something after where height fuse should have triggered + if (armed && Height <= detonationHeight) + { + HeightFuseAirBurst(); + } + else + { + base.Impact(hitThing); + } + } + + void HeightFuseAirBurst() + { + float f = (LastPos.y - detonationHeight) / (LastPos.y - Height); + ExactPosition = f * (LastPos - ExactPosition); + if (!ExactPosition.ToIntVec3().IsValid) + { + Destroy(); + return; + } + base.Impact(null); + } + } +} diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs index 2b6c9ea17c..3c42e78272 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs @@ -31,6 +31,10 @@ public class ProjectilePropertiesCE : ProjectileProperties public float airborneSuppressionFactor = 1; public float dangerFactor = 1; + public ThingDef detonateMoteDef; + public FleckDef detonateFleckDef; + public float detonateEffectsScaleOverride = -1; + #region Bunker Buster fields /// /// Amount of tiles ProjectileCE_BunkerBuster will detonate after after penetrating an obstacle diff --git a/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_AmmoConsumedPerShotCount.cs b/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_AmmoConsumedPerShotCount.cs index 224805307b..0e9080355b 100644 --- a/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_AmmoConsumedPerShotCount.cs +++ b/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_AmmoConsumedPerShotCount.cs @@ -30,13 +30,15 @@ private Thing Gun(StatRequest req) public override bool ShouldShowFor(StatRequest req) { - return base.ShouldShowFor(req) && (GunDef(req)?.Verbs? - .Any(x => ((x as VerbPropertiesCE)?.ammoConsumedPerShotCount ?? 1) > 1) ?? false); + return base.ShouldShowFor(req) && + (((GunDef(req)?.GetCompProperties() as CompProperties_AmmoUser)?.ammoSet.ammoConsumedPerShot != 1) || + (GunDef(req)?.Verbs?.Any(x => ((x as VerbPropertiesCE)?.ammoConsumedPerShotCount ?? 1) > 1) ?? false)); } public override float GetValueUnfinalized(StatRequest req, bool applyPostProcess = true) { - return ((VerbPropertiesCE)GunDef(req)?.Verbs?.FirstOrDefault(x => ((VerbPropertiesCE)x).ammoConsumedPerShotCount > 1))?.ammoConsumedPerShotCount ?? 1; + return ((GunDef(req)?.GetCompProperties() as CompProperties_AmmoUser)?.ammoSet?.ammoConsumedPerShot ?? 1 * + ((VerbPropertiesCE)GunDef(req)?.Verbs?.FirstOrDefault(x => ((VerbPropertiesCE)x).ammoConsumedPerShotCount > 1))?.ammoConsumedPerShotCount ?? 1); } public override string GetExplanationUnfinalized(StatRequest req, ToStringNumberSense numberSense) diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs index 342a94b0d0..54bbb79d06 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs @@ -363,7 +363,7 @@ public override bool TryCastShot() //Reduce ammunition if (CompAmmo != null) { - if (!CompAmmo.TryReduceAmmoCount(VerbPropsCE.ammoConsumedPerShotCount)) + if (!CompAmmo.TryReduceAmmoCount(CompAmmo.Props.ammoSet.ammoConsumedPerShot * VerbPropsCE.ammoConsumedPerShotCount)) { return false; } diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs index 2f548cd217..354faef2e6 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs @@ -227,7 +227,7 @@ public override bool TryCastShot() } if (CompAmmo != null) { - if (!CompAmmo.TryReduceAmmoCount(VerbPropsCE.ammoConsumedPerShotCount)) + if (!CompAmmo.TryReduceAmmoCount(CompAmmo.Props.ammoSet.ammoConsumedPerShot * VerbPropsCE.ammoConsumedPerShotCount)) { return false; } diff --git a/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs b/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs index 27e23b216f..c40b1da7c3 100644 --- a/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs +++ b/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs @@ -82,7 +82,13 @@ public static Tuple LookupProjectileCountAndSpreadCE(ThingDef _ammoD public static Def LookupAmmosetCE(string defName) { - return DefDatabase.AllDefs.Where(x => x.defName == defName).First(); + var list = DefDatabase.AllDefs.Where(x => x.defName == defName); + if (list.EnumerableNullOrEmpty()) + { + Log.Error($"Combat Extended Vehicle Compat: ammoset named {defName} not found."); + return null; + } + return list.First(); } public static IEnumerable _GetUsedAmmo() @@ -105,7 +111,7 @@ public static IEnumerable _GetUsedAmmo() cetddme._ammoSet = asd; var ammunition = vtd.ammunition = new ThingFilter(); vtd.genericAmmo = false; - vtd.chargePerAmmoCount = 1f; + vtd.chargePerAmmoCount = 1f / asd.ammoConsumedPerShot; HashSet allowedAmmo = (HashSet)ammunition.AllowedThingDefs; foreach (var al in asd.ammoTypes) diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 84d014baab..8e7c570c77 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -42,11 +42,13 @@ Mod | [O21] Outland - Redburn Pact | [Ods] SCP Outfits Only Edition | [Pratt] WWII Weapons Pack (Vanilla) | +[RH2] DOOM | [RH2] Faction: Bounty Hunters | [RH2] Faction: Task Force 141 | [RH2] Faction: The Rangers | [RH2] Faction: Utilitarian | [RH2] Faction: V.O.I.D. | +[RH2] Metal Gear Solid | [RH2] Rimmu-Nation² - Clothing | [RH2] Rimmu-Nation² - Security | [RH2] Rimmu-Nation² - Weapons |