Add carry weight and bulk, tweaks

CombatExtended-Continued · Nov 22, 2024 · 7b34a11 · 7b34a11
1 parent bf8fcea
commit 7b34a11
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/...imWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors.xml b/...imWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors.xml
@@ -13,6 +13,14 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GW_TotE_CustodesGuardArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>90</CarryBulk>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="GW_TotE_CustodesGuardArmor"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
@@ -63,6 +71,14 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GW_TotE_CustodesWardenArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>90</CarryBulk>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="GW_TotE_CustodesWardenArmor"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
@@ -109,7 +125,15 @@
 		<xpath>Defs/ThingDef[defName="GW_TotE_AllarusArmor"]/statBases</xpath>
 		<value>
 			<Bulk>350</Bulk>
-			<WornBulk>50</WornBulk>
+			<WornBulk>40</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GW_TotE_AllarusArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>150</CarryWeight>
+			<CarryBulk>120</CarryBulk>
 		</value>
 	</Operation>
 
@@ -163,6 +187,14 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GW_TotE_CastellanArmor"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>90</CarryBulk>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="GW_TotE_CastellanArmor"]/statBases/ArmorRating_Sharp</xpath>
 		<value>

diff --git a/...GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Guns.xml b/...GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Guns.xml
@@ -89,7 +89,7 @@
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
 		<weaponTags>
-			<li>CE_AI_AR</li>
+			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 	</Operation>
 

diff --git a/... Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Melee_Weapons.xml b/... Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Melee_Weapons.xml
@@ -211,6 +211,23 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="GW_TotE_Vaultsword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="GW_TotE_Vaultsword"]</xpath>
+			<value>
+				<weaponTags />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GW_TotE_Vaultsword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="GW_TotE_Vaultsword"]</xpath>
 		<value>