Some tweaks and fixes

CombatExtended-Continued · Sep 4, 2024 · be1c75d · be1c75d
1 parent 8db7a5e
commit be1c75d
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 91 deletions.
diff --git a/...es/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianBannerShields.xml b/...es/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
@@ -1,32 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationAttributeSet">
-		<xpath>Defs/ThingDef[@Name="pphhyy_BaseShield"]</xpath>
-		<attribute>ParentName</attribute>
-		<value>ArmorSmithableBase</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="pphhyy_BaseShield"]</xpath>
-		<value>
-			<thingClass>CombatExtended.Apparel_Shield</thingClass>
-			<apparel>
-				<countsAsClothingForNudity>false</countsAsClothingForNudity>
-				<careIfWornByCorpse>false</careIfWornByCorpse>
-				<bodyPartGroups>
-					<li>LeftShoulder</li>
-				</bodyPartGroups>
-				<layers>
-					<li>Shield</li>
-				</layers>
-			</apparel>
-			<tradeTags>
-				<li>Armor</li>
-			</tradeTags>
-		</value>
-	</Operation>
-
+	<!-- All Banners -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[
 			defName="pphhyy_Barbarian_BarbBannerI" or
@@ -90,6 +65,7 @@
 		</value>
 	</Operation>
 
+	<!-- Banner 1 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerI"]</xpath>
 		<value>
@@ -131,6 +107,7 @@
 		</value>
 	</Operation>
 
+	<!-- Banner 2 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerII"]</xpath>
 		<value>
@@ -172,6 +149,7 @@
 		</value>
 	</Operation>
 
+	<!-- Banner 3 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerIII"]</xpath>
 		<value>
@@ -213,6 +191,7 @@
 		</value>
 	</Operation>
 
+	<!-- Banner 4 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerIV"]</xpath>
 		<value>

diff --git a/...hes/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianMetalShields.xml b/...hes/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
+	<!-- All Shields -->
 	<Operation Class="PatchOperationAttributeSet">
 		<xpath>Defs/ThingDef[
 			defName="pphhyy_Barbarian_MetalShield" or
 			defName="pphhyy_Barbarian_MetalShieldII" or
 			defName="pphhyy_Barbarian_MetalShieldIII"]</xpath>
 		<attribute>ParentName</attribute>
-		<value>ShieldBase</value>
+		<value>pphhyy_BaseShield</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
@@ -42,30 +43,6 @@
 			</equippedStatOffsets>
 		</value>
 	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShield"]/equippedStatOffsets</xpath>
-		<value>
-			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShieldII"]/equippedStatOffsets</xpath>
-		<value>
-			<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
-			<ArmorRating_Blunt>4</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShieldIII"]/equippedStatOffsets</xpath>
-		<value>
-			<ArmorRating_Sharp>3</ArmorRating_Sharp>
-			<ArmorRating_Blunt>4.25</ArmorRating_Blunt>
-		</value>
-	</Operation>
 
 	<Operation Class="PatchOperationRemove">
 		<xpath>Defs/ThingDef[
@@ -120,6 +97,30 @@
 			</statBases>
 		</value>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShield"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShieldII"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
+			<ArmorRating_Blunt>4</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShieldIII"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+			<ArmorRating_Blunt>4.25</ArmorRating_Blunt>
+		</value>
+	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_MetalShield"]</xpath>

diff --git a/...hes/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianRoundShields.xml b/...hes/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
+	<!-- All Shields -->
 	<Operation Class="PatchOperationAttributeSet">
 		<xpath>Defs/ThingDef[
 			defName="pphhyy_Barbarian_RoundShield" or
 			defName="pphhyy_Barbarian_RoundShieldII" or
 			defName="pphhyy_Barbarian_RoundShieldIII"]</xpath>
 		<attribute>ParentName</attribute>
-		<value>ShieldBase</value>
+		<value>pphhyy_BaseShield</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
@@ -42,25 +43,40 @@
 			</equippedStatOffsets>
 		</value>
 	</Operation>
-
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="pphhyy_Barbarian_RoundShield" or
+			defName="pphhyy_Barbarian_RoundShieldII" or
+			defName="pphhyy_Barbarian_RoundShieldIII"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Mass>4.5</Mass>
+				<Bulk>7</Bulk>
+				<WornBulk>5</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShield"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShield"]/statBases</xpath>
 		<value>
 			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
 			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldII"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldII"]/statBases</xpath>
 		<value>
 			<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
 			<ArmorRating_Blunt>4</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldIII"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldIII"]/statBases</xpath>
 		<value>
 			<ArmorRating_Sharp>3</ArmorRating_Sharp>
 			<ArmorRating_Blunt>4.25</ArmorRating_Blunt>
