From 43c3dbb0d857a73be801e8932d4038dbe757215b Mon Sep 17 00:00:00 2001 From: bradjrenshaw Date: Sun, 8 May 2022 19:22:28 -0400 Subject: [PATCH 1/5] Added diggable golden walnut locations to ginger Island tileInfo. --- stardew-access/Features/TileInfo.cs | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/stardew-access/Features/TileInfo.cs b/stardew-access/Features/TileInfo.cs index fd0862f..8e075b9 100644 --- a/stardew-access/Features/TileInfo.cs +++ b/stardew-access/Features/TileInfo.cs @@ -430,17 +430,24 @@ namespace stardew_access.Features else if (x == 8 && y == 9) return (((!Game1.MasterPlayer.hasOrWillReceiveMail("willyBoatAnchor")) ? CATEGORY.Interactables : CATEGORY.Decor), ((!Game1.MasterPlayer.hasOrWillReceiveMail("willyBoatAnchor")) ? "Repair " : "") + "Boat Anchor"); } - else if (Game1.currentLocation is IslandWest islandWest) + else if (Game1.currentLocation is IslandLocation islandLocation) { - if (islandWest.shippingBinPosition.X == x && islandWest.shippingBinPosition.Y == y) - return (CATEGORY.Interactables, "Shipping Bin"); + var nutTracker = Game1.player.team.collectedNutTracker; + if (islandLocation.IsBuriedNutLocation(new Point(x, y)) && !nutTracker.ContainsKey("Buried_" + islandLocation.Name + "_" + x + "_" + y)) + { + return (CATEGORY.Interactables, "Diggable spot"); + } + else if (Game1.currentLocation is IslandWest islandWest) + { + if (islandWest.shippingBinPosition.X == x && islandWest.shippingBinPosition.Y == y) + return (CATEGORY.Interactables, "Shipping Bin"); + } + else if (Game1.currentLocation is IslandNorth islandNorth) + { + if (islandNorth.traderActivated.Value && x == 36 && y == 71) + return (CATEGORY.Interactables, "Island Trader"); + } } - else if (Game1.currentLocation is IslandNorth islandNorth) - { - if (islandNorth.traderActivated.Value && x == 36 && y == 71) - return (CATEGORY.Interactables, "Island Trader"); - } - return (null, null); } From 72f1835929880ea955693eb6bf0d1af1a6fda528 Mon Sep 17 00:00:00 2001 From: bradjrenshaw Date: Sun, 8 May 2022 19:31:04 -0400 Subject: [PATCH 2/5] Brief refactor for readability. --- stardew-access/Features/TileInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stardew-access/Features/TileInfo.cs b/stardew-access/Features/TileInfo.cs index 8e075b9..bf1c848 100644 --- a/stardew-access/Features/TileInfo.cs +++ b/stardew-access/Features/TileInfo.cs @@ -433,7 +433,7 @@ namespace stardew_access.Features else if (Game1.currentLocation is IslandLocation islandLocation) { var nutTracker = Game1.player.team.collectedNutTracker; - if (islandLocation.IsBuriedNutLocation(new Point(x, y)) && !nutTracker.ContainsKey("Buried_" + islandLocation.Name + "_" + x + "_" + y)) + if (islandLocation.IsBuriedNutLocation(new Point(x, y)) && !nutTracker.ContainsKey($"Buried_{islandLocation.Name}_{x}_{y}")) { return (CATEGORY.Interactables, "Diggable spot"); } From 415231c65d01dee11d6bf79426674732c8de22cb Mon Sep 17 00:00:00 2001 From: Mohammad Shoaib Date: Mon, 9 May 2022 23:29:21 +0530 Subject: [PATCH 3/5] Added farm and farm cave tiles --- stardew-access/assets/static-tiles.json | 42 +++++++++++++++++++++++++ stardew-access/manifest.json | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/stardew-access/assets/static-tiles.json b/stardew-access/assets/static-tiles.json index b204e8b..ec96ea2 100644 --- a/stardew-access/assets/static-tiles.json +++ b/stardew-access/assets/static-tiles.json @@ -1,4 +1,46 @@ { + "farm": + { + "Bus Stop Entrance": + { + "x":[79], + "y":[15,16,17,18], + "type":"door" + }, + "Backwoods Entrance": + { + "x":[40,41], + "y":[0], + "type":"door" + }, + "Cindersap Forest Entrance": + { + "x":[40,41], + "y":[64], + "type":"door" + }, + "Farm Cave Entrance": + { + "x":[34], + "y":[7], + "type":"door" + }, + "Grandpa's Shrine": + { + "x":[8], + "y":[7], + "type":"interactable" + } + }, + "farmcave": + { + "Exit": + { + "x":[8], + "y":[11], + "type":"door" + } + }, "busstop": { "Ticket Machine": diff --git a/stardew-access/manifest.json b/stardew-access/manifest.json index 91acaaf..eb54070 100644 --- a/stardew-access/manifest.json +++ b/stardew-access/manifest.json @@ -1,7 +1,7 @@ { "Name": "Stardew Access", "Author": "Mohammad Shoaib", - "Version": "1.2.0", + "Version": "1.2.1", "Description": "An accessibility mod with screen reader support!", "UniqueID": "shoaib.stardewaccess", "EntryDll": "stardew-access.dll", From eebabe8fe601a6db88daf5100a7e6898de30d045 Mon Sep 17 00:00:00 2001 From: Mohammad Shoaib Date: Tue, 10 May 2022 00:02:15 +0530 Subject: [PATCH 4/5] Added statue of perfection & endless fortune --- stardew-access/Features/TileInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stardew-access/Features/TileInfo.cs b/stardew-access/Features/TileInfo.cs index bf1c848..944434c 100644 --- a/stardew-access/Features/TileInfo.cs +++ b/stardew-access/Features/TileInfo.cs @@ -9,7 +9,7 @@ namespace stardew_access.Features { public class TileInfo { - public static string[] trackable_machines = { "bee house", "cask", "press", "keg", "machine", "maker", "preserves jar", "bone mill", "kiln", "crystalarium", "furnace", "geode crusher", "tapper", "lightning rod", "incubator", "wood chipper", "worm bin", "loom" }; + public static string[] trackable_machines = { "bee house", "cask", "press", "keg", "machine", "maker", "preserves jar", "bone mill", "kiln", "crystalarium", "furnace", "geode crusher", "tapper", "lightning rod", "incubator", "wood chipper", "worm bin", "loom", "statue of endless fortune", "statue of perfection" }; ///Returns the name of the object at tile alongwith it's category's name public static (string? name, string? categoryName) getNameWithCategoryNameAtTile(Vector2 tile) From 730beeffaa01d108c88d0d170b8d398e9a199afa Mon Sep 17 00:00:00 2001 From: Mohammad Shoaib Date: Tue, 10 May 2022 00:21:37 +0530 Subject: [PATCH 5/5] removed birdie from static tiles (as she was already detectable) --- stardew-access/assets/static-tiles.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stardew-access/assets/static-tiles.json b/stardew-access/assets/static-tiles.json index ec96ea2..05fe015 100644 --- a/stardew-access/assets/static-tiles.json +++ b/stardew-access/assets/static-tiles.json @@ -1351,12 +1351,6 @@ "y":[22], "type":"door" }, - "Birdie": - { - "x":[18], - "y":[58], - "type":"npc" - }, "Hole 1": { "x":[37],