Merge pull request #11 from TrueBlindGaming/master

fix for busy stones..mostly
master
Mohammad Shoaib 2022-03-20 12:10:12 +05:30 committed by GitHub
commit b3bad018dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions

View File

@ -342,7 +342,7 @@ namespace stardew_access.Features
if (name != null && communityCenter.shouldNoteAppearInArea(CommunityCenter.getAreaNumberFromName(name))) if (name != null && communityCenter.shouldNoteAppearInArea(CommunityCenter.getAreaNumberFromName(name)))
return $"{name} bundle"; return $"{name} bundle";
} }
else if (Game1.currentLocation is not AbandonedJojaMart) else if (Game1.currentLocation is AbandonedJojaMart)
{ {
name = (x, y) switch name = (x, y) switch
{ {
@ -687,12 +687,13 @@ namespace stardew_access.Features
if (obj is Furniture) if (obj is Furniture)
toReturn.category = CATEGORY.Furnitures; toReturn.category = CATEGORY.Furnitures;
MachineState machineState = GetMachineState(obj); if(toReturn.category == CATEGORY.Others) {
if (machineState == MachineState.Ready) MachineState machineState = GetMachineState(obj);
toReturn.name = $"Harvestable {toReturn.name}"; if (machineState == MachineState.Ready)
else if (machineState == MachineState.Busy) toReturn.name = $"Harvestable {toReturn.name}";
toReturn.name = $"Busy {toReturn.name}"; else if (machineState == MachineState.Busy)
toReturn.name = $"Busy {toReturn.name}";
}
return toReturn; return toReturn;
} }
@ -837,7 +838,7 @@ namespace stardew_access.Features
return (null, CATEGORY.Others); return (null, CATEGORY.Others);
} }
#endregion #endregion
public static bool isMineDownLadderAtTile(int x, int y) public static bool isMineDownLadderAtTile(int x, int y)
{ {