Merge pull request #3563 from Sirderpsalot0357/temp

Tweak Biomes! Core/Caverns shell and chitin armor values
CombatExtended-Continued · Nov 28, 2024 · 662e7ad · 662e7ad
2 parents 4fdd2e1 + e3b0f53
commit 662e7ad
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 49 deletions.
diff --git a/...verns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml b/...verns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml
@@ -125,70 +125,70 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>0.21</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.11</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>1.1</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Blunt>0.055</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.5</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Sharp>0.15</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<xpath>Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.09</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.075</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>1.7</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.24</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.9</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.12</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>2.2</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.32</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>1.1</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.16</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>2.0</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.46</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.95</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.23</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
@@ -219,4 +219,5 @@
 			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
+
 </Patch>
diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<!-- === Plate Shoulderpads === -->
+	<!-- === All Armor === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="BMT_Apparel_ChitinMediumArmor" or
+			defName="BMT_Apparel_ChitinHeavyArmor" or
+			defName="BMT_Apparel_ChitinFullArmor"]/apparel/layers </xpath>
+		<value>
+			<layers>
+				<li>Shell</li>
+			</layers>
+		</value>
+	</Operation>
+
+	<!-- === Light Armor === -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/Mass</xpath>
 		<value>
@@ -15,21 +28,12 @@
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.2</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[
-			defName="BMT_Apparel_ChitinMediumArmor" or
-			defName="BMT_Apparel_ChitinHeavyArmor" or
-			defName="BMT_Apparel_ChitinFullArmor"]/apparel/layers </xpath>
-		<value>
-			<layers>
-				<li>Shell</li>
-			</layers>
-		</value>
-	</Operation>
-
+	<!-- === Medium Armor === -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases</xpath>
 		<value>
@@ -41,10 +45,13 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
-			<StuffEffectMultiplierArmor>2.0</StuffEffectMultiplierArmor>
+			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>2.4</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
+	<!-- === Heavy Armor === -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases</xpath>
 		<value>
@@ -56,16 +63,14 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
-			<StuffEffectMultiplierArmor>3.0</StuffEffectMultiplierArmor>
+			<StuffEffectMultiplierArmor>4.5</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>2.4</ArmorRating_Sharp>
+			<ArmorRating_Blunt>4.8</ArmorRating_Blunt>			
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationRemove">
+	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets/MoveSpeed</xpath>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets</xpath>
 		<value>
 			<MeleeDodgeChance>-0.15</MeleeDodgeChance>
 		</value>
@@ -127,6 +132,7 @@
 		</value>
 	</Operation>
 
+	<!-- === Heavy Armor === -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases</xpath>
 		<value>
@@ -138,7 +144,9 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
-			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<ArmorRating_Sharp>2.8</ArmorRating_Sharp>
+			<ArmorRating_Blunt>5.2</ArmorRating_Blunt>	
 		</value>
 	</Operation>
 
@@ -209,19 +217,22 @@
 		</value>
 	</Operation>
 
+	<!-- === Helmets === -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet"
-			or defName="BMT_Apparel_ChitinBeetleHelmet"
-			or defName="BMT_Apparel_ChitinSpiderHelmet"]/statBases/StuffEffectMultiplierArmor </xpath>
+		<xpath>Defs/ThingDef[
+			defName="BMT_Apparel_ChitinFullHelmet" or
+			defName="BMT_Apparel_ChitinBeetleHelmet" or
+			defName="BMT_Apparel_ChitinSpiderHelmet"]/statBases/StuffEffectMultiplierArmor </xpath>
 		<value>
 			<StuffEffectMultiplierArmor>3.5</StuffEffectMultiplierArmor>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet"
-			or defName="BMT_Apparel_ChitinBeetleHelmet"
-			or defName="BMT_Apparel_ChitinSpiderHelmet"] </xpath>
+		<xpath>Defs/ThingDef[
+			defName="BMT_Apparel_ChitinFullHelmet" or
+			defName="BMT_Apparel_ChitinBeetleHelmet" or
+			defName="BMT_Apparel_ChitinSpiderHelmet"] </xpath>
 		<value>
 			<li Class="CombatExtended.PartialArmorExt">
 				<stats>

diff --git a/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml
@@ -1,61 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
+
 	<!-- Crab leather -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>1.0</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.17</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.085</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
 	<!--greenchitin -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>0.6</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.16</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.6</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.08</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 	<!-- gray chitin -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>0.4</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.12</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.7</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.06</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
 	<!-- mollusk Leather -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Sharp</xpath>
 		<value>
-			<StuffPower_Armor_Sharp>1.3</StuffPower_Armor_Sharp>
+			<StuffPower_Armor_Sharp>0.2</StuffPower_Armor_Sharp>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.4</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.1</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
@@ -70,7 +71,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BMT_Leather_Gastropoda"]/statBases/StuffPower_Armor_Blunt</xpath>
 		<value>
-			<StuffPower_Armor_Blunt>0.032</StuffPower_Armor_Blunt>
+			<StuffPower_Armor_Blunt>0.015</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
 
@@ -131,4 +132,5 @@
 			<StuffPower_Armor_Blunt>0.03</StuffPower_Armor_Blunt>
 		</value>
 	</Operation>
+
 </Patch>