From 42835dc2a970d11698200a9fabf052f223645469 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sat, 15 Jan 2022 05:17:38 -0500
Subject: [PATCH 01/15] Updated Swamp installer and update script.

---
 audiogame-manager.sh         | 5 ++---
 game-scripts/swamp-update.sh | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 8876730..ec1b833 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -2183,9 +2183,8 @@ EOF
         export winVer="win7"
         export winetricksSettings="vd=1024x768"
         install_wine_bottle dx8vb quartz corefonts vb6run speechsdk
-        download "https://kaldobsky.com/audiogames/SwampPart1.zip" "https://kaldobsky.com/audiogames/SwampPart2.zip"
-        unzip -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPart1.zip"
-        unzip -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPart2.zip"
+        download "https://www.kaldobsky.com/audiogames/Swamp.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/Swamp.zip"
         # make sure the latest version is installed.
         if wget -O "${cache}/SwampPatch.zip" "https://www.kaldobsky.com/audiogames/SwampPatch.zip" ; then
             unzip -o -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPatch.zip"
diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index cd8bfa8..b8c9128 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -37,10 +37,11 @@
 #    Works which are defined in the CPAL as a work which combines Covered Code
 #    or portions thereof with code not governed by the terms of the CPAL.
  
-updateURL="https://www.kaldobsky.com/audiogames/SwampPatch.zip"
+cache="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache"
+updateURL="https://www.kaldobsky.com/audiogames/Swamp.zip"
 
 extract_error() {
-    echo "There was an error extracting the patch."
+    echo "There was an error extracting the zip file."
     exit 1
 }
 
@@ -53,7 +54,7 @@ trap popd EXIT
 
 echo "Checking for Swamp updates..."
 
-# Check for and download new patches.
+# Check for and download new versions.
 update="$(wget -N "${updateURL}" 2>&1 | grep "not modified on server")"
 
 if [ -n "${update}" ]; then
@@ -64,7 +65,7 @@ fi
 echo "Updating Swamp..."
 
 # Unzip the new patch
-unzip -o SwampPatch.zip || extract_error
+unzip -o Swamp.zip || extract_error
 
 echo "Swamp has been updated."
 

From a90b808700a4b1e22a8c6b8d2ee7fa7ffce7ac48 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 16 Jan 2022 16:08:04 -0500
Subject: [PATCH 02/15] Improved, hopefully, the swamp-update script.

---
 game-scripts/swamp-update.sh | 38 ++++++++++++------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index b8c9128..635fcb4 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -38,35 +38,23 @@
 #    or portions thereof with code not governed by the terms of the CPAL.
  
 cache="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache"
-updateURL="https://www.kaldobsky.com/audiogames/Swamp.zip"
-
-extract_error() {
-    echo "There was an error extracting the zip file."
-    exit 1
-}
+updateURL="https://www.kaldobsky.com/audiogames"
+updateFiles=("Swamp.zip")
 
 
-# Set the swamp directory
-pushd ~/.local/wine/swamp/drive_c/Program\ Files/swamp
+# Back up configuration files.
+for i in losers.txt muted.txt scriptkeys.txt keyconfig.ini ; do
+    cp -v ~/"drive_c/Program Files/swamp/${i}" ~/"drive_c/Program Files/swamp/${i}.agm"
+    echo "${i} backed up as ${i}.agm"
+done | dialog --progressbox "Backing up configuration files. They can be found in your swamp directory." -1 -1
 
-# Restore the directory stack on exit.
-trap popd EXIT
+sleep 3
 
-echo "Checking for Swamp updates..."
+# Download and extract updates
+for i in "${updateFiles[@]}" ; do
+    wget -O "${cache}/$i" "${url}/$i"
+    unzip -d ~/"drive_c/Program Files/swamp" "${cache}/${i}"
+done | dialog --progressbox "Updating Swamp, please wait..." -1 -1
 
-# Check for and download new versions.
-update="$(wget -N "${updateURL}" 2>&1 | grep "not modified on server")"
-
-if [ -n "${update}" ]; then
-    echo "Swamp is up to date."
-    exit 0 
-fi
-
-echo "Updating Swamp..."
-
-# Unzip the new patch
-unzip -o Swamp.zip || extract_error
-
-echo "Swamp has been updated."
 
 exit 0

