Merge pull request #875 from zymex22/issue869

fixed biotech messing with drone skills

Author: Sn1p3rr3c0n

Source/ProjectRimFactory/Common/HarmonyPatches/Patch_Pawn_get_IsColonyMech.cs

@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using System.Reflection.Emit;
+using HarmonyLib;
+using ProjectRimFactory.Drones;
+using Verse;
+
+namespace ProjectRimFactory.Common.HarmonyPatches;
+
+[HarmonyPatch (typeof(Pawn), "get_IsColonyMech")]
+// ReSharper disable once InconsistentNaming
+// Required for Drone Skills to function property
+// get_IsColonyMech checks if a Pawn is Mechanoid and controlled by the Play but NOT if it is a Biotech Mech
+// BUT it is used as IF that where the case. requiring this patch 
+public class Patch_Pawn_get_IsColonyMech
+{
+
+    private static bool foundReturnFalsePointer;
+    private static object returnFalsePointer;
+    private static int referencePointCnt;
+    private static bool foundReferencePoint;
+
+    // ReSharper disable once UnusedMember.Local
+    static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+    {
+        
+        foreach (var instruction in instructions)
+        {
+            // Get the Return False Pointer
+            if (!foundReturnFalsePointer && instruction.opcode == OpCodes.Brfalse_S)
+            {
+                foundReturnFalsePointer = true;
+                returnFalsePointer = instruction.operand;
+            }
+
+            // Find the get_MentalStateDef() Check (we want to be inserted right after that)
+            if (!foundReferencePoint && foundReturnFalsePointer &&
+                instruction.operand?.ToString() == "Verse.MentalStateDef get_MentalStateDef()")
+            {
+                foundReferencePoint = true;
+            }
+
+            if (foundReferencePoint) referencePointCnt++;
+            
+            if (foundReferencePoint && referencePointCnt == 3)
+            {
+                // now we want to insert a check if the pawn is Pawn_Drone
+                // For maximum performance fully inlined IL
+                // 5 additional instructions
+                yield return new CodeInstruction(OpCodes.Ldarg_0);
+                yield return new CodeInstruction(OpCodes.Isinst, typeof(Pawn_Drone));
+                yield return new CodeInstruction(OpCodes.Ldnull);
+                yield return new CodeInstruction(OpCodes.Cgt_Un);
+                
+                yield return new CodeInstruction(OpCodes.Brtrue_S, returnFalsePointer);
+                
+            }
+            
+            
+            
+            yield return instruction;
+        }
+    }
+}

Source/ProjectRimFactory/Drones/Building_WorkGiverDroneStation.cs

@@ -9,12 +9,10 @@ namespace ProjectRimFactory.Drones
 {
     public abstract class Building_WorkGiverDroneStation : Building_DroneStation
     {
-        public virtual IEnumerable<WorkTypeDef> WorkTypes => DefModExtensionDroneStation.workTypes;
+        public Dictionary<WorkTypeDef, bool> WorkSettingsDict => WorkSettings;
 
-        public virtual Dictionary<WorkTypeDef, bool> WorkSettingsDict => WorkSettings;
 
-
-        private Pawn_WorkSettings workSettings = null;
+        private Pawn_WorkSettings workSettings;
 
 
         //Try give Job to Spawned drone

Source/ProjectRimFactory/Drones/DroneSkills.cs

@@ -5,7 +5,7 @@
 
 namespace ProjectRimFactory.Drones
 {
-    class DroneSkills
+    internal static class DroneSkills
     {
         /// <summary>
         /// 
@@ -53,7 +53,7 @@ public static List<SkillRecord> UpdateSkills(Pawn_SkillTracker skill, List<Skill
                     continue;
                 }
 
-                record.levelInt = ReserchSkillModifier.GetResearchSkillLevel(); //No Settings Found use the Reserch Directly
+                record.levelInt = ReserchSkillModifier.GetResearchSkillLevel(); //No Settings Found use the Research Directly
 
             }
 

Source/ProjectRimFactory/Drones/Pawn_Drone.cs

@@ -1,5 +1,4 @@
 using ProjectRimFactory.Common;
-using ProjectRimFactory.SAL3;
 using ProjectRimFactory.SAL3.Tools;
 using RimWorld;
 using Verse;