diff --git a/1.2/Assemblies/AchtungMod.dll b/1.2/Assemblies/AchtungMod.dll index 51c0e7c..f4e82f4 100644 Binary files a/1.2/Assemblies/AchtungMod.dll and b/1.2/Assemblies/AchtungMod.dll differ diff --git a/Source/Main.cs b/Source/Main.cs index 5e7ec13..5bc050a 100644 --- a/Source/Main.cs +++ b/Source/Main.cs @@ -420,8 +420,9 @@ public static int GetPriority(Pawn pawn, WorkTypeDef w) return pawn.workSettings.GetPriority(w); } - static bool IgnoreForbiddenHauling(WorkGiver_Scanner workgiver) + static bool IgnoreForbiddenHauling(WorkGiver_Scanner workgiver, Thing thing) { + if (workgiver is WorkGiver_Haul && thing.def.alwaysHaulable == false && thing.def.EverHaulable == false) return false; if (Achtung.Settings.ignoreForbidden == false) return false; return workgiver.Ignorable(); } @@ -436,7 +437,7 @@ public static IEnumerable Transpiler(IEnumerable c.GetParameters().Count() > 1); var m_ForcedFloatMenuOption = AccessTools.Method(typeof(ForcedFloatMenuOption), createForcedMenuItemName); var m_Accepts = SymbolExtensions.GetMethodInfo(() => new ThingRequest().Accepts(default)); - var m_IgnoreForbiddenHauling = SymbolExtensions.GetMethodInfo(() => IgnoreForbiddenHauling(default)); + var m_IgnoreForbiddenHauling = SymbolExtensions.GetMethodInfo(() => IgnoreForbiddenHauling(default, default)); var list = instructions.ToList(); @@ -445,6 +446,7 @@ public static IEnumerable Transpiler(IEnumerable Transpiler(IEnumerable