From f884243543216228c5cbb33975adfe5fff6d2bb5 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 8 Aug 2021 09:53:08 -0700 Subject: [PATCH 1/8] Silver dollar should now work --- audiogame-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index ed4747e..07544a6 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -871,7 +871,7 @@ gameList=( "Sequence Storm" #"Shades of Doom 1.2" "Shades of Doom" - #"Silver Dollar" + "Silver Dollar" "Slender Lost Vision" "Sonic Zoom" #"Space Defender" @@ -1903,7 +1903,7 @@ EOF ;; "Silver Dollar") export winVer="win7" - install_wine_bottle speechsdk + install_wine_bottle dotnet40 speechsdk download "http://download.dracoent.com/Windows/SilverDollarSetup.exe" wine "${cache}/SilverDollarSetup.exe" /silent add_launcher "c:\Program Files\Draconis Entertainment\Silver Dollar\SilverDollarGui.exe" From 6b5891822ec8d5accde3d16ed2d7733d8dd50b75 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 8 Aug 2021 10:13:06 -0700 Subject: [PATCH 2/8] Attempt to fix silver dollar --- audiogame-manager.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 07544a6..5a2d222 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1903,7 +1903,10 @@ EOF ;; "Silver Dollar") export winVer="win7" - install_wine_bottle dotnet40 speechsdk + install_wine_bottle speechsdk + # FIXME: Hacky, but it works. Install dotnet40 by itself so it actually doesn't hang. + winetricks -q dotnet40 + wineserver -k # Damn you, dotnet. download "http://download.dracoent.com/Windows/SilverDollarSetup.exe" wine "${cache}/SilverDollarSetup.exe" /silent add_launcher "c:\Program Files\Draconis Entertainment\Silver Dollar\SilverDollarGui.exe" From 072229a0be82deefb7a44a1ed882ff4ed47baae0 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 8 Aug 2021 10:23:22 -0700 Subject: [PATCH 3/8] Attempt more fixes --- audiogame-manager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 5a2d222..21399f2 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1905,7 +1905,7 @@ EOF export winVer="win7" install_wine_bottle speechsdk # FIXME: Hacky, but it works. Install dotnet40 by itself so it actually doesn't hang. - winetricks -q dotnet40 + DISPLAY="" winetricks -q dotnet40 wineserver -k # Damn you, dotnet. download "http://download.dracoent.com/Windows/SilverDollarSetup.exe" wine "${cache}/SilverDollarSetup.exe" /silent From 8c43c9b3e6effdca4d6b0b3e7176a27114022f6c Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 8 Aug 2021 10:29:06 -0700 Subject: [PATCH 4/8] Try to fix more dotnet stuff --- audiogame-manager.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 21399f2..7a74d6b 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -959,7 +959,10 @@ done case "${game}" in "A Hero's Call") export winVer="win7" - install_wine_bottle dotnet40 xna31 speechsdk corefonts + install_wine_bottle xna31 speechsdk corefonts + # Dotnet is evil. That is all. + DISPLAY="" winetricks -q dotnet40 + winetricks -k # Really! download "http://files.OutOfSightGames.com/files/a-heros-call.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll" unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/a-heros-call.zip" find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; @@ -1503,7 +1506,10 @@ case "${game}" in "Entombed") export winVer="win7" #install_wine_bottle dotnet35 msvcrt40 speechsdk - install_wine_bottle speechsdk msvcrt40 dotnet48 xna40 + install_wine_bottle speechsdk msvcrt40 + # Ok, more dotnet. + DISPLAY="" winetricks -q dotnet48 xna40 + winetricks -k # Sigh. download "http://blind-games.com/newentombed/EntombedSetup.exe" wine "${cache}/EntombedSetup.exe" /silent add_launcher "c:\Program Files\Entombed\Entombed.exe" @@ -1592,7 +1598,7 @@ case "${game}" in "Hunter") install_wine_bottle vb6run dx8vb # FIXME: Hacky, but it works. Install dotnet35 by itself so it actually doesn't hang. - winetricks -q dotnet35 + DISPLAY="" winetricks -q dotnet35 wineserver -k # Damn you, dotnet. download "http://www.agarchive.net/games/bsc/HunterSetup.exe" "https://www.agarchive.net/games/bsc/BSC%20unlock%20code%20generator.7z" wine "${cache}/HunterSetup.exe" /silent & @@ -2051,7 +2057,7 @@ EOF "Troopanum2") install_wine_bottle vb6run dx8vb # FIXME: Hacky, but it works. Install dotnet35 by itself so it actually doesn't hang. - winetricks -q dotnet35 + DISPLAY="" winetricks -q dotnet35 wineserver -k # Damn you, dotnet. download "https://www.agarchive.net/games/bsc/Troopanum2Setup.exe" "https://www.agarchive.net/games/bsc/BSC%20unlock%20code%20generator.7z" wine "${cache}/Troopanum2Setup.exe" /silent & From a8c68bda89e6fd993537562b91964e0cd8ad6756 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 8 Aug 2021 10:56:03 -0700 Subject: [PATCH 5/8] Finally fixed silver dollar --- audiogame-manager.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 7a74d6b..5beeff7 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1910,11 +1910,12 @@ EOF "Silver Dollar") export winVer="win7" install_wine_bottle speechsdk + download "http://download.dracoent.com/Windows/SilverDollarSetup.exe" + wine "${cache}/SilverDollarSetup.exe" /silent + # warning warning warning: Do not change location, or installer will not function. # FIXME: Hacky, but it works. Install dotnet40 by itself so it actually doesn't hang. DISPLAY="" winetricks -q dotnet40 wineserver -k # Damn you, dotnet. - download "http://download.dracoent.com/Windows/SilverDollarSetup.exe" - wine "${cache}/SilverDollarSetup.exe" /silent add_launcher "c:\Program Files\Draconis Entertainment\Silver Dollar\SilverDollarGui.exe" ;; "Slender Lost Vision") From 8952485f8bd659b756be0616aea5d5378d77099b Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 8 Aug 2021 15:02:06 -0400 Subject: [PATCH 6/8] Added a -R flag for redownloading all packages associated with an installer. --- audiogame-manager.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 5beeff7..0025b32 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -307,6 +307,9 @@ download() { dest="${dest//%20/ }" # Remove the destination file if it is empty. test -s "${cache}/${dest}" || rm -f "${cache}/${dest}" 2> /dev/null + if [[ "${redownload}" == "true" ]] && [[ -e "${cache}/${dest}" ]]; then + rm -v "${cache}/${dest}" + fi # Skip if the item is in cache. test -e "${cache}/${dest}" && continue if ! wget -4 -O "${cache}/${dest}" "${i}" ; then @@ -818,7 +821,7 @@ gameList=( "Castaways 2" #"Chopper Challenge" "Christmas WhoopAss" - #"Constant Battle" + "Constant Battle" "Copter Mission" "Crazy Party" "Crazy Tennis" @@ -927,6 +930,7 @@ declare -A command=( [l:]="Launch given game without interactive audiogame-manager menu specified by its wine bottle." [N]="No cache, delete the installer after it has been extracted." [P]="Print a list of packages required by audiogame-manager." + [R]="Redownload. Removes old versions of packages from cache before installing." [r]="Remove a game. This will delete all game data." ) @@ -951,6 +955,7 @@ while getopts "${args}" i ; do l) game_launcher "${OPTARG}";; N) noCache="true";; P) checklist quiet;; + R) redownload="true";; r) game_removal;; esac done From 19a8a877e13c4b2c6eeeef373e8fcb11fbda164a Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 8 Aug 2021 16:10:16 -0400 Subject: [PATCH 7/8] Fixed, I think, the launcher for warsim. --- audiogame-manager.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 0025b32..392ac46 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -699,7 +699,9 @@ game_launcher() { exit 0 fi if [[ "$game" =~ warsim ]]; then - wine "$winePath\\$wineExec" + pushd "$(winepath "$winePath")" + wine "$wineExec" + popd exit 0 fi if [[ -d "${WINEPREFIX}/drive_c/windows/syswow64" ]]; then From 11492ea5bfca98bb3627b3b9fb3e25f9670d4dfd Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 8 Aug 2021 16:22:00 -0400 Subject: [PATCH 8/8] Commented out constant battle because it does not work. --- audiogame-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 392ac46..e956f87 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -823,7 +823,7 @@ gameList=( "Castaways 2" #"Chopper Challenge" "Christmas WhoopAss" - "Constant Battle" + #"Constant Battle" "Copter Mission" "Crazy Party" "Crazy Tennis" @@ -1440,7 +1440,7 @@ case "${game}" in ;; "Constant Battle") export winVer="win7" - install_wine_bottle speechsdk + install_wine_bottle cjkfonts speechsdk download "https://renovagames.com/bc/BC-Setup.exe" wine "${cache}/BC-Setup.exe" /silent #add_launcher "c:\Program Files\"