- Fixed fuel waste when forced-refuelling a non-empty building.

jptrrs · Jan 19, 2020 · c99d449 · c99d449
1 parent 2576444
commit c99d449
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Assemblies/BurnItForFuel.dll b/Assemblies/BurnItForFuel.dll
diff --git a/Source/CompSelectFuel.cs b/Source/CompSelectFuel.cs
@@ -137,5 +137,6 @@ public override IEnumerable<Gizmo> CompGetGizmosExtra()
             }
             yield break;
         }
+
     }
 }
diff --git a/Source/HarmonyPatch.cs b/Source/HarmonyPatch.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using UnityEngine;
 using Verse;
 using Verse.AI;
 
@@ -25,6 +26,10 @@ static HarmonyPatches()
 
             harmonyInstance.Patch(original: AccessTools.Method(type: typeof(RefuelWorkGiverUtility), name: "FindAllFuel"),
                 prefix: null, postfix: new HarmonyMethod(type: patchType, name: nameof(FindAllFuel_Postfix)), transpiler: null);
+
+            harmonyInstance.Patch(original: AccessTools.Method(type: typeof(CompRefuelable), name: "GetFuelCountToFullyRefuel"),
+                prefix: null, postfix: new HarmonyMethod(type: patchType, name: nameof(GetFuelCountToFullyRefuel_Postfix)), transpiler: null);
+
         }
 
         public static void CanRefuel_Postfix(object __instance, Pawn pawn, Thing t, bool forced, ref bool __result)
@@ -85,6 +90,7 @@ public static void FindBestFuel_Postfix(Pawn pawn, Thing refuelable, ref Thing _
 
         private static Thing FindBestFuel(Pawn pawn, Thing refuelable)
         {
+            //Log.Message("FindBestFuel_Postfix for: "+refuelable);
             ThingFilter filter = new ThingFilter();
             filter = refuelable.TryGetComp<CompSelectFuel>().fuelSettings.filter;
             Predicate<Thing> predicate = (Thing x) => !x.IsForbidden(pawn) && pawn.CanReserve(x, 1, -1, null, false) && filter.Allows(x);
@@ -107,7 +113,8 @@ public static void FindAllFuel_Postfix(Pawn pawn, Thing refuelable, ref List<Thi
 
         private static List<Thing> FindAllFuel(Pawn pawn, Thing refuelable)
         {
-            int quantity = refuelable.TryGetComp<CompRefuelable>().GetFuelCountToFullyRefuel();
+            CompRefuelable comp = refuelable.TryGetComp<CompRefuelable>();
+            int quantity = GetFuelCountToFullyRefuel(comp);
             ThingFilter filter = new ThingFilter();
             filter = refuelable.TryGetComp<CompSelectFuel>().fuelSettings.filter;
             Predicate<Thing> validator = (Thing x) => !x.IsForbidden(pawn) && pawn.CanReserve(x, 1, -1, null, false) && filter.Allows(x);
@@ -148,5 +155,16 @@ private static List<Thing> FindAllFuel(Pawn pawn, Thing refuelable)
             }
             return null;
         }
+
+        public static void GetFuelCountToFullyRefuel_Postfix(CompRefuelable __instance, ref int __result)
+        {
+            __result = GetFuelCountToFullyRefuel(__instance);
+        }
+
+        public static int GetFuelCountToFullyRefuel(CompRefuelable __instance)
+        {
+            float f = (__instance.TargetFuelLevel - __instance.Fuel) / __instance.Props.FuelMultiplierCurrentDifficulty;
+            return Mathf.Max(Mathf.CeilToInt(f), 1);
+        }
     }
 }
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.3")]