From 59c73ee61671d204f922a36728d78ef2c44b33da Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 8 Feb 2022 12:57:27 -0500 Subject: [PATCH 01/11] Enable winetricks reporting by default so that packages that make audiogames work get reported to the winetricks maintainer. --- audiogame-manager.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index a897a38..ff5d0ce 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -498,6 +498,10 @@ echo "Loading documentation, please wait..." } winetricks() { + # Report used packages to the winetricks maintainer so he knows they are being used. + if ! [[ -e "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" ]]; then + echo "1" > "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" + fi # Download or update agm's copy of winetricks if [[ ! -e "${cache}/winetricks" ]]; then checkWinetricksUpdate="true" @@ -1593,7 +1597,7 @@ case "${game}" in "Crime Hunter") export WINEARCH=win64 export winVer="win7" - install_wine_bottle + install_wine_bottle sapi download "http://masonasons.me/softs/CH2.0Win.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient64.dll" unzip -d "$WINEPREFIX/drive_c/Program Files/crime-hunter" "${cache}/CH2.0Win.zip" find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvdaControllerClient64.dll" "{}" \; From aaf61bddfbbe30e1d72cced1b3b06b6824f60214 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 16 Feb 2022 18:18:16 -0500 Subject: [PATCH 02/11] Added logging. --- audiogame-manager.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index ff5d0ce..bfc8a39 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -833,6 +833,10 @@ unset noCache # Manual installation is not default, make sure it's unset unset manualInstall +# Set up logging +echo -e "\n\n-----> Logging started at $(date '+%A, %B %d, %Y at %I:%M%p')\n" >> "${cache}/audiogame-manager.log" +exec &> >(/usr/bin/tee -a "${cache}/audiogame-manager.log") + # The list of games available for installation. # Use menu friendly names. gameList=( From ac733a2e7e704704a79e4ddbc68cd330b6e13246 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Wed, 16 Feb 2022 15:25:17 -0800 Subject: [PATCH 03/11] Add code dungeon, sapi not working yet --- audiogame-manager.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index bfc8a39..2a0cd0a 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -902,6 +902,7 @@ gameList=( "Challenge of the Horse" #"Chopper Challenge" "Christmas WhoopAss" + "Code Dungeon" #"Constant Battle" "Copter Mission" "Crazy Party" @@ -1576,6 +1577,17 @@ case "${game}" in wine "${cache}/christmas whoopass setup.exe" /sp- /silent add_launcher "c:\Program Files\Draconis Entertainment\Christmas Whoop Ass\wa.exe" ;; + "Code Dungeon") + get_installer "codedungeon-win-64.zip" "https://stealcase.itch.io/codedungeon" + export WINEARCH=win64 + export winVer="win8" + install_wine_bottle + unzip -d "$WINEPREFIX/drive_c/Program Files/code-dungeon" "${cache}/codedungeon-win-64.zip" + # Weird work around to get keyboard working. + winetricks -q usetakefocus=y + winetricks -q usetakefocus=n + add_launcher "c:\Program Files\code-dungeon\Code Dungeon.exe" + ;; "Copter Mission") export bottle="oriol-gomez" export winVer="win7" From 7b5104dc2888b779a366e78e1c65ba8ce252f06d Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Wed, 16 Feb 2022 15:26:16 -0800 Subject: [PATCH 04/11] Fix two typos --- audiogame-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 2a0cd0a..406c878 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1072,7 +1072,7 @@ case "${game}" in install_wine_bottle xna31 speechsdk corefonts # Dotnet is evil. That is all. DISPLAY="" winetricks -q dotnet40 - winetricks -k # Really! + wineserver -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" "{}" \; @@ -1695,7 +1695,7 @@ case "${game}" in install_wine_bottle speechsdk msvcrt40 # Ok, more dotnet. DISPLAY="" winetricks -q dotnet48 xna40 - winetricks -k # Sigh. + wineserver -k # Sigh. download "http://blind-games.com/newentombed/EntombedSetup.exe" wine "${cache}/EntombedSetup.exe" /silent add_launcher "c:\Program Files\Entombed\Entombed.exe" From a900984ac77325f399022c442fda61ae40eec288 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 16 Feb 2022 19:18:15 -0500 Subject: [PATCH 05/11] Fixed a bug that will cause a file not found error on first run. --- audiogame-manager.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index bfc8a39..5a9463a 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -500,6 +500,7 @@ echo "Loading documentation, please wait..." winetricks() { # Report used packages to the winetricks maintainer so he knows they are being used. if ! [[ -e "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" ]]; then + mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/" echo "1" > "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" fi # Download or update agm's copy of winetricks @@ -978,7 +979,7 @@ gameList=( "Super Dogs Bone Hunt" "Super Egg Hunt" "Super Liam" - #"Super Mario Bros" + "Super Mario Bros" "Survive the Wild" "Swamp" "Technoshock" From c8a8b92b34090d04bd5402afc4fbd457749e1d0f Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Wed, 16 Feb 2022 16:35:15 -0800 Subject: [PATCH 06/11] Super Mario Bros works --- audiogame-manager.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 406c878..32aa003 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -979,7 +979,7 @@ gameList=( "Super Dogs Bone Hunt" "Super Egg Hunt" "Super Liam" - #"Super Mario Bros" + "Super Mario Bros" "Survive the Wild" "Swamp" "Technoshock" @@ -2273,6 +2273,7 @@ EOF install_wine_bottle speechsdk download "https://www.agarchive.net/games/jeqoconGames/super%20mario%20bros.7z" 7z e -o"$WINEPREFIX/drive_c/Program Files/Super Mario Bros" "${cache}/super mario bros.7z" + cp -v "$WINEPREFIX/drive_c/Program Files/Super Mario Bros"/*.wav "$WINEPREFIX/drive_c/Program Files/Super Mario Bros"/*.ogg "$WINEPREFIX/drive_c/Program Files/Super Mario Bros"/mario/ add_launcher "c:\Program Files\Super Mario Bros\Mario.exe" ;; "Survive the Wild") From d4681baff46393583d425fd4cbe1c3a1ef60a6da Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Wed, 16 Feb 2022 17:27:49 -0800 Subject: [PATCH 07/11] Sonic the hedgehog working... I think. --- audiogame-manager.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index f9b9e59..9232e76 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -975,6 +975,7 @@ gameList=( "Silver Dollar" "Slender Lost Vision" #"Shooter" + "Sonic the Hedgehog" "Sonic Zoom" #"Space Defender" "Super Dogs Bone Hunt" @@ -2233,6 +2234,16 @@ EOF find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvdaControllerClient64.dll" "{}" \; add_launcher "c:\Program Files\shooter\shooter.exe" ;; + "Sonic the Hedgehog") + export winVer="win7" + install_wine_bottle speechsdk + download "https://www.agarchive.net/games/jeqoconGames/sonic%20the%20hedgehog.7z" + 7z e -o"$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog" "${cache}/sonic the hedgehog.7z" + cp -v "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.wav "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.ogg "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.mp3 "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/sfx/ + cp -v "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.wav "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.ogg "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.mp3 "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/music/ + cp -v "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.wav "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.ogg "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/*.mp3 "$WINEPREFIX/drive_c/Program Files/Sonic the Hedgehog"/angles/ + add_launcher "c:\Program Files\Sonic the Hedgehog\sth.exe" + ;; "Sonic Zoom") export winVer="win7" install_wine_bottle speechsdk From ef7dc8591ad38edad6e379d0831dc614b762c769 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 24 Feb 2022 10:11:25 -0500 Subject: [PATCH 08/11] Updated RHVoice installer to latest version. --- audiogame-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 9232e76..624b122 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -525,10 +525,10 @@ install_rhvoice() { if [[ "$norh" == "true" ]]; then return fi - download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" + download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.2007.13-setup.exe" winetricks -q win8 echo "Installing RHVoice..." - wine "${cache}/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" & + wine "${cache}/RHVoice-voice-English-Bdl-v4.1.2007.13-setup.exe" & sleep 20 wineserver -k } From 0fea6213de86e0145707bced49ff8a07e466b96c Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 24 Feb 2022 10:17:07 -0500 Subject: [PATCH 09/11] Upgrade now handled with dialog. --- audiogame-manager.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 624b122..b2ffe93 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -86,10 +86,8 @@ update() { if [[ "$(wget --quiet -O - https://stormgames.wolfe.casa/downloads/${downloadFile} | sha256sum | cut -d ' ' -f1)" == "$(sha256sum "${filePath}" | cut -d ' ' -f1)" ]]; then return fi - echo "There is a new version of ${0##*/} available." - echo "Do you want to update now?" - read -r continue - if [[ "${continue,,}" =~ ^y|ye|yes$ ]]; then + dialog --backtitle "Audiogame Manager" --yesno "There is a new version of ${0##*/} available.\nDo you want to update now?" -1 -1 + if [[ ${continue} -eq 0 ]]; then if [[ -w "$0" ]]; then wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}" chmod +x "$0" From b8ca36baf552e74dc83fde8d79d735bb858bae90 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 24 Feb 2022 10:28:01 -0500 Subject: [PATCH 10/11] Fix a bug with updating happening even though you pick no. --- audiogame-manager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index b2ffe93..2f16795 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -86,7 +86,7 @@ update() { if [[ "$(wget --quiet -O - https://stormgames.wolfe.casa/downloads/${downloadFile} | sha256sum | cut -d ' ' -f1)" == "$(sha256sum "${filePath}" | cut -d ' ' -f1)" ]]; then return fi - dialog --backtitle "Audiogame Manager" --yesno "There is a new version of ${0##*/} available.\nDo you want to update now?" -1 -1 + dialog --backtitle "Audiogame Manager" --yesno "There is a new version of ${0##*/} available.\nDo you want to update now?" -1 -1 --stdout if [[ ${continue} -eq 0 ]]; then if [[ -w "$0" ]]; then wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}" From c97852de088fe156323eef7ff25ed657646821e8 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 24 Feb 2022 10:31:48 -0500 Subject: [PATCH 11/11] Fix that bug for real this time. --- audiogame-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 2f16795..d89d75c 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -86,8 +86,8 @@ update() { if [[ "$(wget --quiet -O - https://stormgames.wolfe.casa/downloads/${downloadFile} | sha256sum | cut -d ' ' -f1)" == "$(sha256sum "${filePath}" | cut -d ' ' -f1)" ]]; then return fi - dialog --backtitle "Audiogame Manager" --yesno "There is a new version of ${0##*/} available.\nDo you want to update now?" -1 -1 --stdout - if [[ ${continue} -eq 0 ]]; then + dialog --backtitle "Audiogame Manager" --yesno "There is a new version of ${0##*/} available.\nDo you want to update now?" -1 -1 + if [[ ${?} -eq 0 ]]; then if [[ -w "$0" ]]; then wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}" chmod +x "$0"