Talon/stardew-access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue#28 Prepend fish name to fish ponds

Browse Source
This commit is contained in:
Mohammad Shoaib Khan
2022-08-17 13:28:49 +05:30
parent 5bd3e4085d
commit 2df4cfca27
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
stardew-access/Features/TileInfo.cs
View File

@@ -317,6 +317,16 @@ namespace stardew_access.Features
{ {
string name = building.buildingType.Value; string name = building.buildingType.Value;
// Prepend fish name for fish ponds
if (building is FishPond fishPond)
{
if (fishPond.fishType.Value >= 0)
{
name = $"{Game1.objectInformation[fishPond.fishType.Value].Split('/')[4]} {name}";
}
}
// Detect doors, input slots, etc.
if ((building.humanDoor.Value.X + building.tileX.Value) == x && (building.humanDoor.Value.Y + building.tileY.Value) == y) if ((building.humanDoor.Value.X + building.tileX.Value) == x && (building.humanDoor.Value.Y + building.tileY.Value) == y)
return (CATEGORY.Doors, name + " Door"); return (CATEGORY.Doors, name + " Door");
else if ((building.animalDoor.Value.X + building.tileX.Value) == x && (building.animalDoor.Value.Y + building.tileY.Value) == y) else if ((building.animalDoor.Value.X + building.tileX.Value) == x && (building.animalDoor.Value.Y + building.tileY.Value) == y)
@@ -327,7 +337,7 @@ namespace stardew_access.Features
return (CATEGORY.Buildings, name + " input"); return (CATEGORY.Buildings, name + " input");
else if (building is Mill && (building.tileX.Value + 3) == x && (building.tileY.Value + 1) == y) else if (building is Mill && (building.tileX.Value + 3) == x && (building.tileY.Value + 1) == y)
return (CATEGORY.Buildings, name + " output"); return (CATEGORY.Buildings, name + " output");
else if (!lessInfo) else
return (CATEGORY.Buildings, name); return (CATEGORY.Buildings, name);
} }
} }
@@ -984,12 +994,10 @@ namespace stardew_access.Features
{ {
if (Game1.currentLocation is Mine or MineShaft) if (Game1.currentLocation is Mine or MineShaft)
{ {
int? index = null; if (Game1.currentLocation.Map.GetLayer("Buildings").Tiles[x, y] == null)
return false;
if (Game1.currentLocation.Map.GetLayer("Buildings").Tiles[x, y] != null) if (Game1.currentLocation.Map.GetLayer("Buildings").Tiles[x, y].TileIndex == 112)
index = Game1.currentLocation.Map.GetLayer("Buildings").Tiles[x, y].TileIndex;
if (index == 112)
return true; return true;
} }
} }