From bc5c4f37f6c5dba46a7a9529973692a60923bf72 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 16 Jan 2022 16:27:28 -0500
Subject: [PATCH 03/15] Fixed a pretty massive bug in update-swamp.

---
 game-scripts/swamp-update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index 635fcb4..c823bff 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -11,7 +11,7 @@
 #
 #    Software distributed under the License is distributed on an â ISâasis,
 #    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#    for the specific language governing rights and limitations under the
+#    for THE SPecific language governing rights and limitations under the
 #    License.
 #
 #    The Original Code is audiogame manager.
@@ -44,7 +44,7 @@ updateFiles=("Swamp.zip")
 
 # Back up configuration files.
 for i in losers.txt muted.txt scriptkeys.txt keyconfig.ini ; do
-    cp -v ~/"drive_c/Program Files/swamp/${i}" ~/"drive_c/Program Files/swamp/${i}.agm"
+    cp -v ~/".local/wine/swamp/drive_c/Program Files/swamp/${i}" ~/".local/wine/swamp/drive_c/Program Files/swamp/${i}.agm"
     echo "${i} backed up as ${i}.agm"
 done | dialog --progressbox "Backing up configuration files. They can be found in your swamp directory." -1 -1
 
@@ -53,7 +53,7 @@ sleep 3
 # Download and extract updates
 for i in "${updateFiles[@]}" ; do
     wget -O "${cache}/$i" "${url}/$i"
-    unzip -d ~/"drive_c/Program Files/swamp" "${cache}/${i}"
+    unzip -d ~/".local/wine/swamp/drive_c/Program Files/swamp" "${cache}/${i}"
 done | dialog --progressbox "Updating Swamp, please wait..." -1 -1
 
 

From b5ad1a33bc44f066eba69b4d0f22aeebd88df080 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 16 Jan 2022 20:21:10 -0500
Subject: [PATCH 04/15] Fixed another bug in swamp update script.

---
 game-scripts/swamp-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index c823bff..d482b3c 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -52,7 +52,7 @@ sleep 3
 
 # Download and extract updates
 for i in "${updateFiles[@]}" ; do
-    wget -O "${cache}/$i" "${url}/$i"
+    wget -O "${cache}/$i" "${updateURL}/$i"
     unzip -d ~/".local/wine/swamp/drive_c/Program Files/swamp" "${cache}/${i}"
 done | dialog --progressbox "Updating Swamp, please wait..." -1 -1
 

From 9dea96e0d0ee303c886437a59344d5803297629b Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Thu, 20 Jan 2022 20:46:35 -0500
Subject: [PATCH 05/15] Remove all the prompts when extracting the new Swamp
 zip file.

---
 game-scripts/swamp-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index c823bff..cf7249d 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -53,7 +53,7 @@ sleep 3
 # Download and extract updates
 for i in "${updateFiles[@]}" ; do
     wget -O "${cache}/$i" "${url}/$i"
-    unzip -d ~/".local/wine/swamp/drive_c/Program Files/swamp" "${cache}/${i}"
+    unzip -o -d ~/".local/wine/swamp/drive_c/Program Files/swamp" "${cache}/${i}"
 done | dialog --progressbox "Updating Swamp, please wait..." -1 -1
 
 

From a9a6e1689fa56d33f94fa61394fd6f468f378e80 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Fri, 21 Jan 2022 19:24:51 -0800
Subject: [PATCH 06/15] Add several aprone games, add all aprone games to one
 bottle. This will require user intervension for already installed games

---
 audiogame-manager.sh | 93 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 6 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index ec1b833..fa10beb 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -380,6 +380,18 @@ get_bottle() {
         "esp-pinball-classic"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
         "esp-pinball-extreme"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
         "esp-pinball-party-pack"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
+        # Aprone (Jeremy Kaldobsky) games.
+        "castaways"*) ;&
+        "castaways-2"*) ;&
+        "daytona-and-the-book-of-gold"*) ;&
+        "dog-who-hates-toast"*) ;&
+        "lunimals"*) ;&
+        "paw-prints"*) ;&
+        "preludeamals"*) ;&
+        "puzzle-divided"*) ;&
+        "revelation"*) ;&
+        "swamp"*) ;&
+        "triple -triad"*) export WINEPREFIX="${HOME}/.local/wine/aprone" ;;
         *) export WINEPREFIX="${HOME}/.local/wine/${game%|*}";;
     esac
 }
