From 1023250196d0d550789e5663f622a5e01505d2fe Mon Sep 17 00:00:00 2001
From: Lightwave <git@lightwave.me>
Date: Sun, 15 Dec 2024 04:23:20 +0400
Subject: [PATCH] Update shields to use new render system.

---
 .../ThingDefs_Apparel/Apparel_Shields.xml     | 125 ++++++++++++++++++
 .../ThingDefs_Apparel/Apparel_06M_Shields.xml |  62 +++++++++
 .../Neolithic/Apparel_02Neo_Body.xml          |  33 ++++-
 .../Defs/ThingsDefs/RK_Apparel.xml            |  64 ++++++++-
 4 files changed, 282 insertions(+), 2 deletions(-)

diff --git a/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Shields.xml b/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Shields.xml
index 6bae492b4d..af070f860b 100644
--- a/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Shields.xml
+++ b/Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Shields.xml
@@ -95,6 +95,38 @@
 				<li>TribalShield</li>
 			</tags>
 			<developmentalStageFilter>Child, Adult</developmentalStageFilter>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/Shields/ShieldTribal</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.65</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.2, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.2, 0, -0.2)</offset>
+							<flip>true</flip>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
@@ -173,6 +205,37 @@
 				<li>BoneShield</li>
 				<li>TribalShield</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/Shields/ShieldBone</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.67</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>20</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-20</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
@@ -247,6 +310,37 @@
 				<li>TribalShield</li>
 			</tags>
 			<developmentalStageFilter>Child, Adult</developmentalStageFilter>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/Shields/Buckler</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.66</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
@@ -323,6 +417,37 @@
 				<li>TribalShield</li>
 			</tags>
 			<useDeflectMetalEffect>true</useDeflectMetalEffect>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/Shields/Shield</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.65</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.2, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.2, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
diff --git a/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_06M_Shields.xml b/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_06M_Shields.xml
index 8dc5b05aa1..ea84713b4b 100644
--- a/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_06M_Shields.xml	
+++ b/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_06M_Shields.xml	
@@ -50,6 +50,37 @@
 				<li>Legion</li>
 			</tags>
 			<useWornGraphicMask>True</useWornGraphicMask>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/VileShields/ScutumShield</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.65</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
@@ -137,6 +168,37 @@
 			<tags>
 				<li>MedievalShield</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/VileShields/HeaterShield</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.65</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
diff --git a/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Neolithic/Apparel_02Neo_Body.xml b/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Neolithic/Apparel_02Neo_Body.xml
index 1af17e26c5..581552d98a 100644
--- a/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Neolithic/Apparel_02Neo_Body.xml	
+++ b/Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Neolithic/Apparel_02Neo_Body.xml	
@@ -418,7 +418,7 @@
 			<Mass>2</Mass>
 			<Bulk>2</Bulk>
 			<WornBulk>1</WornBulk>
-			<EquipDelay>1.2</EquipDelay>		
+			<EquipDelay>1.2</EquipDelay>
 			<StuffEffectMultiplierInsulation_Cold>0.01</StuffEffectMultiplierInsulation_Cold>
 			<StuffEffectMultiplierInsulation_Heat>0.01</StuffEffectMultiplierInsulation_Heat>
 			<StuffEffectMultiplierArmor>0.75</StuffEffectMultiplierArmor>
@@ -450,6 +450,37 @@
 				<li>NeoliticShield</li>
 				<li>TribalShield</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Things/Apparel/VilePart2_Primitive/WickerShield/WickerShield</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.65</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
diff --git a/Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml b/Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml
index 7f86147a8a..37549a9f1a 100644
--- a/Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml
+++ b/Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml
@@ -2625,6 +2625,37 @@
 				<li>RK_LightArmor</li>
 				<li>RK_Thief</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Apparel/RK_WoodenShield</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.75</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>
@@ -2665,7 +2696,7 @@
 					<li>Gold</li>
 					<li>Silver</li>
 				</disallowedThingDefs>
-			</defaultIngredientFilter>		
+			</defaultIngredientFilter>
 		</recipeMaker>
 		<costList>
 			<Plasteel>60</Plasteel>
@@ -2720,6 +2751,37 @@
 			<tags>
 				<li>RK_HeavyArmor</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+					<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+					<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+					<texPath>Apparel/RK_HeavyShield</texPath>
+					<shaderTypeDef>CutoutComplex</shaderTypeDef>
+					<parentTagDef>ApparelBody</parentTagDef>
+					<drawData>
+						<scale>0.75</scale>
+						<defaultData>
+							<layer>80</layer>
+						</defaultData>
+						<dataNorth>
+							<layer>-5</layer>
+							<offset>(-0.1, 0, -0.2)</offset>
+						</dataNorth>
+						<dataEast>
+							<layer>-5</layer>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>30</rotationOffset>
+						</dataEast>
+						<dataSouth>
+							<offset>(0.1, 0, -0.2)</offset>
+						</dataSouth>
+						<dataWest>
+							<offset>(0, 0, -0.2)</offset>
+							<rotationOffset>-30</rotationOffset>
+						</dataWest>
+					</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<thingCategories>
 			<li>ShieldCat</li>