From ee9c7502a5935b9c64f29973b982bc8f271da846 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 6 Jul 2021 04:42:31 -0400 Subject: [PATCH] Add working RHVoice to 32 bit installations by default. This needs more work, but I'm tired, so saving progress for now. --- audiogame-manager.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index bf63d61..22ef940 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -457,10 +457,15 @@ install_wine_bottle() { geckoPath="${cache}/wine_gecko-2.40-x86.msi" fi if [[ "${WINEARCH}" == "win32" ]]; then + download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" # 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 + winetricks -q win8 + wine "${cache}/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" & + sleep 20 + wineserver -k 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. @@ -1364,8 +1369,8 @@ case "${game}" in add_launcher "c:\Program Files\Games\yahtzeeB\BGYahtzee.exe" ;; "Bloodshed") - export WINEARCH="win64" - install_wine_bottle + export winVer="win7" + install_wine_bottle speechsdk download "http://www.samtupy.com/games/bloodshed.exe" cp "${cache}/bloodshed.exe" "$WINEPREFIX/drive_c/Program Files/" add_launcher "c:\Program Files\bloodshed.exe" @@ -1935,10 +1940,9 @@ EOF add_launcher "c:\Program Files\Survive the Wild\stw.exe" ;; "Swamp") - export WINEARCH="win64" export winVer="win7" export winetricksSettings="vd=1024x768" - install_wine_bottle dx8vb quartz corefonts vb6run + 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" @@ -1946,7 +1950,7 @@ 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 && Windows64bit.bat' + wine cmd.exe /c 'cd /d c:\Program Files\swamp && Windows32bit.bat' add_launcher "c:\Program Files\swamp\Swamp.exe" ;; "Technoshock")