@@ -896,8 +908,10 @@ gameList=(
     "Crazy Tennis"
     "Crime Hunter"
     "Danger on the Wheel"
+    "Daytona and the Book of Gold"
     "Death on the Road"
     "Deathmatch"
+    "Dog Who Hates Toast"
     "Duck Hunt"
     "DynaMan"
     "Easter Quest"
@@ -937,11 +951,15 @@ gameList=(
     "Palace Punch Up"
     "Paladin of the Sky"
     "Park Boss"
+    "Paw Prints"
     "Perilous Hearts"
     "Pontes Kickups!"
     "Pigeon Panic"
+    "Preludeamals"
     #"Psycho Strike"
+    "Puzzle Divided"
     "Q9"
+    "Revelation"
     "Rhythm Rage"
     #"River raiders"
     "RS Games"
@@ -1505,6 +1523,7 @@ case "${game}" in
         add_launcher "c:\Program Files\Breed memorial\Breed memorial\breed memorial.exe"
     ;;
     "Castaways")
+        export bottle="aprone"
         export winVer="win7"
         install_wine_bottle vb6run dx8vb speechsdk
         download "https://www.kaldobsky.com/audiogames/castaways.zip"
@@ -1513,12 +1532,13 @@ case "${game}" in
         add_launcher "c:\Program Files\castaways\Castaways.exe"
     ;;
     "Castaways 2")
+        export bottle="aprone"
         export winVer="win7"
         install_wine_bottle vb6run dx8vb speechsdk
         download "http://www.kaldobsky.com/audiogames/castaways2beta.zip"
-        unzip -d "$WINEPREFIX/drive_c/Program Files/castaways" "${cache}/castaways2beta.zip"
-        wine "c:\Program Files\castaways\Checkup.exe" /verysilent
-        add_launcher "c:\Program Files\castaways\Castaways2.exe"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/castaways2" "${cache}/castaways2beta.zip"
+        wine "c:\Program Files\castaways2\Checkup.exe" /verysilent
+        add_launcher "c:\Program Files\castaways2\Castaways2.exe"
     ;;
     "Chopper Challenge")
         # Freezes at menu
@@ -1583,7 +1603,17 @@ case "${game}" in
         find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
         add_launcher "c:\Program Files\danger on the wheel\game.exe"
     ;;
-    "Death on the Road")
+    "Daytona and the Book of Gold")
+        export bottle="aprone"
+        export winVer="win7"
+        export winetricksSettings="vd=1024x768"
+        install_wine_bottle vb6run dx8vb quartz corefonts
+        download "https://kaldobsky.com/audiogames/Daytona.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/daytona" "${cache}/Daytona.zip"
+        wine 'c:\Program Files\daytona\checkup.exe' /verysilent
+        add_launcher "c:\Program Files\daytona\Daytona.exe"
+;;
+"Death on the Road")
         export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
@@ -1599,6 +1629,17 @@ case "${game}" in
         wine "${cache}/death match project alpha setup.exe" /silent
         add_launcher "c:\Program Files\reality software\death match project alpha\dm1.exe"
     ;;
+    "Dog Who Hates Toast")
+        export bottle="aprone"
+        export winVer="win7"
+        export winetricksSettings="vd=1024x768"
+        install_wine_bottle vb6run dx8vb quartz speechsdk corefonts
+        download "https://www.kaldobsky.com/audiogames/dogwhohatestoast.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/dogwhohatestoast" "${cache}/dogwhohatestoast.zip"
+        wine 'c:\Program Files\dogwhohatestoast\checkup.exe' /verysilent
+        add_launcher "c:\Program Files\dogwhohatestoast\DogwhoHatesToast.exe"
+        echo "Note: Dog who Hates Toast installed. Once you start the game, you must press tab until you hear sapi on to get speech." >&2
+;;
     "Duck Hunt")
         export bottle="l-works"
         install_wine_bottle vb6run dx8vb speechsdk
@@ -1884,13 +1925,13 @@ EOF
         add_launcher "c:\Program Files\Lone Wolf\lw.exe"
     ;;
     "Lunimals")
+        export bottle="aprone"
         export winVer="win7"
         export winetricksSettings="vd=1024x768"
         install_wine_bottle vb6run dx8vb quartz speechsdk corefonts
         download "https://kaldobsky.com/audiogames/lunimals.zip"
         unzip -d "$WINEPREFIX/drive_c/Program Files/lunimals" "${cache}/lunimals.zip"
