Skip to content

Fix crop count inflation on non-farm locations #41

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
ktiedt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crop count inflation on non-farm locations #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions Stardew Valley Expanded/StardewValleyExpanded/HarmonyPatch_FarmComputerLocations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,13 @@ public static void ApplyPatch(Harmony harmony, IMonitor monitor)
public static List<string> GreenhouseLocations = ["Custom_GrandpasShedGreenhouse"];

/// <summary>Adds any extra farm locations' crops to this method's total.</summary>
/// <param name="__instance">The calling location instance.</param>
/// <param name="__result">The result of the original method.</param>
private static void Farm_getTotalCrops(ref int __result)
private static void Farm_getTotalCrops(GameLocation __instance, ref int __result)
{
if (__instance is not Farm)
return;

try
{
foreach (string name in FarmLocations) // for each extra farm location
Expand Down Expand Up @@ -114,9 +118,13 @@ private static void Farm_getTotalCrops(ref int __result)
}

/// <summary>Adds any extra farm locations' crops to this method's total.</summary>
/// <param name="__instance">The calling location instance.</param>
/// <param name="__result">The result of the original method.</param>
private static void Farm_getTotalCropsReadyForHarvest(ref int __result)
private static void Farm_getTotalCropsReadyForHarvest(GameLocation __instance, ref int __result)
{
if (__instance is not Farm)
return;

try
{
foreach (string name in FarmLocations) // for each extra farm location
Expand Down Expand Up @@ -148,9 +156,13 @@ private static void Farm_getTotalCropsReadyForHarvest(ref int __result)
}

/// <summary>Adds any extra farm locations' crops to this method's total.</summary>
/// <param name="__instance">The calling location instance.</param>
/// <param name="__result">The result of the original method.</param>
private static void Farm_getTotalUnwateredCrops(ref int __result)
private static void Farm_getTotalUnwateredCrops(GameLocation __instance, ref int __result)
{
if (__instance is not Farm)
return;

try
{
foreach (string name in FarmLocations) // for each extra farm location
Expand Down Expand Up @@ -182,9 +194,13 @@ private static void Farm_getTotalUnwateredCrops(ref int __result)
}

/// <summary>Adds any extra farm locations' crops to this method's total.</summary>
/// <param name="__instance">The calling location instance.</param>
/// <param name="__result">The result of the original method.</param>
private static void Farm_getTotalOpenHoeDirt(ref int __result)
private static void Farm_getTotalOpenHoeDirt(GameLocation __instance, ref int __result)
{
if (__instance is not Farm)
return;

try
{
foreach (string name in FarmLocations) // for each extra farm location
Expand Down Expand Up @@ -216,9 +232,13 @@ private static void Farm_getTotalOpenHoeDirt(ref int __result)
}

/// <summary>Adds any extra greenhouse locations' crops to this method's total.</summary>
/// <param name="__instance">The calling location instance.</param>
/// <param name="__result">The result of the original method.</param>
private static void Farm_getTotalGreenhouseCropsReadyForHarvest(ref int? __result)
private static void Farm_getTotalGreenhouseCropsReadyForHarvest(GameLocation __instance, ref int? __result)
{
if (__instance is not Farm)
return;

try
{
foreach (string name in GreenhouseLocations) // for each extra greenhouse location
Expand Down