Removed exit and entrance entries

master
Mohammad Shoaib Khan 2022-11-07 20:27:11 +05:30
parent ec7148e613
commit fe03dfb46e
No known key found for this signature in database
GPG Key ID: 3EE32C9DFF520699
3 changed files with 3 additions and 639 deletions

View File

@ -432,9 +432,7 @@ namespace stardew_access.Features
} }
else if (Game1.currentLocation is FarmHouse farmHouse) else if (Game1.currentLocation is FarmHouse farmHouse)
{ {
if (farmHouse.getEntryLocation().X == x && farmHouse.getEntryLocation().Y == y) if (farmHouse.upgradeLevel >= 1)
return (CATEGORY.Doors, "Exit");
else if (farmHouse.upgradeLevel >= 1)
if (farmHouse.getKitchenStandingSpot().X == x && (farmHouse.getKitchenStandingSpot().Y - 1) == y) // Standing spot is where the player will stand if (farmHouse.getKitchenStandingSpot().X == x && (farmHouse.getKitchenStandingSpot().Y - 1) == y) // Standing spot is where the player will stand
return (CATEGORY.Interactables, "Kitchen"); return (CATEGORY.Interactables, "Kitchen");
else if (farmHouse.fridgePosition.X == x && farmHouse.fridgePosition.Y == y) else if (farmHouse.fridgePosition.X == x && farmHouse.fridgePosition.Y == y)
@ -442,9 +440,7 @@ namespace stardew_access.Features
} }
else if (Game1.currentLocation is IslandFarmHouse islandFarmHouse) else if (Game1.currentLocation is IslandFarmHouse islandFarmHouse)
{ {
if (x == 14 && y == 17) if ((islandFarmHouse.fridgePosition.X - 1) == x && islandFarmHouse.fridgePosition.Y == y)
return (CATEGORY.Doors, "Exit");
else if ((islandFarmHouse.fridgePosition.X - 1) == x && islandFarmHouse.fridgePosition.Y == y)
return (CATEGORY.Interactables, "Kitchen"); return (CATEGORY.Interactables, "Kitchen");
else if (islandFarmHouse.fridgePosition.X == x && islandFarmHouse.fridgePosition.Y == y) else if (islandFarmHouse.fridgePosition.X == x && islandFarmHouse.fridgePosition.Y == y)
return (CATEGORY.Interactables, "Fridge"); return (CATEGORY.Interactables, "Fridge");

View File

@ -228,7 +228,7 @@ namespace stardew_access.Patches
!__instance.Farmer.seasonForSaveGame.HasValue || !__instance.Farmer.seasonForSaveGame.HasValue ||
!__instance.Farmer.yearForSaveGame.HasValue) ? __instance.Farmer.dateStringForSaveGame : Utility.getDateStringFor(__instance.Farmer.dayOfMonthForSaveGame.Value, __instance.Farmer.seasonForSaveGame.Value, __instance.Farmer.yearForSaveGame.Value)); !__instance.Farmer.yearForSaveGame.HasValue) ? __instance.Farmer.dateStringForSaveGame : Utility.getDateStringFor(__instance.Farmer.dayOfMonthForSaveGame.Value, __instance.Farmer.seasonForSaveGame.Value, __instance.Farmer.yearForSaveGame.Value));
string toSpeak = $"{farmName} Farm Selected, \t\n Farmer:{farmerName}, \t\nMoney:{money}, \t\nHours Played:{hoursPlayed}, \t\nDate:{dateStringForSaveGame}"; string toSpeak = $"{farmName} Farm Selected, \t\n Farmer: {farmerName}, \t\nMoney: {money}, \t\nHours Played: {hoursPlayed}, \t\nDate: {dateStringForSaveGame}";
MainClass.ScreenReader.SayWithChecker(toSpeak, true); MainClass.ScreenReader.SayWithChecker(toSpeak, true);
#endregion #endregion

File diff suppressed because it is too large Load Diff