-        cp "$WINEPREFIX/drive_c/Program Files/lunimals/dx7vb.dll" "$WINEPREFIX/drive_c/windows/system32"
-        wine cmd.exe /c 'cd /d c:\windows\system32 && regsvr32 dx7vb.dll'
+        wine 'c:\Program Files\lunimals\checkup.exe' /verysilent
         add_launcher "c:\Program Files\lunimals\Lunimals.exe"
         echo "Note: Lunimals installed. Once you start the game, you must press tab until you hear sapi on to get speech." >&2
     ;;
@@ -1992,6 +2033,16 @@ EOF
         wineserver -w
         add_launcher "c:\Program Files\NASoft\ParkBoss\pbMain.exe"
     ;;
+    "Paw Prints")
+        export bottle="aprone"
+        export winVer="win7"
+        export winetricksSettings="vd=1024x768"
+        install_wine_bottle vb6run dx8vb quartz speechsdk corefonts
+        download "https://www.kaldobsky.com/audiogames/pawprints.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/pawprints" "${cache}/pawprints.zip"
+        wine 'c:\Program Files\pawprints\checkup.exe' /verysilent
+        add_launcher "c:\Program Files\pawprints\PawPrints.exe"
+    ;;
     "Perilous Hearts")
         install_wine_bottle speechsdk
         download "https://www.agarchive.net/games/blastbay/perilous%20hearts%20concept%20demo.exe"
@@ -2005,18 +2056,46 @@ EOF
         wine "${cache}/pigeon panic setup.exe" /silent
         add_launcher "c:\Program Files\Lworks\Pigeon Panic\pigeonPanic.exe"
     ;;
+    "Preludeamals")
+        export bottle="aprone"
+        export winVer="win7"
+        export winetricksSettings="vd=1024x768"
+        install_wine_bottle vb6run dx8vb quartz speechsdk corefonts
+        download "https://www.kaldobsky.com/audiogames/Preludeamals.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/preludeamals" "${cache}/Preludeamals.zip"
+        wine 'c:\Program Files\preludeamals\checkup.exe' /verysilent
+        add_launcher "c:\Program Files\preludeamals\Preludeamals.exe"
+    ;;
     "Psycho Strike")
         install_wine_bottle speechsdk
         download "http://www.vgstorm.com/psycho_strike_installer.exe"
         wine "${cache}/psycho_strike_installer.exe" /silent
         add_launcher "c:\Program Files\VGStorm.com\Psycho Strike\strike.exe"
     ;;
+    "Puzzle Divided")
+        export bottle="aprone"
+        export winVer="win7"
+        export winetricksSettings="vd=1024x768"
+        install_wine_bottle vb6run dx8vb quartz corefonts
+        download "https://www.kaldobsky.com/audiogames/puzzledivided.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/puzzledivided" "${cache}/puzzledivided.zip"
+        add_launcher "c:\Program Files\puzzledivided\PuzzleDivided.exe"
+    ;;
     "Q9")
         install_wine_bottle
         download "http://www.blastbay.com/q9_english_installer.exe"
         wine "${cache}/q9_english_installer.exe" /silent
         add_launcher "c:\Program Files\Q9 Action Game\q9.exe"
     ;;
+    "Revelation")
+        export bottle="aprone"
+        export winVer="win7"
+        export winetricksSettings="vd=1024x768"
+        install_wine_bottle vb6run dx8vb quartz speechsdk corefonts
+        download "https://www.kaldobsky.com/audiogames/revelation.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/revelation" "${cache}/revelation.zip"
+        add_launcher "c:\Program Files\revelation\Revelation.exe"
+    ;;
     "Rhythm Rage")
         export bottle="oriol-gomez"
         export winVer="win7"
@@ -2180,6 +2259,7 @@ EOF
         add_launcher "c:\Program Files\Survive the Wild\stw.exe"
     ;;
     "Swamp")
+        export bottle="aprone"
         export winVer="win7"
         export winetricksSettings="vd=1024x768"
         install_wine_bottle dx8vb quartz corefonts vb6run speechsdk
@@ -2271,6 +2351,7 @@ EOF
         add_launcher "c:\Program Files\Three-D-Velocity-Binaries-master\tdv.exe"
     ;;
     "Triple Triad")
