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

Removed AutoHotKey for performing clicks

Browse Source
This commit is contained in:
Mohammad Shoaib
2022-02-04 14:26:19 +05:30
parent 5100b4fd89
commit 2298d891da
17 changed files with 309 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
stardew-access/Patches/BuildingNAnimalMenuPatches.cs
View File

@@ -57,7 +57,7 @@ namespace stardew_access.Patches
if (purchaseAnimalMenuQuery != toSpeak)
{
purchaseAnimalMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -65,7 +65,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -145,7 +145,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -156,7 +156,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -167,7 +167,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -178,7 +178,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -189,7 +189,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -200,7 +200,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -211,7 +211,7 @@ namespace stardew_access.Patches
if (carpenterMenuQuery != toSpeak)
{
carpenterMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -234,14 +234,14 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
private static async void SayBlueprintInfo(string info)
{
isSayingBlueprintInfo = true;
MainClass.screenReader.Say(info, true);
MainClass.ScreenReader.Say(info, true);
await Task.Delay(300);
isSayingBlueprintInfo = false;
}

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

@@ -42,13 +42,13 @@ namespace stardew_access.Patches
toSpeak += $"{message.message}, ";
});
if (toSpeak != " ")
MainClass.screenReader.SayWithChatChecker(toSpeak, false);
MainClass.ScreenReader.SayWithChatChecker(toSpeak, false);
#endregion
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -77,7 +77,7 @@ namespace stardew_access.Patches
toSpeak += $"{message.message}, ";
});
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
await Task.Delay(200);
isChatRunning = false;
}

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

@@ -49,9 +49,9 @@ namespace stardew_access.Patches
if (toSpeak != " ")
{
if (hasResponses)
MainClass.screenReader.SayWithChecker(toSpeak, false);
MainClass.ScreenReader.SayWithChecker(toSpeak, false);
else
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
}
else if (__instance.isQuestion)
@@ -80,9 +80,9 @@ namespace stardew_access.Patches
if (toSpeak != " ")
{
if (hasResponses)
MainClass.screenReader.SayWithChecker(toSpeak, false);
MainClass.ScreenReader.SayWithChecker(toSpeak, false);
else
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
}
else if (Game1.activeClickableMenu is DialogueBox)
@@ -91,13 +91,13 @@ namespace stardew_access.Patches
if (currentDialogue != __instance.getCurrentString())
{
currentDialogue = __instance.getCurrentString();
MainClass.screenReader.Say(__instance.getCurrentString(), true);
MainClass.ScreenReader.Say(__instance.getCurrentString(), true);
}
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate dialog:\n{e.StackTrace}\n{e.Message}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate dialog:\n{e.StackTrace}\n{e.Message}", LogLevel.Error);
}
}
@@ -273,15 +273,15 @@ namespace stardew_access.Patches
if (toSpeak.ToString() != " ")
{
if (Context.IsPlayerFree)
MainClass.screenReader.SayWithChecker(toSpeak.ToString(), true); // Normal Checker
MainClass.ScreenReader.SayWithChecker(toSpeak.ToString(), true); // Normal Checker
else
MainClass.screenReader.SayWithMenuChecker(toSpeak.ToString(), true); // Menu Checker
MainClass.ScreenReader.SayWithMenuChecker(toSpeak.ToString(), true); // Menu Checker
}
#endregion
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate dialog:\n{e.StackTrace}\n{e.Message}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate dialog:\n{e.StackTrace}\n{e.Message}", LogLevel.Error);
}
}
}

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

