Friendly animals who are blocking shooters will have their name label…

… shown in green, even if animal labels are off.
Falconne · Mar 15, 2019 · c71a998 · c71a998
1 parent 29f901f
commit c71a998
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/src/AvoidFriendlyFire/AvoidFriendlyFire.csproj b/src/AvoidFriendlyFire/AvoidFriendlyFire.csproj
@@ -54,6 +54,7 @@
     <Compile Include="FireProperties.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="Patches\AttackTargetFinder_BestAttackTarget_Patch.cs" />
+    <Compile Include="Patches\PawnUIOverlay_DrawPawnGUIOverlay_Patch.cs" />
     <Compile Include="Patches\TooltipUtility_ShotCalculationTipString_Patch.cs" />
     <Compile Include="Patches\PawnNameColorUtility_PawnNameColorOf_Patch.cs" />
     <Compile Include="Patches\Pawn_DraftController_GetGizmos_Patch.cs" />

diff --git a/src/AvoidFriendlyFire/Patches/PawnUIOverlay_DrawPawnGUIOverlay_Patch.cs b/src/AvoidFriendlyFire/Patches/PawnUIOverlay_DrawPawnGUIOverlay_Patch.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using Harmony;
+using UnityEngine;
+using Verse;
+
+namespace AvoidFriendlyFire
+{
+    [HarmonyPatch(typeof(PawnUIOverlay), "DrawPawnGUIOverlay")]
+    public class PawnUIOverlay_DrawPawnGUIOverlay_Patch
+    {
+        private static readonly FieldInfo _pawnGetter =
+            typeof(PawnUIOverlay).GetField("pawn", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        public static bool Prefix(ref PawnUIOverlay __instance)
+        {
+            var pawn = (Pawn) _pawnGetter.GetValue(__instance);
+            if (!pawn.Spawned || pawn.Map.fogGrid.IsFogged(pawn.Position))
+            {
+                return false;
+            }
+
+            if (pawn.RaceProps.Humanlike || pawn.Name == null)
+                return true;
+
+            if (!Main.Instance.PawnStatusTracker.IsABlocker(pawn))
+                return true;
+
+            Vector2 pos = GenMapUI.LabelDrawPosFor(pawn, -0.6f);
+            GenMapUI.DrawPawnLabel(pawn, pos);
+
+            return false;
+        }
+    }
+}
diff --git a/src/AvoidFriendlyFire/Properties/AssemblyInfo.cs b/src/AvoidFriendlyFire/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]