+        export bottle="aprone"
         export winVer="win7"
         install_wine_bottle vb6run dx8vb speechsdk
         download "https://www.kaldobsky.com/audiogames/tripletriad.zip"

From 615dd39033b6034c4d576815706ff4849916de5c Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Fri, 21 Jan 2022 23:08:59 -0500
Subject: [PATCH 07/15] new flag, -n, which skips installing RHVoice for people
 who don't want to use it. Also, RHVoice should not longer reinstall in
 bottles that already have it.

---
 audiogame-manager.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index fa10beb..b8fcc6b 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -510,6 +510,21 @@ winetricks() {
     ${cache}/winetricks "$@"
 }
 
+install_rhvoice() {
+    if [[ -d "$HOME/.local/wine/${bottle}/drive_c/Program Files/Olga Yakovleva/" ]]; then
+        return
+    fi
+    if [[ "$norh" == "true" ]]; then
+        return
+    fi
+    download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.9-setup.exe"
+    winetricks -q win8
+    echo "Installing RHVoice..."
+    wine "${cache}/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" &
+    sleep 20
+    wineserver -k
+}
+
 install_wine_bottle() {
     # 32 bit installations work best and are the default here, if you need to override it, do it in the game specific installation steps.
     export WINEARCH="${WINEARCH:-win32}"
@@ -540,12 +555,7 @@ install_wine_bottle() {
             wine msiexec /i z:"$monoPath" /quiet
             wine msiexec /i z:"$geckoPath" /quiet
             if [[ "${*}" =~ speechsdk ]]; then
-                download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.9-setup.exe"
-                winetricks -q win8
-                echo "Installing RHVoice..."
-                wine "${cache}/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" &
-                sleep 20
-                wineserver -k
+                install_rhvoice
             fi
             winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
         else
@@ -1029,6 +1039,7 @@ declare -A command=(
     [L]="Display license information."
     [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."
+    [n]="No RHVoice, do not install RHVoice when the game is installed."
     [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."
@@ -1055,6 +1066,7 @@ while getopts "${args}" i ; do
         L) license;;
         l) game_launcher "${OPTARG}";;
         N) noCache="true";;
+        n) norh="true";;
         P) checklist quiet;;
         R) redownload="true";;
         r) game_removal;;

From 3ca9d7db07ecbd8293bc98c03cd1307b7671827b Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 23 Jan 2022 17:45:22 -0500
Subject: [PATCH 08/15] Tumni13 games put into their own shared bottle. Added
 game "Challenge of the Horse".

---
 audiogame-manager.sh | 48 ++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index b8fcc6b..b0cecba 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -354,7 +354,23 @@ download() {
 get_bottle() {
     # Handles games that use the same wine bottle
     case "${game}" in 
+        # Aprone (Jeremy Kaldobsky) games.
+        "castaways"*) ;&
+        "castaways-2"*) ;&
+        "daytona-and-the-book-of-gold"*) ;&
+        "dog-who-hates-toast"*) ;&
+        "lunimals"*) ;&
+        "paw-prints"*) ;&
+        "preludeamals"*) ;&
+        "puzzle-divided"*) ;&
+        "revelation"*) ;&
+        "swamp"*) ;&
+        "triple -triad"*) export WINEPREFIX="${HOME}/.local/wine/aprone" ;;
         "bg-"*) export WINEPREFIX="${HOME}/.local/wine/bg";;
+        # ESP Pinball games
+        "esp-pinball-classic"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
+        "esp-pinball-extreme"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
+        "esp-pinball-party-pack"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
         # l-works games group
         "duck-hunt"*) ;&
         "judgement-day"*) ;&
@@ -376,22 +392,9 @@ get_bottle() {
         "run-for-your-life"*) ;&
         "thief"*) ;&
         "villains-from-beyond"*) export WINEPREFIX="${HOME}/.local/wine/oriol-gomez";;
-        # ESP Pinball games
-        "esp-pinball-classic"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
-        "esp-pinball-extreme"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
-        "esp-pinball-party-pack"*) export WINEPREFIX="${HOME}/.local/wine/esp-pinball";;
-        # Aprone (Jeremy Kaldobsky) games.
-        "castaways"*) ;&
-        "castaways-2"*) ;&
-        "daytona-and-the-book-of-gold"*) ;&
-        "dog-who-hates-toast"*) ;&
-        "lunimals"*) ;&
-        "paw-prints"*) ;&
-        "preludeamals"*) ;&
-        "puzzle-divided"*) ;&
-        "revelation"*) ;&
-        "swamp"*) ;&
-        "triple -triad"*) export WINEPREFIX="${HOME}/.local/wine/aprone" ;;
+        # tunmi13 games group
+        "battle-of-the-hunter"*) ;&
+        "challenge-of-the-horse"*) export WINEPREFIX="${HOME}/.local/wine/tunmi13";;
         *) export WINEPREFIX="${HOME}/.local/wine/${game%|*}";;
     esac
 }
