Added ore panning spot to interactables category.

master
bradjrenshaw 2022-05-12 20:33:50 -04:00
parent 153b120730
commit f4a47bf64a
1 changed files with 8 additions and 4 deletions

View File

@ -49,13 +49,13 @@ namespace stardew_access.Features
if (Game1.currentLocation.isCharacterAtTile(tile) is NPC npc) if (Game1.currentLocation.isCharacterAtTile(tile) is NPC npc)
{ {
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;
@ -300,7 +300,11 @@ namespace stardew_access.Features
/// <br/>name: This is the name of the tile. Default to null if the tile tile has nothing on it.</returns> /// <br/>name: This is the name of the tile. Default to null if the tile tile has nothing on it.</returns>
public static (CATEGORY? category, string? name) getDynamicTilesInfo(int x, int y, bool lessInfo = false) public static (CATEGORY? category, string? name) getDynamicTilesInfo(int x, int y, bool lessInfo = false)
{ {
if (Game1.currentLocation is Farm farm) if (Game1.currentLocation.orePanPoint != Point.Zero && Game1.currentLocation.orePanPoint == new Point(x, y))
{
return (CATEGORY.Interactables, "panning spot");
}
else if (Game1.currentLocation is Farm farm)
{ {
if (farm.GetMainMailboxPosition().X == x && farm.GetMainMailboxPosition().Y == y) if (farm.GetMainMailboxPosition().X == x && farm.GetMainMailboxPosition().Y == y)
return (CATEGORY.Interactables, "Mail box"); return (CATEGORY.Interactables, "Mail box");
@ -407,7 +411,7 @@ namespace stardew_access.Features
} }
else if (Game1.currentLocation is Beach beach) else if (Game1.currentLocation is Beach beach)
{ {
if (MainClass.ModHelper.Reflection.GetField<NPC>(beach, "oldMariner").GetValue() is NPC mariner && mariner.getTileLocation() == new Vector2(x, y)) if (MainClass.ModHelper.Reflection.GetField<NPC>(beach, "oldMariner").GetValue() is NPC mariner && mariner.getTileLocation() == new Vector2(x, y))
{ {
return (CATEGORY.NPCs, "Old Mariner"); return (CATEGORY.NPCs, "Old Mariner");
} }