Merge pull request #3137 from SamaelGray/SamaelGray-MechLethalDamageT…

…hreshold Mech HP scaling tweaks
CombatExtended-Continued · Jun 22, 2024 · d4bd0f8 · d4bd0f8
2 parents d0cebc3 + ff8d6fc
commit d4bd0f8
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 6 deletions.
diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml
@@ -149,6 +149,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Scorcher"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Scorcher"]/tools</xpath>
 		<value>

diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml
@@ -3,7 +3,7 @@
 
 	<Operation Class="PatchOperationFindMod">
 		<mods>
-			<li>Biotech</li>				
+			<li>Biotech</li>
 		</mods>
 
 		<match Class="PatchOperationFindMod">
@@ -85,7 +85,7 @@
 						<nomatch Class="PatchOperationAdd">
 							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Aura_PlayerControlled"]</xpath>
 							<value>
-								<comps/>
+								<comps />
 							</value>
 						</nomatch>
 					</li>

diff --git a/...atches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml b/...atches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml
@@ -3,7 +3,7 @@
 
 	<Operation Class="PatchOperationFindMod">
 		<mods>
-			<li>Biotech</li>				
+			<li>Biotech</li>
 		</mods>
 
 		<match Class="PatchOperationFindMod">
@@ -96,7 +96,7 @@
 						<nomatch Class="PatchOperationAdd">
 							<xpath>Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout_PlayerControlled"]</xpath>
 							<value>
-								<comps/>
+								<comps />
 							</value>
 						</nomatch>
 					</li>

diff --git a/...tches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml b/...tches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml
@@ -3,7 +3,7 @@
 
 	<Operation Class="PatchOperationFindMod">
 		<mods>
-			<li>Biotech</li>				
+			<li>Biotech</li>
 		</mods>
 
 		<match Class="PatchOperationFindMod">
@@ -69,7 +69,7 @@
 						<nomatch Class="PatchOperationAdd">
 							<xpath>Defs/ThingDef[defName="AM_Mech_Advanced_PristineSlurrypede_PlayerControlled"]</xpath>
 							<value>
-								<comps/>
+								<comps />
 							</value>
 						</nomatch>
 					</li>

diff --git a/...atches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml b/...atches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml
@@ -246,6 +246,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedLancer"]/tools</xpath>
 		<value>
@@ -484,6 +491,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight"]/statBases/ArmorRating_Blunt</xpath>
 		<value>

diff --git a/...ctions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml b/...ctions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml
@@ -458,6 +458,13 @@
 					</value>
 				</li>
 
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/race/baseHealthScale</xpath>
+					<value>
+						<baseHealthScale>1.0</baseHealthScale>
+					</value>
+				</li>
+
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="VFE_Mech_AdvancedKnight_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
 					<value>

diff --git a/...anoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/...anoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml
@@ -270,6 +270,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="VFE_Mech_Lancer"]/tools</xpath>
 		<value>
@@ -508,6 +515,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="VFE_Mech_Knight"]/statBases/ArmorRating_Blunt</xpath>
 		<value>

diff --git a/...nilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml b/...nilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml
@@ -126,6 +126,13 @@
 					</value>
 				</li>
 
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/race/baseHealthScale</xpath>
+					<value>
+						<baseHealthScale>1.0</baseHealthScale>
+					</value>
+				</li>
+
 				<li Class="PatchOperationReplace">
 					<xpath>Defs/ThingDef[defName="VFE_Mech_Knight_PlayerControlled"]/statBases/ArmorRating_Blunt</xpath>
 					<value>

diff --git a/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml b/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml
@@ -339,6 +339,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Lancer"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Lancer"]/tools</xpath>
 		<value>