Skip to content

[Animal Husbandry] Respect ExcludeFromShippingCollection if set #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zombifier wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Animal Husbandry] Respect ExcludeFromShippingCollection if set #326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d01b9df
Respect ExcludeFromShippingCollection if set
zombifier Jan 10, 2026
c534ec8
also patch isPotentialBasicShipped
zombifier Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ButcherMod/meats/MeatOverrides.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ public static bool sellToStorePrice(SObject __instance, ref int __result)
num = Math.Max(1f, num * Game1.MasterPlayer.difficultyModifier);
}
__result = (int)num;
return false;
return false;
}
return true;
return true;
}

public static bool isPotentialBasicShipped(ref int category, ref bool __result)
public static bool isPotentialBasicShipped(string itemId, ref int category, ref bool __result)
{
if (category == -14)
if (category == -14
&& Game1.objectData.TryGetValue(itemId, out var objectData)
&& !objectData.ExcludeFromShippingCollection)
{
__result = true;
return false;
Expand All @@ -43,7 +45,9 @@ public static bool isPotentialBasicShipped(ref int category, ref bool __result)

public static bool countsForShippedCollection(SObject __instance, ref bool __result)
{
if (__instance.Category == -14)
if (__instance.Category == -14
&& Game1.objectData.TryGetValue(__instance.ItemId, out var objectData)
&& !objectData.ExcludeFromShippingCollection)
{
__result = true;
return false;
Expand Down