From f92f651f9a9e389de1e8554a1b5cba3ec2f4b161 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 30 Oct 2024 20:44:35 +0330 Subject: [PATCH 1/5] Robotic Servitude patch --- LoadFolders.xml | 21 +- .../Bodies/Bodies_Mechanoid_Medium.xml | 56 +++++ .../Patches/ThingDefs_Misc/Melee_Assassin.xml | 64 ++++++ .../ThingDefs_Races/Races_Mechanoid.xml | 206 ++++++++++++++++++ SupportedThirdPartyMods.md | 1 + 5 files changed, 338 insertions(+), 10 deletions(-) create mode 100644 ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml create mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml create mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml diff --git a/LoadFolders.xml b/LoadFolders.xml index 0faed28a68..4cb924136f 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -66,7 +66,7 @@
  • ModPatches/Astra Militarum Regimentum - Krieg
  • ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet
  • ModPatches/Auto-Mortars
    • -
  • ModPatches/AV Work Queen
    • +
  • ModPatches/AV Work Queen
  • ModPatches/Autocleaner
  • ModPatches/Beast Man Tribes
  • ModPatches/Beeralope Squad
    • @@ -102,7 +102,7 @@
  • ModPatches/Charge-Loading Lee-Enfield
  • ModPatches/Civilization Beyond Earth Armor Sets
  • ModPatches/Clay Soldier Race
    • -
  • ModPatches/Colonial Shuttle
    • +
  • ModPatches/Colonial Shuttle
  • ModPatches/Colony Leadership
  • ModPatches/Combat Enthusiast's Collection
  • ModPatches/Comigo's Fancy Floating Turrets
    • @@ -144,7 +144,7 @@
  • ModPatches/Eisenhans Power Armor
  • ModPatches/Eltex Bodysuit
  • ModPatches/Enchanted Sword
    • -
  • ModPatches/Epochs - Pyrinth
    • +
  • ModPatches/Epochs - Pyrinth
  • ModPatches/Epona Race
  • ModPatches/Equium
  • ModPatches/Erin's Au Ra
    • @@ -165,7 +165,7 @@
  • ModPatches/Erin's Wildlife
  • ModPatches/EvolvedOrgansRedux
  • ModPatches/Exotic Arsenal
    • -
  • ModPatches/Expanded Materials - Metals
    • +
  • ModPatches/Expanded Materials - Metals
  • ModPatches/Expanded Materials - Plastics
  • ModPatches/Expanded Woodworking
  • ModPatches/Extended Storage
    • @@ -177,7 +177,7 @@
  • ModPatches/FSF Vanilla Bionics Expansion
  • ModPatches/Faction - Mafia
  • ModPatches/Fallout New Vegas - Elite Riot Gear
    • -
  • ModPatches/Fallout Vault 111 Starter Pack
    • +
  • ModPatches/Fallout Vault 111 Starter Pack
  • ModPatches/Fantasy Metals Reforged
  • ModPatches/Farming Expansion
  • ModPatches/FashionRIMsta
    • @@ -200,7 +200,7 @@
  • ModPatches/Gestalt Engine
  • ModPatches/Giddy-Up 2
  • ModPatches/GrimWorld Angels of Death
    • -
  • ModPatches/Grimworld Core Imperialis
    • +
  • ModPatches/Grimworld Core Imperialis
  • ModPatches/GrimWorld Hammer of the Imperium
  • ModPatches/GrimWorld Imperial Vehicles
  • ModPatches/Girls Frontline Apparel Pack
    • @@ -244,7 +244,7 @@
  • ModPatches/Jin-Roh Kerberos Panzer Cop Armor
  • ModPatches/K4G Empires of Old - Core
  • ModPatches/K4G Empires of Old - Engineers Institute
    • -
  • ModPatches/K4G Empires of Old - The Alekeepers
    • +
  • ModPatches/K4G Empires of Old - The Alekeepers
  • ModPatches/K4G Empires of Old - The Faceless Sultainate
  • ModPatches/K4G Empires of Old - The Polluted Legion
  • ModPatches/K4G Empires of Old - The Rising Sun
    • @@ -470,6 +470,7 @@
  • ModPatches/Rimsenal Xenotype Pack - Askbarn
  • ModPatches/Rimworld - The Dark Descent
  • ModPatches/Risk of Rain UES Contact Light Armory
    • +
  • ModPatches/Robotic Servitude
  • ModPatches/Rockmen Race
  • ModPatches/Roren Race
  • ModPatches/Royal Arsenal
    • @@ -490,7 +491,7 @@
  • ModPatches/Simply More Melee
  • ModPatches/Slime Rancher
  • ModPatches/Solark Race
    • -
  • ModPatches/Spacer Pack
    • +
  • ModPatches/Spacer Pack
  • ModPatches/Spacer Shields
  • ModPatches/Spaceworm
  • ModPatches/Spartan Foundry
    • @@ -625,9 +626,9 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • - +
  • ModPatches/Multiplayer
  • ModPatches/SRTS
  • ModPatches/VehicleFramework
    • - + \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml new file mode 100644 index 0000000000..b2deebe5c6 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml @@ -0,0 +1,56 @@ + + + + + + Defs/BodyDef[defName="Gha_Laborer"]//*[ + def="MechanicalThoraxCanManipulate" or + def="MechanicalNeck" or + def="SightSensor" or + def="HearingSensor" or + def="SmellSensor" or + def="MechanicalLeg"] + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear left foot"]/groups + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear left foot"] + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear right foot"]/groups + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear right foot"] + + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]//*[ + def="MechanicalThoraxCanManipulate" or + def="MechanicalNeck" or + def="MechanicalHead" or + def="SightSensor" or + def="HearingSensor" or + def="SmellSensor" or + def="MechanicalLeg" or + def="MechanicalFoot"]/groups + + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml new file mode 100644 index 0000000000..3954f889d8 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"]/tools + + +
  • + + +
  • Poke
    • + + 6 + 1.27 + 0.10 + 1.96 + Handle + +
  • + + +
  • Stab
    • + + 19 + 1.27 + 1.96 + 3.92 + Point + +
  • + + +
  • Cut
    • + + 48 + 1.25 + 4.84 + 1.08 + Edge + +     +     +     + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"]/statBases + + 7 + 0.93 + + + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"] + + + 0.67 + 0.7 + 0.47 + + + + +     \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml new file mode 100644 index 0000000000..a42f1e9939 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -0,0 +1,206 @@ + + + + + + + Defs/PawnKindDef[defName="Gha_Combat_Laborer"] + +
  • + + 4 + 6 + +
    • +     +     + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases + + 50 + 20 + 1.3 + 1.25 + 0.09 + 0.08 + 0.07 + 150 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases/ArmorRating_Blunt + + 3 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases/ArmorRating_Sharp + + 2 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 1.85 + HeadAttackTool + 0.625 + +     +     +     + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/statBases + + 0.12 + 0.12 + 0.07 + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontLeftLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontRightLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 15 + 3.51 + HeadAttackTool + 12 + true + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/comps + + Defs/ThingDef[defName="Gha_Corpse_Laborer"] + + + + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • +     +     + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Blunt + + 11 + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Sharp + + 5.5 + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/race/baseHealthScale + + 1.0 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 4.5 + + + +     \ No newline at end of file diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 1b2ab0d89e..8a67fb0948 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -458,6 +458,7 @@ Rimworld - Witcher Monster Hunt | Rimworld-Style Pilas and Bows Strapped with Grenades and Shells Extended | Rimworld of Magic | Risk of Rain: UES Contact Light Armory (Continued) | +Robotic Servitude | Rockmen race | Roren, People of Rorensia | Royal Arsenal | From 4161bb333d7561cf1ac9c7eb42975d6209033e88 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 30 Oct 2024 20:49:21 +0330 Subject: [PATCH 2/5] Duplicate file name fix --- .../{Bodies_Mechanoid_Medium.xml => Bodies_Mechanoid_Laborer.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ModPatches/Robotic Servitude/Patches/Bodies/{Bodies_Mechanoid_Medium.xml => Bodies_Mechanoid_Laborer.xml} (100%) diff --git a/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml similarity index 100% rename from ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml rename to ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml From b452d0b04a2bb2fc26373f65d7ecc30c40279817 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 03:53:14 -0400 Subject: [PATCH 3/5] Adjust stats, split off assassin --- .../ThingDefs_Races/Races_Mechanoid.xml | 35 ++------- .../Races_Mechanoid_Anomaly.xml | 72 +++++++++++++++++++ 2 files changed, 79 insertions(+), 28 deletions(-) create mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index a42f1e9939..5a991e614c 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -28,6 +28,7 @@ 0.08 0.07 150 + 0.4 @@ -55,9 +56,10 @@
  • Blunt
    • 4 - 1.85 + 2.0 HeadAttackTool - 0.625 + true + 0.5 @@ -162,44 +164,21 @@ Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Blunt - 11 + 5.25 Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Sharp - 5.5 + 3.5 Defs/ThingDef[defName="Gha_Combat_Laborer"]/race/baseHealthScale - 1.0 - - - - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases - - 0.17 - 0.17 - 0.09 - - - - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt - - 12 - - - - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp - - 4.5 + 1.15 diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml new file mode 100644 index 0000000000..5007a829f6 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml @@ -0,0 +1,72 @@ + + + + + +
  • Anomaly
    • +     + + + + + + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"] + +
  • + Humanoid +
    • + + + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + +
    • + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + +
    • + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 6 + +
    • + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • + + + +     +     +     + +     \ No newline at end of file From abfd07469c7772adc95ec42cd90100fe6c5ea440 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 03:57:00 -0400 Subject: [PATCH 4/5] Revert split--misread file. --- .../ThingDefs_Races/Races_Mechanoid.xml | 47 +++++++++++- .../Races_Mechanoid_Anomaly.xml | 72 ------------------- 2 files changed, 46 insertions(+), 73 deletions(-) delete mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index 5a991e614c..bd251c131a 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -68,7 +68,7 @@ - Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer"] + Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer" or defName="Gha_Assassin_Laborer"]
  • Humanoid @@ -182,4 +182,49 @@ + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 6 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml deleted file mode 100644 index 5007a829f6..0000000000 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - -
  • Anomaly
    • -     - - - - - - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"] - -
  • - Humanoid -
    • - - - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases - - 0.17 - 0.17 - 0.09 - -
    • - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt - - 12 - -
    • - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp - - 6 - -
    • - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps - -
  • - 700 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 70 - 0.5 -
    • - - - -     -     -     - -     \ No newline at end of file From 51f5a9dcec57460366ea9c6abafc601f8b965778 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 04:00:26 -0400 Subject: [PATCH 5/5] Housekeeping --- .../ThingDefs_Races/Races_Mechanoid.xml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index bd251c131a..41e81eea67 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -205,26 +205,4 @@ - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps - -
  • - 700 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 70 - 0.5 -
    • -     -     - \ No newline at end of file