From 23627322dd6e4916f14eff293b80c03e71d5bf84 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 3 Dec 2023 06:27:54 -0800 Subject: [PATCH] Fix conjury installer and updater to work with both 64 and 32 bit versions of the game, as it seems 64 bit was switched for 32 bit in the latest release. Please watch for bugs. --- audiogame-manager.sh | 5 +++-- game-scripts/conjury-update.sh | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 952cdfe..477978d 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1951,12 +1951,13 @@ download "https://erion.cf/files/ag_103.zip" add_launcher "c:\Program Files\coin collector\game.exe" ;; "Conjury") - download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" + download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" export WINEARCH=win64 export winVer="win8" install_wine_bottle get_steam 2684520 "https://store.steampowered.com/app/2684520/Conjury/" - find "$WINEPREFIX" -type f -name 'nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; + find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86_64/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; + find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; add_launcher 'c:\Program Files\Conjury\release\Conjury.exe' ;; "Constant Battle") diff --git a/game-scripts/conjury-update.sh b/game-scripts/conjury-update.sh index a5d86db..41a4e49 100755 --- a/game-scripts/conjury-update.sh +++ b/game-scripts/conjury-update.sh @@ -47,7 +47,13 @@ source "${sourcePath}" export game="Conjury" export WINEPREFIX="$HOME/.local/wine/conjury" +# Make sure both nvda2speechd 64 and 32 bit are available. +# This is needed to work around the change from 64 bit to 32 bit game. +download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" + # Now it should be as simple as running get_steam to redownload the game. get_steam 2684520 "https://store.steampowered.com/app/2684520/Conjury/" +find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86_64/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; +find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; exit 0