From 816a984ad00531be94fb44eda97356488a748428 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Mon, 18 Sep 2023 19:47:12 +0330 Subject: [PATCH] housekeeping --- .../Machines of War/BodyDefs/CicadaBody.xml | 24 +-- .../BodyDefs/DemolisherBody.xml | 34 ++--- .../Machines of War/BodyDefs/EnforcerBody.xml | 35 +++-- Patches/Machines of War/Fuckyoweapon.xml | 8 - .../ThingDefs_Misc/BreachCharger.xml | 137 ++++++++--------- .../ThingDefs_Misc/CricketCannon.xml | 8 +- .../ThingDefs_Misc/Demolisherweapon.xml | 124 +++++++-------- .../ThingDefs_Misc/stormcharger.xml | 141 +++++++++--------- .../ThingDefs_Races/CicadaRaces.xml | 22 +-- .../ThingDefs_Races/DemolisherRaces.xml | 21 +-- .../ThingDefs_Races/EnforcerBreachRaces .xml | 24 ++- .../ThingDefs_Races/EnforcerRaces.xml | 20 ++- SupportedThirdPartyMods.md | 2 +- 13 files changed, 297 insertions(+), 303 deletions(-) delete mode 100644 Patches/Machines of War/Fuckyoweapon.xml diff --git a/Patches/Machines of War/BodyDefs/CicadaBody.xml b/Patches/Machines of War/BodyDefs/CicadaBody.xml index 02e5c110cd..4a3086797a 100644 --- a/Patches/Machines of War/BodyDefs/CicadaBody.xml +++ b/Patches/Machines of War/BodyDefs/CicadaBody.xml @@ -1,18 +1,20 @@ +
  • Machines of War
    •  +
  • Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/groups Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart - +
    • @@ -22,7 +24,7 @@ Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"] - + @@ -32,7 +34,7 @@ Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"] - + @@ -42,7 +44,7 @@ Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] - + @@ -52,7 +54,7 @@ Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] - + @@ -62,19 +64,17 @@ Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] - + - -
  • Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/groups Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"] - +
    • @@ -84,7 +84,7 @@ Defs/BodyDef[defName="MOW_MechanicalCicada"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"] - + @@ -148,6 +148,6 @@     -     + -     + \ No newline at end of file diff --git a/Patches/Machines of War/BodyDefs/DemolisherBody.xml b/Patches/Machines of War/BodyDefs/DemolisherBody.xml index dc05fd4efa..fb8a403e01 100644 --- a/Patches/Machines of War/BodyDefs/DemolisherBody.xml +++ b/Patches/Machines of War/BodyDefs/DemolisherBody.xml @@ -1,18 +1,20 @@ +
  • Machines of War
    •  +
  • Defs/BodyDef[defName="MOW_Demolisher"]/corePart/groups Defs/BodyDef[defName="MOW_Demolisher"]/corePart - +
    • @@ -22,7 +24,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"] - + @@ -32,7 +34,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"] - + @@ -42,7 +44,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] - + @@ -52,7 +54,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] - + @@ -62,7 +64,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] - + @@ -72,7 +74,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"] - + @@ -82,7 +84,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"] - + @@ -92,7 +94,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"] - + @@ -102,7 +104,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"] - + @@ -112,7 +114,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"] - + @@ -122,7 +124,7 @@ Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"] - + @@ -199,14 +201,12 @@
  • - Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups + Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups
  • CoveredByNaturalArmor
    • - -
  • Defs/BodyDef[defName="MOW_Demolisher"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups @@ -216,6 +216,6 @@ - + - + \ No newline at end of file diff --git a/Patches/Machines of War/BodyDefs/EnforcerBody.xml b/Patches/Machines of War/BodyDefs/EnforcerBody.xml index 787ad00026..1f34223d74 100644 --- a/Patches/Machines of War/BodyDefs/EnforcerBody.xml +++ b/Patches/Machines of War/BodyDefs/EnforcerBody.xml @@ -1,18 +1,20 @@ +
  • Machines of War
    • +
  • Defs/BodyDef[defName="MOW_Enforcer"]/corePart/groups Defs/BodyDef[defName="MOW_Enforcer"]/corePart - +
    • @@ -22,7 +24,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"] - + @@ -32,7 +34,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"] - + @@ -42,7 +44,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] - + @@ -52,7 +54,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] - + @@ -62,7 +64,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] - + @@ -72,7 +74,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"] - + @@ -82,7 +84,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"] - + @@ -92,7 +94,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"] - + @@ -102,7 +104,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"] - + @@ -112,7 +114,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"] - + @@ -122,7 +124,7 @@ Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"] - + @@ -199,14 +201,12 @@
  • - Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups + Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups
  • CoveredByNaturalArmor
    • - -
  • Defs/BodyDef[defName="MOW_Enforcer"]/corePart/parts/li[def="MOW_MechanicalShoulderPauldron"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups @@ -216,7 +216,6 @@ - - + - + \ No newline at end of file diff --git a/Patches/Machines of War/Fuckyoweapon.xml b/Patches/Machines of War/Fuckyoweapon.xml deleted file mode 100644 index 571ad5ccfa..0000000000 --- a/Patches/Machines of War/Fuckyoweapon.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="MOW_Gun_EMMarksmanRifle"] - - - diff --git a/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml b/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml index 52dda7b8d6..a161be6fec 100644 --- a/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml +++ b/Patches/Machines of War/ThingDefs_Misc/BreachCharger.xml @@ -7,75 +7,76 @@ -
  • - - Defs/ThingDef[defName = "MOW_Gun_BreachChargeScatter"]/tools - - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Poke
    • - - 15 - 2.02 - 5.630 - Barrel - - - - - -
  • - MOW_Gun_BreachChargeScatter - - 4.35 - 6.0 - 1.25 - 0.14 - 1 - 0.26 - - - 3.0 - CombatExtended.Verb_ShootCE - True - Bullet_12GaugeCharged - 0.2 - 12 - MOW_Shot_StormChargeScatter - GunTail_Heavy - 9 - - - 24 - 3.5 - AmmoSet_12GaugeCharged - - - Snapshot - - -
  • CE_AI_Rifle
    • -
  • NoSwitch
    • - - +
  • + + Defs/ThingDef[defName = "MOW_Gun_BreachChargeScatter"]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Poke
    • + + 15 + 2.02 + 5.630 + Barrel + + + + -     -     + +
  • + MOW_Gun_BreachChargeScatter + + 4.35 + 6.0 + 1.25 + 0.14 + 1 + 0.26 + + + 3.0 + CombatExtended.Verb_ShootCE + True + Bullet_12GaugeCharged + 0.2 + 12 + MOW_Shot_StormChargeScatter + GunTail_Heavy + 9 + + + 24 + 3.5 + AmmoSet_12GaugeCharged + + + Snapshot + + +
  • CE_AI_Rifle
    • +
  • NoSwitch
    • + + + +     +     -     + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml b/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml index 036d8f3fb0..19d7fa9924 100644 --- a/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml +++ b/Patches/Machines of War/ThingDefs_Misc/CricketCannon.xml @@ -7,6 +7,7 @@ +
  • Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/tools @@ -25,7 +26,6 @@
    • -
  • Defs/ThingDef[defName="MOW_Gun_ShockaveCannon"]/statBases/RangedWeapon_Cooldown @@ -47,8 +47,8 @@
    • -     -     + + - + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml b/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml index 5a87569299..6b7d882288 100644 --- a/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml +++ b/Patches/Machines of War/ThingDefs_Misc/Demolisherweapon.xml @@ -7,70 +7,70 @@ -
  • - - Defs/ThingDef[defName = "MOW_Gun_ParticleLauncher"]/tools - - - -
  • - - -
  • Blunt
    • - - 30 - 1.55 - 1.5 - 30.755 - Stock - - - - +
  • + + Defs/ThingDef[defName = "MOW_Gun_ParticleLauncher"]/tools + + + +
  • + + +
  • Blunt
    • + + 30 + 1.55 + 1.5 + 30.755 + Stock + + + + -
  • - MOW_Gun_ParticleLauncher - - 20.00 - 1.5 - 1 - 0.01 - 0.82 - 20.00 - - - 1.01 - CombatExtended.Verb_ShootCE - true - Bullet_80x256mmFuel_Incendiary - 1.7 - 40 - 1 - InfernoCannon_Fire - GunTail_Light - 14 - 5 - 4 - true - - - 5 - 15 - 7.8 - AmmoSet_80x256mmFuel - - - Snapshot - - -
  • CE_AI_Launcher
    • -
  • NoSwitch
    • - - +
  • + MOW_Gun_ParticleLauncher + + 20.00 + 1.5 + 1 + 0.01 + 0.82 + 20.00 + + + 1.01 + CombatExtended.Verb_ShootCE + true + Bullet_80x256mmFuel_Incendiary + 1.7 + 40 + 1 + InfernoCannon_Fire + GunTail_Light + 14 + 5 + 4 + true + + + 5 + 15 + 7.8 + AmmoSet_80x256mmFuel + + + Snapshot + + +
  • CE_AI_Launcher
    • +
  • NoSwitch
    • + + -     -     + + - + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Misc/stormcharger.xml b/Patches/Machines of War/ThingDefs_Misc/stormcharger.xml index 10d93513e2..d445c8285c 100644 --- a/Patches/Machines of War/ThingDefs_Misc/stormcharger.xml +++ b/Patches/Machines of War/ThingDefs_Misc/stormcharger.xml @@ -7,75 +7,80 @@ -
  • - - Defs/ThingDef[defName = "MOW_Gun_StormChargeScatter"]/tools - - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Poke
    • - - 15 - 2.02 - 5.630 - Barrel - - - - - -
  • - MOW_Gun_StormChargeScatter - - 4.35 - 6.0 - 1.25 - 0.14 - 1 - 0.56 - - - 3.0 - CombatExtended.Verb_ShootCE - True - Bullet_12GaugeCharged - 0.5 - 24 - MOW_Shot_StormChargeScatter - GunTail_Heavy - 9 - - - 12 - 4.5 - AmmoSet_12GaugeCharged - - - Snapshot - - -
  • CE_AI_Rifle
    • -
  • NoSwitch
    • - - +
  • + Defs/ThingDef[defName="MOW_Gun_EMMarksmanRifle"] +
    • -     -     +
  • + + Defs/ThingDef[defName = "MOW_Gun_StormChargeScatter"]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Poke
    • + + 15 + 2.02 + 5.630 + Barrel + + + + + + +
  • + MOW_Gun_StormChargeScatter + + 4.35 + 6.0 + 1.25 + 0.14 + 1 + 0.56 + + + 3.0 + CombatExtended.Verb_ShootCE + True + Bullet_12GaugeCharged + 0.5 + 24 + MOW_Shot_StormChargeScatter + GunTail_Heavy + 9 + + + 12 + 4.5 + AmmoSet_12GaugeCharged + + + Snapshot + + +
  • CE_AI_Rifle
    • +
  • NoSwitch
    • + + + + + - + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml b/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml index cbc78d7477..3a54dff6ed 100644 --- a/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml +++ b/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml @@ -7,6 +7,7 @@ +
  • Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases @@ -26,7 +27,6 @@
  • Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases - 0.25 200 100 1.0 @@ -80,7 +80,7 @@ Defs/ThingDef[defName="MOW_Mech_Cicada"] - +
    • @@ -101,32 +101,32 @@ -
  • Defs/ThingDef[defName="MOW_Mech_Cicada"]/comps
  • - 3000 + 1580 true 1250 5 true - 3 + 5 + 5 300 200 true - 366 - 0.5 - 4 - 6 + 158 + 0.75 + 5 + 10
    • - + - + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml b/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml index 8b34fda26c..47c43527b3 100644 --- a/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml +++ b/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml @@ -7,6 +7,7 @@ +
  • Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases @@ -49,7 +50,7 @@
  • Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases/ArmorRating_Sharp - 30 + 24
    • @@ -80,7 +81,7 @@ Defs/ThingDef[defName="MOW_Mech_Demolisher"] - + @@ -101,26 +102,26 @@ -
  • Defs/ThingDef[defName="MOW_Mech_Demolisher"]/comps
  • - 6000 + 3950 true 1250 5 true - 3 + 5 + 5 300 200 true - 366 + 395 0.5 - 12 - 30 + 14 + 36
    • @@ -134,6 +135,6 @@     - + - + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml b/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml index 80dbde0470..86faabd503 100644 --- a/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml +++ b/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml @@ -7,6 +7,7 @@ +
  • Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases @@ -26,7 +27,6 @@
  • Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases - 0.25 50 60 1.0 @@ -42,14 +42,14 @@
  • Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases/ArmorRating_Blunt - 15 + 9
  • Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases/ArmorRating_Sharp - 8 + 5
    • @@ -80,7 +80,7 @@ Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"] - + @@ -101,32 +101,30 @@ -
  • Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/comps
  • - 2000 + 1310 true 1250 5 true - 3 + 5 + 5 300 200 true - 366 - 0.5 - 3 - 5 + 131 + 0.75
    • - + - + \ No newline at end of file diff --git a/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml b/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml index e5224c850f..dd09c8b880 100644 --- a/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml +++ b/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml @@ -7,6 +7,7 @@ +
  • Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases @@ -26,7 +27,6 @@
  • Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases - 0.25 50 60 1.0 @@ -80,7 +80,7 @@ Defs/ThingDef[defName="MOW_Mech_Enforcer"] - +
    • @@ -101,32 +101,30 @@ -
  • Defs/ThingDef[defName="MOW_Mech_Enforcer"]/comps
  • - 2000 + 1310 true 1250 5 true - 3 + 5 + 5 300 200 true - 366 - 0.5 - 2 - 3 + 131 + 0.75
    • - + - + \ No newline at end of file diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index a7bcdea2d6..58daf29b4d 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -278,7 +278,7 @@ Let's Have a Cat! | Littluna Race | Logann Race | Logistics_Mechanoid | -Magic Wands | +Machines of War | Makeshift Melee Weapons | Marilyn the Mincho Worshipper Witch | Mass Effect - Playable Geth |