@@ -910,6 +913,7 @@ gameList=(
     #"Breed Memorial"
     "Castaways"
     "Castaways 2"
+    "Challenge of the Horse"
     #"Chopper Challenge"
     "Christmas WhoopAss"
     #"Constant Battle"
@@ -1127,9 +1131,10 @@ case "${game}" in
         echo "After you launch the game, press tab then enter and it should begin speaking."
     ;;
     "Battle of the Hunter")
+        export bottle="tunmi13"
         export winVer="win7"
         install_wine_bottle speechsdk
-        download "https://stormgames.wolfe.casa/downloads/bth.zip"
+        download "http://tunmi13.ddns.net/projects/bth.zip"
         unzip -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/bth.zip"
         find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
         add_launcher "c:\Program Files\\${game}\bth.exe"
@@ -1552,6 +1557,15 @@ case "${game}" in
         wine "c:\Program Files\castaways2\Checkup.exe" /verysilent
         add_launcher "c:\Program Files\castaways2\Castaways2.exe"
     ;;
+    "Challenge of the Horse")
+        export bottle="tunmi13"
+        export winVer="win7"
+        install_wine_bottle speechsdk
+        download "http://tunmi13.ddns.net/projects/coth.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/coth.zip"
+        find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
+        add_launcher "c:\Program Files\\${game}\game.exe"
+    ;;
     "Chopper Challenge")
         # Freezes at menu
         install_wine_bottle vb6run dx8vb speechsdk

From 05b02e366ff99c8dcbbcf4b97f5bccc8c70ce948 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 23 Jan 2022 23:58:15 -0500
Subject: [PATCH 09/15] Swamp update scripts now uses the new aprone bottle.

---
 game-scripts/swamp-update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index bb4e2c1..b8babb9 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -44,7 +44,7 @@ updateFiles=("Swamp.zip")
 
 # Back up configuration files.
 for i in losers.txt muted.txt scriptkeys.txt keyconfig.ini ; do
-    cp -v ~/".local/wine/swamp/drive_c/Program Files/swamp/${i}" ~/".local/wine/swamp/drive_c/Program Files/swamp/${i}.agm"
+    cp -v ~/".local/wine/aprone/drive_c/Program Files/swamp/${i}" ~/".local/wine/swamp/drive_c/Program Files/swamp/${i}.agm"
     echo "${i} backed up as ${i}.agm"
 done | dialog --progressbox "Backing up configuration files. They can be found in your swamp directory." -1 -1
 
@@ -53,7 +53,7 @@ sleep 3
 # Download and extract updates
 for i in "${updateFiles[@]}" ; do
     wget -O "${cache}/$i" "${updateURL}/$i"
-    unzip -o -d ~/".local/wine/swamp/drive_c/Program Files/swamp" "${cache}/${i}"
+    unzip -o -d ~/".local/wine/aprone/drive_c/Program Files/swamp" "${cache}/${i}"
 done | dialog --progressbox "Updating Swamp, please wait..." -1 -1
 
 

From ec6e49da190c8992f37444f52098a37567c0d156 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 24 Jan 2022 00:05:02 -0500
Subject: [PATCH 10/15] Missed a rename in the update script.

---
 game-scripts/swamp-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index b8babb9..0b704d0 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -44,7 +44,7 @@ updateFiles=("Swamp.zip")
 
 # Back up configuration files.
 for i in losers.txt muted.txt scriptkeys.txt keyconfig.ini ; do
-    cp -v ~/".local/wine/aprone/drive_c/Program Files/swamp/${i}" ~/".local/wine/swamp/drive_c/Program Files/swamp/${i}.agm"
+    cp -v ~/".local/wine/aprone/drive_c/Program Files/swamp/${i}" ~/".local/wine/aprone/drive_c/Program Files/swamp/${i}.agm"
     echo "${i} backed up as ${i}.agm"
 done | dialog --progressbox "Backing up configuration files. They can be found in your swamp directory." -1 -1
 