@@ -106,21 +122,7 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[
-			defName="pphhyy_Barbarian_RoundShield" or
-			defName="pphhyy_Barbarian_RoundShieldII" or
-			defName="pphhyy_Barbarian_RoundShieldIII"]/statBases</xpath>
-		<value>
-			<statBases>
-				<MaxHitPoints>150</MaxHitPoints>
-				<Mass>4.5</Mass>
-				<Bulk>7</Bulk>
-				<WornBulk>5</WornBulk>
-			</statBases>
-		</value>
-	</Operation>
-
+	<!-- Round Shield 1 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShield"]</xpath>
 		<value>
@@ -162,6 +164,7 @@
 		</value>
 	</Operation>
 
+	<!-- Round Shield 2 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldII"]</xpath>
 		<value>
@@ -203,6 +206,7 @@
 		</value>
 	</Operation>
 
+	<!-- Round Shield 3 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldIII"]</xpath>
 		<value>

diff --git a/...ches/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianTallShields.xml b/...ches/Medieval Overhaul Barbarians/Patches/ThingDefs_Misc/Shields/BarbarianTallShields.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
+	<!-- All Shields -->
 	<Operation Class="PatchOperationAttributeSet">
 		<xpath>Defs/ThingDef[
 			defName="pphhyy_Barbarian_TallShield" or
 			defName="pphhyy_Barbarian_TallShieldII" or
 			defName="pphhyy_Barbarian_TallShieldIII"]</xpath>
 		<attribute>ParentName</attribute>
-		<value>ShieldBase</value>
+		<value>pphhyy_BaseShield</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
@@ -42,25 +43,40 @@
 			</equippedStatOffsets>
 		</value>
 	</Operation>
-
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="pphhyy_Barbarian_TallShield" or
+			defName="pphhyy_Barbarian_TallShieldII" or
+			defName="pphhyy_Barbarian_TallShieldIII"]/statBases</xpath>
+		<value>
+			<statBases>
+				<MaxHitPoints>150</MaxHitPoints>
+				<Mass>5</Mass>
+				<Bulk>8</Bulk>
+				<WornBulk>5</WornBulk>
+			</statBases>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShield"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShield"]/statBases</xpath>
 		<value>
 			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
 			<ArmorRating_Blunt>3.75</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldII"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldII"]/statBases</xpath>
 		<value>
 			<ArmorRating_Sharp>2.75</ArmorRating_Sharp>
 			<ArmorRating_Blunt>4</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldIII"]/equippedStatOffsets</xpath>
+		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldIII"]/statBases</xpath>
 		<value>
 			<ArmorRating_Sharp>3</ArmorRating_Sharp>
 			<ArmorRating_Blunt>4.25</ArmorRating_Blunt>
@@ -110,21 +126,7 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[
-			defName="pphhyy_Barbarian_TallShield" or
-			defName="pphhyy_Barbarian_TallShieldII" or
-			defName="pphhyy_Barbarian_TallShieldIII"]/statBases</xpath>
-		<value>
-			<statBases>
-				<MaxHitPoints>150</MaxHitPoints>
-				<Mass>5</Mass>
-				<Bulk>8</Bulk>
-				<WornBulk>5</WornBulk>
-			</statBases>
-		</value>
-	</Operation>
-
+	<!-- Tall Shield 1 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShield"]</xpath>
 		<value>
@@ -166,6 +168,7 @@
 		</value>
 	</Operation>
 
+	<!-- Tall Shield 2 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldII"]</xpath>
 		<value>
@@ -207,6 +210,7 @@
 		</value>
 	</Operation>
 
+	<!-- Tall Shield 3 -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldIII"]</xpath>
 		<value>