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

Fixed museum menu

master
Mohammad Shoaib 2022-03-19 15:44:57 +05:30
parent 32d354f23c
commit 092960f571
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
stardew-access/Patches/MenuPatches.cs
View File

@ -3,6 +3,7 @@ using Microsoft.Xna.Framework.Input;
using stardew_access.Features; using stardew_access.Features;
using StardewModdingAPI; using StardewModdingAPI;
using StardewValley; using StardewValley;
using StardewValley.Locations;
using StardewValley.Menus; using StardewValley.Menus;
namespace stardew_access.Patches namespace stardew_access.Patches
@ -10,11 +11,12 @@ namespace stardew_access.Patches
internal class MenuPatches internal class MenuPatches
{ {
private static string currentLetterText = " "; private static string currentLetterText = " ";
private static string hoveredItemQueryKey = " "; private static string museumQueryKey = " ";
private static string currentLevelUpTitle = " "; private static string currentLevelUpTitle = " ";
public static Vector2? prevTile = null; public static Vector2? prevTile = null;
private static bool isMoving = false; private static bool isMoving = false;
#region Museum Menu Patch
internal static bool MuseumMenuKeyPressPatch() internal static bool MuseumMenuKeyPressPatch()
{ {
try try
@ -43,14 +45,37 @@ namespace stardew_access.Patches
{ {
int x = Game1.getMouseX(), y = Game1.getMouseY(); // Mouse x and y position int x = Game1.getMouseX(), y = Game1.getMouseY(); // Mouse x and y position
if (___holdingMuseumPiece) if (__instance.heldItem != null)
{ {
// Museum Inventory // Museum Inventory
string toSpeak = "";
int tileX = (int)(Utility.ModifyCoordinateFromUIScale(x) + (float)Game1.viewport.X) / 64;
int tileY = (int)(Utility.ModifyCoordinateFromUIScale(y) + (float)Game1.viewport.Y) / 64;
LibraryMuseum libraryMuseum = (LibraryMuseum)Game1.currentLocation;
if (libraryMuseum.isTileSuitableForMuseumPiece(tileX, tileY))
toSpeak = $"{tileX}x {tileY}y";
if (museumQueryKey != toSpeak)
{
museumQueryKey = toSpeak;
MainClass.GetScreenReader().Say(toSpeak, true);
}
} }
else else
{ {
// Player Inventory // Player Inventory
narrateHoveredItemInInventory(__instance.inventory, __instance.inventory.inventory, __instance.inventory.actualInventory, x, y); if (!narrateHoveredItemInInventory(__instance.inventory, __instance.inventory.inventory, __instance.inventory.actualInventory, x, y))
{
if (__instance.okButton != null && __instance.okButton.containsPoint(x, y))
{
if (museumQueryKey != $"ok button")
{
museumQueryKey = $"ok button";
MainClass.GetScreenReader().Say("ok button", true);
}
}
}
} }
} }
catch (Exception e) catch (Exception e)
@ -58,6 +83,7 @@ namespace stardew_access.Patches
MainClass.ErrorLog($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}"); MainClass.ErrorLog($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}");
} }
} }
#endregion
internal static bool narrateHoveredItemInInventory(InventoryMenu inventoryMenu, List<ClickableComponent> inventory, IList<Item> actualInventory, int x, int y) internal static bool narrateHoveredItemInInventory(InventoryMenu inventoryMenu, List<ClickableComponent> inventory, IList<Item> actualInventory, int x, int y)
{ {
@ -114,9 +140,9 @@ namespace stardew_access.Patches
toSpeak = "Empty Slot"; toSpeak = "Empty Slot";
} }
if (hoveredItemQueryKey != $"{toSpeak}:{i}") if (museumQueryKey != $"{toSpeak}:{i}")
{ {
hoveredItemQueryKey = $"{toSpeak}:{i}"; museumQueryKey = $"{toSpeak}:{i}";
MainClass.GetScreenReader().Say(toSpeak, true); MainClass.GetScreenReader().Say(toSpeak, true);
} }
return true; return true;