From b50f218365c6ba24ca1937b96ddcf8680e59f2f8 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 23 Jan 2022 22:11:25 -0800
Subject: [PATCH 11/15] Use checkup.exe for swamp instead of win32.bat to avoid
 some problems

---
 audiogame-manager.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index b0cecba..55235ae 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -2295,7 +2295,8 @@ EOF
         if wget -O "${cache}/SwampPatch.zip" "https://www.kaldobsky.com/audiogames/SwampPatch.zip" ; then
             unzip -o -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPatch.zip"
         fi
-        wine cmd.exe /c 'cd /d c:\Program Files\swamp && Windows32bit.bat'
+        wine 'c:\Program Files\swamp\checkup.exe' /verysilent
+        #wine cmd.exe /c 'cd /d c:\Program Files\swamp && Windows32bit.bat'
         add_launcher "c:\Program Files\swamp\Swamp.exe"
     ;;
     "Technoshock")

From 174ef9bd6cff0f07cf7fd1d4015222fd514b2452 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 24 Jan 2022 01:41:45 -0500
Subject: [PATCH 12/15] Prompt to remove Swamp music directory which can cause
 problems without a full 32 bit gstreamer installation.

---
 audiogame-manager.sh         | 12 +++++++++---
 game-scripts/swamp-update.sh |  8 ++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 55235ae..903d702 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -2288,15 +2288,21 @@ EOF
         export bottle="aprone"
         export winVer="win7"
         export winetricksSettings="vd=1024x768"
+        dialog --backtitle "Audiogame manager" --yesno "If you do not have a full 32 bit gstreamer installation, the Swamp music can cause stuttering and crashes. Would you like to remove the music directory after installation?" -1 -1 --stdout
+        deleteMusic=$?
         install_wine_bottle dx8vb quartz corefonts vb6run speechsdk
         download "https://www.kaldobsky.com/audiogames/Swamp.zip"
         unzip -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/Swamp.zip"
         # make sure the latest version is installed.
-        if wget -O "${cache}/SwampPatch.zip" "https://www.kaldobsky.com/audiogames/SwampPatch.zip" ; then
-            unzip -o -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPatch.zip"
-        fi
+        #if wget -O "${cache}/SwampPatch.zip" "https://www.kaldobsky.com/audiogames/SwampPatch.zip" ; then
+            #nzip -o -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/SwampPatch.zip"
+        #fi
         wine 'c:\Program Files\swamp\checkup.exe' /verysilent
         #wine cmd.exe /c 'cd /d c:\Program Files\swamp && Windows32bit.bat'
+        # Delete music if requested.
+        if [[ $deleteMusic -eq 0 ]]; then
+            rm -frv "$WINEPREFIX/drive_c/Program Files/swamp/sounds/Music/"
+        fi
         add_launcher "c:\Program Files\swamp\Swamp.exe"
     ;;
     "Technoshock")
diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh
index 0b704d0..e69f551 100755
--- a/game-scripts/swamp-update.sh
+++ b/game-scripts/swamp-update.sh
@@ -42,6 +42,9 @@ updateURL="https://www.kaldobsky.com/audiogames"
 updateFiles=("Swamp.zip")
 
 
+dialog --backtitle "Audiogame manager" --yesno "If you do not have a full 32 bit gstreamer installation, the Swamp music can cause stuttering and crashes. Would you like to remove the music directory after installation?" -1 -1 --stdout
+deleteMusic=$?
+
 # Back up configuration files.
 for i in losers.txt muted.txt scriptkeys.txt keyconfig.ini ; do
     cp -v ~/".local/wine/aprone/drive_c/Program Files/swamp/${i}" ~/".local/wine/aprone/drive_c/Program Files/swamp/${i}.agm"
@@ -56,5 +59,10 @@ for i in "${updateFiles[@]}" ; do
     unzip -o -d ~/".local/wine/aprone/drive_c/Program Files/swamp" "${cache}/${i}"
 done | dialog --progressbox "Updating Swamp, please wait..." -1 -1
 
+        # Delete music if requested.
+        if [[ $deleteMusic -eq 0 ]]; then
+            rm -frv ~/".local/wine/aprone/drive_c/Program Files/swamp/sounds/Music/"
+        fi
+
 
 exit 0

