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

Fixed some bugs in game menu

Browse Source
This commit is contained in:
shoaib11120
2022-01-07 14:57:57 +05:30
parent bd379b77df
commit a649f3a2ec
4 changed files with 97 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stardew-access/ModEntry.cs
View File

@@ -98,6 +98,11 @@ namespace stardew_access
#endregion
#region Game Menu Patches
harmony.Patch(
original: AccessTools.Method(typeof(GameMenu), nameof(GameMenu.draw), new Type[] { typeof(SpriteBatch) }),
postfix: new HarmonyMethod(typeof(GameMenuPatches), nameof(GameMenuPatches.GameMenuPatch))
);
harmony.Patch(
original: AccessTools.Method(typeof(OptionsPage), nameof(OptionsPage.draw), new Type[] { typeof(SpriteBatch) }),
postfix: new HarmonyMethod(typeof(GameMenuPatches), nameof(GameMenuPatches.OptionsPagePatch))

6
stardew-access/Patches/DialoguePatches.cs
View File

@@ -131,6 +131,12 @@ namespace stardew_access.Patches
if (Game1.activeClickableMenu is GameMenu && (Game1.activeClickableMenu as GameMenu).GetCurrentPage() is CraftingPage)
return;
if (Game1.activeClickableMenu is GameMenu && (Game1.activeClickableMenu as GameMenu).GetCurrentPage() is OptionsPage)
return;
if (Game1.activeClickableMenu is GameMenu && (Game1.activeClickableMenu as GameMenu).GetCurrentPage() is ExitPage)
return;
if (Game1.activeClickableMenu is ItemGrabMenu)
return;
#endregion

76
stardew-access/Patches/GameMenuPatches.cs
View File

@@ -10,9 +10,42 @@ namespace stardew_access.Patches
{
internal static string hoveredItemQueryKey = "";
internal static string geodeMenuQueryKey = "";
internal static string gameMenuQueryKey = "";
internal static string itemGrabMenuQueryKey = "";
internal static string craftingPageQueryKey = "";
internal static string inventoryPageQueryKey = "";
internal static string exitPageQueryKey = "";
internal static string optionsPageQueryKey = "";
internal static void GameMenuPatch(GameMenu __instance)
{
try
{
// Continue if only in the Inventory Page or Crafting Page
if (__instance.currentTab != 0 && __instance.currentTab != 4 && __instance.currentTab != 6 && __instance.currentTab != 7)
return;
int x = Game1.getMousePosition(true).X, y = Game1.getMousePosition(true).Y; // Mouse x and y position
for(int i=0; i<__instance.tabs.Count; i++)
{
if(__instance.tabs[i].containsPoint(x, y))
{
string toSpeak = $"{GameMenu.getLabelOfTabFromIndex(i)} Tab";
if (gameMenuQueryKey != toSpeak)
{
gameMenuQueryKey = toSpeak;
ScreenReader.say(toSpeak, true);
}
return;
}
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
internal static void GeodeMenuPatch(GeodeMenu __instance)
{
@@ -122,6 +155,7 @@ namespace stardew_access.Patches
{
itemGrabMenuQueryKey = toSpeak;
hoveredItemQueryKey = "";
gameMenuQueryKey = "";
ScreenReader.say(toSpeak, true);
}
return;
@@ -132,6 +166,7 @@ namespace stardew_access.Patches
if (itemGrabMenuQueryKey != toSpeak)
{
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
ScreenReader.say(toSpeak, true);
}
@@ -144,6 +179,7 @@ namespace stardew_access.Patches
if (itemGrabMenuQueryKey != toSpeak)
{
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
ScreenReader.say(toSpeak, true);
Game1.playSound("sa_drop_item");
@@ -164,6 +200,7 @@ namespace stardew_access.Patches
if (itemGrabMenuQueryKey != toSpeak)
{
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
ScreenReader.say(toSpeak, true);
}
@@ -174,12 +211,14 @@ namespace stardew_access.Patches
#region Narrate hovered item
if(narrateHoveredItemInInventory(__instance.inventory.inventory, __instance.inventory.actualInventory, x, y, true))
{
gameMenuQueryKey = "";
itemGrabMenuQueryKey = "";
return;
}
if (narrateHoveredItemInInventory(__instance.ItemsToGrabMenu.inventory, __instance.ItemsToGrabMenu.actualInventory, x, y, true))
{
gameMenuQueryKey = "";
itemGrabMenuQueryKey = "";
return;
}
@@ -317,6 +356,7 @@ namespace stardew_access.Patches
if (craftingPageQueryKey != toSpeak)
{
craftingPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
ScreenReader.say(toSpeak, true);
}
@@ -327,6 +367,7 @@ namespace stardew_access.Patches
#region Narrate hovered item
if (narrateHoveredItemInInventory(__instance.inventory.inventory, __instance.inventory.actualInventory, x, y))
{
gameMenuQueryKey = "";
craftingPageQueryKey = "";
return;
}
@@ -366,6 +407,7 @@ namespace stardew_access.Patches
if (inventoryPageQueryKey != toSpeak)
{
inventoryPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
ScreenReader.say(toSpeak, true);
Game1.playSound("sa_drop_item");
@@ -461,6 +503,7 @@ namespace stardew_access.Patches
if (inventoryPageQueryKey != toSpeak)
{
inventoryPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
ScreenReader.say(toSpeak, true);
}
@@ -472,6 +515,7 @@ namespace stardew_access.Patches
#region Narrate hovered item
if (narrateHoveredItemInInventory(__instance.inventory.inventory, __instance.inventory.actualInventory, x, y, true))
{
gameMenuQueryKey = "";
inventoryPageQueryKey = "";
return;
}
@@ -520,8 +564,13 @@ namespace stardew_access.Patches
toSpeak = $"{toSpeak} Options:";
}
ScreenReader.sayWithChecker(toSpeak, true);
break;
if (optionsPageQueryKey != toSpeak)
{
gameMenuQueryKey = "";
optionsPageQueryKey = toSpeak;
ScreenReader.say(toSpeak, true);
}
return;
}
}
}
@@ -538,12 +587,26 @@ namespace stardew_access.Patches
if (__instance.exitToTitle.visible &&
__instance.exitToTitle.containsPoint(Game1.getMousePosition(true).X, Game1.getMousePosition(true).Y))
{
ScreenReader.sayWithChecker("Exit to Title Button", true);
string toSpeak = "Exit to Title Button";
if (exitPageQueryKey != toSpeak)
{
gameMenuQueryKey = "";
exitPageQueryKey = toSpeak;
ScreenReader.say(toSpeak, true);
}
return;
}
if (__instance.exitToDesktop.visible &&
__instance.exitToDesktop.containsPoint(Game1.getMousePosition(true).X, Game1.getMousePosition(true).Y))
{
ScreenReader.sayWithChecker("Exit to Desktop Button", true);
string toSpeak = "Exit to Desktop Button";
if (exitPageQueryKey != toSpeak)
{
gameMenuQueryKey = "";
exitPageQueryKey = toSpeak;
ScreenReader.say(toSpeak, true);
}
return;
}
}
catch (Exception e)
@@ -670,10 +733,5 @@ namespace stardew_access.Patches
#endregion
return false;
}
internal static bool narrateHoveredCraftingRecipe()
{
return false;
}
}
}

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

@@ -275,6 +275,22 @@ namespace stardew_access.Patches
GameMenuPatches.craftingPageQueryKey = "";
}
if (Game1.activeClickableMenu is GameMenu && (Game1.activeClickableMenu as GameMenu).GetCurrentPage() is ExitPage)
{
GameMenuPatches.exitPageQueryKey = "";
}
if (Game1.activeClickableMenu is GameMenu && (Game1.activeClickableMenu as GameMenu).GetCurrentPage() is CraftingPage)
{
GameMenuPatches.craftingPageQueryKey = "";
}
// This should be after checking all pages/tabs in the GameMenu
if (Game1.activeClickableMenu is GameMenu)
{
GameMenuPatches.gameMenuQueryKey = "";
}
if(__instance is ItemGrabMenu)
{
GameMenuPatches.itemGrabMenuQueryKey = "";