From 3f5771c69ab4474d006a819d12391900b39f6a52 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sat, 2 Sep 2023 23:39:39 -0400
Subject: [PATCH] Swamp seems to be fixed in wine 8.14. If you are using wine
 earlier than this version, please use the master branch, not testing.

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

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 3136be7..4504001 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -321,7 +321,6 @@ get_bottle() {
         "revelation"*) ;&
         "swamp"*) ;&
         "triple-triad"*)
-            install_wine "7.7" "32"
             export WINEPREFIX="${HOME}/.local/wine/aprone" ;;
         "bg-"*) export WINEPREFIX="${HOME}/.local/wine/bg";;
         # ESP Pinball games
@@ -612,8 +611,8 @@ install_wine_bottle() {
     export WINEPREFIX="$HOME/.local/wine/${bottle}"
     # Arguments to the function are dependancies to be installed.
         # Get location of mono and gecko.
-        monoPath="$(find /usr/share/wine/mono -name "wine-mono*x86.msi" 2> /dev/null)"
-        geckoPath="$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi" 2> /dev/null)"
+        monoPath="$(find /usr/share/wine/ -maxdepth 1 -type d -name mono 2> /dev/null)"
+        geckoPath="$(find /usr/share/wine/ -maxdepth 1 -type d "gecko" 2> /dev/null)"
         if [[ -z "$monoPath" ]]; then
             download 'http://dl.winehq.org/wine/wine-mono/6.0.0/wine-mono-6.0.0-x86.msi'
             monoPath="${cache}/wine-mono-6.0.0-x86.msi"
@@ -2407,6 +2406,7 @@ EOF
         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
+        alert
     ;;
     "Manamon")
         export winVer="win7"
@@ -2959,14 +2959,12 @@ EOF
         alert
     ;;
     "Swamp")
-        export version="7.7"
         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=$?
         download "https://www.kaldobsky.com/audiogames/Swamp.zip"
-        install_wine "${version}" "32"
         install_wine_bottle dx8vb quartz corefonts vb6run speechsdk
         unzip -d "$WINEPREFIX/drive_c/Program Files/swamp" "${cache}/Swamp.zip"
         # make sure the latest version is installed.
@@ -2979,6 +2977,7 @@ EOF
         if [[ $deleteMusic -eq 0 ]]; then
             rm -frv "$WINEPREFIX/drive_c/Program Files/swamp/sounds/Music/"
         fi
+        rm -fv "$WINEPREFIX/drive_c/Program Files/swamp/maps/sub2"
         add_launcher "c:\Program Files\swamp\Swamp.exe"
     ;;
     "Tactical Battle")