From 7eb1e2bb3e4146297095b4d664b76b05ab5176ed Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sat, 5 Feb 2022 20:54:38 -0500
Subject: [PATCH 13/15] Revert back to using system available 64 bit wine
 prefixes.

---
 audiogame-manager.sh | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 903d702..9d921a8 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -552,36 +552,14 @@ install_wine_bottle() {
             download 'http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi'
             geckoPath="${cache}/wine_gecko-2.40-x86.msi"
         fi
-        if [[ "${WINEARCH}" == "win32" ]]; then
             # This is in a brace list to pipe through dialog.
             { DISPLAY="" wineboot -u
             wine msiexec /i z:"$monoPath" /quiet
             wine msiexec /i z:"$geckoPath" /quiet
-            if [[ "${*}" =~ speechsdk ]]; then
+            if [[ "${*}" =~ speechsdk ]] || [[ "${WINEARCH}" == "win64" ]]; then
                 install_rhvoice
             fi
             winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
-        else
-            # This is in a brace list to pipe through dialog.
-            download "https://nashcentral.duckdns.org/projects/wine.tar.gz"
-            { tar xf "${cache}/wine.tar.gz" -C "${HOME}/.local/wine/"
-            mv "${HOME}/.local/wine/.wine/drive_c/users/user" "${HOME}/.local/wine/.wine/drive_c/users/${USER}"
-            if [[ "$(uname)" == "Darwin" ]]; then
-                gsed -i 's/"DefaultTTSRate"=dword:00000000/"DefaultTTSRate"=dword:00000005/' "${HOME}/.local/wine/.wine/user.reg"
-            else
-                sed -i 's/"DefaultTTSRate"=dword:00000000/"DefaultTTSRate"=dword:00000005/' "${HOME}/.local/wine/.wine/user.reg"
-            fi
-            mv "${HOME}/.local/wine/.wine/" "${WINEPREFIX}/"
-            wine64 cmd /c exit
-            wine msiexec /i z:"$monoPath" /quiet
-            wine msiexec /i z:"$geckoPath" /quiet
-            if [[ -z "$winVer" ]]; then
-                download "http://kitchen.kaldobsky.com/ttsgames/SpeechXP.exe"
-                winetricks -q winxp
-                wine "${cache}/SpeechXP.exe" /silent
-            fi
-            winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
-        fi
 }
 
 

From 7a73efb9b305b55cdcce735387d5834622dc2d18 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sat, 5 Feb 2022 21:38:13 -0500
Subject: [PATCH 14/15] Game "The Vale" added but not quite working yet.

---
 audiogame-manager.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 9d921a8..428b328 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -978,6 +978,7 @@ gameList=(
     "The Blind Swordsman"
     #"The Gate"
     "The Great Toy Robbery"
+    "The Vale"
     "Thief"
     "Traders of Known Space"
     #"Three D velocity"
@@ -2327,6 +2328,14 @@ EOF
         find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
         add_launcher "c:\Program Files\Lworks\The Great Toy Robbery\tgtr.exe"
     ;;
+    "The Vale")
+        get_installer "the-vale-win.zip" "https://falling-squirrel.itch.io/the-vale"
+        export WINEARCH=win64
+        export winVer="win7"
+        install_wine_bottle
+        unzip -d "$WINEPREFIX/drive_c/Program Files/the-vale" "${cache}/the-vale-win.zip"
+        add_launcher "c:\Program Files\the-vale\TheVale.exe"
+    ;;
     "Thief")
         export bottle="oriol-gomez"
         export winVer="win7"

From 70eed456034047ac4f987eebc9341dfdab584859 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 6 Feb 2022 02:05:43 -0500
Subject: [PATCH 15/15] Game "The Vale" now working.

---
 audiogame-manager.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 428b328..a897a38 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -2331,9 +2331,12 @@ EOF
     "The Vale")
         get_installer "the-vale-win.zip" "https://falling-squirrel.itch.io/the-vale"
         export WINEARCH=win64
-        export winVer="win7"
+        export winVer="win8"
         install_wine_bottle
         unzip -d "$WINEPREFIX/drive_c/Program Files/the-vale" "${cache}/the-vale-win.zip"
+        # Weird work around to get keyboard working.
+        winetricks -q usetakefocus=y
+        winetricks -q usetakefocus=n
         add_launcher "c:\Program Files\the-vale\TheVale.exe"
     ;;
     "Thief")