Merge branch 'master' into TileViewer
commit
2717efa42e
|
@ -9,7 +9,7 @@ namespace stardew_access.Features
|
||||||
{
|
{
|
||||||
public class TileInfo
|
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" };
|
||||||
|
|
||||||
///<summary>Returns the name of the object at tile alongwith it's category's name</summary>
|
///<summary>Returns the name of the object at tile alongwith it's category's name</summary>
|
||||||
public static (string? name, string? categoryName) getNameWithCategoryNameAtTile(Vector2 tile)
|
public static (string? name, string? categoryName) getNameWithCategoryNameAtTile(Vector2 tile)
|
||||||
|
@ -430,6 +430,13 @@ namespace stardew_access.Features
|
||||||
else if (x == 8 && y == 9)
|
else if (x == 8 && y == 9)
|
||||||
return (((!Game1.MasterPlayer.hasOrWillReceiveMail("willyBoatAnchor")) ? CATEGORY.Interactables : CATEGORY.Decor), ((!Game1.MasterPlayer.hasOrWillReceiveMail("willyBoatAnchor")) ? "Repair " : "") + "Boat Anchor");
|
return (((!Game1.MasterPlayer.hasOrWillReceiveMail("willyBoatAnchor")) ? CATEGORY.Interactables : CATEGORY.Decor), ((!Game1.MasterPlayer.hasOrWillReceiveMail("willyBoatAnchor")) ? "Repair " : "") + "Boat Anchor");
|
||||||
}
|
}
|
||||||
|
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}"))
|
||||||
|
{
|
||||||
|
return (CATEGORY.Interactables, "Diggable spot");
|
||||||
|
}
|
||||||
else if (Game1.currentLocation is IslandWest islandWest)
|
else if (Game1.currentLocation is IslandWest islandWest)
|
||||||
{
|
{
|
||||||
if (islandWest.shippingBinPosition.X == x && islandWest.shippingBinPosition.Y == y)
|
if (islandWest.shippingBinPosition.X == x && islandWest.shippingBinPosition.Y == y)
|
||||||
|
@ -440,7 +447,7 @@ namespace stardew_access.Features
|
||||||
if (islandNorth.traderActivated.Value && x == 36 && y == 71)
|
if (islandNorth.traderActivated.Value && x == 36 && y == 71)
|
||||||
return (CATEGORY.Interactables, "Island Trader");
|
return (CATEGORY.Interactables, "Island Trader");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return (null, null);
|
return (null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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":
|
"busstop":
|
||||||
{
|
{
|
||||||
"Ticket Machine":
|
"Ticket Machine":
|
||||||
|
@ -1309,12 +1351,6 @@
|
||||||
"y":[22],
|
"y":[22],
|
||||||
"type":"door"
|
"type":"door"
|
||||||
},
|
},
|
||||||
"Birdie":
|
|
||||||
{
|
|
||||||
"x":[18],
|
|
||||||
"y":[58],
|
|
||||||
"type":"npc"
|
|
||||||
},
|
|
||||||
"Hole 1":
|
"Hole 1":
|
||||||
{
|
{
|
||||||
"x":[37],
|
"x":[37],
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"Name": "Stardew Access",
|
"Name": "Stardew Access",
|
||||||
"Author": "Mohammad Shoaib",
|
"Author": "Mohammad Shoaib",
|
||||||
"Version": "1.2.0",
|
"Version": "1.2.1",
|
||||||
"Description": "An accessibility mod with screen reader support!",
|
"Description": "An accessibility mod with screen reader support!",
|
||||||
"UniqueID": "shoaib.stardewaccess",
|
"UniqueID": "shoaib.stardewaccess",
|
||||||
"EntryDll": "stardew-access.dll",
|
"EntryDll": "stardew-access.dll",
|
||||||
|
|
Loading…
Reference in New Issue