diff --git a/1.4/Assemblies/PickUpAndHaul.dll b/1.4/Assemblies/PickUpAndHaul.dll index 3af51f6..2573e59 100644 Binary files a/1.4/Assemblies/PickUpAndHaul.dll and b/1.4/Assemblies/PickUpAndHaul.dll differ diff --git a/Source/PickUpAndHaul/CompatHelper.cs b/Source/PickUpAndHaul/CompatHelper.cs index 6547d26..bd4641e 100644 --- a/Source/PickUpAndHaul/CompatHelper.cs +++ b/Source/PickUpAndHaul/CompatHelper.cs @@ -4,20 +4,20 @@ internal class CompatHelper { public static bool CeOverweight(Pawn pawn) { - return false; - //var ceCompInventory = pawn.GetComp(); - //return (ceCompInventory.currentWeight / ceCompInventory.capacityWeight) >= Settings.MaximumOccupiedCapacityToConsiderHauling; + //return false; + var ceCompInventory = pawn.GetComp(); + return (ceCompInventory.currentWeight / ceCompInventory.capacityWeight) >= Settings.MaximumOccupiedCapacityToConsiderHauling; } public static int CanFitInInventory(Pawn pawn, Thing thing) { - return thing.stackCount; - //pawn.GetComp().CanFitInInventory(thing, out var countToPickUp); - //return countToPickUp; + //return thing.stackCount; + pawn.GetComp().CanFitInInventory(thing, out var countToPickUp); + return countToPickUp; } internal static void UpdateInventory(Pawn pawn) { - //pawn.GetComp().UpdateInventory(); + pawn.GetComp().UpdateInventory(); } } \ No newline at end of file diff --git a/Source/PickUpAndHaul/PickUpAndHaul.csproj b/Source/PickUpAndHaul/PickUpAndHaul.csproj index 5cb17c5..aae37db 100644 --- a/Source/PickUpAndHaul/PickUpAndHaul.csproj +++ b/Source/PickUpAndHaul/PickUpAndHaul.csproj @@ -22,10 +22,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + + ..\..\..\2890901044\Assemblies\CombatExtended.dll + False + ..\..\1.4\Assemblies\IHoldMultipleThings.dll