v1.18.1.1 (12/30/17)

v1.18.1.1 (12/30/17) + Fixed GeneticRim issue. + Fixed odd bug with blood loss while resting.
Rim-Of-Madness-Team · Dec 30, 2017 · a50cd4e · a50cd4e
1 parent c8d6092
commit a50cd4e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -4,7 +4,7 @@
 	<name>Rim of Madness - Vampires</name>
 	<author>Jecrell</author>
 	<targetVersion>0.18.0</targetVersion>
-	<description>V1.18.1.0
+	<description>V1.18.1.1
     Adds vampires to RimWorld.
 
 		Heavily inspired by Vampire the Masquerade, this mod introduces a disease known as vampirism.

diff --git a/Assemblies/Vampire.dll b/Assemblies/Vampire.dll
diff --git a/Source/.vs/Vampire/v15/.suo b/Source/.vs/Vampire/v15/.suo
diff --git a/Source/Vampires/HarmonyPatches/HarmonyPatches.cs b/Source/Vampires/HarmonyPatches/HarmonyPatches.cs
@@ -59,7 +59,13 @@ static HarmonyPatches()
 
 
             //Patches all JobGivers to consider sunlight for vampires before they do them.
-            var listOfJobGivers = (from domainAssembly in AppDomain.CurrentDomain.GetAssemblies()
+            var listOfJobGivers = (from domainAssembly in AppDomain.CurrentDomain.GetAssemblies().Where(
+                x => x.GetName().Name != "Harmony" &&
+                     x.GetName().Name != "DraftingPatcher" &&
+                     x.GetName().Name != "AnimalRangedVerbsUnlocker" &&
+                     x.GetName().Name != "ExplosionTypes" &&
+                     x.GetName().Name != "NewAnimalSubproducts" &&
+                     x.GetName().Name != "NewHatcher")
                 from assemblyType in domainAssembly.GetTypes()
                 where typeof(ThinkNode_JobGiver).IsAssignableFrom(assemblyType)
                 select assemblyType).ToArray();
@@ -83,7 +89,13 @@ where typeof(ThinkNode_JobGiver).IsAssignableFrom(assemblyType)
                 }
             }
             //Patches all JoyGivers to consider sunlight for vampires before they do them.
-            var listOfJoyGivers = (from domainAssembly in AppDomain.CurrentDomain.GetAssemblies()
+            var listOfJoyGivers = (from domainAssembly in AppDomain.CurrentDomain.GetAssemblies().Where(
+                    x => x.GetName().Name != "Harmony" &&
+                         x.GetName().Name != "DraftingPatcher" &&
+                         x.GetName().Name != "AnimalRangedVerbsUnlocker" &&
+                         x.GetName().Name != "ExplosionTypes" &&
+                         x.GetName().Name != "NewAnimalSubproducts" &&
+                         x.GetName().Name != "NewHatcher")
                 from assemblyType in domainAssembly.GetTypes()
                 where typeof(JoyGiver).IsAssignableFrom(assemblyType)
                 select assemblyType).ToArray();
@@ -108,7 +120,13 @@ where typeof(JoyGiver).IsAssignableFrom(assemblyType)
             }
 
             //Patches all JoyGivers to consider sunlight for vampires before they do them.
-            var listOfWorkGivers = (from domainAssembly in AppDomain.CurrentDomain.GetAssemblies()
+            var listOfWorkGivers = (from domainAssembly in AppDomain.CurrentDomain.GetAssemblies().Where(
+                    x => x.GetName().Name != "Harmony" &&
+                         x.GetName().Name != "DraftingPatcher" &&
+                         x.GetName().Name != "AnimalRangedVerbsUnlocker" &&
+                         x.GetName().Name != "ExplosionTypes" &&
+                         x.GetName().Name != "NewAnimalSubproducts" &&
+                         x.GetName().Name != "NewHatcher")
                 from assemblyType in domainAssembly.GetTypes()
                 where typeof(WorkGiver).IsAssignableFrom(assemblyType)
                 select assemblyType).ToArray();
@@ -318,8 +336,8 @@ where typeof(WorkGiver).IsAssignableFrom(assemblyType)
             harmony.Patch(AccessTools.Method(typeof(Pawn), "MakeCorpse"),
                 new HarmonyMethod(typeof(HarmonyPatches), nameof(Vamp_MakeCorpse)), null);
             //Makes vampires use one blood point to be forced awake from slumber.
-            harmony.Patch(AccessTools.Method(typeof(Pawn_JobTracker), "EndCurrentJob"),
-                new HarmonyMethod(typeof(HarmonyPatches), nameof(Vamp_EndCurrentJob)), null);
+//            harmony.Patch(AccessTools.Method(typeof(Pawn_JobTracker), "EndCurrentJob"),
+//                new HarmonyMethod(typeof(HarmonyPatches), nameof(Vamp_EndCurrentJob)), null);
             //Vampires should tire very much during the daylight hours.
             harmony.Patch(AccessTools.Method(typeof(Need_Rest), "NeedInterval"), null,
                 new HarmonyMethod(typeof(HarmonyPatches), nameof(Vamp_SleepyDuringDaylight)));