Merge pull request #1 from RimWorldMod/A17-patch

merge A17 patch into master

Author: GHXX

Detour.cs

@@ -10,15 +10,13 @@ namespace TechAdvancing
 {
     class Detour
     {
-        public static void detour(MethodInfo source, MethodInfo target)
+        public static void DoDetour(MethodInfo source, MethodInfo target)
         {
-            //Log.Message("GHXX Techadvancing: Attempting detour: " + source.Name + " -- TO -> " + target.Name);
+            if (LogOutput.DebugMode_TA_enabled) { LogOutput.WriteLogMessage(Errorlevel.Warning, "DEBUG MODE ACTIVATED"); }            
+
             MethodInfo methodToReplace = target;
-            if (LogOutput.DebugMode_TA_enabled) { LogOutput.writeLogMessage(Errorlevel.Warning, "DEBUG MODE ACTIVATED"); }
-            //typeof(Target).GetMethod("targetMethod" + funcNum, BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
-            MethodInfo methodToInject = source;
+            MethodInfo methodToInject = source;            
 
-            //typeof(Injection).GetMethod("injectionMethod" + funcNum, BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
             RuntimeHelpers.PrepareMethod(methodToReplace.MethodHandle);
             RuntimeHelpers.PrepareMethod(methodToInject.MethodHandle);
 
@@ -53,11 +51,11 @@ public static void detour(MethodInfo source, MethodInfo target)
                 {
                     // 32-bit systems use 32-bit relative offset and jump
                     // 5 byte destructive
-                    
+
                     // Get function pointers
                     int Source_Base = source.MethodHandle.GetFunctionPointer().ToInt32();
                     int Destination_Base = target.MethodHandle.GetFunctionPointer().ToInt32();
-                    
+
                     // Native source address
                     byte* Pointer_Raw_Source = (byte*)Source_Base;
 
@@ -74,8 +72,6 @@ public static void detour(MethodInfo source, MethodInfo target)
 
 
             }
-            //Log.Message("GHXX Techadvancing: Detour complete: " + source.Name + " -- TO -> " + target.Name);
-            //return true;
         }
     }
 }

Extensions.cs

@@ -6,7 +6,6 @@
 using Verse;
 using UnityEngine;
 using TechAdvancing;
-using GHXXTechAdvancing;
 using Harmony;
 using Verse.Sound;
 using System.Reflection;