@@ -42,7 +42,7 @@ namespace stardew_access.Patches
if (junimoNoteMenuQuery != toSpeak)
{
junimoNoteMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -54,7 +54,7 @@ namespace stardew_access.Patches
if (junimoNoteMenuQuery != toSpeak)
{
junimoNoteMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -65,7 +65,7 @@ namespace stardew_access.Patches
if (junimoNoteMenuQuery != toSpeak)
{
junimoNoteMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -77,7 +77,7 @@ namespace stardew_access.Patches
if (junimoNoteMenuQuery != toSpeak)
{
junimoNoteMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -87,7 +87,7 @@ namespace stardew_access.Patches
if (junimoNoteMenuQuery != toSpeak)
{
junimoNoteMenuQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -117,19 +117,19 @@ namespace stardew_access.Patches
else if (isBackPressed && __instance.backButton != null && !__instance.backButton.containsPoint(x, y))
{
__instance.backButton.snapMouseCursorToCenter();
MainClass.screenReader.Say("Back Button", true);
MainClass.ScreenReader.Say("Back Button", true);
}
else if (isPPressed && __instance.purchaseButton != null && !__instance.purchaseButton.containsPoint(x, y))
{
__instance.purchaseButton.snapMouseCursorToCenter();
MainClass.screenReader.Say("Purchase Button", true);
MainClass.ScreenReader.Say("Purchase Button", true);
}
}
string reward = __instance.getRewardNameForArea(___whichArea);
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -193,7 +193,7 @@ namespace stardew_access.Patches
toSpeak = $"Completed {toSpeak}";
c.snapMouseCursorToCenter();
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
}
break;
@@ -228,7 +228,7 @@ namespace stardew_access.Patches
}
c.snapMouseCursorToCenter();
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
}
break;
@@ -281,7 +281,7 @@ namespace stardew_access.Patches
toSpeak = "Empty Slot";
}
c.snapMouseCursorToCenter();
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
}
break;
@@ -289,7 +289,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
await Task.Delay(200);
@@ -372,7 +372,7 @@ namespace stardew_access.Patches
if (socialPageQuery != toSpeak)
{
socialPageQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -417,7 +417,7 @@ namespace stardew_access.Patches
if (socialPageQuery != toSpeak)
{
socialPageQuery = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -430,7 +430,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -461,7 +461,7 @@ namespace stardew_access.Patches
{
shopMenuQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
Game1.playSound("drop_item");
}
return;
@@ -473,7 +473,7 @@ namespace stardew_access.Patches
{
shopMenuQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -484,7 +484,7 @@ namespace stardew_access.Patches
{
shopMenuQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -531,14 +531,14 @@ namespace stardew_access.Patches
{
shopMenuQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
}
#endregion
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -560,7 +560,7 @@ namespace stardew_access.Patches
if (gameMenuQueryKey != toSpeak)
{
gameMenuQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -568,7 +568,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -589,7 +589,7 @@ namespace stardew_access.Patches
if (geodeMenuQueryKey != toSpeak)
{
geodeMenuQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -602,7 +602,7 @@ namespace stardew_access.Patches
if (geodeMenuQueryKey != toSpeak)
{
geodeMenuQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -614,7 +614,7 @@ namespace stardew_access.Patches
if (geodeMenuQueryKey != toSpeak)
{
geodeMenuQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
Game1.playSound("drop_item");
}
return;
@@ -627,7 +627,7 @@ namespace stardew_access.Patches
if (geodeMenuQueryKey != toSpeak)
{
geodeMenuQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -639,7 +639,7 @@ namespace stardew_access.Patches
if (geodeMenuQueryKey != toSpeak)
{
geodeMenuQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -652,7 +652,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -684,7 +684,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
hoveredItemQueryKey = "";
gameMenuQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -696,7 +696,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -709,7 +709,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -722,7 +722,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -735,7 +735,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -749,7 +749,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -763,7 +763,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -776,7 +776,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
Game1.playSound("drop_item");
}
return;
@@ -818,7 +818,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -843,7 +843,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -956,7 +956,7 @@ namespace stardew_access.Patches
{
craftingPageQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -968,7 +968,7 @@ namespace stardew_access.Patches
{
craftingPageQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -980,7 +980,7 @@ namespace stardew_access.Patches
{
craftingPageQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -992,7 +992,7 @@ namespace stardew_access.Patches
{
craftingPageQueryKey = toSpeak;
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
Game1.playSound("drop_item");
}
return;
@@ -1072,7 +1072,7 @@ namespace stardew_access.Patches
craftingPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1089,7 +1089,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -1139,7 +1139,7 @@ namespace stardew_access.Patches
inventoryPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
Game1.playSound("drop_item");
}
return;
@@ -1153,7 +1153,7 @@ namespace stardew_access.Patches
inventoryPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1166,7 +1166,7 @@ namespace stardew_access.Patches
inventoryPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1179,7 +1179,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1193,7 +1193,7 @@ namespace stardew_access.Patches
itemGrabMenuQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1289,7 +1289,7 @@ namespace stardew_access.Patches
inventoryPageQueryKey = toSpeak;
gameMenuQueryKey = "";
hoveredItemQueryKey = "";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1307,7 +1307,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -1352,7 +1352,7 @@ namespace stardew_access.Patches
{
gameMenuQueryKey = "";
optionsPageQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1360,7 +1360,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -1376,7 +1376,7 @@ namespace stardew_access.Patches
{
gameMenuQueryKey = "";
exitPageQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
@@ -1388,14 +1388,14 @@ namespace stardew_access.Patches
{
gameMenuQueryKey = "";
exitPageQueryKey = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return;
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -1527,7 +1527,7 @@ namespace stardew_access.Patches
if (hoveredItemQueryKey != $"{toSpeak}:{i}")
{
hoveredItemQueryKey = $"{toSpeak}:{i}";
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
return true;
}

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

@@ -38,7 +38,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
return true;
@@ -52,13 +52,13 @@ namespace stardew_access.Patches
if (__instance.nextPageButton != null && __instance.nextPageButton.containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker($"Next Page Button", true);
MainClass.ScreenReader.SayWithMenuChecker($"Next Page Button", true);
return;
}
if (__instance.previousPageButton != null && __instance.previousPageButton.containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker($"Previous Page Button", true);
MainClass.ScreenReader.SayWithMenuChecker($"Previous Page Button", true);
return;
}
@@ -66,14 +66,14 @@ namespace stardew_access.Patches
{
if (__instance.languages[i].containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker($"{__instance.languageList[i]} Button", true);
MainClass.ScreenReader.SayWithMenuChecker($"{__instance.languageList[i]} Button", true);
break;
}
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -86,14 +86,14 @@ namespace stardew_access.Patches
{
if (___elevators[i].containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker($"{___elevators[i].name} level", true);
MainClass.ScreenReader.SayWithMenuChecker($"{___elevators[i].name} level", true);
break;
}
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -105,11 +105,11 @@ namespace stardew_access.Patches
___textBox.SelectMe();
string toSpeak = $"{title}";
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -119,19 +119,19 @@ namespace stardew_access.Patches
{
int x = Game1.getMouseX(), y = Game1.getMouseY();
MainClass.screenReader.SayWithMenuChecker(___message, true);
MainClass.ScreenReader.SayWithMenuChecker(___message, true);
if (__instance.okButton.containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker("Ok Button", false);
MainClass.ScreenReader.SayWithMenuChecker("Ok Button", false);
}
else if (__instance.cancelButton.containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker("Cancel Button", false);
MainClass.ScreenReader.SayWithMenuChecker("Cancel Button", false);
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -188,16 +188,16 @@ namespace stardew_access.Patches
}
if (toSpeak != " ")
MainClass.screenReader.SayWithMenuChecker(toSpeak, true);
MainClass.ScreenReader.SayWithMenuChecker(toSpeak, true);
else if (__instance.isProfessionChooser && currentLevelUpTitle != $"{___title}. Select a new profession.")
{
MainClass.screenReader.SayWithMenuChecker($"{___title}. Select a new profession.", true);
MainClass.ScreenReader.SayWithMenuChecker($"{___title}. Select a new profession.", true);
currentLevelUpTitle = $"{___title}. Select a new profession.";
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -212,21 +212,21 @@ namespace stardew_access.Patches
if (__instance.okButton.containsPoint(Game1.getMouseX(), Game1.getMouseY()))
{
toSpeak = $"{total}g in total. Press left mouse button to save.";
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
for (int i = 0; i < __instance.categories.Count; i++)
{
if (__instance.categories[i].containsPoint(Game1.getMouseX(), Game1.getMouseY()))
{
toSpeak = $"Money recieved from {__instance.getCategoryName(i)}: {___categoryTotals[i]}g.";
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
}
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -266,7 +266,7 @@ namespace stardew_access.Patches
toSpeak += "\t\n Left click to accept quest.";
__instance.acceptQuestButton.snapMouseCursorToCenter();
}
MainClass.screenReader.Say(toSpeak, false);
MainClass.ScreenReader.Say(toSpeak, false);
}
#endregion
@@ -279,7 +279,7 @@ namespace stardew_access.Patches
string label = c.label;
if (c.containsPoint(Game1.getMousePosition().X, Game1.getMousePosition().Y))
MainClass.screenReader.SayWithChecker($"Grab: {name} \t\n {label}", false);
MainClass.ScreenReader.SayWithChecker($"Grab: {name} \t\n {label}", false);
}
}
#endregion
@@ -287,7 +287,7 @@ namespace stardew_access.Patches
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -329,7 +329,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -371,14 +371,14 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
internal static void ExitEventPatch()
{
if (MainClass.screenReader != null)
MainClass.screenReader.CloseScreenReader();
if (MainClass.ScreenReader != null)
MainClass.ScreenReader.CloseScreenReader();
}
internal static void resetGlobalVars()
{

29
stardew-access/Patches/QuestPatches.cs
View File

@@ -23,7 +23,7 @@ namespace stardew_access.Patches
toSpeak = $"Left Quest:\n\t{toSpeak}\n\tPress left click to accept this quest.";
MainClass.screenReader.SayWithMenuChecker(toSpeak, true);
MainClass.ScreenReader.SayWithMenuChecker(toSpeak, true);
return;
}
@@ -33,13 +33,13 @@ namespace stardew_access.Patches
toSpeak = $"Right Quest:\n\t{toSpeak}\n\tPress left click to accept this quest.";
MainClass.screenReader.SayWithMenuChecker(toSpeak, true);
MainClass.ScreenReader.SayWithMenuChecker(toSpeak, true);
return;
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -99,7 +99,7 @@ namespace stardew_access.Patches
if (Game1.dayOfMonth == i + 1)
toSpeak += $", Current";
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
}
#endregion
@@ -114,7 +114,7 @@ namespace stardew_access.Patches
if (currentDailyQuestText != toSpeak)
{
currentDailyQuestText = toSpeak;
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
}
else
@@ -134,7 +134,7 @@ namespace stardew_access.Patches
__instance.acceptQuestButton.snapMouseCursorToCenter();
}
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
}
#endregion
@@ -142,7 +142,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
#endregion
@@ -171,7 +171,7 @@ namespace stardew_access.Patches
toSpeak += ___pages[___currentPage][i].ShouldDisplayAsComplete() ? " completed!" : "";
if (__instance.questLogButtons[i].containsPoint(Game1.getOldMouseX(), Game1.getOldMouseY()))
{
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
}
}
@@ -218,10 +218,13 @@ namespace stardew_access.Patches
toSpeak += $"\t\nOrder {j + 1}: {parsed_text} \t\n";
}
int daysLeft = ____shownQuest.GetDaysLeft();
if (____shownQuest != null)
{
int daysLeft = ____shownQuest.GetDaysLeft();
if (daysLeft > 0)
toSpeak += $"\t\n{daysLeft} days left.";
if (daysLeft > 0)
toSpeak += $"\t\n{daysLeft} days left.";
}
#endregion
}
@@ -229,13 +232,13 @@ namespace stardew_access.Patches
if (snapMouseToRewardBox)
__instance.rewardBox.snapMouseCursorToCenter();
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
#endregion
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
#endregion

26
stardew-access/Patches/TitleMenuPatches.cs
View File

@@ -45,11 +45,11 @@ namespace stardew_access.Patches
#endregion
if (toSpeak != " ")
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -95,15 +95,15 @@ namespace stardew_access.Patches
if (TitleMenu.subMenu != null && __instance.backButton.containsPoint(Game1.getMouseX(), Game1.getMouseY()))
{
string text = "Back Button";
MainClass.screenReader.SayWithChecker(text, true);
MainClass.ScreenReader.SayWithChecker(text, true);
}
if (TitleMenu.subMenu == null && toSpeak != "")
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -119,7 +119,7 @@ namespace stardew_access.Patches
#region Farms
if (___menu.deleteButtons.Count > 0 && ___menu.deleteButtons[i].containsPoint(x, y))
{
MainClass.screenReader.SayWithChecker($"Delete {__instance.Farmer.farmName} Farm", true);
MainClass.ScreenReader.SayWithChecker($"Delete {__instance.Farmer.farmName} Farm", true);
return;
}
@@ -128,14 +128,14 @@ namespace stardew_access.Patches
// Used diff. functions to narrate to prevent it from speaking the message again on selecting another button.
string message = "Really delete farm?";
MainClass.screenReader.SayWithChecker(message, true);
MainClass.ScreenReader.SayWithChecker(message, true);
if (___menu.okDeleteButton.containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker("Ok Button", false);
MainClass.ScreenReader.SayWithMenuChecker("Ok Button", false);
}
else if (___menu.cancelDeleteButton.containsPoint(x, y))
{
MainClass.screenReader.SayWithMenuChecker("Cancel Button", false);
MainClass.ScreenReader.SayWithMenuChecker("Cancel Button", false);
}
return;
}
@@ -150,14 +150,14 @@ namespace stardew_access.Patches
string toSpeak = $"{farmName} Farm Selected, \t\n Farmer:{farmerName}, \t\nMoney:{money}, \t\nHours Played:{hoursPlayed}, \t\nDate:{dateStringForSaveGame}";
MainClass.screenReader.SayWithChecker(toSpeak, true);
MainClass.ScreenReader.SayWithChecker(toSpeak, true);
#endregion
}
}
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -179,7 +179,7 @@ namespace stardew_access.Patches
}
catch (Exception e)
{
MainClass.monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
MainClass.Monitor.Log($"Unable to narrate Text:\n{e.Message}\n{e.StackTrace}", LogLevel.Error);
}
}
@@ -640,7 +640,7 @@ namespace stardew_access.Patches
if (toSpeak != " ")
{
MainClass.screenReader.Say(toSpeak, true);
MainClass.ScreenReader.Say(toSpeak, true);
}
await Task.Delay(200);