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

Added old mariner to npcs category when present.

master
bradjrenshaw 2022-05-12 20:05:01 -04:00
parent 569311c61e
commit 153b120730
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,16 +47,15 @@ namespace stardew_access.Features
(string? name, CATEGORY category) staticTile = MainClass.STiles.getStaticTileInfoAtWithCategory(x, y); (string? name, CATEGORY category) staticTile = MainClass.STiles.getStaticTileInfoAtWithCategory(x, y);
string? bush = getBushAtTile(x, y, lessInfo); string? bush = getBushAtTile(x, y, lessInfo);
if (Game1.currentLocation.isCharacterAtTile(tile) != null) if (Game1.currentLocation.isCharacterAtTile(tile) is NPC npc)
{ {
NPC npc = Game1.currentLocation.isCharacterAtTile(tile); toReturn = npc.displayName;
toReturn = npc.displayName;
if (npc.isVillager() || npc.CanSocialize) if (npc.isVillager() || npc.CanSocialize)
category = CATEGORY.Farmers; category = CATEGORY.Farmers;
else else
category = CATEGORY.NPCs; category = CATEGORY.NPCs;
} }
else if (farmAnimal != null) else if (farmAnimal != null)
{ {
toReturn = farmAnimal; toReturn = farmAnimal;
category = CATEGORY.FarmAnimals; category = CATEGORY.FarmAnimals;
@ -408,7 +407,11 @@ namespace stardew_access.Features
} }
else if (Game1.currentLocation is Beach beach) else if (Game1.currentLocation is Beach beach)
{ {
if (x == 58 && y == 13) if (MainClass.ModHelper.Reflection.GetField<NPC>(beach, "oldMariner").GetValue() is NPC mariner && mariner.getTileLocation() == new Vector2(x, y))
{
return (CATEGORY.NPCs, "Old Mariner");
}
else if (x == 58 && y == 13)
{ {
if (!beach.bridgeFixed.Value) if (!beach.bridgeFixed.Value)
return (CATEGORY.Interactables, "Repair Bridge"); return (CATEGORY.Interactables, "Repair Bridge");