@@ -17,10 +16,9 @@ public static class Extensions
     {
         public static string TranslateOrDefault(this string x,string fallback = null, string Prefix = null)
         {
-            string retvar = "";
-            if ((Prefix+x).TryTranslate(out retvar))
+            if ((Prefix + x).TryTranslate(out string retvar))
             {
-                return retvar;  
+                return retvar;
             }
             return fallback??(Prefix+x);
         }

HarmonyDetours.cs

@@ -0,0 +1,93 @@
+using Harmony;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using UnityEngine;
+using Verse;
+using Verse.Sound;
+
+namespace TechAdvancing
+{
+    /// <summary>
+    /// Class storing all the detours and the detour call.
+    /// </summary>
+    class HarmonyDetours
+    {
+        /// <summary>
+        /// Method for performing all the detours via Harmony.
+        /// </summary>
+        public static void Setup()
+        {
+            var harmony = HarmonyInstance.Create("com.ghxx.rimworld.techadvancing");
+            harmony.PatchAll(Assembly.GetExecutingAssembly());
+        }
+    }
+
+    /// <summary>
+    /// Prefix for adding the button below the progressbar of the research window. The button is used for opening the config screen.
+    /// </summary>
+    [HarmonyPatch(typeof(RimWorld.MainTabWindow_Research))]
+    [HarmonyPatch("DrawLeftRect")]
+    [HarmonyPatch(new Type[] { typeof(Rect) })]
+    class TA_Research_Menu_Patch
+    {
+        static void Prefix(Rect leftOutRect)
+        {
+            Rect TA_Cfgrect = new Rect(0f, 0f, 180f, 20f);
+            TA_Cfgrect.x = (leftOutRect.width - TA_Cfgrect.width) / 2f;
+            TA_Cfgrect.y = leftOutRect.height - 20f;
+
+            if (Widgets.ButtonText(TA_Cfgrect, "TAcfgmenulabel".Translate(), true, false, true))
+            {
+                SoundDef.Named("ResearchStart").PlayOneShotOnCamera();
+                Find.WindowStack.Add((Window)new TechAdvancing_Config_Tab());
+            }
+        }
+    }
+
+    /// <summary>
+    /// Patch for having a method called when a pawn dies.
+    /// </summary>
+    [HarmonyPatch(typeof(Verse.Pawn))]
+    [HarmonyPatch("Kill")]
+    [HarmonyPatch(new Type[] { typeof(DamageInfo?) })]
+    class TA_OnKill_Event
+    {
+        static void Postfix(Pawn __instance, DamageInfo? dinfo)
+        {
+            TechAdvancing.Event.OnKill(__instance);
+        }
+    }
+
+    /// <summary>
+    /// Patch for getting notified about faction changes. E.g.: when a pawn joins the colony.
+    /// </summary>
+    [HarmonyPatch(typeof(Verse.Pawn))]
+    [HarmonyPatch("SetFaction")]
+    [HarmonyPatch(new Type[] { typeof(Faction), typeof(Pawn) })]
+    class TA_OnNewPawn_Event
+    {
+        static void Prefix(Pawn __instance, Faction newFaction, Pawn recruiter = null)
+        {
+            TechAdvancing.Event.OnNewPawn(__instance);
+        }
+    }
+
+    /// <summary>
+    /// Postfix Patch for getting to know the new faction.
+    /// </summary>
+    [HarmonyPatch(typeof(Verse.Pawn))]
+    [HarmonyPatch("SetFaction")]
+    [HarmonyPatch(new Type[] { typeof(Faction), typeof(Pawn) })]
+    class TA_PostOnNewPawn_Event
+    {
+        static void Postfix(Faction newFaction, Pawn recruiter = null)
+        {
+            TechAdvancing.Event.PostOnNewPawn();
+        }
+    }
+
+}

LogOutput.cs

@@ -8,14 +8,24 @@
 
 namespace TechAdvancing
 {
+    /// <summary>
+    /// Class for writing log messages easily.
+    /// </summary>
     class LogOutput
     {
-
+#if DEBUG 
+        public static readonly bool DebugMode_TA_enabled = true;
+#else
         public static readonly bool DebugMode_TA_enabled = false;
-
-        public static void writeLogMessage(Errorlevel level, string message)
+#endif
+        /// <summary>
+        /// Sends a new colored log message.
+        /// </summary>
+        /// <param name="level">The severity level.</param>
+        /// <param name="message">The message to write.</param>
+        public static void WriteLogMessage(Errorlevel level, string message)
         {
-            if((level == Errorlevel.Debug && DebugMode_TA_enabled)|| level == Errorlevel.Information)
+            if ((level == Errorlevel.Debug && DebugMode_TA_enabled) || level == Errorlevel.Information)
             {
                 Log.Message("[Tech Advancing] [" + level.ToString() + "] " + message);
             }
@@ -25,13 +35,16 @@ public static void writeLogMessage(Errorlevel level, string message)
             }
             else if (level == Errorlevel.Error || level == Errorlevel.Critical)
             {
-                Log.Warning("[Tech Advancing] [" + level.ToString() + "] " + message);
+                Log.Error("[Tech Advancing] [" + level.ToString() + "] " + message);
             }
         }
 
 
     }
 
+    /// <summary>
+    /// Represents the available severity levels.
+    /// </summary>
     public enum Errorlevel
     {
         Debug,