Merge pull request CombatExtended-Continued#3109 from SamaelGray/Sama…

…elGray-MaterialsRebalanced Vanilla material stat rebalanced
Tostov · Jun 26, 2024 · ec77091 · ec77091
2 parents 92d035e + b20e292
commit ec77091
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml b/Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml
@@ -569,7 +569,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/PawnKindDef[defName="Tribal_Warrior"]/weaponMoney</xpath>
 		<value>
-			<weaponMoney>80~150</weaponMoney>
+			<weaponMoney>115~150</weaponMoney>
 		</value>
 	</Operation>
 

diff --git a/Patches/Core/ThingDefs_Items/Items_Resource_Stuff.xml b/Patches/Core/ThingDefs_Items/Items_Resource_Stuff.xml
@@ -155,14 +155,10 @@
 		<xpath>Defs/ThingDef[defName="Plasteel"]/stuffProps/statFactors</xpath>
 		<value>
 			<Mass>0.8</Mass>
-			<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
+			<MeleePenetrationFactor>1.25</MeleePenetrationFactor>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="Plasteel"]/statBases/SharpDamageMultiplier</xpath>
-	</Operation>
-
 	<!-- Wood -->
 
 	<Operation Class="PatchOperationReplace">
@@ -231,25 +227,11 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="WoodLog"]/statBases/SharpDamageMultiplier</xpath>
-		<value>
-			<SharpDamageMultiplier>0.7</SharpDamageMultiplier>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="WoodLog"]/statBases/BluntDamageMultiplier</xpath>
-		<value>
-			<BluntDamageMultiplier>0.5</BluntDamageMultiplier>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="WoodLog"]/stuffProps/statFactors</xpath>
 		<value>
-			<Mass>0.3</Mass>
-			<MeleePenetrationFactor>0.3</MeleePenetrationFactor>
+			<Mass>0.6</Mass>
+			<MeleePenetrationFactor>0.5</MeleePenetrationFactor>
 		</value>
 	</Operation>
 
@@ -290,18 +272,11 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Uranium"]/stuffProps/statFactors/MeleeWeapon_CooldownMultiplier</xpath>
-		<value>
-			<MeleeWeapon_CooldownMultiplier>1.22</MeleeWeapon_CooldownMultiplier>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Uranium"]/stuffProps/statFactors</xpath>
 		<value>
 			<Mass>2.45</Mass>
-			<MeleePenetrationFactor>1.4</MeleePenetrationFactor>
+			<MeleePenetrationFactor>1.3</MeleePenetrationFactor>
 		</value>
 	</Operation>
 
@@ -338,14 +313,14 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Jade"]/stuffProps/statFactors/MeleeWeapon_CooldownMultiplier</xpath>
 		<value>
-			<MeleeWeapon_CooldownMultiplier>1.15</MeleeWeapon_CooldownMultiplier>
+			<MeleeWeapon_CooldownMultiplier>0.8</MeleeWeapon_CooldownMultiplier>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Jade"]/stuffProps/statFactors</xpath>
 		<value>
-			<Mass>1.3</Mass>
+			<Mass>0.7</Mass>
 		</value>
 	</Operation>