From 3b7637b977543f36ad04a3fa3b0e67e4a01c58c2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 16 Nov 2021 22:13:27 -0800 Subject: [PATCH] potential fix to raw milk drink --- .../1.3/Assemblies/CRIALactation.dll | Bin 23552 -> 23552 bytes CRIALactation/CRIALactation.csproj | 5 ++++- .../HarmonyPatch_FoodUtility.cs | 12 +++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index 365a7dbac4acb1df6f2374e3e6c462a9035c9850..4e80b339d5704d910a4314b627b5866b604c739e 100644 GIT binary patch delta 6490 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 Tocs?ZC)Rd_Z~8*CU*`FL+`r&w delta 6554 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 diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj index 30d9d7e..7ee399b 100644 --- a/CRIALactation/CRIALactation.csproj +++ b/CRIALactation/CRIALactation.csproj @@ -95,10 +95,13 @@ - + + + + diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs index 5942f09..3691ad9 100644 --- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs @@ -21,7 +21,7 @@ namespace CRIALactation } [HarmonyPatch(typeof(FoodUtility), "ThoughtsFromIngesting")] - public static void Postfix(ref List __result, Pawn ingester, Thing foodSource, ThingDef foodDef) + public static void Prefix(Pawn ingester, Thing foodSource, ThingDef foodDef) { if (ingester.Ideo != null) @@ -42,9 +42,15 @@ namespace CRIALactation MeatSourceCategory meatSourceCategory = FoodUtility.GetMeatSourceCategory(ingredient); - if(ingredient == ThingDefOf_Milk.HumanoidMilk || ingredient == ThingDefOf_Milk.HumanMilk) + if (ingester.Ideo != null) { - AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkMeal, ingester, ingredient, meatSourceCategory); + + if (ingredient == ThingDefOf_Milk.HumanoidMilk || ingredient == ThingDefOf_Milk.HumanMilk) + { + AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkMeal, ingester, ingredient, meatSourceCategory); + } + + } }