Skip to content

Commit

Permalink
Merge pull request #3981 from TheLonerD/update-shields
Browse files Browse the repository at this point in the history 
Update shields to use new render system
  • Loading branch information
@TheLoneTec
TheLoneTec authored Dec 15, 2024
2 parents 9a61288 + 1023250 commit df11f32
Show file tree
Hide file tree
Showing 4 changed files with 282 additions and 2 deletions.
125 changes: 125 additions & 0 deletions Mods/Core_SK/Defs/ThingDefs_Apparel/Apparel_Shields.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
62 changes: 62 additions & 0 deletions Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Apparel_06M_Shields.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
33 changes: 32 additions & 1 deletion Mods/HMC Vile's Pre-Industrial/Defs/ThingDefs_Apparel/Neolithic/Apparel_02Neo_Body.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
64 changes: 63 additions & 1 deletion Mods/RatkinRaceHSK/Defs/ThingsDefs/RK_Apparel.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -2665,7 +2696,7 @@
<li>Gold</li>
<li>Silver</li>
</disallowedThingDefs>
</defaultIngredientFilter>
</defaultIngredientFilter>
</recipeMaker>
<costList>
<Plasteel>60</Plasteel>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit df11f32

Please sign in to comment.