Merge pull request #3284 from SamaelGray/SamaelGray-TortDegradableArmor

Tortoise degradable armor
CombatExtended-Continued · Jul 21, 2024 · ed723ec · ed723ec
2 parents 57a7323 + c72edb9
commit ed723ec
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 3 deletions.
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
@@ -40,15 +40,15 @@
 		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Blunt</xpath>
 
 		<value>
-			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+			<ArmorRating_Blunt>3.25</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Sharp</xpath>
 
 		<value>
-			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<ArmorRating_Sharp>1.15</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
@@ -82,6 +82,29 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AEXP_DesertTortoise"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>330</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
 	<!-- === Gila Monster === -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AEXP_GilaMonster"]/statBases</xpath>

diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml
@@ -534,7 +534,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Tortoise"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
-			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
@@ -581,4 +581,27 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Tortoise"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Tortoise"]</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Tortoise"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>275</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.75</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
 </Patch>