diff --git a/1.3/Assemblies/WhatTheHack.dll b/1.3/Assemblies/WhatTheHack.dll index 01f2f1a..5649fc4 100644 Binary files a/1.3/Assemblies/WhatTheHack.dll and b/1.3/Assemblies/WhatTheHack.dll differ diff --git a/1.3/Source/WhatTheHack/Comps/CompOverlay.cs b/1.3/Source/WhatTheHack/Comps/CompOverlay.cs index 0117721..06b3f1d 100644 --- a/1.3/Source/WhatTheHack/Comps/CompOverlay.cs +++ b/1.3/Source/WhatTheHack/Comps/CompOverlay.cs @@ -51,10 +51,8 @@ public override void PostDraw() base.PostDraw(); Building_RogueAI parent = this.parent as Building_RogueAI; DrawBackground(parent); - Log.Message("postdraw called"); if (ShowEye) { - Log.Message("postdraw called, showEye is true"); DrawEye(parent); } @@ -75,7 +73,6 @@ private void DrawEye(Building_RogueAI parent) drawPosEye.y += 0.046875f; drawPosEye += overlay.offsetDefault; SetAnimationOffset(ref drawPosEye); - Log.Message("draw eye called!"); gdEye.Graphic.Draw(drawPosEye, parent.Rotation, parent, 0f); } diff --git a/1.3/Source/WhatTheHack/Harmony/CaravanFormingUtility.cs b/1.3/Source/WhatTheHack/Harmony/CaravanFormingUtility.cs index cced956..8d98a45 100644 --- a/1.3/Source/WhatTheHack/Harmony/CaravanFormingUtility.cs +++ b/1.3/Source/WhatTheHack/Harmony/CaravanFormingUtility.cs @@ -6,11 +6,32 @@ using System.Linq; using System.Reflection.Emit; using System.Text; +using Verse; +using Verse.AI; using Verse.AI.Group; +using WhatTheHack.Storage; using WhatTheHack.ThinkTree; namespace WhatTheHack.Harmony { + + [HarmonyPatch(typeof(CaravanFormingUtility), "StartFormingCaravan")] + static class CaravanFormingUtility_StartFormingCaravan + { + static void Postfix(List pawns) + { + foreach (var pawn in pawns) + { + if (pawn.IsHacked()) + { + pawn.jobs.EndCurrentJob(JobCondition.InterruptForced, false); + ExtendedPawnData pawnData = Base.Instance.GetExtendedDataStorage().GetExtendedDataFor(pawn); + pawnData.isActive = true; + } + } + } + } + [HarmonyPatch(typeof(CaravanFormingUtility), "AllSendablePawns")] static class CaravanFormingUtility_AllSendablePawns { diff --git a/1.3/Source/WhatTheHack/Harmony/Test.cs b/1.3/Source/WhatTheHack/Harmony/Test.cs deleted file mode 100644 index 2e1f0ec..0000000 --- a/1.3/Source/WhatTheHack/Harmony/Test.cs +++ /dev/null @@ -1,32 +0,0 @@ -using HarmonyLib; -using RimWorld; -using RimWorld.Planet; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Verse; -using Verse.AI; -using WhatTheHack.Storage; - -namespace WhatTheHack.Harmony -{ - - [HarmonyPatch(typeof(CaravanFormingUtility), "StartFormingCaravan")] - static class JobGiver_PrepareCaravan_CollectPawns_AnimalNeedsGathering - { - static void Postfix(List pawns) - { - foreach(var pawn in pawns) - { - if (pawn.IsHacked()) - { - pawn.jobs.EndCurrentJob(JobCondition.InterruptForced, false); - ExtendedPawnData pawnData = Base.Instance.GetExtendedDataStorage().GetExtendedDataFor(pawn); - pawnData.isActive = true; - } - } - } - } -} diff --git a/1.3/Source/WhatTheHack/Harmony/ThingSetMaker_Meteorite.cs b/1.3/Source/WhatTheHack/Harmony/ThingSetMaker_Meteorite.cs index 60f12f5..59721d3 100644 --- a/1.3/Source/WhatTheHack/Harmony/ThingSetMaker_Meteorite.cs +++ b/1.3/Source/WhatTheHack/Harmony/ThingSetMaker_Meteorite.cs @@ -14,7 +14,7 @@ namespace WhatTheHack.Harmony [HarmonyPatch(typeof(ThingSetMaker_Meteorite), "FindRandomMineableDef")] static class ThingSetMaker_Meteorite_FindRandomMineableDef { - static void Postfix(ThingSetMaker_Meteorite __instance, ThingDef __result) + static void Postfix(ThingSetMaker_Meteorite __instance, ref ThingDef __result) { if(__result == WTH_DefOf.WTH_MechanoidParts) { diff --git a/1.3/Source/WhatTheHack/WhatTheHack.csproj b/1.3/Source/WhatTheHack/WhatTheHack.csproj index 6250e0f..cb7b7ac 100644 --- a/1.3/Source/WhatTheHack/WhatTheHack.csproj +++ b/1.3/Source/WhatTheHack/WhatTheHack.csproj @@ -74,7 +74,6 @@ -