Merge pull request #3186 from CombatExtended-Continued/RenderChanges

Render changes
CombatExtended-Continued · Jun 23, 2024 · 17553ee · 17553ee
2 parents d9c849a + 5706024
commit 17553ee
Show file tree

Hide file tree

Showing 11 changed files with 195 additions and 485 deletions.
diff --git a/Defs/ThingDefs_Misc/Apparel_Shield.xml b/Defs/ThingDefs_Misc/Apparel_Shield.xml
@@ -64,10 +64,36 @@
 			<MeleeParryChance>1.0</MeleeParryChance>
 		</equippedStatOffsets>
 		<apparel>
-			<developmentalStageFilter>Child, Adult</developmentalStageFilter>
+ 	     	<developmentalStageFilter>Child, Adult</developmentalStageFilter>
 			<tags>
 				<li>TribalShield</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+				<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+				<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+				<texPath>Things/Apparel/Shield/CE_Shield</texPath>
+				<shaderTypeDef>CutoutComplex</shaderTypeDef>
+				<parentTagDef>ApparelBody</parentTagDef>
+				<drawData>
+					<scale>0.8</scale>
+					<defaultData>
+						<layer>91</layer>
+					</defaultData>
+					<dataEast>
+						<layer>-5</layer>
+						<offset>(0, 0, -0.1)</offset>						
+					</dataEast>
+					<dataNorth>
+						<layer>-5</layer>
+						<offset>(0.15, 0, -0.1)</offset>
+					</dataNorth>
+					<dataSouth>
+						<offset>(0.3, 0, -0.2)</offset>
+					</dataSouth>
+				</drawData>
+				</li>
+			</renderNodeProperties>
 		</apparel>
 		<modExtensions>
 			<li Class="CombatExtended.ShieldDefExtension">
@@ -130,6 +156,32 @@
 			<tags>
 				<li>OutlanderShield</li>
 			</tags>
+			<renderNodeProperties>
+				<li>
+				<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
+				<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
+				<texPath>Things/Apparel/BallisticShield/CE_BallisticShield</texPath>
+				<shaderTypeDef>CutoutComplex</shaderTypeDef>
+				<parentTagDef>ApparelBody</parentTagDef>
+				<drawData>
+					<scale>0.8</scale>
+					<defaultData>
+						<layer>91</layer>
+					</defaultData>
+					<dataEast>
+						<layer>-5</layer>
+						<offset>(0, 0, -0.1)</offset>						
+					</dataEast>
+					<dataNorth>
+						<layer>-5</layer>
+						<offset>(0.15, 0, -0.1)</offset>
+					</dataNorth>
+					<dataSouth>
+						<offset>(0.15, 0, -0.1)</offset>
+					</dataSouth>
+				</drawData>
+				</li>
+			</renderNodeProperties>			
 		</apparel>
 		<modExtensions>
 			<li Class="CombatExtended.ShieldDefExtension">
@@ -144,7 +196,6 @@
 				<crouchCoverage>
 					<li>Legs</li>
 				</crouchCoverage>
-				<drawAsTall>true</drawAsTall>
 			</li>
 		</modExtensions>
 		<tradeTags>

diff --git a/Source/BetterTurretsCompat/BetterTurretsCompat.csproj b/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
@@ -54,7 +54,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" GeneratePathProperty="true" />
 		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Source/CombatExtended/CombatExtended.csproj b/Source/CombatExtended/CombatExtended.csproj
@@ -128,7 +128,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4061" GeneratePathProperty="true" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" GeneratePathProperty="true" />
 		<PackageReference Include="Lib.Harmony" Version="2.3.3" ExcludeAssets="runtime" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/Source/CombatExtended/CombatExtended/Render/PawnRenderNodeWorker_Drafted.cs b/Source/CombatExtended/CombatExtended/Render/PawnRenderNodeWorker_Drafted.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Remoting.Messaging;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace CombatExtended
+{
+    public class PawnRenderNodeWorker_Drafted : PawnRenderNodeWorker
+    {
+        public override bool CanDrawNow(PawnRenderNode node, PawnDrawParms parms)
+        {
+            var pawn = node.tree.pawn;
+            return pawn != null && pawn.Spawned && (pawn.Drafted || (pawn.CurJob?.def.alwaysShowWeapon ?? false) || (pawn.mindState?.duty?.def.alwaysShowWeapon ?? false)) && base.CanDrawNow(node, parms);
+        }
+    }
+}
diff --git a/Source/CombatExtended/CombatExtended/Render/PawnRenderNode_Apparel.cs b/Source/CombatExtended/CombatExtended/Render/PawnRenderNode_Apparel.cs
@@ -0,0 +1,33 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Verse;
+
+namespace CombatExtended
+{
+    public class PawnRenderNode_Apparel : Verse.PawnRenderNode_Apparel
+    {
+        public PawnRenderNode_Apparel(Pawn pawn, PawnRenderNodeProperties props, PawnRenderTree tree) : base(pawn, props, tree)
+        {
+        }
+        public PawnRenderNode_Apparel(Pawn pawn, PawnRenderNodeProperties props, PawnRenderTree tree, Apparel apparel) : base(pawn, props, tree)
+        {
+        }
+        public PawnRenderNode_Apparel(Pawn pawn, PawnRenderNodeProperties props, PawnRenderTree tree, Apparel apparel, bool useHeadMesh) : base(pawn, props, tree)
+        {
+        }
+        public override IEnumerable<Graphic> GraphicsFor(Pawn pawn)
+        {
+            yield return GraphicDatabase.Get((apparel.def.graphicData?.graphicClass ?? typeof(Graphic_Multi)), TexPathFor(pawn), ShaderFor(pawn), apparel.def.graphicData.drawSize, apparel.DrawColor, apparel.DrawColorTwo);
+        }
+        public override string ToString()
+        {
+            return apparel?.ToString() ?? base.ToString();
+        }
+    }
+}
diff --git a/Source/CombatExtended/CombatExtended/Things/Apparel_Shield.cs b/Source/CombatExtended/CombatExtended/Things/Apparel_Shield.cs
@@ -19,9 +19,17 @@ public class Apparel_Shield : Apparel
         private const float YOffsetStatus = 0.04296875f;
 
         public const string OneHandedTag = "CE_OneHandedWeapon";
-        private bool drawShield => Wearer.Drafted || (Wearer.CurJob?.def.alwaysShowWeapon ?? false) || (Wearer.mindState.duty?.def.alwaysShowWeapon ?? false);  // Copied from PawnRenderer.CarryWeaponOpenly(), we show the shield whenever weapons are drawn
+        private bool drawShield => this.def.apparel.renderNodeProperties.NullOrEmpty() && (Wearer.Drafted || (Wearer.CurJob?.def.alwaysShowWeapon ?? false) || (Wearer.mindState.duty?.def.alwaysShowWeapon ?? false));  // Copied from PawnRenderer.CarryWeaponOpenly(), we show the shield whenever weapons are drawn
         private bool IsTall => def.GetModExtension<ShieldDefExtension>()?.drawAsTall ?? false;
 
+        public override void PostMake()
+        {
+            base.PostMake();
+            if (this.def.apparel.renderNodeProperties.NullOrEmpty())
+            {
+                Log.WarningOnce($"{def.defName} using obsolete render system", def.defName.GetHashCodeSafe());
+            }
+        }
 
         public override bool AllowVerbCast(Verb verb)
         {