diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml index 4c3cdd7558..fc22e7545a 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml +++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml @@ -145,6 +145,13 @@ Kraken A gyro-stabilized projectile with hardened penetrator and explosive 'kicker' charge, designed to punch through heavy armor. + + + Tempest + + Tempest + A gyro-stabilized projectile carrying a plasma shock generator that is effective against machines. + Melta diff --git a/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml b/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml new file mode 100644 index 0000000000..3df62c8f42 --- /dev/null +++ b/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml @@ -0,0 +1,410 @@ + + + + + Ammo825mmLong + + AmmoRifles + UI/Icons/ThingCategories/CaliberRifle + + + + + + AmmoSet_825mmLong + + + Bullet_825mmLong_FMJ + Bullet_825mmLong_AP + Bullet_825mmLong_HP + Bullet_825mmLong_Incendiary + Bullet_825mmLong_HE + Bullet_825mmLong_Sabot + + AmmoSet_Rifle + + + + + + Rimmed rifle cartridge found mostly in outdated bolt-action firearms. + + 0.029 + 0.04 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +     + +
  • Ammo825mmLong
    • +     +     + + + Ammo_825mmLong_FMJ + + + Things/Ammo/Rifle/Clip/FMJ + Graphic_StackCount + + + 0.12 + + FullMetalJacket + Bullet_825mmLong_FMJ + + + + Ammo_825mmLong_AP + + + Things/Ammo/Rifle/Clip/AP + Graphic_StackCount + + + 0.12 + + ArmorPiercing + Bullet_825mmLong_AP + + + + Ammo_825mmLong_HP + + + Things/Ammo/Rifle/Clip/HP + Graphic_StackCount + + + 0.12 + + HollowPoint + Bullet_825mmLong_HP + + + + Ammo_825mmLong_Incendiary + + + Things/Ammo/Rifle/Clip/Incendiary + Graphic_StackCount + + + 0.17 + + IncendiaryAP + Bullet_825mmLong_Incendiary + + + + Ammo_825mmLong_HE + + + Things/Ammo/Rifle/Clip/HE + Graphic_StackCount + + + 0.23 + + ExplosiveAP + Bullet_825mmLong_HE + + + + Ammo_825mmLong_Sabot + + + Things/Ammo/Rifle/Clip/Sabot + Graphic_StackCount + + + 0.14 + 0.023 + + Sabot + Bullet_825mmLong_Sabot + + + + + + + Things/Projectile/Bullet_Small + Graphic_Single + + + Bullet + 154 + true + + + + + Bullet_825mmLong_FMJ + + + 22 + 6 + 88.48 + + + + + Bullet_825mmLong_AP + + + 14 + 12 + 88.48 + + + + + Bullet_825mmLong_HP + + + 28 + 3 + 88.48 + + + + + Bullet_825mmLong_Incendiary + + + 14 + 12 + 88.48 + +
  • + Flame_Secondary + 7 +
    • +     +     +     + + + Bullet_825mmLong_HE + + + 22 + 6 + 68.22 + +
  • + Bomb_Secondary + 7 +
    • +     +     +     + + + Bullet_825mmLong_Sabot + + + 13 + 21 + 115.46 + 209 + + + + + + + MakeAmmo_825mmLong_FMJ + + Craft 500 8.25mm Long (FMJ) cartridges. + Making 8.25mm Long (FMJ) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 500 + + 3000 +     + + + MakeAmmo_825mmLong_AP + + Craft 500 8.25mm Long (AP) cartridges. + Making 8.25mm Long (AP) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 500 + + 3600 +     + + + MakeAmmo_825mmLong_HP + + Craft 500 8.25mm Long (HP) cartridges. + Making 8.25mm Long (HP) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 500 + + 3000 +     + + + MakeAmmo_825mmLong_Incendiary + + Craft 500 8.25mm Long (AP-I) cartridges. + Making 8.25mm Long (AP-I) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • Prometheum
    • + + + 4 + +     + + +
  • Steel
    • +
  • Prometheum
    • +     +     + + 500 + + 4600 +     + + + MakeAmmo_825mmLong_HE + + Craft 500 8.25mm Long (AP-HE) cartridges. + Making 8.25mm Long (AP-HE) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • FSX
    • + + + 7 + +     + + +
  • Steel
    • +
  • FSX
    • +     +     + + 500 + + 5800 +     + + + MakeAmmo_825mmLong_Sabot + + Craft 500 8.25mm Long (Sabot) cartridges. + Making 8.25mm Long (Sabot) cartridges. + +
  • + + +
  • Steel
    • + + + 16 + +
  • + + +
  • Uranium
    • + + + 4 + +
  • + + +
  • Chemfuel
    • + + + 4 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • Chemfuel
    • +     +     + + 500 + + 4000 +     + +     \ No newline at end of file diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml index a2ee769b19..6a90217794 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml @@ -18,6 +18,7 @@ Bullet_Bolter75_Inferno Bullet_Bolter75_MetalStorm Bullet_Bolter75_Kraken + Bullet_Bolter75_Tempest @@ -30,6 +31,7 @@ Bullet_Bolter75_Inferno_Relic Bullet_Bolter75_MetalStorm_Relic Bullet_Bolter75_Kraken_Relic + Bullet_Bolter75_Tempest_Relic @@ -38,8 +40,8 @@ A .75 caliber, gryojet-stabilized projectile with an explosive charge and hardened tip, fired from most patterns of Astartes bolters. - 0.151 - 0.06 + 0.1 + 0.08
  • CE_AutoEnableTrade
    • @@ -60,7 +62,7 @@ Graphic_StackCount - 1.98 + 3.26 Standard Bullet_Bolter75_Standard @@ -74,7 +76,7 @@ Graphic_StackCount - 1.37 + 3.07 Inferno Bullet_Bolter75_Inferno @@ -88,7 +90,7 @@ Graphic_StackCount - 1.48 + 2.99 MetalStorm Bullet_Bolter75_MetalStorm @@ -102,11 +104,25 @@ Graphic_StackCount - 1.48 + 3.38 Kraken Bullet_Bolter75_Kraken     + + + Ammo_Bolter75_Tempest + + + ThirdParty/Warhammer/Ammo/Bolter/Tempest + Graphic_StackCount + + + 3.08 + + Tempest + Bullet_Bolter75_Tempest + @@ -118,9 +134,8 @@ CombatExtended.BulletCE Bullet - 80 - true - Mote_BolterCasing + 129 + false @@ -128,13 +143,13 @@ Bullet_Bolter75_Standard - 37 - 14 - 2.931 + 49 + 30 + 384.48
  • Bomb_Secondary - 22 + 30
    • @@ -143,44 +158,39 @@ Bullet_Bolter75_Inferno - CombatExtended.ProjectileCE_Explosive - PrometheumFlame - 3 - 0.5 - FilthPrometheum - 1 - MortarIncendiary_Explode + 38 + 30 + 384.48
  • - 4 - Thermobaric + PrometheumFlame + 33 0.5 - MortarIncendiary_Explode true + FilthPrometheum + 1
    • Bullet_Bolter75_MetalStorm - CombatExtended.ProjectileCE_Bursting - 0.5 + 1.5 Bomb - 10 - true - 1.2 - 2 + 49 + 15 + 39.494 + true
  • - 6 + 6 - -89~-5
    • @@ -190,25 +200,40 @@ Bullet - 104 - 27.6 - 2.931 + 31 + 60 + 384.48 + +
  • + Bomb_Secondary + 15 +
    • +     +     + + + + Bullet_Bolter75_Tempest + + + Bullet + 31 + 30 + 384.48 + +
  • + EMP + 12 +
    • +     + 0.80     - -
  • - 10 - Bomb - 0.25 - MortarBomb_Explode - true -
    • -     - 95 + 135 @@ -216,13 +241,13 @@ Bullet_Bolter75_Standard_Relic - 41 - 18 - 4.13 + 49 + 33 + 422.93
  • Bomb_Secondary - 26 + 30
    • @@ -231,44 +256,39 @@ Bullet_Bolter75_Inferno_Relic - CombatExtended.ProjectileCE_Explosive - PrometheumFlame - 5 - 0.75 - FilthPrometheum - 1 - MortarIncendiary_Explode + 38 + 33 + 422.93
  • - 5 - Thermobaric - 0.75 - MortarIncendiary_Explode + PrometheumFlame + 33 + 0.5 true + FilthPrometheum + 1
    • Bullet_Bolter75_MetalStorm_Relic - CombatExtended.ProjectileCE_Bursting - 0.75 + 1.5 Bomb - 14 - true - 1.2 - 2 + 49 + 16.5 + 43.44 + true
  • - 9 + 6 - -89~-5
    • @@ -278,19 +298,34 @@ Bullet - 114 - 34 - 4.13 + 31 + 66 + 422.93 + +
  • + Bomb_Secondary + 15 +
    • +     +     + + + + Bullet_Bolter75_Tempest_Relic + + + Bullet + 31 + 33 + 422.93 + +
  • + EMP + 12 +
    • +     + 1     - -
  • - 10 - Bomb - 0.25 - MortarBomb_Explode - true -
    • -     @@ -307,7 +342,15 @@
  • Steel
    • - 62 + 4 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -315,7 +358,7 @@
  • FSX
    • - 14 + 17
  • @@ -323,12 +366,13 @@
  • ComponentIndustrial
    • - 2 + 12
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -336,7 +380,7 @@ 200 - 10400 + 21840 @@ -351,7 +395,15 @@
  • Steel
    • - 62 + 4 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -359,7 +411,7 @@
  • Prometheum
    • - 7 + 15
  • @@ -367,12 +419,13 @@
  • ComponentIndustrial
    • - 4 + 12
  • Steel
    • +
  • Uranium
  • Prometheum
  • ComponentIndustrial
    •  @@ -380,7 +433,7 @@ 200 - 9400 + 20880     @@ -395,7 +448,15 @@
  • Steel
    • - 62 + 8 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -403,7 +464,7 @@
  • FSX
    • - 5 + 9
  • @@ -411,12 +472,13 @@
  • ComponentIndustrial
    • - 6 + 12
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -424,7 +486,7 @@ 200 - 12400 + 18480     @@ -439,7 +501,15 @@
  • Steel
    • - 62 + 16 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -447,7 +517,7 @@
  • FSX
    • - 4 + 17
  • @@ -455,6 +525,35 @@
  • ComponentIndustrial
    • + 12 + + + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 23280 +     + + + MakeAmmo_Bolter75_Tempest + + Craft 200 .75 Cal Bolter (tempest) shells. + Making .75 Cal Bolter (tempest) shells. + +
  • + + +
  • Steel
    • + + 4
  • @@ -463,21 +562,28 @@
  • Uranium
    • - 4 + 19 + +
  • + + +
  • ComponentIndustrial
    • + + + 15
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
  • Uranium
    • +
  • ComponentIndustrial
    •      - 200 + 200 - 13200 + 15840     \ No newline at end of file diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml new file mode 100644 index 0000000000..2ee1710ac2 --- /dev/null +++ b/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml @@ -0,0 +1,390 @@ + + + + + AmmoBolter50 + + AmmoAdvanced + UI/Icons/ThingCategories/CaliberHighCaliber + + + + + + AmmoSet_Bolter50 + + + Bullet_Bolter50_Standard + Bullet_Bolter50_Inferno + Bullet_Bolter50_Kraken + Bullet_Bolter50_Tempest + + + + + + + A .50 caliber, gryojet-stabilized projectile with an explosive charge and hardened tip, fired from most patterns of Astartes bolters. + + 0.045 + 0.03 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +
  • CE_AutoEnableCrafting_GWAmmoBench
    • +     + +
  • AmmoBolter50
    • +     + 5000 +     + + + Ammo_Bolter50_Standard + + + ThirdParty/Warhammer/Ammo/Bolter/Standard + Graphic_StackCount + + + 1.51 + + Standard + Bullet_Bolter50_Standard + + + + Ammo_Bolter50_Inferno + + + ThirdParty/Warhammer/Ammo/Bolter/Inferno + Graphic_StackCount + + + 1.39 + + Inferno + Bullet_Bolter50_Inferno + + + + Ammo_Bolter50_Kraken + + + ThirdParty/Warhammer/Ammo/Bolter/Kraken + Graphic_StackCount + + + 1.69 + + Kraken + Bullet_Bolter50_Kraken + + + + Ammo_Bolter50_Tempest + + + ThirdParty/Warhammer/Ammo/Bolter/Tempest + Graphic_StackCount + + + 1.55 + + Tempest + Bullet_Bolter50_Tempest + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + + CombatExtended.BulletCE + + Bullet + 137 + false + + + + + Bullet_Bolter50_Standard + + + 30 + 20 + 147 + +
  • + Bomb_Secondary + 15 +
    • +     +     +     + + + Bullet_Bolter50_Inferno + + + 24 + 20 + 147 + + +
  • + PrometheumFlame + 17 + 0.5 + true + FilthPrometheum + 1 +
    • +     +     + + + Bullet_Bolter50_Kraken + + + Bullet + 19 + 40 + 147 + +
  • + Bomb_Secondary + 8 +
    • +     +     +     + + + Bullet_Bolter50_Tempest + + + Bullet + 19 + 20 + 147 + +
  • + EMP + 6 +
    • +     + 0.60 +     +     + + + + + MakeAmmo_Bolter50_Standard + + Craft 200 .50 Cal Bolter (standard) shells. + Making .50 Cal Bolter (standard) shells. + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • FSX
    • + + + 77 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 9840 +     + + + MakeAmmo_Bolter50_Inferno + + Craft 200 .50 Cal Bolter (inferno) shells. + Making .50 Cal Bolter (inferno) shells. + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • Prometheum
    • + + + 5 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 8880 +     + + + MakeAmmo_Bolter50_Kraken + + Craft 200 .50 Cal Bolter (kraken) shells. + Making .50 Cal Bolter (kraken) shells. + +
  • + + +
  • Steel
    • + + + 24 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • FSX
    • + + + 7 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 12000 +     + + + MakeAmmo_Bolter50_Tempest + + Craft 200 .50 Cal Bolter (tempest) shells. + Making .50 Cal Bolter (tempest) shells. + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 7920 +     + +     \ No newline at end of file diff --git a/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml b/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml index ee7d61f994..837a322ee5 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml @@ -18,6 +18,7 @@ Bullet_Bolter998_Inferno Bullet_Bolter998_MetalStorm Bullet_Bolter998_Kraken + Bullet_Bolter998_Tempest @@ -48,7 +49,7 @@ Graphic_StackCount - 4.44 + 6.11 Standard Bullet_Bolter998_Standard @@ -62,7 +63,7 @@ Graphic_StackCount - 2.28 + 5.65 Inferno Bullet_Bolter998_Inferno @@ -76,7 +77,7 @@ Graphic_StackCount - 2.70 + 5.42 MetalStorm Bullet_Bolter998_MetalStorm @@ -90,11 +91,25 @@ Graphic_StackCount - 2.37 + 6.41 Kraken Bullet_Bolter998_Kraken + + + Ammo_Bolter998_Tempest + + + ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest + Graphic_StackCount + + + 5.68 + + Tempest + Bullet_Bolter998_Tempest + @@ -106,9 +121,8 @@ CombatExtended.BulletCE Bullet - 96 - true - Mote_HeavyBolterCasing + 129 + false @@ -116,13 +130,13 @@ Bullet_Bolter998_Standard - 64 - 20 - 5.101 + 72 + 35 + 908.38
  • Bomb_Secondary - 38 + 50
    • @@ -131,44 +145,39 @@ Bullet_Bolter998_Inferno - CombatExtended.ProjectileCE_Explosive - PrometheumFlame - 5 - 1.5 - FilthPrometheum - 0.7 - MortarIncendiary_Explode + 57 + 35 + 908.38
  • - 7 - Thermobaric - 1 - MortarIncendiary_Explode + PrometheumFlame + 56 + 0.5 true + FilthPrometheum + 1
    • Bullet_Bolter998_MetalStorm - CombatExtended.ProjectileCE_Bursting - 1 + 1.5 Bomb - 17 - true - 1.05 - 2 + 58 + 17.5 + 59.81 + true
  • - 6 + 12 - -89~-5
    • @@ -178,19 +187,34 @@ Bullet - 142 - 46 - 5.101 + 46 + 70 + 908.38 + +
  • + Bomb_Secondary + 25 +
    • +     +     + + + + Bullet_Bolter998_Tempest + + + Bullet + 46 + 35 + 908.38 + +
  • + EMP + 21 +
    • +     + 1     - -
  • - 17 - Bomb - 0.5 - MortarBomb_Explode - true -
    • -     @@ -207,7 +231,15 @@
  • Steel
    • - 154 + 10 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -215,7 +247,7 @@
  • FSX
    • - 18 + 40
  • @@ -223,12 +255,13 @@
  • ComponentIndustrial
    • - 4 + 19
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -236,7 +269,7 @@ 200 - 36600 + 44400 @@ -251,7 +284,15 @@
  • Steel
    • - 154 + 10 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -259,7 +300,7 @@
  • Prometheum
    • - 12 + 35
  • @@ -267,12 +308,13 @@
  • ComponentIndustrial
    • - 6 + 19
  • Steel
    • +
  • Uranium
  • Prometheum
  • ComponentIndustrial
    •  @@ -280,7 +322,7 @@ 200 - 19400 + 42000     @@ -295,7 +337,15 @@
  • Steel
    • - 154 + 20 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -303,7 +353,7 @@
  • FSX
    • - 8 + 20
  • @@ -311,12 +361,13 @@
  • ComponentIndustrial
    • - 8 + 19
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -324,7 +375,7 @@ 200 - 21800 + 36000     @@ -339,7 +390,15 @@
  • Steel
    • - 154 + 40 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -347,7 +406,7 @@
  • FSX
    • - 6 + 40
  • @@ -355,7 +414,36 @@
  • ComponentIndustrial
    • - 6 + 19 + + + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 48000 +     + + + MakeAmmo_Bolter998_Tempest + + Craft 200 .998 Cal Bolter (tempest) shells. + Making .998 Cal Bolter (tempest) shells. + +
  • + + +
  • Steel
    • + + + 10
  • @@ -363,21 +451,28 @@
  • Uranium
    • - 8 + 43 + +
  • + + +
  • ComponentIndustrial
    • + + + 26
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
  • Uranium
    • +
  • ComponentIndustrial
    •      - 200 + 200 - 20600 + 30240     \ No newline at end of file diff --git a/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml b/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml index bfa152271e..522068ce47 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml @@ -47,8 +47,8 @@ A universal power pack for lasguns. - 0.001 - 0.005 + 0.008 + 0.01
  • CE_AutoEnableTrade
    • @@ -115,8 +115,8 @@ CE_Laser - 34 - 30 + 80 + 558 0.001     diff --git a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml index e8676fa929..ac588ea051 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml @@ -1,17 +1,61 @@ - + + + AmmoMeltaGun + + AmmoAdvanced + ThirdParty/Warhammer/UI/MeltaGunAmmoUI + AmmoSet_MeltaCharge - Bullet_Laser_MeltaCharge + Bullet_Laser_MeltaCharge - + + + Ammo_MeltaGun + + Canister of Pyrum-petrol fuel for Meltaguns + + 0.09 + 0.081 + 2.094 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_GWAmmoBench
    • +     + Melta + + ThirdParty/Warhammer/Ammo/MeltaGun + Graphic_StackCount + + +
  • AmmoMeltaGun
    • +     + +
  • + 3.5 + 12 + PrometheumFlame + 0.15 + 0.10 + true + True + 30~50 +
    • +     + 75 +     + + Bullet_Laser_MeltaCharge @@ -47,4 +91,58 @@ + + + MakeAmmo_MeltaGun + + Craft 20 meltagun canisters + Making 20 shots worth of meltagun canisters + +
  • + + +
  • Steel
    • + + + 20 + +
  • + + +
  • Plasteel
    • + + + 10 + +
  • + + +
  • Prometheum
    • + + + 20 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Plasteel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 20 + + 15200 +     +     \ No newline at end of file diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml index cb5bf45f23..ae2b8da904 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml @@ -1,9 +1,21 @@ - + + + Defs/ThingDef[ + defName="GW_SM_Scout" or + defName="GW_SM_ReiverArmor" or + defName="GW_SM_PhobosArmor" or + defName="GW_SM_MaximusArmor" or + defName="GW_SM_CorvusArmor" or + defName="GW_SM_AquillaArmor" or + defName="GW_SM_TacticusArmor" or + defName="GW_SM_GravisArmor" or + defName="GW_SM_IndomitusTerminatorArmor"]/equippedStatOffsets/MoveSpeed + - + Defs/ThingDef[defName="GW_SM_Scout"]/statBases @@ -16,45 +28,18 @@ Defs/ThingDef[defName="GW_SM_Scout"]/statBases/ArmorRating_Sharp - 16 + 25 Defs/ThingDef[defName="GW_SM_Scout"]/statBases/ArmorRating_Blunt - 24 - - - - - - - Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases - - 5 - 2 - - - - - Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Sharp - - 14 - - - - - Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Blunt - - 20 + 150 - - - Defs/ThingDef[defName="GW_SM_ReiverArmor"]/statBases @@ -66,45 +51,19 @@ Defs/ThingDef[defName="GW_SM_ReiverArmor"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[defName="GW_SM_ReiverArmor"]/statBases/ArmorRating_Blunt - 58 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Blunt - - 46 + 300 - - Defs/ThingDef[defName="GW_SM_PhobosArmor"]/statBases @@ -116,45 +75,19 @@ Defs/ThingDef[defName="GW_SM_PhobosArmor"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[defName="GW_SM_PhobosArmor"]/statBases/ArmorRating_Blunt - 50 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Blunt - - 46 + 300 - - Defs/ThingDef[defName="GW_SM_MaximusArmor"]/statBases @@ -166,45 +99,19 @@ Defs/ThingDef[defName="GW_SM_MaximusArmor"]/statBases/ArmorRating_Sharp - 26 + 36 Defs/ThingDef[defName="GW_SM_MaximusArmor"]/statBases/ArmorRating_Blunt - 62 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Blunt - - 54 + 350 - - Defs/ThingDef[defName="GW_SM_CorvusArmor"]/statBases @@ -216,45 +123,19 @@ Defs/ThingDef[defName="GW_SM_CorvusArmor"]/statBases/ArmorRating_Sharp - 26 + 36 Defs/ThingDef[defName="GW_SM_CorvusArmor"]/statBases/ArmorRating_Blunt - 62 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Blunt - - 54 + 350 - - Defs/ThingDef[defName="GW_SM_AquillaArmor"]/statBases @@ -266,45 +147,19 @@ Defs/ThingDef[defName="GW_SM_AquillaArmor"]/statBases/ArmorRating_Sharp - 26 + 36 Defs/ThingDef[defName="GW_SM_AquillaArmor"]/statBases/ArmorRating_Blunt - 62 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Blunt - - 54 + 350 - - Defs/ThingDef[defName="GW_SM_TacticusArmor"]/statBases @@ -316,95 +171,50 @@ Defs/ThingDef[defName="GW_SM_TacticusArmor"]/statBases/ArmorRating_Sharp - 32 + 36 Defs/ThingDef[defName="GW_SM_TacticusArmor"]/statBases/ArmorRating_Blunt - 74 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Sharp - - 32 - - - - - Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Blunt - - 66 + 350 - - Defs/ThingDef[defName="GW_SM_GravisArmor"]/statBases - 200 - 20 + 300 + 40 Defs/ThingDef[defName="GW_SM_GravisArmor"]/statBases/ArmorRating_Sharp - 32 + 65 Defs/ThingDef[defName="GW_SM_GravisArmor"]/statBases/ArmorRating_Blunt - 74 + 500 - - + - Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Sharp - - 32 - - - - - Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/equippedStatOffsets - 66 + 100 + 80 - - - - Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/statBases @@ -416,38 +226,14 @@ Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/statBases/ArmorRating_Sharp - 37.5 + 110 Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/statBases/ArmorRating_Blunt - 84 - - - - - - - Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Sharp - - 36 - - - - - Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Blunt - - 84 + 750 diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml index ed16b2791f..f9fb265c85 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml @@ -28,14 +28,14 @@ Defs/ThingDef[defName="GW_SM_ReiverBackpack" or defName="GW_SM_PhobosBackpack"]/statBases/ArmorRating_Sharp - 6 + 5 Defs/ThingDef[defName="GW_SM_ReiverBackpack" or defName="GW_SM_PhobosBackpack"]/statBases/ArmorRating_Blunt - 9 + 20 @@ -51,8 +51,8 @@ Defs/ThingDef[defName="GW_SM_MaximusBackpack" or defName="GW_SM_CorvusBackpack" or defName="GW_SM_AquillaBackpack"]/equippedStatOffsets/VEF_MassCarryCapacity - 50 - 60 + 70 + 70 @@ -66,14 +66,14 @@ Defs/ThingDef[defName="GW_SM_MaximusBackpack" or defName="GW_SM_CorvusBackpack" or defName="GW_SM_AquillaBackpack"]/statBases/ArmorRating_Sharp - 8 + 10 Defs/ThingDef[defName="GW_SM_MaximusBackpack" or defName="GW_SM_CorvusBackpack" or defName="GW_SM_AquillaBackpack"]/statBases/ArmorRating_Blunt - 12 + 30 @@ -89,8 +89,8 @@ Defs/ThingDef[defName="GW_SM_TacticusBackpack"]/equippedStatOffsets/VEF_MassCarryCapacity - 60 - 60 + 85 + 85 @@ -104,14 +104,14 @@ Defs/ThingDef[defName="GW_SM_TacticusBackpack"]/statBases/ArmorRating_Sharp - 12 + 15 Defs/ThingDef[defName="GW_SM_TacticusBackpack"]/statBases/ArmorRating_Blunt - 18 + 35 @@ -127,8 +127,8 @@ Defs/ThingDef[defName="GW_SM_GravisBackpack"]/equippedStatOffsets/VEF_MassCarryCapacity - 70 - 60 + 90 + 85 @@ -142,14 +142,14 @@ Defs/ThingDef[defName="GW_SM_GravisBackpack"]/statBases/ArmorRating_Sharp - 15 + 20 Defs/ThingDef[defName="GW_SM_GravisBackpack"]/statBases/ArmorRating_Blunt - 22.5 + 50 @@ -166,6 +166,7 @@ Defs/ThingDef[defName="GW_SM_AssaultJumpPack"]/equippedStatOffsets 70 + 35 @@ -186,7 +187,7 @@ Defs/ThingDef[defName="GW_SM_AssaultJumpPack"]/statBases/ArmorRating_Blunt - 22.5 + 35 diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml index f5140c197d..eb8bb4f679 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml @@ -7,6 +7,29 @@ Defs/ThingDef[@Name="GW_SM_HelmetBase"]/apparel/layers/li[text()="EyeCover"] + + Defs/ThingDef[@Name="GW_SM_HelmetBase"] + +
  • + +
  • + 0.80 + +
  • Eye
    • + + + +
  • + 0.80 + +
  • Eye
    • + + + + +     +     + @@ -21,14 +44,14 @@ Defs/ThingDef[@Name="GW_SM_ScoutHelmet_Base"]/statBases/ArmorRating_Sharp - 6 + 15 Defs/ThingDef[@Name="GW_SM_ScoutHelmet_Base"]/statBases/ArmorRating_Blunt - 9 + 20 @@ -72,14 +95,14 @@ Defs/ThingDef[@Name="GW_SM_MKXReiverHelmet_Base"]/statBases/ArmorRating_Sharp - 20 + 30 Defs/ThingDef[@Name="GW_SM_MKXReiverHelmet_Base"]/statBases/ArmorRating_Blunt - 44 + 30 @@ -122,14 +145,14 @@ Defs/ThingDef[@Name="GW_SM_MKXPhobosHelmet_Base"]/statBases/ArmorRating_Sharp - 20 + 30 Defs/ThingDef[@Name="GW_SM_MKXPhobosHelmet_Base"]/statBases/ArmorRating_Blunt - 44 + 35 @@ -172,14 +195,14 @@ Defs/ThingDef[@Name="GW_SM_MKIVHelmet_Base"]/statBases/ArmorRating_Sharp - 22 + 30 Defs/ThingDef[@Name="GW_SM_MKIVHelmet_Base"]/statBases/ArmorRating_Blunt - 48 + 35 @@ -222,14 +245,14 @@ Defs/ThingDef[@Name="GW_SM_MKIVHelmet_Base"]/statBases/ArmorRating_Sharp - 22 + 30 Defs/ThingDef[@Name="GW_SM_MKVIHelmet_Base"]/statBases/ArmorRating_Blunt - 48 + 35 @@ -272,14 +295,14 @@ Defs/ThingDef[@Name="GW_SM_MKVIIHelmet_Base"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[@Name="GW_SM_MKVIIHelmet_Base"]/statBases/ArmorRating_Blunt - 50 + 35 @@ -322,14 +345,14 @@ Defs/ThingDef[@Name="GW_SM_MKXHelmet_Base"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[@Name="GW_SM_MKXHelmet_Base"]/statBases/ArmorRating_Blunt - 50 + 35 @@ -372,14 +395,14 @@ Defs/ThingDef[@Name="GW_SM_GravisHelmet_Base"]/statBases/ArmorRating_Sharp - 27 + 50 Defs/ThingDef[@Name="GW_SM_GravisHelmet_Base"]/statBases/ArmorRating_Blunt - 52 + 60 @@ -429,14 +452,14 @@ Defs/ThingDef[@Name="GW_SM_TerminatorHelmet"]/statBases/ArmorRating_Sharp - 38 + 80 Defs/ThingDef[@Name="GW_SM_TerminatorHelmet"]/statBases/ArmorRating_Blunt - 84 + 100 diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_ShoulderPads.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_ShoulderPads.xml new file mode 100644 index 0000000000..d2d3cb45cc --- /dev/null +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_ShoulderPads.xml @@ -0,0 +1,223 @@ + + + + + + Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases + + 5 + 2 + + + + + Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Sharp + + 15 + + + + + Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Blunt + + 25 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Sharp + + 25 + + + + + Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Blunt + + 30 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Sharp + + 25 + + + + + Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Blunt + + 30 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + + + Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + + + Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Sharp + + 35 + + + + + Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Blunt + + 50 + + + + + + + Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Sharp + + 40 + + + + + Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Blunt + + 60 + + + + \ No newline at end of file diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml index effe551fe1..a131a05202 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml @@ -295,90 +295,6 @@ 0.3     - - - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/tools - - -
  • - - -
  • Poke
    • - - 3 - 1.1 - 0.12 - 0.75 - Handle - -
  • - - -
  • Cut
    • - - 164 - -
  • - Flame - 16 - 0.6 -
    • -     - 1.1 - 45.7 - 8.2 - Edge - -
  • - - -
  • Stab
    • - - 178 - -
  • - Flame - 16 - 0.6 -
    • -     - 1.1 - 49.3 - 9.5 - Point - -     -     -     - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/weaponTags - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"] - - - - - - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/equippedStatOffsets - - 0.85 - 0.64 - 0.37 - - - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/statBases - - 8.4 - 0.65 - - diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml index 1ae9d88c5a..edcc6d189f 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml @@ -2,11 +2,18 @@ - Defs/ThingDef[defName="GW_SM_Building_HeavyBolter" or defName="GW_SM_Building_Lascannon"]/fillPercent + Defs/ThingDef[defName="GW_SM_Building_HeavyBolter"]/fillPercent 0.85 + + + Defs/ThingDef[defName="GW_SM_Building_Lascannon"]/fillPercent + + 0.75 + + @@ -218,4 +225,4 @@     -     + \ No newline at end of file diff --git a/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml b/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml index b2ee0ef860..1cac169bd0 100644 --- a/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml +++ b/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml @@ -36,10 +36,20 @@ + + + + Things/Weapons/GW_Volkite_Bolt + Graphic_Single + 2.0 + + +
  • Things/Weapons/GW_Volkite_Bolt
    • +     +     - + Bullet_Volk_Pistol - CE_Laser 16 @@ -48,9 +58,8 @@ - + Bullet_Volk_Rifle - CE_Laser 30 @@ -59,9 +68,8 @@ - + Bullet_Volk_HellGun - CE_Laser 39 @@ -70,9 +78,8 @@ - + Bullet_Volk_Cannon - BeamGraphic 2 diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml index 329b7e89a7..74b1c90317 100644 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml +++ b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml @@ -655,7 +655,7 @@ CombatExtended.Verb_ShootCE true - Bullet_Lasgun_Rifle + Bullet_Lasgun_HellGun 1.3 62 12 @@ -668,7 +668,7 @@ 120 6.5 - AmmoSet_Lasgun_Rifle + AmmoSet_Lasgun_HellGun 6 @@ -806,7 +806,7 @@ CombatExtended.Verb_ShootCE true - Bullet_45ACP_FMJ + Bullet_825mmLong_FMJ 1 55 8 @@ -819,7 +819,7 @@ 40 3.5 - AmmoSet_45ACP + AmmoSet_825mmLong 4 @@ -858,7 +858,7 @@ CombatExtended.Verb_ShootCE true - Bullet_45ACP_FMJ + Bullet_825mmLong_FMJ 0.6 25 8 @@ -871,7 +871,7 @@ 20 3.5 - AmmoSet_45ACP + AmmoSet_825mmLong 4 @@ -1208,7 +1208,7 @@ CombatExtended.Verb_ShootCE true - Bullet_Bolter75_Standard + Bullet_Bolter50_Standard 1.4 42 6 @@ -1219,7 +1219,7 @@ 12 7.8 - AmmoSet_Bolter75 + AmmoSet_Bolter50 2 diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml index 18a8b6d38f..21db415ebf 100644 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml +++ b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml @@ -121,7 +121,7 @@ Bullet_Lasgun_Pistol 0.6 12 - 3 + 6 GW_AM_Gun_Kantraeldefender GunTail_Heavy 9 @@ -133,7 +133,7 @@ AmmoSet_Lasgun_Pistol - 6 + 3 Snapshot @@ -273,7 +273,7 @@ CombatExtended.Verb_ShootCE true - Bullet_Bolter75_Standard + Bullet_Bolter50_Standard 0.6 24 4 @@ -285,7 +285,7 @@ 8 3.2 - AmmoSet_Bolter75 + AmmoSet_Bolter50 2 diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Scenarios.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Scenarios.xml deleted file mode 100644 index 32e9d2fa82..0000000000 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Scenarios.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Defs/ScenarioDef[defName="HP_AM_MilitarumCrashlanders"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_10Gauge_Buck - 40 -
    • -     -     - - - Defs/ScenarioDef[defName="HP_AM_MilitarumCrashlanders"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_45ACP_FMJ - 240 -
    • -     -     - - - Defs/ScenarioDef[defName="HP_AM_MilitarumCrashlanders"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_LasgunPowerPack - 120 -
    • -     -     - -     \ No newline at end of file diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml index bcf71fdb3e..bea07041a1 100644 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml +++ b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml @@ -7,13 +7,18 @@ Defs/ThingDef[ defName="GW_Building_HeavyBolter" or defName="GW_Building_Autocannon" or - defName="GW_Building_Lascannon" or - defName="GW_Building_TarantulaHeavyBolter" or - defName="GW_Building_TarantulaLascannon"]/fillPercent + defName="GW_Building_TarantulaHeavyBolter"]/fillPercent 0.85 + + + Defs/ThingDef[defName="GW_Building_Lascannon" or defName="GW_Building_TarantulaLascannon"]/fillPercent + + 0.75 + + @@ -519,4 +524,5 @@     - + + \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LandRaider_Upgrades.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LandRaider_Upgrades.xml new file mode 100644 index 0000000000..09c4f3a528 --- /dev/null +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LandRaider_Upgrades.xml @@ -0,0 +1,170 @@ + + + + + + + Defs/Vehicles.UpgradeTreeDef[defName="GW_Landraider_UpgradeTree"]/nodes/li[key="RedeemerUpgrade"]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats + + +
  • + ArmorRating_Blunt + 8 +
    • +
  • + ArmorRating_Sharp + 4 +
    • +     +     +     + + + Defs/Vehicles.UpgradeTreeDef[defName="GW_Landraider_UpgradeTree"]/nodes/li[key="CrusaderUpgrade"]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats + + +
  • + ArmorRating_Blunt + 8 +
    • +
  • + ArmorRating_Sharp + 4 +
    • +     +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/projectile + + Bullet_20x102mmNATO_AP + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/reloadTimer + + 7.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/warmUpTimer + + 2.3 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/chargePerAmmoCount + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/maxRange + + 72 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_20x102mmNATO_AP
    • +
  • Ammo_20x102mmNATO_Incendiary
    • +
  • Ammo_20x102mmNATO_HE
    • +
  • Ammo_20x102mmNATO_Sabot
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"] + +
  • + AmmoSet_20x102mmNATO + 1.5 + 182 + 1.0 + 0.01 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/projectile + + Bullet_Bolter998_Standard + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/reloadTimer + + 7.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/warmUpTimer + + 2.3 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/chargePerAmmoCount + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/maxRange + + 62 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/ammunition/thingDefs + + +
  • Ammo_Bolter998_Standard
    • +
  • Ammo_Bolter998_MetalStorm
    • +
  • Ammo_Bolter998_Kraken
    • +
  • Ammo_Bolter998_Inferno
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"] + +
  • + AmmoSet_Bolter998 + 1.5 + 229 + 1.0 + 0.01 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Executioner.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Executioner.xml deleted file mode 100644 index 01a288f9b1..0000000000 --- a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Executioner.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/magazineCapacity - - 800 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/genericAmmo - - false - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/projectile - - Bullet_Laser_PlasmaDestroyer - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/maxRange - - 75 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/ammunition/thingDefs - - -
  • Ammo_PlasmaCanister
    • -     -     -     - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/chargePerAmmoCount - - 50 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"] - -
  • - AmmoSet_PlasmaCanister_Destroyer - 1 - 0.73 - 0.01 -
    • -     -     - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/statBases/ArmorRating_Blunt - - 44 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/statBases/ArmorRating_Sharp - - 22 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/vehicleStats/CargoCapacity - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="FrontArmorPlating"]/health - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt - - 68 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp - - 34 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="LeftArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="RightArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="BackArmorPlating"]/health - - 750 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="Roof"]/health - - 650 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="Roof"]/armor/ArmorRating_Blunt - - 36 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="Roof"]/armor/ArmorRating_Sharp - - 18 - - - -     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Punisher.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Punisher.xml deleted file mode 100644 index d135321d68..0000000000 --- a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Punisher.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/projectile - - Bullet_20x102mmNATO_AP - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/reloadTimer - - 7.2 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/warmUpTimer - - 2.8 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/genericAmmo - - false - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/maxRange - - 66 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/ammunition/thingDefs - - -
  • Ammo_20x102mmNATO_AP
    • -
  • Ammo_20x102mmNATO_Incendiary
    • -
  • Ammo_20x102mmNATO_HE
    • -
  • Ammo_20x102mmNATO_Sabot
    • -     -     -     - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"] - -
  • - AmmoSet_20x102mmNATO - 2 - 96 - 1.0 - 0.05 -
    • -     -     - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/statBases/ArmorRating_Blunt - - 44 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/statBases/ArmorRating_Sharp - - 22 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/vehicleStats/CargoCapacity - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="FrontArmorPlating"]/health - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt - - 68 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp - - 34 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="LeftArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="RightArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="BackArmorPlating"]/health - - 750 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="Roof"]/health - - 650 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="Roof"]/armor/ArmorRating_Blunt - - 36 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="Roof"]/armor/ArmorRating_Sharp - - 18 - - - -     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Upgrades.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Upgrades.xml new file mode 100644 index 0000000000..92d692b45d --- /dev/null +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Upgrades.xml @@ -0,0 +1,123 @@ + + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/projectile + + Bullet_20x102mmNATO_AP + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/reloadTimer + + 7.2 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/warmUpTimer + + 2.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/maxRange + + 66 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_20x102mmNATO_AP
    • +
  • Ammo_20x102mmNATO_Incendiary
    • +
  • Ammo_20x102mmNATO_HE
    • +
  • Ammo_20x102mmNATO_Sabot
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"] + +
  • + AmmoSet_20x102mmNATO + 2 + 96 + 1.0 + 0.05 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/magazineCapacity + + 800 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/projectile + + Bullet_Laser_PlasmaDestroyer + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/maxRange + + 75 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_PlasmaCanister
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/chargePerAmmoCount + + 50 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"] + +
  • + AmmoSet_PlasmaCanister_Destroyer + 1 + 0.73 + 0.01 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_Predator_Upgrades.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_Predator_Upgrades.xml new file mode 100644 index 0000000000..28eee9749a --- /dev/null +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_Predator_Upgrades.xml @@ -0,0 +1,196 @@ + + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/projectile + + Bullet_20x102mmNATO_AP + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/reloadTimer + + 7.2 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/warmUpTimer + + 2.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/maxRange + + 66 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_20x102mmNATO_AP
    • +
  • Ammo_20x102mmNATO_Incendiary
    • +
  • Ammo_20x102mmNATO_HE
    • +
  • Ammo_20x102mmNATO_Sabot
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"] + +
  • + AmmoSet_20x102mmNATO + 2 + 96 + 1.0 + 0.05 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/magazineCapacity + + 600 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/projectile + + Bullet_Lasgun_Cannon + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/fireModes + + +
  • + 2 + 2 + 100 + + UI/Gizmos/FireRate_Single +
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/maxRange + + 75 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_LasgunPowerPack
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/chargePerAmmoCount + + 5 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"] + +
  • + AmmoSet_Lasgun_Cannon + 2 + 1.0 + 0.01 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/magazineCapacity + + 800 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/projectile + + Bullet_Laser_PlasmaDestroyer + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/maxRange + + 75 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_PlasmaCanister
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/chargePerAmmoCount + + 50 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"] + +
  • + AmmoSet_PlasmaCanister_Destroyer + 1 + 0.73 + 0.01 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml index d459554266..a24eddc529 100644 --- a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml @@ -2,14 +2,14 @@ - Defs/ThingDef[defName="GW_HeavyBolterNonCE" or - defName="GW_AutocannonammoNonCE" or - defName="GW_BattleCannonShellNonCE" or - defName="GW_LascannonammoNonCE" or - defName="GW_HeavyPlasmaNonCE" or - defName="GW_BanePrimaryCannonShellNonCE" or - defName="GW_BaneDemolisherCannonShellNonCE"] - + Defs/ThingDef[defName="GW_HeavyBolterNonCE" or + defName="GW_AutocannonammoNonCE" or + defName="GW_BattleCannonShellNonCE" or + defName="GW_LascannonammoNonCE" or + defName="GW_HeavyPlasmaNonCE" or + defName="GW_BanePrimaryCannonShellNonCE" or + defName="GW_BaneDemolisherCannonShellNonCE"] + \ No newline at end of file diff --git a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml index a319d47425..d96adeb3dd 100644 --- a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml +++ b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml @@ -191,30 +191,32 @@ VFEP_WarcasketGun_MeltaGun - 1 - 0.01 - 1.27 - 10 - 12 - 1.32 + 1.5 + 0.07 + 1.2 + 13.4 + 23.2 + 1.78 CombatExtended.Verb_ShootCE true Bullet_Laser_MeltaCharge - 2.2 - 42 - 50 + 0.6 + 18 + 1 HP_Meltagun_Gun_Sound GunTail_Heavy 19 + 2.7 + 12 true - 100 - 7.2 + 5 + 4 AmmoSet_MeltaCharge diff --git a/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png new file mode 100644 index 0000000000..d2896f782e Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png new file mode 100644 index 0000000000..b614607061 Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png new file mode 100644 index 0000000000..6afa5f1daf Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png new file mode 100644 index 0000000000..d082b5ff52 Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png new file mode 100644 index 0000000000..cb64e5d00e Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png new file mode 100644 index 0000000000..3322ca4dcb Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png differ