diff --git a/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml b/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml index 36de5f028b..7c98a593da 100644 --- a/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml +++ b/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml @@ -131,6 +131,13 @@ + + Defs/ThingDef[defName="Gun_HellcatRifle"]/graphicData + + (1.25,1.25) + + + diff --git a/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml index 9f4582c70a..1350d359fd 100644 --- a/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml +++ b/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups @@ -108,6 +138,27 @@ + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml index 40f46197be..3b281d88fa 100644 --- a/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml +++ b/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups @@ -108,6 +138,27 @@ + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml index e14d0d635d..ae3ff1dfed 100644 --- a/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml +++ b/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalLeg"]/groups @@ -98,6 +128,27 @@ + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/Biotech/Patches/Bodies/Mech_Centurion.xml b/Biotech/Patches/Bodies/Mech_Centurion.xml index 9d9ac67e07..4cae99a1ed 100644 --- a/Biotech/Patches/Bodies/Mech_Centurion.xml +++ b/Biotech/Patches/Bodies/Mech_Centurion.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalLeg"]/groups @@ -98,6 +128,27 @@ + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/Biotech/Patches/Bodies/Mech_Diabolus.xml b/Biotech/Patches/Bodies/Mech_Diabolus.xml index d5b47813d2..b903b9b392 100644 --- a/Biotech/Patches/Bodies/Mech_Diabolus.xml +++ b/Biotech/Patches/Bodies/Mech_Diabolus.xml @@ -25,6 +25,36 @@ + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalDiabolusBodySecondRing"]/groups @@ -101,6 +131,27 @@ + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalDiabolusBodySecondRing"]/groups diff --git a/Biotech/Patches/Bodies/Mech_Warqueen.xml b/Biotech/Patches/Bodies/Mech_Warqueen.xml index 867429d5fc..f718588640 100644 --- a/Biotech/Patches/Bodies/Mech_Warqueen.xml +++ b/Biotech/Patches/Bodies/Mech_Warqueen.xml @@ -25,6 +25,36 @@ + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups @@ -91,6 +121,27 @@ + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups 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/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml index 2c4e22b98f..ce9ad810d2 100644 --- a/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/Defs/Ammo/Shell/155mmHowitzer.xml @@ -125,6 +125,7 @@ Smoke Bullet_155mmHowitzerShell_Smoke + false diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index ba9a5ffc43..c246cda4d8 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/Defs/Ammo/Shell/81mmMortar.xml @@ -217,6 +217,7 @@ Deadlife Bullet_81mmMortarShell_Deadlife + false diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml index d8b7d82746..fc233e4166 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml @@ -1,19 +1,13 @@  - тактический жилет - - Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. - + тактический жилет + Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. - рюкзак - - Удобный и просторный рюкзак для хранения всех видов предметов. - + рюкзак + Удобный и просторный рюкзак для хранения всех видов предметов. - первобытный рюкзак - - Примитивный рюкзак из меха животных, полезен для хранения предметов во время путешествия. - + первобытный рюкзак + Примитивный рюкзак из меха животных, полезен для хранения предметов во время путешествия. \ No newline at end of file diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml index 788cfb7288..0f9d75e37a 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml @@ -1,14 +1,10 @@  - щит ближнего боя - - Простой щит, который может блокировать простые снаряды и удары рукопашным оружием. - + щит ближнего боя + Простой щит, который может блокировать простые снаряды и удары рукопашным оружием. - баллистический щит - - Тяжелый щит, предназначенный для защиты от стрельбы. Он может охватывать большую часть тела пользователя, но не позволяет использовать двуручное оружие. Его тяжелый вес и масса делают его громоздким в бою. - + баллистический щит + Тяжелый щит, предназначенный для защиты от стрельбы. Он может охватывать большую часть тела пользователя, но не позволяет использовать двуручное оружие. Его тяжелый вес и масса делают его громоздким в бою. \ No newline at end of file diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml index e137044530..9df6cfe0f6 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml @@ -3,10 +3,8 @@ - композитный бронежилет - - Жилет с бронепластинами, прикрывающими грудь и спину. Композитная керамика обеспечивает лучшую защиту, чем простая сталь, но не так прочна. - + композитный бронежилет + Жилет с бронепластинами, прикрывающими грудь и спину. Композитная керамика обеспечивает лучшую защиту, чем простая сталь, но не так прочна. diff --git a/LoadFolders.xml b/LoadFolders.xml index 6b6fcc83e2..157c61b249 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -70,6 +70,7 @@
  • ModPatches/Autocleaner
  • ModPatches/Beast Man Tribes
  • ModPatches/Beeralope Squad
    • +
  • ModPatches/Beliar Xenotype
  • ModPatches/Better Wool Production
  • ModPatches/Big and Small - Heaven and Hell
  • ModPatches/Big and Small - MO
    • @@ -141,6 +142,7 @@
  • ModPatches/Edge of Descension - Hovercraft
  • ModPatches/Edge of Descension - Monoblades
  • ModPatches/Edge of Descension - Vanguard
    • +
  • ModPatches/EdoThemedExpansion
  • ModPatches/Eisenhans Power Armor
  • ModPatches/Eltex Bodysuit
  • ModPatches/Enchanted Sword
    • @@ -199,6 +201,7 @@
  • ModPatches/Gas Traps and Shells
  • ModPatches/Gestalt Engine
  • ModPatches/Giddy-Up 2
    • +
  • ModPatches/GREG
  • ModPatches/GrimWorld Angels of Death
  • ModPatches/Grimworld Core Imperialis
  • ModPatches/GrimWorld Hammer of the Imperium
    • @@ -225,6 +228,7 @@
  • ModPatches/High Caliber
  • ModPatches/High Tech Laboratory Facilities
  • ModPatches/Hive Armory
    • +
  • ModPatches/Hyena (Continued)
  • ModPatches/Idhale Race
  • ModPatches/Impact Weaponry
  • ModPatches/Imperial Arsenal Royal Warcasket
    • @@ -234,6 +238,7 @@
  • ModPatches/Infused 2 Expansion
  • ModPatches/Infusion 2
  • ModPatches/Insects have chitin
    • +
  • ModPatches/Ion Weaponry
  • ModPatches/JDS Castle Walls
  • ModPatches/JDS EFT Apparel
  • ModPatches/JDS Exiled Dawn
    • @@ -254,6 +259,7 @@
  • ModPatches/KV Hand n Footwear
  • ModPatches/Kaiser Armory
  • ModPatches/Kemomimihouse
    • +
  • ModPatches/kemomimihouse Kz
  • ModPatches/Kenshi Armory
  • ModPatches/Kijin 3.0
  • ModPatches/Kill la Kill Styles Pack
    • @@ -380,6 +386,10 @@
  • ModPatches/Poleepkwa Race
  • ModPatches/Possessed Weapons
  • ModPatches/PowerArmour T-45b
    • +
  • ModPatches/pphhyy Demigryph
    • +
  • ModPatches/pphhyy Expanded Scythers
    • +
  • ModPatches/pphhyy's Lightless Empyrean
    • +
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/Pratt WWII Weapons Pack
  • ModPatches/Prestige Specialist Armor
  • ModPatches/Profaned
    • @@ -445,6 +455,7 @@
  • ModPatches/RimFantasy - Medieval Overhaul Edition
  • ModPatches/RimHammer40k -Dreadnought
  • ModPatches/RimNauts 2
    • +
  • ModPatches/Rimrats
  • ModPatches/RimSec-Security
  • ModPatches/RimTraits - General Traits
  • ModPatches/RimTraits - Medieval Talents
    • @@ -492,6 +503,7 @@
  • ModPatches/Simply More Melee
  • ModPatches/Slime Rancher
  • ModPatches/Solark Race
    • +
  • ModPatches/Spacer Arsenal
  • ModPatches/Spacer Pack
  • ModPatches/Spacer Shields
  • ModPatches/Spaceworm
    • @@ -534,6 +546,7 @@
  • ModPatches/VGP Drinks
  • ModPatches/VGP Garden Fabrics
  • ModPatches/VRE Android Factions
    • +
  • ModPatches/Valorant Weapon Pack
  • ModPatches/Vampire, Demons, and the Undead
  • ModPatches/Vanilla Animals Expanded
  • ModPatches/Vanilla Animals Expanded - Endangered
    • @@ -623,13 +636,6 @@
  • ModPatches/Xenoorca Race
  • ModPatches/YetAnotherProsthetics - Core
  • ModPatches/Zombieland
    • -
  • ModPatches/kemomimihouse Kz
    • -
  • ModPatches/pphhyy Demigryph
    • -
  • ModPatches/pphhyy Expanded Scythers
    • -
  • ModPatches/pphhyy Sanguinary Animals
    • -
  • ModPatches/pphhyy's Lightless Empyrean
    • -
  • ModPatches/EdoThemedExpansion
    • -
  • ModPatches/Beliar Xenotype
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml index 2a4751f8f8..be85ecd813 100644 --- a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml +++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml @@ -101,7 +101,6 @@ def="Foot" or def="Toe"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml index 1f10035526..b9cf5aca7a 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml @@ -91,4 +91,52 @@     + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left second leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left second leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right second leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right second leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left third leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left third leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right third leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right third leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="InsectLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml index 8ca2debbb4..bd17a093e8 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml @@ -92,6 +92,20 @@ + + Defs/BodyDef[defName="AA_ScorpionLike"]//*[def="InsectLeg"] + + + + + + + Defs/BodyDef[defName="AA_ScorpionLike"]//*[def="InsectLeg" or def="AA_LeftPincer" or def="AA_RightPincer"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/groups diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml index 99ddf9c9cf..aaefd402db 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml @@ -38,6 +38,60 @@ + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml index aa4765e78e..af44afeaf5 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml @@ -90,7 +90,6 @@
  • - false 0.5
  • AA_LeftPincer
    • @@ -98,7 +97,6 @@
  • - false 0.5
  • AA_LeftPincer
    • diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml index a2688ce731..9c4d3db7ae 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml @@ -14,14 +14,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml index 525fe1a8ec..e6172a7324 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml @@ -1,5 +1,6 @@ + Defs/ThingDef[defName="AA_Slurrypede"] @@ -56,7 +57,6 @@
  • - false 0.25
  • SightSensor
    • @@ -65,7 +65,6 @@
  • - false 0.25
  • SightSensor
    • @@ -109,4 +108,5 @@     +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Defs/Alpha Genes/Ammo/Forsakens_Ammo_ProjReskin.xml b/ModPatches/Alpha Genes/Defs/Alpha Genes/Ammo/Forsakens_Ammo_ProjReskin.xml new file mode 100644 index 0000000000..dfad620e27 --- /dev/null +++ b/ModPatches/Alpha Genes/Defs/Alpha Genes/Ammo/Forsakens_Ammo_ProjReskin.xml @@ -0,0 +1,350 @@ + + + + + + + AmmoSet_8x35mmCharged_ForsakenSniper + + + Bullet_8x35mmCharged_ForsakenSniper + Bullet_8x35mmCharged_AP_ForsakenSniper + Bullet_8x35mmCharged_Ion_ForsakenSniper + + + + + Bullet_8x35mmCharged_ForsakenSniper + + + Things/Item/Weapon/AG_ForsakenSniper/AG_SniperPulse + Graphic_Single + + + 19 + +
  • + Bomb_Secondary + 6 +
    • +     + 16 + 57.6 +     +     + + + Bullet_8x35mmCharged_AP_ForsakenSniper + + + Things/Item/Weapon/AG_ForsakenSniper/AG_SniperPulse + Graphic_Single + + + 15 + +
  • + Bomb_Secondary + 2 +
    • +     + 30 + 57.6 +     +     + + + Bullet_8x35mmCharged_Ion_ForsakenSniper + + + Things/Item/Weapon/AG_ForsakenSniper/AG_SniperPulse + Graphic_Single + + + 15 + +
  • + EMP + 9 +
    • +     + 22.5 + 57.6 + 0.2 +     +     + + + + + AmmoSet_12GaugeCharged_ForsakenShotGun + + + Bullet_12GaugeCharged_ForsakenShotGun + Bullet_12GaugeCharged_Slug_ForsakenShotGun + Bullet_12GaugeCharged_Ion_ForsakenShotGun + + + + + Bullet_12GaugeCharged_ForsakenShotGun + + + Things/Item/Weapon/AG_ForsakenShotgun/AG_ForsakenShotgun + Graphic_Single + TransparentPostLight + 0.5,0.5 + + + + 15 + +
  • + Bomb_Secondary + 5 +
    • +     + 8 + 24.4 + 4 + 17.8 +     +     + + + Bullet_12GaugeCharged_Slug_ForsakenShotGun + + + Things/Item/Weapon/AG_ForsakenShotgun/AG_ForsakenShotgun + Graphic_Single + TransparentPostLight + + + 25 + +
  • + Bomb_Secondary + 13 +
    • +     + 12 + 90 +     +     + + + Bullet_12GaugeCharged_Ion_ForsakenShotGun + + + Things/Item/Weapon/AG_ForsakenShotgun/AG_ForsakenShotgun + Graphic_Single + TransparentPostLight + + + 10 + +
  • + EMP + 6 +
    • +     + 8 + 14.4 + 4 + 17.8 + 0.025 +     +     + + + + + AmmoSet_5x35mmCharged_ForsakenAR + + + Bullet_5x35mmCharged_ForsakenAR + + + + + Bullet_5x35mmCharged_ForsakenAR + + + Things/Item/Weapon/AG_ForsakenAssaultRifle/AG_ForsakenAssaultRifle + Graphic_Single + + + Bullet + 13 + 200 + +
  • + Bomb_Secondary + 2 +
    • +     + 30 + 40 +     +     + + + + + + + AmmoSet_ForsakensArrows + + + Projectile_ForsakensArrows + Projectile_GreatArrow_StoneFO + Projectile_GreatArrow_SteelFO + Projectile_GreatArrow_PlasteelFO + Projectile_GreatArrow_VenomFO + Projectile_GreatArrow_Flame + + + + + + + Ammo_ForsakensArrows + + Heavy arrow designed to be fired from a forsaken bow. + + ThirdParty/Forsakens/FAmmoArrow + Graphic_StackCount + + + 0.115 + 0.66 + 0 + + ForsakenArrow + + + + + + Projectile_ForsakensArrows + + + Things/Item/Weapon/AG_ForsakenBow/AG_ForsakenArrow + Graphic_Single + + + 12 + 4.5 + 5 + 0.5 + 39 + + Ammo_ForsakensArrows + + + + + Projectile_GreatArrow_StoneFO + + + Things/Projectile/Arrows/Arrow_Stone + Graphic_Single + + + 26 + 8 + 1.660 + 1 + 0.2 + Ammo_GreatArrow_Stone + + + + + Projectile_GreatArrow_SteelFO + + + Things/Projectile/Arrows/Arrow_Steel + Graphic_Single + + + 31 + 10 + 2.340 + 2 + 0.6 + Ammo_GreatArrow_Steel + + + + + Projectile_GreatArrow_PlasteelFO + + + Things/Projectile/Arrows/Arrow_Plasteel + Graphic_Single + + + 36 + 9 + 2.140 + 3 + 0.75 + Ammo_GreatArrow_Plasteel + + + + + Projectile_GreatArrow_VenomFO + + + Things/Projectile/Arrows/Arrow_Venom + Graphic_Single + + + 31 + Arrow + 10 + +
  • + ArrowVenom + 2 +
    • +     + 2.340 + 2 + 0.6 + Ammo_GreatArrow_Steel +     +     + + + + + MakeAmmo_ForsakensArrows + + Craft 10 forsakens arrows. + Making forsaken arrows. + 400 + + +
  • + + +
  • Steel
    • + + + 10 + +     + + +
  • Steel
    • +     +     + + 10 + +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ScenarioDefs/Scenarios_Forsaken.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ScenarioDefs/Scenarios_Forsaken.xml new file mode 100644 index 0000000000..987d14e3e4 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ScenarioDefs/Scenarios_Forsaken.xml @@ -0,0 +1,16 @@ + + + + + + Defs/ScenarioDef[defName="AG_ForsakenCrashlanded"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_ForsakensArrows + 100 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Items/Items_Resource_Stuff.xml new file mode 100644 index 0000000000..cc43e79d12 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Items/Items_Resource_Stuff.xml @@ -0,0 +1,54 @@ + + + + + + + Defs/ThingDef[defName="AG_Ultima"]/statBases/StuffPower_Armor_Sharp + + + 0.2 + + + + + Defs/ThingDef[defName="AG_Ultima"]/statBases/StuffPower_Armor_Blunt + + + 0.18 + + + + Defs/ThingDef[defName="AG_Ultima"]/statBases/StuffPower_Armor_Heat + + + 0.08 + + + + + Defs/ThingDef[defName="AG_Ultima"]/stuffProps/categories + + Defs/ThingDef[defName="AG_Ultima"]/stuffProps + + +
  • SoftArmor
    • +     +     +     + + Defs/ThingDef[defName="AG_Ultima"]/stuffProps/categories + +
  • SoftArmor
    • +     +     +     + + + Defs/ThingDef[defName="AG_Ultima"]/statBases + + 0.05 + + + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/AG_ApparelDefs.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/AG_ApparelDefs.xml new file mode 100644 index 0000000000..589fa79035 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/AG_ApparelDefs.xml @@ -0,0 +1,255 @@ + + + + + + + + + Defs/ThingDef[defName="AG_Forsaken_Hood" or defName="AG_Forsaken_Hood_Child"]/statBases + + 1 + + + + + Defs/ThingDef[defName="AG_ForsakenCloak"]/statBases + + 7.5 + 1 + + + + + Defs/ThingDef[defName="AG_ForsakenCloak_Child"]/statBases + + 3.5 + 1 + + + + + Defs/ThingDef[ + defName="AG_Forsaken_Hood"or + defName="AG_Forsaken_Hood_Child" or + defName="AG_ForsakenCloak" or + defName="AG_ForsakenCloak_Child" + ]/statBases/ArmorRating_Sharp + + + 1.25 + + + + + Defs/ThingDef[ + defName="AG_Forsaken_Hood"or + defName="AG_Forsaken_Hood_Child" or + defName="AG_ForsakenCloak" or + defName="AG_ForsakenCloak_Child" + ]/statBases/ArmorRating_Blunt + + + 0.35 + + + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases + + 6 + 1.5 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases/ArmorRating_Sharp + + 16 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases/ArmorRating_Blunt + + 36 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet"]/apparel + + true + + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmetPsy"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="AG_ForsakenMarineHelmetPsy"]/apparel + + true + + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/equippedStatOffsets + + 0.50 + -1 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases + + 0 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases/MaxHitPoints + + 250 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • +     +     + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + +     +     + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases + + 100 + 15 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/equippedStatOffsets + + 20 + 80 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/ArmorRating_Sharp + + 20 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/ArmorRating_Blunt + + 45 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/Mass + + 40 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/Flammability + + 0 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml index f225387411..1329aaf620 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml @@ -29,4 +29,38 @@     + + + + Defs/ThingDef[defName="AG_Bullet_HydraBlast"] + + + AG_Bullet_HydraBlast + + + Things/Item/Weapon/AG_BlackHydra/AG_BigPulse + Graphic_Single + + + Bullet + 50 + 76 + 42.273 + 90 + true + + +
  • + 120 + Bomb + 3 + true + Filth_Fuel + 0.5 +
    • +     +     +     +     + \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsMelee_Forsaken.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsMelee_Forsaken.xml new file mode 100644 index 0000000000..e8675d6553 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsMelee_Forsaken.xml @@ -0,0 +1,260 @@ + + + + + + + Defs/ThingDef[defName="AG_ForsakenLongBlade"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 0.33 + 1.52 + 0.500 + Handle + +
  • + + +
  • Stab
    • + + 20 + 1 + 2 + 20 + Point + +
  • + + +
  • Cut
    • + + 34 + 0.88 + 3 + 10 + Edge + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenLongBlade"]/statBases + + 8 + 1.33 + + + + + Defs/ThingDef[defName="AG_ForsakenLongBlade"] + + + 1.6 + 1.0 + 0.4 + + + + + + + + + Defs/ThingDef[defName="AG_ForsakenBattleAxe"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.35 + 0.15 + 3 + Shaft + +
  • + + +
  • Stab
    • + + 12 + 2.2 + 1.165 + 1 + 14 + Point + +
  • + + +
  • Cut
    • + + 45 + 2.2 + 1.165 + 25.4 + 16 + Edge + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenBattleAxe"]/statBases + + 12 + 1.08 + + + + + Defs/ThingDef[defName="AG_ForsakenBattleAxe"]/equippedStatOffsets + + + 0.33 + 1.2 + 0.6 + + + + + + + + + Defs/ThingDef[defName="AG_ForsakenBulkSword"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 0.5 + 0.10 + 0.8 + Handle + +
  • + + +
  • Stab
    • + + 12 + 0.6 + 0.60 + 1 + 14 + Point + +
  • + + +
  • Cut
    • + + 22 + 0.6 + 0.30 + 2.592 + 7 + Edge + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenBulkSword"]/statBases + + + 9 + 1 + + + + + Defs/ThingDef[defName="AG_ForsakenBulkSword"] + + + 0.63 + 0.75 + 0.4 + + + + + + + + Defs/ThingDef[defName="AG_ForsakenSpear"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.35 + 0.15 + 2.25 + Shaft + +
  • + + +
  • Poke
    • + + 8 + 1.78 + 0.05 + 1 + Point + +
  • + + +
  • Stab
    • + + 21 + 1.18 + 1.00 + 3 + 18 + Head + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenSpear"]/statBases + + 10 + 1.68 + + + + + Defs/ThingDef[defName="AG_ForsakenSpear"] + + + 0.17 + 1.45 + 0.9 + + + + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsRanged_Forsaken.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsRanged_Forsaken.xml new file mode 100644 index 0000000000..14cb66f58a --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsRanged_Forsaken.xml @@ -0,0 +1,300 @@ + + + + + + + Defs/ThingDef[ + defName="AG_ForsakenSniper" or + defName="AG_ForsakenShotgun" or + defName="AG_ForsakenAssaultRifle" + ]/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="AG_ForsakenBow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.6 + 0.65 + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenHydra"] + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + AG_ForsakenSniper + + 7.18 + 0.56 + 2.80 + 0.02 + 1.6 + 12.60 + 50500 + + + + 2 + 50 + 15 + 35 + 1 + 6 + + + CombatExtended.Verb_ShootCE + true + Bullet_8x35mmCharged_ForsakenSniper + 1.6 + 86 + Shot_SniperRifle + GunTail_Heavy + 12 + + + 10 + 4 + AmmoSet_8x35mmCharged_ForsakenSniper + + + FALSE + AimedShot + + +
  • Bipod_AMR
    • +     + false +     + + + + + + AG_ForsakenShotgun + + 3.10 + 0.56 + 1.0 + 0.14 + 1.03 + 7.20 + 54500 + + + + 1 + 50 + 15 + 30 + 1 + 4 + + + CombatExtended.Verb_ShootCE + true + Bullet_12GaugeCharged_ForsakenShotGun + 0.6 + 18 + Shot_Shotgun + GunTail_Heavy + 14 + + + + 8 + 4 + AmmoSet_12GaugeCharged_ForsakenShotGun + + + FALSE + Snapshot + + + + + + + + + + AG_ForsakenAssaultRifle + + 3 + 0.36 + 1.00 + 0.1 + 1.33 + 10.03 + 60500 + + + 1 + 50 + 15 + 35 + 1 + 3 + + + 1.29 + CombatExtended.Verb_ShootCE + true + Bullet_5x35mmCharged_ForsakenAR + 1.1 + 55 + 8 + 4 + Shot_ChargeRifle + GunTail_Heavy + 1 + + + 40 + 4 + AmmoSet_5x35mmCharged_ForsakenAR + + + TRUE + AimedShot + 4 + + + + + + + + + AG_ForsakenBow + + 0.7 + 0.75 + 2 + 4.00 + 1 + + + 100 + + + CombatExtended.Verb_ShootCE + true + Projectile_ForsakensArrows + 1.2 + 26 + Bow_Large + + + AmmoSet_ForsakensArrows + + + RecurveBow + true + + + + AG_ForsakenHydra + + 10.00 + 1.20 + 1.00 + 0.01 + 2 + 13.00 + 80000 + + + 10 + 100 + 100 + 50 + 6 + + + CombatExtended.Verb_ShootCE + true + AG_Bullet_HydraBlast + 3 + 4 + 62 + ChargeLance_Fire + GunTail_Heavy + false + 1 + false + + true + + + + 1 + 6 + + + AimedShot + + false + + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml index a2ba9b5d40..45de0071ad 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml @@ -15,14 +15,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -39,7 +37,6 @@
  • - false 0.5
  • AG_LeftPincer
    • @@ -47,7 +44,6 @@
  • - false 0.5
  • AG_LeftPincer
    • diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml index e18bf8469b..fd5861ecd8 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml @@ -57,6 +57,60 @@ + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml index fcc3cc8231..834f09a783 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml @@ -57,6 +57,60 @@ + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml index 51edf670a0..bf6726229a 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml @@ -57,6 +57,60 @@ + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml index b7d2bea835..5843242377 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml @@ -39,6 +39,60 @@ + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml index 6bc200e517..0c4a3d6098 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml @@ -39,6 +39,60 @@ + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml index 535821497d..39c704c5ee 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml @@ -45,6 +45,60 @@ +
  • + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + +     + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml index 973131eea4..3b7a2300ab 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml @@ -63,6 +63,60 @@
    • +
  • + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml index 78ab537b57..9d69bf2bf3 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml @@ -45,6 +45,60 @@
    • +
  • + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml index 93a3f6ab7a..42af4fe4a2 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml @@ -45,6 +45,60 @@
    • +
  • + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups diff --git a/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml index 9eb2cdc6ae..f2a5a8b40f 100644 --- a/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml +++ b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml @@ -37,7 +37,6 @@ def="RightDroidFoot" ]/groups -
  • CoveredByNaturalArmor
    • diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml index 7e50263378..027cc39e60 100644 --- a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml +++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml @@ -73,7 +73,6 @@ true - 240 7.8 @@ -110,7 +109,6 @@ GunTail_Light 9 - 200 7.8 diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml index 4cb21c029e..558227331b 100644 --- a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml +++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml @@ -185,7 +185,6 @@ GunTail_Heavy 9 - 18 4 @@ -223,7 +222,6 @@ GunTail_Heavy 9 - 30 4 @@ -261,7 +259,6 @@ GunTail_Heavy 9 - 30 4 @@ -307,7 +304,6 @@ true - 120 7.8 @@ -344,7 +340,6 @@ true - 6 4 @@ -384,7 +379,6 @@ Mounted - 100 7.8 diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml index 468544350b..cbda128cdb 100644 --- a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml +++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="AstorielScenario"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml index 9634c1f4b2..f5a884fa11 100644 --- a/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml +++ b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml @@ -37,7 +37,7 @@ Smelt UnfinishedAmmo 18000 - Making pila. + Making a giant javelin.
  • diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml index c70faf7b57..fd561cd74f 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml @@ -24,6 +24,9 @@ Medieval true true + +
  • WeaponsRanged
    • +     diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml index 70ca842085..bcc45b38b7 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="BMT_DarkAxolotl"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="BMT_DarkAxolotl"]/statBases - 0.12 0.05 @@ -25,7 +23,6 @@ Defs/ThingDef[defName="BMT_DarkAxolotl"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml index d28a6679bb..3bd6536a97 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/statBases/MoveSpeed - 2.0 0.04 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Blunt - 2 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Sharp - 4 @@ -30,7 +27,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml index 7c1e1838a8..0b472c5191 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/statBases/MoveSpeed - 7.5 0.06 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Blunt - 3 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Sharp - 3 @@ -30,7 +27,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml index e9f7135790..2612036c77 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Mole"] -
  • QuadrupedLow @@ -13,7 +12,6 @@ Defs/ThingDef[defName="BMT_Mole"]/statBases - 0.22 0.01 @@ -30,7 +28,6 @@ Defs/ThingDef[defName="BMT_Mole"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml index f7ff6b7b1c..82ced4faba 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Pillbug"]/statBases/MoveSpeed - 2.3 0.11 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_Pillbug"]/race/baseHealthScale - 0.3 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_Pillbug"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml index 73e7640501..aa74305a2f 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/statBases/MoveSpeed - 2.5 0.04 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Blunt - 4.65 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Sharp - 2.25 @@ -30,7 +27,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml index f307af679d..64544ecf2f 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Yooka"]/statBases - 0.15 0.38 @@ -13,7 +12,6 @@ Defs/ThingDef[defName="BMT_Yooka"]/tools -
  • diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml index 155e880820..189fe03334 100644 --- a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml +++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Sharp - 0.907 @@ -48,7 +47,6 @@ Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Heat - 0.2 @@ -79,7 +77,6 @@ Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Heat - 0.226 diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml index a6ad486f2f..b76fb74ea6 100644 --- a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml +++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml @@ -134,7 +134,6 @@ /Defs/ThingDef[defName="DF_Dusk_Saw"]/tools -
  • diff --git a/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml index 0de177e3be..6612dd0d74 100644 --- a/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml +++ b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="FoxSquirrel"] -
  • QuadrupedLow @@ -14,7 +13,6 @@ Defs/ThingDef[defName="FoxSquirrel"]/statBases - 0.22 0.01 @@ -31,7 +29,6 @@ Defs/ThingDef[defName="FoxSquirrel"]/tools -
  • diff --git a/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml b/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml index dff302e557..1c53a4a5f1 100644 --- a/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml +++ b/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="ERN_lizarddoggo"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="ERN_lizarddoggo"]/statBases - 0.22 0.05 @@ -32,7 +30,6 @@ Defs/ThingDef[defName="ERN_lizarddoggo"]/tools -
  • diff --git a/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml b/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml index 40e3cb6e22..0f7b45a9c5 100644 --- a/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml +++ b/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml @@ -322,7 +322,6 @@ Defs/ThingDef[defName="ERN_Armadillo"]/statBases - 0.17 0.05 diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml index 5e430b517a..ddd519f349 100644 --- a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml +++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="FR_CrashlandedMinotaur"]/scenario/parts -
  • StartingThing_Defined @@ -21,7 +20,6 @@ Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts -
  • StartingThing_Defined @@ -33,7 +31,6 @@ Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts/li[thingDef="Pila"] - 20 diff --git a/ModPatches/GREG/Patches/GREG/ThingDefs_Races.xml b/ModPatches/GREG/Patches/GREG/ThingDefs_Races.xml new file mode 100644 index 0000000000..be40a43f36 --- /dev/null +++ b/ModPatches/GREG/Patches/GREG/ThingDefs_Races.xml @@ -0,0 +1,251 @@ + + + + + + + Defs/ThingDef[defName="XEN_CattleEgret" or defName="XEN_GreatEgret" or defName="XEN_ReddishEgret" or defName="XEN_SlatyEgret" or defName="XEN_SnowyEgret"] + +
  • + Birdlike +
    • +     +     + + + + + Defs/ThingDef[defName="XEN_CattleEgret"]/statBases + + 0.1 + 0.01 + 0.03 + + + + + Defs/ThingDef[defName="XEN_CattleEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 2.0 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 3 + 2.2 + Beak + + +
  • + Stun + 3 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 1 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + + + + Defs/ThingDef[defName="XEN_GreatEgret" or defName="XEN_ReddishEgret"]/statBases + + 0.1 + 0.01 + 0.04 + + + + + Defs/ThingDef[defName="XEN_GreatEgret" or defName="XEN_ReddishEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 2.0 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 5 + 2.2 + Beak + + +
  • + Stun + 5 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 3 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + + + + Defs/ThingDef[defName="XEN_SlatyEgret"]/statBases + + 0.15 + 0.01 + 0.05 + + + + + Defs/ThingDef[defName="XEN_SlatyEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 1.9 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 4 + 2.1 + Beak + + +
  • + Stun + 4 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + + + + Defs/ThingDef[defName="XEN_SnowyEgret"]/statBases + + 0.1 + 0.01 + 0.03 + + + + + Defs/ThingDef[defName="XEN_SnowyEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 2.0 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 3 + 2.2 + Beak + + +
  • + Stun + 3 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + \ No newline at end of file diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml index 721a41f840..f9a4d2930c 100644 --- a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml +++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml @@ -115,9 +115,7 @@ FALSE SuppressFire - - false     diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml index eaff8b0e94..3e409091a3 100644 --- a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml +++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml @@ -181,14 +181,11 @@ 9 - AimedShot true - - false 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/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml b/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml index cfd1dd135c..d15b00be0b 100644 --- a/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml +++ b/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml @@ -50,7 +50,6 @@ def="Foot" or def="Toe"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Hyena (Continued)/Patches/Hyena (Continued)/ThingDefs_Races.xml b/ModPatches/Hyena (Continued)/Patches/Hyena (Continued)/ThingDefs_Races.xml new file mode 100644 index 0000000000..bebbe17265 --- /dev/null +++ b/ModPatches/Hyena (Continued)/Patches/Hyena (Continued)/ThingDefs_Races.xml @@ -0,0 +1,75 @@ + + + + + + + Defs/ThingDef[defName="SpottedHyena" or defName="StripedHyena"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="SpottedHyena" or defName="StripedHyena"]/statBases + + 0.21 + 0.11 + 0.07 + + + + + Defs/ThingDef[defName="SpottedHyena" or defName="StripedHyena"]/tools + + +
  • + + +
  • Scratch
    • + + 4 + 1 + FrontLeftPaw + 0.06 + 0.22 + +
  • + + +
  • Scratch
    • + + 4 + 1 + FrontRightPaw + 0.06 + 0.22 + +
  • + + +
  • Bite
    • + + 13 + 2 + Teeth + 1.66 + 2.35 + +
  • + + +
  • Blunt
    • + + 1 + 1.5 + HeadAttackTool + 0.13 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Ion Weaponry/Defs/Ion Weaponry/Ammo.xml b/ModPatches/Ion Weaponry/Defs/Ion Weaponry/Ammo.xml new file mode 100644 index 0000000000..ca5d5810a1 --- /dev/null +++ b/ModPatches/Ion Weaponry/Defs/Ion Weaponry/Ammo.xml @@ -0,0 +1,413 @@ + + + + + AmmoRailgun_Ion + + AmmoAdvanced + UI/Icons/ThingCategories/CaliberRailgunPistol + + + + + + AmmoSet_4mmRailgunIon + + + Bullet_4mmRailgun_Ion + + + + + AmmoSet_6mmRailgunIon + + + Bullet_6mmRailgun_Ion + + + + + AmmoSet_8mmRailgunIon + + + Bullet_8mmRailgun_Ion + + + + + AmmoSet_12mmRailgunIon_Lance + + + Bullet_12mmRailgun_Ion_Lance + + + + + + + AmmoSet_12mmRailgunIon_Blast + + + Bullet_12mmRailgun_Ion_Blast + + + + + + + Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles. Features an ionized particle payload. + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +     + + CombatExtended.Graphic_StackCountRanged + + +
  • AmmoRailgun_Ion
    • +     + Ionized +     + + + Ammo_4mmRailgun_Ion + + + 0.006 + 0.008 + 0.06 + + + ThirdParty/VanillaXCOM/Railgun/EMP/Pistol + + + + + Ammo_6mmRailgun_Ion + + + 0.008 + 0.008 + 0.08 + + + ThirdParty/VanillaXCOM/Railgun/EMP/Rifle + + + + + Ammo_8mmRailgun_Ion + + + 0.01 + 0.01 + 0.10 + + + ThirdParty/VanillaXCOM/Railgun/EMP/Rifle + + + + + Ammo_12mmRailgun_Ion + + + 0.012 + 0.01 + 0.12 + + + ThirdParty/VanillaXCOM/Railgun/EMP/HighCaliber + + + + + + + + Projectile/IW_IonBullet + Graphic_Single + TransparentPostLight + + + Bullet + false + + + + + Bullet_4mmRailgun_Ion + + + 0.6 + + + 10 + 8.4 + 88.73 + 250 + +
  • + IW_IonBullet + 10 +
    • +     +     +     + + + Bullet_6mmRailgun_Ion + + + 1.1 + + + 5.5 + 22 + 126.36 + 300 + +
  • + IW_IonBullet + 14 +
    • +     +     +     + + + Bullet_8mmRailgun_Ion + + + 6 + 37.5 + 145.4 + 360 + +
  • + IW_IonBullet + 20 +
    • +     +     +     + + + Bullet_12mmRailgun_Ion_Lance + + + 1.3 + + + 10 + 55 + 252.720 + 380 + +
  • + IW_IonBullet + 20 +
    • +     +     +     + + + Bullet_12mmRailgun_Ion_Blast + CombatExtended.ProjectileCE_Explosive + + + false + EMP + 40 + 4.9 + 120 + +
  • + IW_IonBullet + 20 +
    • +     + true +     +     + + + + + MakeAmmo_4mmRailgun_Ion + + Craft 500 4mm Railgun (Discharge) cartridges. + Making 4mm Railgun (Discharge) cartridges. + 3000 + +
  • + + +
  • Steel
    • + + + 1 + +
  • + + +
  • Uranium
    • + + + 2 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • ComponentIndustrial
    • +     +     + + 500 + +     + + + MakeAmmo_6mmRailgun_Ion + + Craft 500 6mm Railgun (Discharge) cartridges. + Making 6mm Railgun (Discharge) cartridges. + 3000 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Uranium
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • ComponentIndustrial
    • +
  • Steel
    • +
  • Uranium
    • +     +     + + 500 + +     + + + MakeAmmo_8mmRailgun_Ion + + Craft 200 8mm Railgun (Discharge) cartridges. + Making 8mm Railgun (Discharge) cartridges. + 3000 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Uranium
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • ComponentIndustrial
    • +
  • Steel
    • +
  • Uranium
    • +     +     + + 200 + +     + + + MakeAmmo_12mmRailgun_Ion + + Craft 100 12mm Railgun (Discharge) cartridges. + Making 12mm Railgun (Discharge) cartridges. + 3500 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Uranium
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • ComponentIndustrial
    • +
  • Steel
    • +
  • Uranium
    • +     +     + + 100 + +     + +     \ No newline at end of file diff --git a/ModPatches/Ion Weaponry/Patches/Ion Weaponry/Damages.xml b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/Damages.xml new file mode 100644 index 0000000000..c0a6f803c9 --- /dev/null +++ b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/Damages.xml @@ -0,0 +1,30 @@ + + + + + Defs/DamageDef[defName="IW_IonBullet"] + +
  • + true +
    • +     +     + + + Defs/DamageDef[defName="IW_IonBullet"] + + + Electric + 0.50 + Damage_EMP + + + + + Defs/HediffDef[defName="IW_Ionization"]/comps/li[@Class="AthenaFramework.HediffCompProperties_Bomb"]/damageAmount + + 30 + + + +     \ No newline at end of file diff --git a/ModPatches/Ion Weaponry/Patches/Ion Weaponry/RangedSpacer.xml b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/RangedSpacer.xml new file mode 100644 index 0000000000..4d40f5f464 --- /dev/null +++ b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/RangedSpacer.xml @@ -0,0 +1,423 @@ + + + + + + + + Defs/ThingDef[defName ="IW_Gun_IonPistol" or defName ="IW_Gun_IonPDW"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + +     +     +     + + + Defs/ThingDef[ + defName = "IW_Gun_IonRifle" or + defName = "IW_Gun_IonSlugthrower" or + defName = "IW_Gun_IonDMR"]/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="IW_Gun_IonLMG" or defName="IW_Gun_HeavyIonLance"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + Defs/ThingDef[defName="IW_Gun_HeavyIonLance"]/equippedStatOffsets/MoveSpeed + + + + + IW_Gun_IonPistol + + 1.20 + 2.25 + 0.90 + 0.17 + 0.8 + 0.51 + + + 1.2 + CombatExtended.Verb_ShootCE + True + Bullet_4mmRailgun_Ion + 0.6 + 20 + IW_Shot_IonPistol + GunTail_Light + 9 + + + 10 + 4 + AmmoSet_4mmRailgunIon + + + AimedShot + + +
  • SpacerGun
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + IW_Gun_IonPDW + + 3 + 4 + 1.2 + 0.2 + 0.8 + 0.51 + + + 1.40 + CombatExtended.Verb_ShootCE + True + Bullet_4mmRailgun_Ion + 0.6 + 5 + 6 + 15 + IW_Shot_IonPDW + GunTail_Light + 9 + + + 30 + 4 + AmmoSet_4mmRailgunIon + + + 3 + Snapshot + + +
  • SpacerGun
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + IW_Gun_IonRifle + + 5 + 8 + 1.25 + 0.07 + 1.10 + 0.38 + + + 1.3 + CombatExtended.Verb_ShootCE + True + Bullet_6mmRailgun_Ion + 1.1 + 50 + 5 + 5 + IW_Shot_IonRifle + GunTail_Medium + 9 + + + 40 + 4 + AmmoSet_6mmRailgunIon + + + AimedShot + True + 3 + + +
  • SpacerGun
    • +
  • CE_AI_Rifle
    • +     +     + + + + IW_Gun_IonDMR + + 6 + 9.15 + 1.20 + 0.03 + 2.0 + 0.82 + 0.6 + + + 1.4 + CombatExtended.Verb_ShootCE + True + Bullet_8mmRailgun_Ion + 1.5 + 86 + IW_Shot_IonRifle + GunTail_Medium + 9 + + + 5 + 3 + AmmoSet_8mmRailgunIon + + + AimedShot + + +
  • SpacerGun
    • +
  • CE_AI_SR
    • +
  • Bipod_DMR
    • +     +     + + + + IW_Gun_IonSlugthrower + + 5 + 12 + 1.50 + 0.07 + 1.0 + 0.98 + + + 1.3 + CombatExtended.Verb_ShootCE + True + Bullet_8mmRailgun_Ion + 0.6 + 40 + IW_Shot_IonRifle + GunTail_Medium + 9 + + + 8 + 0.8 + true + AmmoSet_8mmRailgunIon + + + AimedShot + + +
  • SpacerGun
    • +     +     + + + + IW_Gun_IonLMG + + 40 + 20 + 2.64 + 0.06 + 1 + 1.2 + + + 1.05 + CombatExtended.Verb_ShootCE + True + Bullet_8mmRailgun_Ion + 1.8 + 60 + IW_Shot_IonLMG + GunTail_Heavy + 18 + 20 + 5 + Regular + + + 200 + 8 + AmmoSet_8mmRailgunIon + + + Snapshot + 10 + + +
  • SpacerGun
    • +
  • CE_AI_LMG
    • +     +     + + + Defs/ThingDef[defName = "IW_Gun_IonLMG"] + +
  • + 1.20,1.20 + 0.2,-0.1 +
    • +     +     + + + + IW_Gun_HeavyIonLance + + 40 + 20 + 2 + 0.1 + 2 + 1.2 + + + 1.5 + CombatExtended.Verb_ShootCE + True + Bullet_12mmRailgun_Ion_Lance + 1.8 + 70 + IW_Shot_HeavyIonLance + GunTail_Heavy + 18 + Regular + + + 10 + 8 + AmmoSet_12mmRailgunIon_Lance + + + AimedShot + + +
  • SpacerGun
    • +
  • Bipod_ATR
    • +     +     + + + Defs/ThingDef[defName="IW_Gun_HeavyIonLance"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to Lance + switch to Ion Blast + True + + 10 + 8 + AmmoSet_12mmRailgunIon_Blast + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_12mmRailgun_Ion_Blast + 5 + 5 + 1.1 + 70 + IW_Shot_IonBlast + 18 + + true + + + + AimedShot + +
    • +
  • + CompEquippable +
    • +     +     + + + Defs/ThingDef[defName = "IW_Gun_HeavyIonLance"] + +
  • + 1.30,1.30 + 0.1,-0.15 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml index 6a46c86900..99e28705f1 100644 --- a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml +++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml @@ -36,15 +36,12 @@ true - FALSE AimedShot true - - false @@ -83,15 +80,12 @@ true - FALSE AimedShot true - - false @@ -130,15 +124,12 @@ true - FALSE AimedShot true - - false @@ -177,15 +168,12 @@ true - FALSE AimedShot true - - false @@ -234,9 +222,7 @@ FALSE AimedShot - - false @@ -285,9 +271,7 @@ FALSE AimedShot - - false @@ -337,9 +321,7 @@ FALSE AimedShot - - false diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml index 44a39c865c..92fa3ad5bb 100644 --- a/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml +++ b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml @@ -15,7 +15,6 @@ def="Eye" or def="Ear"] - @@ -34,7 +33,6 @@ def="Ear" or def="AnimalJaw"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml index fdd1f7dbdf..ec17422737 100644 --- a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml +++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml @@ -27,7 +27,6 @@ def="InsectLeg" or def="Foot"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml index ac5a1021cd..7b0ad64c2d 100644 --- a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml @@ -92,21 +92,18 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
  • - false 0.625
  • MGR_SyntheticalLeg
    • @@ -120,28 +117,24 @@
  • - false 0.625
  • MechanicalFoot
  • - false 0.625
  • MechanicalFoot
  • - false 0.625
  • PowerClaw
  • - false 0.625
  • PowerClaw
    • diff --git a/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml b/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml index 9b21cf2df8..4b40528a2e 100644 --- a/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml +++ b/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml @@ -16,7 +16,6 @@ def="MechanicalLeg" or def="MechanicalFoot"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml index 1c614bfcac..1021edc12c 100644 --- a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml +++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml @@ -7,7 +7,6 @@ Defs/BodyDef[defName="Moyo_Hexapod"]//*[ def="Hexapod_TentacleJoint"] - @@ -21,7 +20,6 @@ def="Hexapod_Tentacle" ]/groups -
  • CoveredByNaturalArmor
    •  @@ -39,7 +37,6 @@ def="PressurePod_Seg4" or def="PressurePod_Seg5"] - @@ -58,7 +55,6 @@ def="MechanicalHead" or def="pressurepod_club"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml index b390d73aba..ef531b8836 100644 --- a/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml +++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml @@ -13,7 +13,6 @@ customLabel="rear left paw" or customLabel="rear right paw"] - @@ -29,7 +28,6 @@ def="Leg" or def="Paw"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml index e48e2f06ce..b00075917f 100644 --- a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml +++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml @@ -50,7 +50,6 @@ def="PNToe" or def="PNTail"]/groups -
  • CoveredByNaturalArmor
    •  diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" index 7f457e8e0a..1b903f2434 100644 --- "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" +++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" @@ -138,7 +138,6 @@ true - FALSE AimedShot @@ -236,7 +235,6 @@ true - FALSE AimedShot diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml index e1dc06761f..51bea70263 100644 --- a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml +++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Sharp - 0.807 @@ -12,7 +11,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Blunt - 0.42 @@ -20,7 +18,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Heat - 0.16 @@ -28,7 +25,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/BluntDamageMultiplier - 1.4 @@ -36,7 +32,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/stuffProps/statFactors - 1.5 @@ -45,7 +40,6 @@ Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Sharp - 0.03 @@ -53,7 +47,6 @@ Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Blunt - 0.02 @@ -61,7 +54,6 @@ Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Heat - 0.05 diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml index 34a1e42249..b9d6642e35 100644 --- a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml +++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="RE_AllianceColony"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml index 1b3ccf9d5c..8584364bcf 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml @@ -7,14 +7,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml index 875543e89b..ddd76d99c8 100644 --- a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml +++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml @@ -77,7 +77,6 @@ Defs/ThingDef[defName="WoW_Animal_Elekk"]/tools -
  • diff --git a/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml index 48c6a7ba47..88163e28e4 100644 --- a/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml +++ b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml @@ -13,7 +13,6 @@ or defName="DwarfScenario" or defName="NightElfScenario" or defName="TrollScenario"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml index 6f5032da46..3fe62eed78 100644 --- a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml +++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml @@ -34,14 +34,11 @@ true - false AimedShot - - false @@ -77,7 +74,6 @@ true - 1 5.6 @@ -89,9 +85,7 @@ AimedShot FALSE - - false @@ -129,7 +123,6 @@ true - 3 2.55 @@ -140,9 +133,7 @@ FALSE SuppressFire - - false @@ -178,7 +169,6 @@ true - 1 3 @@ -190,9 +180,7 @@ FALSE SuppressFire - - false @@ -237,9 +225,7 @@ AimedShot true - - false @@ -276,15 +262,12 @@ true - FALSE AimedShot true - - false @@ -320,7 +303,6 @@ true - 4 5.6 @@ -331,9 +313,7 @@ FALSE AimedShot - - false @@ -372,7 +352,6 @@ true - 1 3 @@ -384,9 +363,7 @@ FALSE SuppressFire - - false @@ -424,15 +401,12 @@ true - FALSE AimedShot true - - false @@ -471,15 +445,12 @@ true - FALSE AimedShot true - - false @@ -516,7 +487,6 @@ true - 6 5.1 @@ -527,9 +497,7 @@ FALSE SuppressFire - - false @@ -566,7 +534,6 @@ true - 1 5.6 @@ -577,9 +544,7 @@ FALSE AimedShot - - false @@ -617,15 +582,12 @@ true - FALSE AimedShot true - - false @@ -662,7 +624,6 @@ true - 1 5.6 @@ -674,9 +635,7 @@ AimedShot true - - false @@ -713,7 +672,6 @@ true - 1 5.6 @@ -725,9 +683,7 @@ AimedShot true - - false @@ -764,7 +720,6 @@ true - 5 4.5 @@ -775,9 +730,7 @@ FALSE SuppressFire - - false diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml index 3db23cd098..1315bceb93 100644 --- a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml +++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml @@ -28,7 +28,6 @@ RNShotBallistic 0 - FALSE AimedShot diff --git a/ModPatches/Rimrats/Patches/Rimrats/ThingDefs_Races.xml b/ModPatches/Rimrats/Patches/Rimrats/ThingDefs_Races.xml new file mode 100644 index 0000000000..f50b4283bb --- /dev/null +++ b/ModPatches/Rimrats/Patches/Rimrats/ThingDefs_Races.xml @@ -0,0 +1,76 @@ + + + + + + + Defs/ThingDef[defName="Rimrat"] + +
  • + QuadrupedLow +
    • +     +     + + + Defs/ThingDef[defName="Rimrat"]/statBases + + 3.0 + 0.2 + 0.01 + + + + + Defs/ThingDef[defName="Rimrat"]/tools + + +
  • + + +
  • Scratch
    • + + 1 + 1.69 + FrontLeftPaw + 0.01 + 0.01 + +
  • + + +
  • Scratch
    • + + 1 + 1.69 + FrontRightPaw + 0.01 + 0.01 + +
  • + +
  • Bite
    • + + 4 + 0.95 + Teeth + 0.5 + 0.085 + +
  • + + +
  • Blunt
    • + + 1 + 3.00 + HeadAttackTool + 0.2 + 0.1 + 0 + +     +     +     + + \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml index 7b43bf52be..9f8dc47d85 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml @@ -16,14 +16,12 @@
  • - false 0.25
  • Eye
  • - false 0.25
  • Eye
    • diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml index 771725a7e4..6afb2d734b 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml @@ -52,7 +52,6 @@
  • - false 0.25
  • Leg
    • @@ -60,7 +59,6 @@
  • - false 0.25
  • Leg
    • diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml index 4b3ffe92db..498be7f285 100644 --- a/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml +++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml @@ -13,7 +13,6 @@ def="MechanicalLeg" or def="MechanicalFoot"] - @@ -34,7 +33,6 @@ def="MechanicalFoot" ]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml new file mode 100644 index 0000000000..c2f546b174 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml @@ -0,0 +1,319 @@ + + + + + + + AmmoSet_8mmRailgun_CoilgunLance + + + Bullet_CoilGunLance + + + + + Bullet_CoilGunLance + + + true + False + Bullet + 25 + 47 + 310 + + + + + + + + + AmmoHotPlasmaCell + + AmmoAdvanced + Spacer Arsenal/PlasmaCell/HotPlasmaCell_c + + + + + + PlasmaBolt + + A concentrated bolt of radiation, imparting disruptive energy into the target. + + + + + + AmmoSet_PlasmaBlaster + + + Bullet_Bolt_PlasmaBlaster + + + + + + + A hot plasma cell utilised by spacer tech assault weapons. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoHotPlasmaCell
    • +     + 5000 +     + + + Ammo_HotPlasmaCell + + + Spacer Arsenal/PlasmaCell + Graphic_StackCount + + + 0.69 + + PlasmaBolt + Bullet_Bolt_PlasmaBlaster + + + + + + + + Things/Projectiles/Bullet_Plasma + Graphic_Single + TransparentPostLight + + + CE_Laser + 170 + false + + + + + Bullet_Bolt_PlasmaBlaster + + Bullet + 5 + 15 + 5 + +
  • + Flame_Secondary + 17 +
    • +     +     +     + + + + + MakeAmmo_HotPlasmaCell + + Craft 500 hot plasma cells. + Making hot plasma cells. + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +
  • + + +
  • Prometheum
    • + + + 8 + +
  • + + +
  • Chemfuel
    • + + + 12 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Prometheum
    • +
  • Chemfuel
    • +     +     + + 500 + + 8400 +     + + + + + + + AmmoPhotonCell + + AmmoAdvanced + Spacer Arsenal/PhotonCell/PhotonCell_c + + + + + + PhotonCell + + A concentrated bolt of radiation, imparting disruptive energy into the target. + + + + + + AmmoSet_PhotonBlaster + + + Bullet_Bolt_PhotonBlaster + + + + + + + A charged photon cell utilised by spacer tech assault weapons. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoPhotonCell
    • +     + 5000 +     + + + Ammo_PhotonCell + + + Spacer Arsenal/PhotonCell + Graphic_StackCount + + + 0.69 + + PhotonCell + Bullet_Bolt_PhotonBlaster + + + + + + + + Things/Projectiles/Bullet_Photon + Graphic_Single + TransparentPostLight + + + Photon + 156 + false + + + + + Bullet_Bolt_PhotonBlaster + + Photon + 12 + 10.5 + 7 + + + + + + + MakeAmmo_PhotonCell + + Craft 500 photon cells. + Making photon cells. + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentSpacer
    • + + + 4 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentSpacer
    • +     +     + + 500 + + 8400 +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml new file mode 100644 index 0000000000..6087fd0024 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml @@ -0,0 +1,17 @@ + + + + + Photon + + {0} has been scorched to death. + BurnSecondary + false + 99999 + 1 + 0 + 0.1 + 2 + + + \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml new file mode 100644 index 0000000000..9361e19181 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml @@ -0,0 +1,101 @@ + + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases + + 4 + 1 + 0.7 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/Mass + + 3.0 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Sharp + + 10 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Blunt + + 26 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/MaxHitPoints + + 190 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets + + 0.15 + -1 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets/MentalBreakThreshold + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList/Plasteel + + 50 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList + + 35 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • +     +     + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml new file mode 100644 index 0000000000..cbb246ea21 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml @@ -0,0 +1,97 @@ + + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 80 + 12 + 0.1 + 30 + 16 + 38.25 + 400 + + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 60 + 140 + 20 + 5 + + + + + + Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]/equippedStatOffsets/MoveSpeed + + 50 + 8 + 0.50 + + + + + Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + +     +     + +     diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml new file mode 100644 index 0000000000..9f88482ba5 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml @@ -0,0 +1,119 @@ + + + + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/thingClass + + CombatExtended.ProjectileCE_Explosive + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/projectile + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"] + + + 1.5 + Thump + 56 + 60 + true + Fleck_GrenadePin + Filth_GrenadeAmmoCasings + true + 12 + 3.0 + 2.0 + 0.25 + + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/comps + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"] + + + + + + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/smeltable + + false + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] + + CombatExtended.AmmoThing + 75 + First + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] + Class + CombatExtended.AmmoDef + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/comps + + +
  • + 56 + Thump + 3.9 +
    • +     +     +     + + + DV_Weapon_GrenadeThump + + 0.4 + 0.87 + 11.22 + 1 + 1.0 + + + + CombatExtended.Verb_ShootCEOneUse + true + 12.0 + 4 + 1 + 6 + true + ThrowGrenade + + true + + DV_Proj_GrenadeThump + true + true + 7 + + +
  • CE_AI_Grenade
    • +
  • CE_AI_AOE
    • +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml new file mode 100644 index 0000000000..6648c4fd57 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml @@ -0,0 +1,105 @@ + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.1 + 1.5 + 0.5 + Handle + +
  • + + +
  • Cut
    • + + 35 + 0.83 + 2.88 + 4.5 + Edge + +
  • + Stun + 10 + 0.4 +
    • +     + +
  • + + +
  • Stab
    • + + 16 + 0.94 + 1.28 + 6.25 + +
  • + Stun + 10 + 0.4 +
    • +     + +     +     +     + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases + + 4 + 0.40 + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + 1.00 + 0.40 + 0.27 + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml new file mode 100644 index 0000000000..9bd47fd899 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml @@ -0,0 +1,256 @@ + + + + + + + Defs/ThingDef[ + defName="DV_Gun_ClashHMG" or + defName="DV_Gun_SonicStunner" or + defName="DV_Gun_BruteRifle" or + defName="DV_Gun_PhotonSMG" or + defName="DV_Gun_PlasmaBlaster" or + defName="DV_Gun_CoilgunLance" + ]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + + DV_Gun_ClashHMG + + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.33 + CombatExtended.Verb_ShootCE + True + Bullet_145x114mm_FMJ + 10 + 10 + 2.1 + 60 + Shot_Autocannon + GunTail_Medium + 12 + + + 60 + 4.9 + AmmoSet_145x114mm + + + FALSE + SuppressFire + 5 + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +     +     + + + Defs/ThingDef[defName="DV_Gun_ClashHMG"]/equippedStatOffsets/MoveSpeed + + + + + + DV_Gun_CoilgunLance + + 4.0 + 9.0 + 1.30 + 0.07 + 1.10 + 0.38 + + + 2.09 + CombatExtended.Verb_ShootCE + True + Bullet_CoilGunLance + 1.1 + 60 + Shot_TurretSniper + GunTail_Heavy + 9 + + + 1 + 4 + AmmoSet_8mmRailgun_CoilgunLance + + + AimedShot + False + + +
  • SpacerGun
    • +
  • Coilgun
    • +     +     + + + + + DV_Gun_PhotonSMG + + 2.50 + 0.37 + 1.00 + 0.14 + 0.94 + 4.50 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_Bolt_PhotonBlaster + 0.6 + 25 + 6 + 6 + DV_Shot_PhotonSMG + GunTail_Medium + 9 + + + 25 + 4 + AmmoSet_PhotonBlaster + + + 3 + FALSE + Snapshot + + +
  • CE_SMG
    • +
  • CE_AI_BROOM
    • +     +     + + + + DV_Gun_PlasmaBlaster + + 8.7 + 0.56 + 1 + 0.05 + 1.37 + 12.9 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_Bolt_PlasmaBlaster + 1.3 + 62 + 7 + 10 + DV_Shot_PlasmaBlaster + GunTail_Medium + 9 + + + 40 + 4.9 + AmmoSet_PlasmaBlaster + + + 5 + FALSE + SuppressFire + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +     +     + + + + + DV_Gun_BruteRifle + + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.33 + CombatExtended.Verb_ShootCE + True + Bullet_50BMG_FMJ + 4 + 10 + 2.1 + 40 + Shot_Autocannon + GunTail_Medium + 12 + + + 15 + 4.9 + AmmoSet_50BMG + + + true + Snapshot + 2 + + + + + Defs/ThingDef[defName="DV_Gun_BruteRifle"]/equippedStatOffsets/MoveSpeed + + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png new file mode 100644 index 0000000000..c1fd2c146c Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png new file mode 100644 index 0000000000..881744cd4a Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png new file mode 100644 index 0000000000..124c04bb8c Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png new file mode 100644 index 0000000000..a89eb7c3f7 Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png new file mode 100644 index 0000000000..3faaf15b06 Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png new file mode 100644 index 0000000000..dcd3fde306 Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png differ diff --git a/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml b/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml index e3b0f2f4ff..eed96ef128 100644 --- a/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml +++ b/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="Tuffalo"] -
  • Quadruped @@ -88,7 +87,6 @@ Defs/ThingDef[defName="TuffaloWool"]/statBases/StuffPower_Armor_Sharp - 0.02 0.056 diff --git a/ModPatches/Valorant Weapon Pack/Patches/Valorant Weapon Pack/ValorantWeaponPack_Ranged.xml b/ModPatches/Valorant Weapon Pack/Patches/Valorant Weapon Pack/ValorantWeaponPack_Ranged.xml new file mode 100644 index 0000000000..16df828b67 --- /dev/null +++ b/ModPatches/Valorant Weapon Pack/Patches/Valorant Weapon Pack/ValorantWeaponPack_Ranged.xml @@ -0,0 +1,741 @@ + + + + + + Defs/ThingDef[ + defName="Biaopei" or + defName="Guimei" or + defName="Zhengyi" or + defName="Kuangnu" or + defName="Duanpao"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + + +     +     + + + Defs/ThingDef[ + defName="Fengci" or + defName="Hailing" or + defName="Xionglu" or + defName="Panguan" or + defName="Liaoquan" or + defName="Shuwei" or + defName="Huanying" or + defName="Kuangtu" or + defName="Feijiang" or + defName="Mangxia" or + defName="Mingju" or + defName="Zhanshen" or + defName="Aodin"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + Biaopei + + 1.11 + 0.39 + 0.7 + 0.17 + 0.97 + 2.03 + + + 2.51 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 12 + Shot_Biaopei + GunTail_Light + 9 + + true + + + + 12 + 1.75 + AmmoSet_9x19mmPara + + +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + Guimei + + 1.24 + 0.42 + 0.7 + 0.17 + 1.17 + 2.4 + + + 2.40 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmParaSD_FMJ + 0.6 + 12 + Shot_Guimei + GunTail_Light + 9 + + true + + + + 15 + 1.5 + AmmoSet_9x19mmParaSD + + + + + + Zhengyi + + 2.79 + 0.49 + 0.7 + 0.15 + 1.39 + 1.39 + + + 2.76 + CombatExtended.Verb_ShootCE + true + Bullet_357Magnum_FMJ + 0.6 + 12 + Shot_Zhengyi + GunTail_Light + 9 + + true + + + + 6 + 2.25 + AmmoSet_357Magnum_Revolver + + + + + + Kuangnu + + 2.84 + 0.36 + 0.7 + 0.16 + 1.93 + 2.95 + + + 1.71 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 12 + 3 + 13 + Shot_Kuangnu + GunTail_Light + 9 + + true + + + + 13 + 1.5 + AmmoSet_9x19mmPara + + + AimedShot + + + + + + Duanpao + + 2.84 + 0.36 + 0.7 + 0.17 + 1.93 + 2.95 + + + 3.13 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 12 + 2 + 2 + Shot_Duanpao + GunTail_Heavy + 9 + + true + + + + 2 + 1.75 + AmmoSet_12Gauge + + + AimedShot + + + + + + Fengci + + 2.5 + 0.37 + 1 + 0.14 + 0.94 + 4.5 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 25 + 6 + 2 + Shot_Fengci + GunTail_Light + 9 + + true + + + + 20 + 2.25 + AmmoSet_9x19mmPara + + + AimedShot + + + + + + Hailing + + 2.85 + 0.37 + 1 + 0.14 + 0.94 + 5 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 25 + 6 + 3 + Shot_Hailing + GunTail_Light + 9 + + true + + + + 30 + 2.25 + AmmoSet_45ACP + + + AimedShot + + + + + + Xionglu + + 3.00 + 1.0 + 1 + 0.14 + 1.20 + 9.0 + + + 2.75 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Xionglu + GunTail_Heavy + 9 + + true + + + + 5 + true + 0.5 + AmmoSet_12Gauge + + + AimedShot + + + + + + Panguan + + 3.5 + 0.39 + 1 + 0.15 + 1.26 + 6.7 + + + 2.54 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Panguan + GunTail_Heavy + 9 + + true + + + + 10 + 4 + AmmoSet_12Gauge + + + Snapshot + + + + + + Liaoquan + + 4.62 + 0.36 + 1 + 0.07 + 1.47 + 8.2 + + + 1.26 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1.1 + 55 + 6 + 3 + Shot_Liaoquan + GunTail_Medium + 9 + + true + + + + 24 + 2.5 + AmmoSet_556x45mmNATO + + + AimedShot + + + + + + Shuwei + + 4.3 + 0.37 + 1 + 0.06 + 1.52 + 10.90 + + + 1.92 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 55 + Shot_Shuwei + GunTail_Medium + 9 + + true + + + + 12 + 2.5 + AmmoSet_762x51mmNATO + + + AimedShot + + + + + + Huanying + + 4.55 + 0.37 + 1 + 0.06 + 1.52 + 11.20 + + + 1.92 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 55 + 6 + 3 + Shot_Huanying + GunTail_Medium + 9 + + true + + + + 30 + 2.5 + AmmoSet_762x51mmNATO + + + AimedShot + + + + + + Kuangtu + + 3.3 + 0.36 + 1 + 0.09 + 1.28 + 7.25 + + + 1.82 + CombatExtended.Verb_ShootCE + true + Bullet_762x39mmSoviet_FMJ + 1.1 + 55 + 6 + 3 + Shot_Kuangtu + GunTail_Medium + 9 + + true + + + + 24 + 2.5 + AmmoSet_762x39mmSoviet + + + AimedShot + + + + + + Feijiang + + 3.06 + 0.78 + 1.7 + 0.05 + 1.38 + 10.70 + + + 2.37 + CombatExtended.Verb_ShootCE + true + Bullet_44Magnum_HV_FMJ + 0.9 + 31 + Shot_Feijiang + GunTail_Heavy + 9 + + true + + + + 5 + true + 0.5 + AmmoSet_44Magnum_HV + + + AimedShot + + + + + + Mangxia + + 11.00 + 1.36 + 2.6 + 0.04 + 1.31 + 6.40 + + + 1.5 + CombatExtended.Verb_ShootCE + true + Bullet_338Lapua_FMJ + 1.8 + 6 + 2 + 75 + Shot_Mangxia + GunTail_Heavy + 9 + + true + + + + 2 + true + 1.2 + AmmoSet_338Lapua + + + AimedShot + + + + + + Mingju + + 6.8 + 1.36 + 2.6 + 0.05 + 1.31 + 11.92 + + + 1.5 + CombatExtended.Verb_ShootCE + true + Bullet_338Lapua_FMJ + 1.8 + 75 + Shot_Mingju + GunTail_Heavy + 9 + + true + + + + 5 + 3.7 + AmmoSet_338Lapua + + + AimedShot + + + + + + Zhanshen + + 8.70 + 0.56 + 1 + 0.05 + 1.37 + 12.90 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1.3 + 62 + 6 + 10 + Shot_Zhanshen + GunTail_Medium + 9 + + true + + + + 50 + 3.25 + AmmoSet_556x45mmNATO + + + SuppressFire + 5 + + + + + + Aodin + + 9.60 + 0.56 + 1 + 0.06 + 1.35 + 12.65 + + + 1.25 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.3 + 62 + 6 + 10 + Shot_Aodin + GunTail_Medium + 9 + + true + + + + 100 + 5 + AmmoSet_762x51mmNATO + + + SuppressFire + 5 + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml index 40925244c0..acc0792e8a 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml @@ -7,14 +7,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml index 772044e8da..ba642d4891 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml @@ -91,7 +91,6 @@
  • - false 0.5
  • VAEWaste_LeftPincer
    • @@ -99,7 +98,6 @@
  • - false 0.5
  • VAEWaste_LeftPincer
    • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml index ec45eb6c87..e5b609245e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml @@ -11,7 +11,6 @@ defName="AEXP_Wildebeest" or defName="AEXP_Cheetah"] -
  • Quadruped @@ -22,7 +21,6 @@ Defs/ThingDef[defName="AEXP_Crocodile"] -
  • QuadrupedLow @@ -33,7 +31,6 @@ Defs/ThingDef[defName="AEXP_Giraffe"] -
  • Birdlike diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml index e90081e869..4c30562345 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Cheetah"]/statBases - 0.46 0.27 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Cheetah"] -
  • @@ -75,7 +73,6 @@ Defs/ThingDef[defName="AEXP_Coyote"]/statBases - 0.27 0.06 @@ -85,7 +82,6 @@ Defs/ThingDef[defName="AEXP_Coyote"]/tools -
  • @@ -138,7 +134,6 @@ Defs/ThingDef[defName="AEXP_Crocodile"]/statBases - 0.1 0.24 @@ -150,7 +145,6 @@ Defs/ThingDef[defName="AEXP_Crocodile"]/tools -
  • @@ -226,7 +220,6 @@ Defs/ThingDef[defName="AEXP_Giraffe"]/statBases - 0.1 0.45 @@ -236,7 +229,6 @@ Defs/ThingDef[defName="AEXP_Giraffe"]/tools -
  • @@ -289,7 +281,6 @@ Defs/ThingDef[defName="AEXP_Hippopotamus"]/statBases - 0.07 0.6 @@ -301,7 +292,6 @@ Defs/ThingDef[defName="AEXP_Hippopotamus"]/tools -
  • @@ -377,7 +367,6 @@ Defs/ThingDef[defName="AEXP_Wildebeest"]/statBases - 0.18 0.2 @@ -387,7 +376,6 @@ Defs/ThingDef[defName="AEXP_Wildebeest"]/tools -
  • @@ -440,7 +428,6 @@ Defs/ThingDef[defName="AEXP_Zebra"]/statBases - 0.1 0.14 @@ -450,7 +437,6 @@ Defs/ThingDef[defName="AEXP_Zebra"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml index d7de5a2526..3c97100926 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml @@ -8,7 +8,6 @@ Defs/ThingDef[defName="AEXP_Leather_Hippopotamus"]/statBases - 0.1 0.08 @@ -22,7 +21,6 @@ Defs/ThingDef[defName="AEXP_Leather_Wildebeest"]/statBases - 0.08 0.064 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml index 618d4cf858..1944ca853c 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Kangaroo"] -
  • Humanoid @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Boombat" or defName="AEXP_Koala" or defName="AEXP_Platypus"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml index 8a9026034b..cca4d43707 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Boombat"]/tradeTags -
  • CE_AnimalBoom
    •  @@ -12,7 +11,6 @@ Defs/ThingDef[defName="AEXP_Boombat"]/statBases - 0.10 0.01 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="AEXP_Boombat"]/tools -
  • @@ -108,7 +105,6 @@ Defs/ThingDef[defName="AEXP_Kangaroo"]/statBases - 0.27 0.25 @@ -118,7 +114,6 @@ Defs/ThingDef[defName="AEXP_Kangaroo"]/tools -
  • @@ -172,7 +167,6 @@ Defs/ThingDef[defName="AEXP_Koala"]/statBases - 0.15 0.01 @@ -182,7 +176,6 @@ Defs/ThingDef[defName="AEXP_Koala"]/tools -
  • @@ -236,7 +229,6 @@ Defs/ThingDef[defName="AEXP_Platypus"]/statBases - 0.12 0.11 @@ -246,7 +238,6 @@ Defs/ThingDef[defName="AEXP_Platypus"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml index 783d8a1461..8aa2bfe0b7 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Leather_Platypus"]/statBases - 0.06 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml index dce8688cd6..2d4fa105e4 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_ArcticCoyote" or defName="AEXP_BlackBear"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Otter"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml index fb385a8670..c29ab0fd4d 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_ArcticCoyote"]/statBases - 0.26 0.08 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_ArcticCoyote"]/tools -
  • @@ -67,7 +65,6 @@ Defs/ThingDef[defName="AEXP_BlackBear"]/statBases - 0.15 0.15 @@ -79,7 +76,6 @@ Defs/ThingDef[defName="AEXP_BlackBear"] -
  • @@ -158,7 +154,6 @@ Defs/ThingDef[defName="AEXP_Otter"]/statBases - 0.24 0.02 @@ -168,7 +163,6 @@ Defs/ThingDef[defName="AEXP_Otter"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml index e73470ddcc..e122fe537d 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml @@ -27,7 +27,6 @@ defName="AEXP_CatSomali" or defName="AEXP_CatSphynx"] -
  • Quadruped diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml index b274b466a1..175cc5b6f5 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml @@ -15,7 +15,6 @@ defName="AEXP_CatSomali" or defName="AEXP_CatSphynx"]/statBases - 0.23 0.02 @@ -36,7 +35,6 @@ defName="AEXP_CatSomali" or defName="AEXP_CatSphynx"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml index 7799d421fa..acf99335a4 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml @@ -13,7 +13,6 @@ defName="AEXP_Shih-Tzu" or defName="AEXP_WelshTerrier"]/statBases - 0.17 0.01 @@ -31,7 +30,6 @@ defName="AEXP_Shih-Tzu" or defName="AEXP_WelshTerrier"]/tools -
  • @@ -84,7 +82,6 @@ Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/statBases - 0.20 0.06 @@ -94,7 +91,6 @@ Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/tools -
  • @@ -147,7 +143,6 @@ Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/statBases - 0.23 0.05 @@ -157,7 +152,6 @@ Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml index c56b0beeeb..71ad2c71a0 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Hyena" or defName="AEXP_Lion"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise" or defName="AEXP_GilaMonster"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml index ab144157e2..b3b0665909 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml @@ -9,14 +9,12 @@
  • - false 0.5
  • Leg
  • - false 0.5
  • Leg
    • @@ -38,7 +36,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Blunt - 3.25 @@ -46,7 +43,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Sharp - 1.15 @@ -54,7 +50,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise"]/tools -
  • @@ -108,7 +103,6 @@ Defs/ThingDef[defName="AEXP_GilaMonster"]/statBases - 0.15 0 @@ -118,7 +112,6 @@ Defs/ThingDef[defName="AEXP_GilaMonster"]/tools -
  • @@ -168,7 +161,6 @@ Defs/ThingDef[defName="AEXP_Hyena"]/statBases - 0.21 0.11 @@ -178,7 +170,6 @@ Defs/ThingDef[defName="AEXP_Hyena"]/tools -
  • @@ -231,7 +222,6 @@ Defs/ThingDef[defName="AEXP_Lion"]/statBases - 0.19 0.18 @@ -241,7 +231,6 @@ Defs/ThingDef[defName="AEXP_Lion"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml index 4e9dce5b06..0d817f3de0 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml @@ -8,7 +8,6 @@ Defs/ThingDef[defName="AEXP_Leather_Lion"]/statBases - 0.07 0.056 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml index d8dfcf1aca..3cc193a8bb 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Camel"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Megascorpion"] -
  • QuadrupedLow @@ -26,7 +24,6 @@ Defs/ThingDef[defName="AEXP_Rattlesnake"] -
  • Serpentine diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml index d433281906..47bbfb011e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Camel"]/statBases - 0.15 0.38 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Camel"]/tools -
  • @@ -67,7 +65,6 @@ Defs/ThingDef[defName="AEXP_Megascorpion"]/statBases - 0.19 0.33 @@ -91,7 +88,6 @@ Defs/ThingDef[defName="AEXP_Megascorpion"]/tools -
  • @@ -164,7 +160,6 @@ Defs/ThingDef[defName="AEXP_Rattlesnake"]/statBases - 0.19 0.18 @@ -174,7 +169,6 @@ Defs/ThingDef[defName="AEXP_Rattlesnake"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml index 7e03875584..35a74cd7fe 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="AEXP_Seal" or defNAme="AEXP_Walrus"] -
  • QuadrupedLow @@ -16,7 +15,6 @@ Defs/ThingDef[defName="AEXP_Penguin"] -
  • Humanoid diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml index fef52eab47..761717e939 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Penguin"]/statBases - 0.25 0.10 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Penguin"]/tools -
  • @@ -56,7 +54,6 @@ Defs/ThingDef[defName="AEXP_Seal"]/statBases - 0.08 0.41 @@ -66,7 +63,6 @@ Defs/ThingDef[defName="AEXP_Seal"]/tools -
  • @@ -120,7 +116,6 @@ Defs/ThingDef[defName="AEXP_Walrus"]/statBases - 0.06 0.25 @@ -132,7 +127,6 @@ Defs/ThingDef[defName="AEXP_Walrus"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml index 3e5abb546a..519d2646df 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml @@ -19,7 +19,6 @@ Defs/ThingDef[defName="AEXP_Leather_Pinniped"]/statBases - 0.07 0.056 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml index f4eb4f28ca..125bdeab30 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml @@ -10,7 +10,6 @@ defName="AEXP_Tiger" or defName="AEXP_Tapir"] -
  • Quadruped @@ -21,7 +20,6 @@ Defs/ThingDef[defName="AEXP_Lemur"] -
  • QuadrupedLow @@ -33,7 +31,6 @@ Defs/ThingDef[defName="AEXP_Mandrill"] -
  • Humanoid diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml index 476c6586f9..d51492b361 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml @@ -13,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Gorilla"]/tools -
  • @@ -104,7 +103,6 @@ Defs/ThingDef[defName="AEXP_Jaguar"]/statBases - 0.26 0.20 @@ -115,7 +113,6 @@ Defs/ThingDef[defName="AEXP_Lemur"]/statBases - 0.1 0.01 @@ -178,7 +175,6 @@ Defs/ThingDef[defName="AEXP_Mandrill"]/statBases - 0.15 0.04 @@ -188,7 +184,6 @@ Defs/ThingDef[defName="AEXP_Mandrill"]/tools -
  • @@ -241,7 +236,6 @@ Defs/ThingDef[defName="AEXP_Tapir"]/statBases - 0.11 0.16 @@ -251,7 +245,6 @@ Defs/ThingDef[defName="AEXP_Tapir"]/tools -
  • @@ -283,7 +276,6 @@ Defs/ThingDef[defName="AEXP_Tiger"]/statBases - 0.27 0.50 @@ -293,7 +285,6 @@ Defs/ThingDef[defName="AEXP_Tiger"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml index d79c60c1fa..130d7f4e58 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml @@ -11,7 +11,6 @@ Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases - 0.07 0.056 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml index 1d88376a2a..f8c6bdc37e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Alligator"] -
  • QuadrupedLow @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Anaconda"] -
  • Serpentine @@ -26,7 +24,6 @@ Defs/ThingDef[defName="AEXP_IndianElephant"] -
  • Quadruped diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml index 590177d01b..c1f8356802 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml @@ -66,7 +66,6 @@ Defs/ThingDef[defName="AEXP_Anaconda"]/statBases - 0.19 0.18 @@ -76,7 +75,6 @@ Defs/ThingDef[defName="AEXP_Anaconda"]/tools -
  • @@ -117,7 +115,6 @@ Defs/ThingDef[defName="AEXP_IndianElephant"]/statBases - 0.10 0.50 @@ -129,7 +126,6 @@ Defs/ThingDef[defName="AEXP_IndianElephant"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml index e7acedf5e5..0d3a629d88 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Muskox" or defName="AEXP_Moose" or defName="AEXP_MegaWolverine"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Porcupine"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml index 0aa81d6678..86b0e53955 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml @@ -8,7 +8,6 @@ Defs/ThingDef[defName="AEXP_MuskOxWool"]/statBases - 0.02 0.03 diff --git a/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml b/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml new file mode 100644 index 0000000000..90f9a44775 --- /dev/null +++ b/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml @@ -0,0 +1,14 @@ + + + + + + + AmmoSet_30x64mmFuel_Thermobaric + + + Bullet_30x64mmFuel_Thermobaric + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml index ce8ef56f9a..971068c4a6 100644 --- a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml +++ b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml @@ -38,7 +38,8 @@ defName="DV_Gun_LeverShotgun" or defName="DV_Gun_LightCarbine" or defName="DV_Gun_CombatShotgun" or - defName="DV_Gun_DMR" + defName="DV_Gun_DMR" or + defName="DV_Gun_ThermoRifle" ]/tools @@ -306,4 +307,50 @@ + + + DV_Gun_ThermoRifle + + 1.60 + 0.15 + 1.8 + 13 + 10 + 1.50 + + + 2 + CombatExtended.Verb_ShootCE + true + Bullet_30x64mmFuel_Thermobaric + 2 + 48 + Shot_Autocannon + 9 + GunTail_Heavy + + true + + + + 4 + 4 + AmmoSet_30x64mmFuel_Thermobaric + + + AimedShot + + + + + Defs/ThingDef[defName="DV_Gun_ThermoRifle"]/weaponTags + + +
  • GunHeavy
    • +
  • SpacerGun
    • +
  • Bipod_AMR
    • + +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Base Generation Expanded/Defs/SymbolDefs.xml b/ModPatches/Vanilla Base Generation Expanded/Defs/SymbolDefs.xml new file mode 100644 index 0000000000..e8fa895b9f --- /dev/null +++ b/ModPatches/Vanilla Base Generation Expanded/Defs/SymbolDefs.xml @@ -0,0 +1,34 @@ + + + + + Shell_Smoke + Shell_Smoke + + + + Shell_Incendiary + Shell_Incendiary + + + + Shell_HighExplosive + Shell_HighExplosive + + + + Shell_EMP + Shell_EMP + + + + Shell_AntigrainWarhead + Shell_AntigrainWarhead + + + + Shell_Firefoam + Shell_Firefoam + + + diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml index 4aa04b1a9e..6bfad5ed4a 100644 --- a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml +++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml @@ -23,6 +23,9 @@ Defs/ThingDef[defName="VFEC_Javelin"] Neolithic + +
  • WeaponsRanged
    • +     diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml index c0cf3c0d4c..042bd9d28a 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml @@ -6,7 +6,8 @@ Defs/BodyDef[defName="VFEI2_ClawedInsectoid"]//*[ def="Shell" or def="Elytra" or - def="Pronotum"] + def="Pronotum" or + def="InsectLeg"] @@ -20,7 +21,8 @@ def="Elytra" or def="Pronotum" or def="InsectHead" or - def="InsectMouth"]/groups + def="InsectMouth" or + def="InsectLeg"]/groups
  • CoveredByNaturalArmor
    • diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml index 45e0aee5d6..ab94a2c04e 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml @@ -16,14 +16,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml index 413285422d..6681c3b003 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml @@ -31,14 +31,12 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
    • diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml index 24e3edf391..697067cbe7 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -33,14 +33,12 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
    • diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml index c3ec359aa6..6a7a2a3298 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="Chemshine"]/statBases - 1 @@ -13,7 +12,6 @@ Defs/HediffDef[defName="Chemshined"]/stages/li[1] - -0.10 @@ -24,7 +22,6 @@ Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/addictiveness - 0.05 @@ -32,7 +29,6 @@ Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/minToleranceToAddict - 0.05 diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml index c455d6e1ca..b16c082ec7 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts/li[thingDef="VFES_Weapon_GrenadeDynamite"] -
  • StartingThing_Defined @@ -17,7 +16,6 @@ Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml index 7ab27d14f1..ea591cf1d4 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases - 1 1 @@ -13,7 +12,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases/StuffEffectMultiplierArmor - 1 @@ -21,7 +19,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/apparel/layers -
  • StrappedHead
    • @@ -31,7 +28,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/equippedStatOffsets - -0.1 @@ -40,7 +36,6 @@ Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases - 5 2 @@ -49,7 +44,6 @@ Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases/StuffEffectMultiplierArmor - 2 @@ -58,7 +52,6 @@ Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases - 2 1 @@ -67,7 +60,6 @@ Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases/StuffEffectMultiplierArmor - 2 diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml index ddae50034d..928ffcb0e8 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName ="VFES_Gun_DoubleActionRevolver"]/tools -
  • @@ -34,7 +33,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun" or defName="VFES_Gun_HuntingRifle"]/tools -
  • @@ -125,7 +123,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleActionRevolver"] -
  • 0.90,0.90 @@ -185,7 +182,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"] -
  • 1.03,1.15 @@ -248,7 +244,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"] -
  • 1.25,1.45 diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml index b518b128e8..002f552e6b 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/graphicData - Things/Projectile/TomahawkThrown/TomahawkThrownC @@ -16,7 +15,6 @@ Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/projectile - 12 diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml index 0585517434..0951934442 100644 --- a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml +++ b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml @@ -28,6 +28,9 @@ Defs/ThingDef[defName="VFET_Throwspikes"] Neolithic + +
  • WeaponsRanged
    • +     diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml index eb93a375cf..81fa8315f3 100644 --- a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml +++ b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml @@ -22,16 +22,4 @@ true     - - - - AmmoSet_RaiderArtillery - - - Bullet_155mmHowitzerShell_HE - Bullet_155mmHowitzerShell_Incendiary - Bullet_81mmMortarShell_Tox - - - \ No newline at end of file diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml deleted file mode 100644 index ce9ca84393..0000000000 --- a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - Raider_Turret_Artillery - - A manned artillery that launches all kinds of shells. Capable of inflicting devastating damage to both enemy forces and structures, this military machinery excels at laying down fire support for soldiers in the field.\n\nCapable of targeting other areas of the world within a medium radius. - CombatExtended.Building_TurretGunCE - - Things/Building/Artillery/TurretArtillery_Base - Graphic_Single - (3,3) - - (0.38,0.2,0.56375,0.8) - Damage/Corner - - - (-0.13,-0.87,-0.1) - (0.5,0.4,1.05) - - - - 250 - 3600 - - Industrial - (0,0,-2) - true - (3,3) - - true - false - -
  • Metallic
    • -     - 100 - - 180 - 9 - - - - Heavy - - false - Raider_Artillery_Weapon - 3 - -
  • Artillery_BaseDestroyer
    • -     - 1 - 1 - - - -
  • MortarShells
    • -     - -
  • Shell_Incendiary
    • -
  • Shell_Firefoam
    • -
  • Shell_AntigrainWarhead
    • -     -     -     -     - Things/Building/Artillery/TurretArtillery_MenuIcon - 0.9 - 5 - -
  • - True -
    • -     - -     - - - Raider_Artillery_Weapon - - Artillery cannon capable of long range bombardment. - - Things/Building/Artillery/TurretArtillery_Top - Graphic_Single - - - 0.5 - 8.5 - - -
  • Artillery_BaseDestroyer
    • -
  • TurretGun
    • -     - -
  • - CombatExtended.Verb_ShootMortarCE - false - true - Bullet_155mmHowitzerShell_HE - 4 - 40 - 1000 - 1 - VFES_Shot_Artillery - 20 - 0.2 - - true - -
    • -     - -
  • - -
  • 30
    • -
  • 50
    • -
  • 70
    • -
  • 90
    • - - -
  • - 1 - 12 - AmmoSet_RaiderArtillery -
    • -     - - - - -
  • MortarShells
    • -     -     -     - - - -
  • MortarShells
    • -     - -
  • Shell_Firefoam
    • -
  • Shell_AntigrainWarhead
    • -     -     -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml index 657d816ea8..9a188d0bc9 100644 --- a/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml +++ b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml @@ -254,10 +254,6 @@ - - Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/buildingTags - - Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/turretBurstWarmupTime diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml index 732692aa83..c665b84f4b 100644 --- a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml +++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml @@ -215,19 +215,19 @@ VWEFT_Gun_RollingBlockRifle - 7.30 - 0.85 + 4.20 + 0.88 2.15 0.01 1.73 12.80 - 2.0 + 2.3 CombatExtended.Verb_ShootCE true Bullet_4570GovHR_FMJ - 1.3 + 1.1 64 Shot_SniperRifle GunTail_Heavy 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/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml index 2c6cae5f4d..2e33802d1d 100644 --- a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml +++ b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml @@ -267,42 +267,36 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
  • - false 0.625
  • MechanicalHead
  • - false 0.625
  • MechanicalHead
  • - false 0.625
  • MechanicalLeg
  • - false 0.625
  • MechanicalLeg
    • diff --git a/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml b/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml index 4a8b270434..71f47b3839 100644 --- a/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml +++ b/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml @@ -70,6 +70,23 @@     + + Defs/BodyDef[defName="BeetleLike"]/corePart/parts/li[def="InsectLeg"]/groups + + Defs/BodyDef[defName="BeetleLike"]/corePart/parts/li[def="InsectLeg"] + + + + + + + + Defs/BodyDef[defName="BeetleLike"]/corePart/parts/li[def="InsectLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + @@ -137,4 +154,21 @@ + + Defs/BodyDef[defName="BeetleLikeWithClaw"]/corePart/parts/li[def="InsectLeg"]/groups + + Defs/BodyDef[defName="BeetleLikeWithClaw"]/corePart/parts/li[def="InsectLeg"] + + + + + + + + Defs/BodyDef[defName="BeetleLikeWithClaw"]/corePart/parts/li[def="InsectLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + \ No newline at end of file diff --git a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml b/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml index 34fba7ce74..1578f2e6bc 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml +++ b/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml @@ -25,6 +25,36 @@ + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups @@ -91,6 +121,27 @@ + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups diff --git a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml b/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml index 1512bf1823..f3f660bba4 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml +++ b/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml @@ -25,6 +25,65 @@ + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalTermiteBodySecondRing"]/groups @@ -61,6 +120,27 @@ + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalTermiteBodySecondRing"]/groups diff --git a/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml b/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml index 186d05cf90..d18cba4a42 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml +++ b/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalLeg"]/groups @@ -98,6 +128,27 @@ + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml b/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml index a576473191..9e2e7bc21f 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml +++ b/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalShoulder"]/groups @@ -108,6 +138,27 @@ + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml index bf3adb8184..48fc13946d 100644 --- a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml +++ b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml @@ -167,8 +167,8 @@ Defs/ThingDef[defName="Gun_Revolver"]
  • - 1.00,1.00 - 0.0,0.0 + 1.00,1.00 + 0.0,-0.04 true true 20 @@ -227,12 +227,18 @@ BlowbackOperation + + Defs/ThingDef[defName="Gun_Autopistol"]/graphicData + + (0.9,0.9) + + + Defs/ThingDef[defName="Gun_Autopistol"]
  • - 0.93,0.93 - 0.0,0.0 + 0.0,-0.04
    • @@ -282,12 +288,18 @@ Gunsmithing + + Defs/ThingDef[defName="Gun_PumpShotgun"]/graphicData + + (1.2,1.2) + + + Defs/ThingDef[defName="Gun_PumpShotgun"]
  • - 1.03,1.25 - 0.05,0.0 + 0.1,0.0
    • @@ -343,12 +355,18 @@ GasOperation + + Defs/ThingDef[defName="Gun_ChainShotgun"]/graphicData + + (1.1,1.1) + + + Defs/ThingDef[defName="Gun_ChainShotgun"]
  • - 1.04,1.23 - 0.05,-0.05 + 0.06,0.0 0,0.2 -30
    • @@ -400,12 +418,18 @@ false     + + Defs/ThingDef[defName="Gun_BoltActionRifle"]/graphicData + + (1.3,1.3) + + + Defs/ThingDef[defName="Gun_BoltActionRifle"]
  • - 1.3,1.3 - 0.12,0.04 + 0.18,0.01 -0.1,0.1
    • @@ -458,11 +482,17 @@ PrecisionRifling     + + Defs/ThingDef[defName="Gun_AssaultRifle"]/graphicData + + (1.2,1.2) + + + Defs/ThingDef[defName="Gun_AssaultRifle"]
  • - 1.16,1.16 0.08,0.0 -0.05,0
    • @@ -514,13 +544,19 @@ false     + + Defs/ThingDef[defName="Gun_SniperRifle"]/graphicData + + (1.35,1.35) + + + Defs/ThingDef[defName="Gun_SniperRifle"]
  • - 1.25,1.45 - 0.15,-0.05 - -0.3,0.1 + 0.2,0.0 + -0.1,0.04
    • @@ -573,12 +609,18 @@ BlowbackOperation + + Defs/ThingDef[defName="Gun_MachinePistol"]/graphicData + + (0.84,0.84) + + + Defs/ThingDef[defName="Gun_MachinePistol"]
  • - 0.84,0.84 - -0.10,-0.07 + -0.1,-0.1 0.1,0.1 -30
    • @@ -637,9 +679,8 @@ Defs/ThingDef[defName="Gun_HeavySMG"]
  • - 0.85,0.85 - 0.00,-0.03 - 0.1,0 + 0.0,0.0 + 0.08,0.01
    • @@ -703,11 +744,17 @@ + + Defs/ThingDef[defName="Gun_IncendiaryLauncher"]/graphicData + + (1.16,1.16) + + + Defs/ThingDef[defName="Gun_IncendiaryLauncher"]
  • - 1.16,1.16 0.1,-0.05
    • @@ -767,11 +814,17 @@ false     + + Defs/ThingDef[defName="Gun_LMG"]/graphicData + + (1.35,1.35) + + + Defs/ThingDef[defName="Gun_LMG"]
  • - 1.35,1.18 0.13,-0.03
    • @@ -827,12 +880,18 @@ ChargedShot     + + Defs/ThingDef[defName="Gun_ChargeRifle"]/graphicData + + (1.03,1.03) + + + Defs/ThingDef[defName="Gun_ChargeRifle"]
  • - 1.03,1.03 - 0.05,0.0 + 0.06,0.01
    • @@ -948,7 +1007,6 @@ Defs/ThingDef[defName="Gun_Minigun"]
  • - 1.00,1.00 0.1,-0.15 -0.2,-0.1 -30 @@ -1062,11 +1120,17 @@ false + + Defs/ThingDef[defName="Gun_DoomsdayRocket"]/graphicData + + (1.45,1.45) + + + Defs/ThingDef[defName="Gun_DoomsdayRocket"]
  • - 1.45,1.45 -0.15,0
    • @@ -1166,11 +1230,17 @@ false + + Defs/ThingDef[defName="Gun_TripleRocket"]/graphicData + + (1.16,1.16) + + + Defs/ThingDef[defName="Gun_TripleRocket"]
  • - 1.16,1.16 -0.25,0
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml index 6b6298294f..10500148fd 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml @@ -180,7 +180,8 @@
  • true - When useStatic is true, this becomes the value used and it is NOT influenced by durability, health and similar + When useStatic is 'true', this becomes the value used and it is NOT influenced by durability, health and similar, + The default value is 'false'. 4
  • Neck
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml index c4968665f9..a8be9d4b04 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml @@ -18,14 +18,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml index f0c0a8d9bf..45bac9eb3c 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml @@ -494,14 +494,12 @@
  • - false 0.5
  • Leg
  • - false 0.5
  • Leg
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml index f49e1d431e..ceef773ed2 100644 --- a/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml +++ b/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml @@ -92,17 +92,19 @@
  • - false 0.25
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
  • - false 0.25
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
    •  diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index 4d3b0e76cb..d0a0a77b24 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -126,12 +126,6 @@ public static string GetProjectileReadout(this ThingDef projectileDef, Thing wea /// public static float GetExplosionArmorPenetration(this CompProperties_ExplosiveCE props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; - public static bool IsShell(ThingDef def) - { - var ammo = ThingDefOf.Turret_Mortar.building.turretGunDef.GetCompProperties(); - return ammo?.ammoSet.ammoTypes.Any(l => l.ammo == def) ?? false; - } - public static bool IsAmmoSystemActive(AmmoDef def) { if (Controller.settings.EnableAmmoSystem) diff --git a/Source/CombatExtended/CombatExtended/SiegeUtility.cs b/Source/CombatExtended/CombatExtended/SiegeUtility.cs new file mode 100644 index 0000000000..fd0b2673cf --- /dev/null +++ b/Source/CombatExtended/CombatExtended/SiegeUtility.cs @@ -0,0 +1,90 @@ +using System.Collections.Generic; +using System.Linq; +using RimWorld; +using Verse; +using Verse.AI.Group; + +namespace CombatExtended +{ + [StaticConstructorOnStartup] + public class SiegeUtility + { + /// + /// The minimum required construction skill to be able to build any potential siege artillery in the game. + /// + public static readonly int MinRequiredConstructionSkill; + + static SiegeUtility() + { + MinRequiredConstructionSkill = DefDatabase.AllDefsListForReading + .Where(def => def.building?.buildingTags.Contains("Artillery_BaseDestroyer") ?? false) + .Select(def => def.constructionSkillPrerequisite) + .Max(); + } + + /// + /// Determine whether the given thing is a valid shell usable by this siege. + /// + /// The thing to check. + /// The siege. + /// true if at least one type of artillery piece taking part in the siege can use this shell, false otherwise. + public static bool IsValidShellType(Thing thing, LordToil_Siege siege) + { + if (thing.def is AmmoDef { spawnAsSiegeAmmo: true } ammoDef) + { + return UniqueArtilleryDefs(siege) + .SelectMany(def => def.building.turretGunDef.comps) + .OfType() + .SelectMany(props => props.ammoSet.ammoTypes) + .Any(ammoLink => ammoLink.ammo == ammoDef); + } + + return false; + } + + /// + /// Supply additional shells for each type of artillery piece taking part in this siege. + /// + /// The siege to resupply. + public static void DropAdditionalShells(LordToil_Siege siege) + { + Lord lord = siege.lord; + bool allowToxGas = false; + if (ModsConfig.BiotechActive && lord.faction.def == FactionDefOf.PirateWaster) + { + allowToxGas = true; + } + + foreach (var artilleryDef in UniqueArtilleryDefs(siege)) + { + // NOTE: Vanilla applies a hardcoded market price cap of 250 here, while we do not. + // Since we already limit the number of shells to be dropped in and also filter by tech level, + // such a hardcoded price cap would only serve to cause issues with modded shells that may be pricier. + var shellDef = TurretGunUtility.TryFindRandomShellDef( + artilleryDef, + allowEMP: false, + allowToxGas: allowToxGas, + mustHarmHealth: true, + lord.faction.def.techLevel, + allowAntigrainWarhead: false, + faction: lord.faction + ); + + if (shellDef != null) + { + siege.DropSupplies(shellDef, LordToil_Siege.ShellReplenishCount); + } + } + } + + /// + /// Get the unique artillery types taking part in this siege. + /// + /// The siege to get artillery types for. + /// Enumerable of unique artillery defs taking part in this siege. + private static IEnumerable UniqueArtilleryDefs(LordToil_Siege siege) => siege.lord.ownedBuildings + .Select(t => t.def) + .Where(def => def.building.buildingTags.Contains("Artillery_BaseDestroyer")) + .Distinct(); + } +} diff --git a/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs b/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs index 7200056022..a4af8c5a61 100644 --- a/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs +++ b/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.Linq; -using System.Reflection; using System.Reflection.Emit; using HarmonyLib; using RimWorld; @@ -8,66 +6,107 @@ namespace CombatExtended.HarmonyCE { + /// + /// Transpile LordToil_Siege.LordToilTick to support artillery pieces with different ammosets than the 81mm mortar. + /// [HarmonyPatch(typeof(LordToil_Siege), "LordToilTick")] - internal static class Harmony_LordToil_Siege + internal static class Harmony_LordToil_Siege_LordToilTick { - internal static IEnumerable Transpiler(IEnumerable instructions) + internal static IEnumerable Transpiler(IEnumerable instructions, + ILGenerator generator) { - var codes = new List(instructions); - var methodCustomCondition = typeof(Harmony_LordToil_Siege).GetMethod(nameof(CustomCondition), BindingFlags.Static | BindingFlags.Public); - var startIndex = -1; - var endIndex = -1; - MethodInfo targetMethod = AccessTools.Method(typeof(ThingDef), "get_IsShell"); // Start of the if condition - FieldInfo targetField = AccessTools.Field(typeof(DamageDef), "harmsHealth"); // End of the if condition - for (int i = 0; i < codes.Count; i++) - { - if (startIndex == -1) - { - // Find the start of the if statement - if (codes[i].opcode == OpCodes.Callvirt && codes[i].Calls(targetMethod)) - { - startIndex = i - 1; // We want to edit -1 instruction from the call of IsShell - } - } - else if (codes[i].opcode == OpCodes.Ldfld && codes[i].LoadsField(targetField)) - { - endIndex = i; - } - } - if (startIndex == -1 || endIndex == -1) - { - Log.Error("CombatExtended :: Harmony_LordToil_Siege couldn't find code block for patching"); - return codes; // Don't modify as we couldn't find the original code block - } - else - { - codes[startIndex] = new CodeInstruction(OpCodes.Call, methodCustomCondition); // Call the new method for evaluation - codes.RemoveRange(startIndex + 1, endIndex - startIndex); // Remove the default code - return codes; - } + var methodCustomCondition = AccessTools.Method(typeof(SiegeUtility), nameof(SiegeUtility.IsValidShellType)); + var dropAdditionalShells = AccessTools.Method(typeof(SiegeUtility), nameof(SiegeUtility.DropAdditionalShells)); + + var isShellMethod = AccessTools.PropertyGetter(typeof(ThingDef), nameof(ThingDef.IsShell)); + var harmsHealthField = AccessTools.Field(typeof(DamageDef), nameof(DamageDef.harmsHealth)); + var tryFindRandomShellDefMethod = + AccessTools.Method(typeof(TurretGunUtility), nameof(TurretGunUtility.TryFindRandomShellDef)); + + var codeMatcher = new CodeMatcher(instructions, generator); + + var isShellPos = codeMatcher + .Start() + .MatchStartForward(CodeMatch.Calls(isShellMethod)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find call to IsShell") + .Pos; + + var harmsHealthPos = codeMatcher.MatchStartForward(CodeMatch.LoadsField(harmsHealthField)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find harmsHealth") + .Pos; + + // Consider all shell types usable by the siege when assessing how many are available to the siege + codeMatcher + .Advance(isShellPos - harmsHealthPos - 1) + .Insert( + CodeInstruction.LoadArgument(0), + new CodeInstruction(OpCodes.Call, methodCustomCondition) + ) + .RemoveInstructionsInRange(isShellPos + 1, harmsHealthPos + 2); + + var ifBlockStart = codeMatcher.Start() + .MatchStartForward(CodeMatch.Calls(tryFindRandomShellDefMethod)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find call to TryFindRandomShellDef") + .MatchEndBackwards(CodeMatch.Branches()) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find start of enclosing if block") + .Pos; + + var ifBlockEndLabel = (Label)codeMatcher.Operand; + + // Drop shells for every type of artillery piece used by the siege + codeMatcher.MatchStartForward(new CodeMatch(instruction => instruction.labels.Contains(ifBlockEndLabel))) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find end of enclosing if block") + .Insert( + CodeInstruction.LoadArgument(0), + new CodeInstruction(OpCodes.Call, dropAdditionalShells) + ) + .RemoveInstructionsInRange(ifBlockStart + 1, codeMatcher.Pos - 1); + + return codeMatcher.Instructions(); } - public static bool CustomCondition(Thing thing) + } + + /// + /// Transpile LordToil_Siege.Init to remove the market price cap on the initially dropped shell stacks. + /// + [HarmonyPatch(typeof(LordToil_Siege), nameof(LordToil_Siege.Init))] + internal static class Harmony_LordToil_Siege_Init + { + internal static IEnumerable Transpiler(IEnumerable instructions, + ILGenerator generator) + { + var codeMatcher = new CodeMatcher(instructions, generator); + + codeMatcher.MatchStartForward(CodeMatch.LoadsConstant(250f)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_Init couldn't find market price cap") + .RemoveInstruction() + .Insert(new CodeInstruction(OpCodes.Ldc_R4, -1f)); + + return codeMatcher.Instructions(); + } + } + + /// + /// Transpile LordToil_Siege.SetAsBuilder to ensure that builders are capable enough to build any siege artillery. + /// + [HarmonyPatch(typeof(LordToil_Siege), nameof(LordToil_Siege.SetAsBuilder))] + internal static class Harmony_LordToil_Siege_SetAsBuilder + { + internal static IEnumerable Transpiler(IEnumerable instructions, + ILGenerator generator) { - // Ensure check is the same here as from CombatExtended.HarmonyCE.Harmony_TurretGunUtility - var ammoDef = thing.def as AmmoDef; - if (ammoDef == null) - { - return false; - } - - // Ignore all non-shell defs. - if (ammoDef == null || !AmmoUtility.IsShell(ammoDef)) - { - return false; - } - - // Check if shell is blacklisted - if (!ammoDef.spawnAsSiegeAmmo) - { - return false; - } - return true; + var codeMatcher = new CodeMatcher(instructions, generator); + + codeMatcher.MatchStartForward( + CodeMatch.LoadsField(AccessTools.Field(typeof(ThingDefOf), nameof(ThingDefOf.Turret_Mortar))), + CodeMatch.LoadsField(AccessTools.Field(typeof(BuildableDef), nameof(BuildableDef.constructionSkillPrerequisite))) + ) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_SetAsBuilder couldn't find required construction skill") + .RemoveInstructions(2) + .Insert(CodeInstruction.LoadField(typeof(SiegeUtility), nameof(SiegeUtility.MinRequiredConstructionSkill))); + + return codeMatcher.Instructions(); } } } diff --git a/Source/CombatExtended/Harmony/Harmony_ThingListGroupHelper.cs b/Source/CombatExtended/Harmony/Harmony_ThingListGroupHelper.cs deleted file mode 100644 index 0692338d76..0000000000 --- a/Source/CombatExtended/Harmony/Harmony_ThingListGroupHelper.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections.Generic; -using System.Reflection; -using HarmonyLib; -using Verse; - -namespace CombatExtended.HarmonyCE -{ - [HarmonyPatch(typeof(ThingListGroupHelper), "Includes")] - internal static class Harmony_ThingListGroupHelper - { - internal static IEnumerable Transpiler(IEnumerable instructions) - { - return instructions.MethodReplacer(typeof(ThingDef).GetMethod("get_IsShell"), - typeof(AmmoUtility).GetMethod(nameof(AmmoUtility.IsShell), BindingFlags.Public | BindingFlags.Static)); - } - } -} diff --git a/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs b/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs index 627366c629..5147f1539e 100644 --- a/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs +++ b/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs @@ -1,94 +1,66 @@ using System.Linq; using System.Collections.Generic; -using System.Collections; -using System.Reflection; using HarmonyLib; using RimWorld; using Verse; -// ReSharper disable InconsistentNaming -// ReSharper disable InlineOutVariableDeclaration -// ReSharper disable UsePatternMatching - namespace CombatExtended.HarmonyCE { - [HarmonyPatch] + /// + /// Replace to support turrets other than the 81mm mortar. + /// + [HarmonyPatch(typeof(TurretGunUtility), nameof(TurretGunUtility.TryFindRandomShellDef))] public static class Harmony_TurretGunUtility { - const string className = "DisplayClass"; - const string methodName = ""; - - // This should be kept up to date with the check in CombatExtended.HarmonyCE.Harmony_LordToil_Siege - public static void Postfix(object __instance, ThingDef x, ref bool __result, bool ___allowEMP, float ___maxMarketValue) + public static bool Prefix( + ThingDef turret, + bool allowEMP, + bool allowToxGas, + TechLevel techLevel, + bool allowAntigrainWarhead, + ref ThingDef __result + ) { - // Ignore already true results. - if (__result) - { - return; - } - - var ammoDef = x as AmmoDef; - - // Ignore all non-shell defs. - if (ammoDef == null || !AmmoUtility.IsShell(ammoDef)) + if (!TurretGunUtility.NeedsShells(turret)) { - return; + __result = null; + return false; } - // Check if market value is within range. - if (___maxMarketValue >= 0.0f && ammoDef.BaseMarketValue > ___maxMarketValue) + // Fall back to the vanilla logic if we have no ammo configured for this turret (unpatched?) + var ammoUserProps = turret.building.turretGunDef.comps.OfType() + .FirstOrDefault(); + if (ammoUserProps == null) { - return; + return true; } - // Get the explosive damage def. - var explosiveDamageDef = ammoDef.GetCompProperties()?.explosiveDamageType ?? - ammoDef.GetCompProperties()?.explosiveDamageType; + IEnumerable potentialAmmoDefs = from ammoLink in ammoUserProps.ammoSet.ammoTypes + let ammoDef = ammoLink.ammo + where ammoDef.spawnAsSiegeAmmo + let projectileDef = ammoLink.projectile + let explosiveDamageDef = + projectileDef.GetCompProperties()?.explosiveDamageType ?? + projectileDef.GetCompProperties()?.explosiveDamageType + let projectileDamageDef = projectileDef.projectile.damageDef + where explosiveDamageDef != null || projectileDamageDef != null - // Get the projectile damage def via the mortar ammo set. - //var mortarAmmoSet = DefDatabase.GetNamed("AmmoSet_81mmMortarShell"); - var projectileDamageDef = ammoDef.projectile?.damageDef ?? CE_AmmoSetDefOf.AmmoSet_81mmMortarShell.ammoTypes.FirstOrDefault(t => t.ammo == ammoDef)?.projectile?.projectile?.damageDef; + // Only allow EMP or tox gas shells if explicitly allowed and relevant DLC is available + where allowEMP || (explosiveDamageDef != DamageDefOf.EMP && projectileDamageDef != DamageDefOf.EMP) + where allowToxGas || !ModsConfig.BiotechActive || (explosiveDamageDef != DamageDefOf.ToxGas && + projectileDamageDef != DamageDefOf.ToxGas) - // Ignore shells that don't have damage defs. - if (explosiveDamageDef == null && projectileDamageDef == null) - { - return; - } + // No antigrain warheads + where allowAntigrainWarhead || ammoDef != ThingDefOf.Shell_AntigrainWarhead - // Ignore EMP if not allowed. - if (!___allowEMP && (explosiveDamageDef == DamageDefOf.EMP || projectileDamageDef == DamageDefOf.EMP)) - { - return; - } + // No higher tech shells than the tech level of the requesting faction + where techLevel == TechLevel.Undefined || ammoDef.techLevel <= techLevel + select ammoDef; - // Check if blacklisted - if (!ammoDef.spawnAsSiegeAmmo) - { - return; - } - - __result = true; - } - - public static MethodBase TargetMethod() - { - var classTargets = typeof(TurretGunUtility).GetNestedTypes(AccessTools.all) - .Where(x => x.Name.Contains(className)); - - if (!classTargets.Any()) - { - Log.Error("CombatExtended :: Harmony_TurretGunUtility couldn't find subclass with part `" + className + "`"); - } - - var methodTarget = classTargets.SelectMany(x => x.GetMethods(AccessTools.all)) - .FirstOrDefault(x => x.Name.Contains(methodName)); - - if (methodTarget == null) - { - Log.Error("CombatExtended :: Harmony_TurretGunUtility couldn't find method with part `" + methodName + "` in subclasses with part `" + className + "`"); - } + // Respect individual weighting of matching shells within the ammoset + potentialAmmoDefs.TryRandomElementByWeight(def => def.generateAllowChance, out __result); - return methodTarget; + return false; } } } diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 7122d468e3..9814d3a19c 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -254,6 +254,7 @@ Glitter Tech | Glitter Weaponry | Gloomy Dragonian Race | GouRIMet | +GREG | Grimstone Beasts | Grimworld: Autoguns | Grimworld: Lasguns | @@ -271,6 +272,7 @@ Heyra the Horned | High Caliber | High Tech Laboratory Facilities | Hive Armory | +Hyena (Continued) | Idhale Race | Impact Weaponry | Imperial Arsenal: Royal Warcasket | @@ -279,6 +281,7 @@ Industrial Melee Weaponry | Infinity Rim: Ariadna (Continued) | Infused 2 Expansion | Infusion 2 | +Ion Weaponry | Iron Harvest Pkp 17 "Eisenhans" Powerarmor | Japanese Dogs | Jernalk's Skeletal Legion (Continued) | @@ -446,6 +449,7 @@ RimFantasy - Medieval Overhaul Edition | RimFantasy - House Doyle | RimHammer40k - Dreadnought | RimNauts 2 | +Rimrats | RimSec Security | Rimsenal - Core | Rimsenal - Enhanced Vanilla | @@ -517,6 +521,7 @@ T's Conversion Staff | T's Samurai Faction | Useless Clothes | Ushankas Glitterworld Uprising | +Valorant Weapon Pack | Vanilla Animals Expanded | Vanilla Animals Expanded - Endangered | Vanilla Animals Expanded - Royal Animals | diff --git a/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png b/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png index c464a3c706..3313359bc0 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png and b/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png b/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png index 0242cad62e..071412e3c4 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png and b/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png b/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png index 6d4ca63a95..e5db4029ad 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png and b/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png b/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png index e0b1d74bd4..7745e1e8f9 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png and b/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png b/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png index d5f7c921a0..37bec74c2c 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png and b/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png b/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png index 4b28cad9ea..1c7b6bcc29 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png and b/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png b/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png index f6d928f4b1..1ef850146c 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png and b/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png b/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png index d41bb1c2be..09f0179d36 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png and b/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png differ diff --git a/Textures/Things/Weapons/MechanoidMinigun.png b/Textures/Things/Weapons/MechanoidMinigun.png index e7201995e6..de974a1340 100644 Binary files a/Textures/Things/Weapons/MechanoidMinigun.png and b/Textures/Things/Weapons/MechanoidMinigun.png differ 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