From 03124451c4fd56f66d997a26c6266f6887c3aefe Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Tue, 28 Mar 2023 12:20:17 -0700 Subject: [PATCH 1/6] Add Sarah and the Castle of Witchcraft and Wizardry --- audiogame-manager.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index e33a8f4..f4fc550 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1109,6 +1109,7 @@ gameList=( "RS Games" "Run For Your Life" #"Sammy Center" + "Sarah and the Castle of Witchcraft and Wizardry" "Scramble!" "Screaming Strike 2" "Sketchbook" @@ -2568,6 +2569,13 @@ EOF find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; add_launcher "c:\Program Files\Sam Tupy\SammyCenter\SammyCenter.exe" ;; + "Sarah and the Castle of Witchcraft and Wizardry") + install_wine_bottle vb6run dx8vb speechsdk + download "http://www.pcs-games.net/Sarah10.exe" "http://www.pcs-games.net/Sarah-Patch4.exe" + wine "${cache}/Sarah10.exe" /sp- /verysilent + wine "${cache}/Sarah-Patch4.exe" /sp- /verysilent + add_launcher "c:\Program Files\Sarah and the Castle of Witchcraft and Wizardry 10\scw.exe" + ;; "Scramble!") winetricksSettings="vd=1024x768" export winVer="win7" From 983d8d39341854619b1ebd9c7c9b6600076d72da Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Tue, 28 Mar 2023 14:02:20 -0700 Subject: [PATCH 2/6] Add sarah documentation to the documentation function. --- audiogame-manager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index f4fc550..2d85c03 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -437,7 +437,7 @@ echo "Loading documentation, please wait..." local gameDoc="$(find "$gamePath" -type f -iname 'user_manual.html' -or -iname 'user_manual.htm' | head -1)" # Game name specific docs, add the name to the for loop. if [[ -z "$gameDoc" ]]; then - for i in "troopanum.txt" "superdeekout.txt" ; do + for i in "troopanum.txt" "superdeekout.txt" scw.html ; do gameDoc="$(find "$gamePath" -type f -iname "$i" -or -iname 'manual.htm' | head -1)" done fi From 5d286cc09d6a58c5a842eba75303b5e8af1573d1 Mon Sep 17 00:00:00 2001 From: stormdragon2976 Date: Thu, 30 Mar 2023 22:26:02 -0400 Subject: [PATCH 3/6] Update action buttons to more closely reflect what they actually do according to the option selected. For example, the game launcher now says "Launch", the -r options now shows "Remove", etc. --- audiogame-manager.sh | 7 +++- mac/mac-launcher.applescript | 74 ------------------------------------ 2 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 mac/mac-launcher.applescript diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 2d85c03..5f57e64 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -631,6 +631,7 @@ game_installer() { menuList+=("Become a Patron" "Become a Patron") game="$(dialog --backtitle "Audio Game Installer" \ --clear \ + --ok-label "Install" \ --no-tags \ --menu "Please select a game to install" 0 0 0 "${menuList[@]}" --stdout)" } @@ -649,8 +650,10 @@ game_removal() { done menuList+=("Donate" "Donate") menuList+=("Become a Patron" "Become a Patron") - local game="$(dialog --backtitle "Audio Game Removal" \ + local game + game="$(dialog --backtitle "Audio Game Removal" \ --clear \ + --ok-label "Remove" \ --no-tags \ --menu "Please select a game to delete" 0 0 0 "${menuList[@]}" --stdout)" if [[ ${#game} -gt 0 ]]; then @@ -703,6 +706,7 @@ kill_game() { menuList+=("Become a Patron" "Become a Patron") local game="$(dialog --backtitle "Audio Game Killer" \ --clear \ + --ok-label "Kill" \ --no-tags \ --menu "Please select a game to force stop" 0 0 0 "${menuList[@]}" --stdout)" if [[ ${#game} -gt 0 ]]; then @@ -746,6 +750,7 @@ game_launcher() { --clear \ --extra-button \ --extra-label "Documentation" \ + --ok-label "Launch" \ --no-tags \ --menu "Please select a game to play" 0 0 0 "${menuList[@]}" --stdout)" local menuCode=$? diff --git a/mac/mac-launcher.applescript b/mac/mac-launcher.applescript deleted file mode 100644 index c47d1ff..0000000 --- a/mac/mac-launcher.applescript +++ /dev/null @@ -1,74 +0,0 @@ -# -# Ã contents of this file are subject to the Common Public Attribution -# License Version 1.0 (the ÃenseÃyou may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# https://opensource.org/licenses/CPAL-1.0. The License is based on the Mozilla Public License Version -# 1.1 but Sections 14 and 15 have been added to cover use of software over a -# computer network and provide for limited attribution for the Original -# Developer. In addition, Exhibit A has been modified to be consistent with -# Exhibit B. -# -# Software distributed under the License is distributed on an ÃISÃsis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is audiogame manager. -# -# The Original Developer is not the Initial Developer and is . If -# left blank, the Original Developer is the Initial Developer. -# -# The Initial Developer of the Original Code is Billy "Storm Dragon" Wolfe. All portions of -# the code written by Billy Wolfe are Copyright (c) 2020. All Rights -# Reserved. -# -# Contributor Michael Taboada. -# -# Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved. -# -# Attribution Phrase (not exceeding 10 words): A Stormux project -# -# Attribution URL: https://stormgames.wolfe.casa -# -# Graphic Image as provided in the Covered Code, if any. -# -# Display of Attribution Information is required in Larger -# 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. - -# Allows you to select a wine prefix to run with audiogame manager -#Get Working Directory -tell application "Finder" - set currentPath to container of (path to me) as alias -end tell -#format Converters -on convertPathToAlias(thePath) - tell application "System Events" - try - return (path of disk item (thePath as string)) as alias - on error - return (path of disk item (path of thePath) as string) as alias - end try - end tell -end convertPathToAlias - -on convertPathToPOSIXString(thePath) - tell application "System Events" - try - set thePath to path of disk item (thePath as string) - on error - set thePath to path of thePath - end try - end tell - return POSIX path of thePath -end convertPathToPOSIXString - -set currentPath to convertPathToPOSIXString(currentPath) -set folderPath to POSIX file "~/.local/wine/" -set folderPath to convertPathToAlias(folderPath) -set gameFolder to choose folder with prompt "Choose your game and press enter:" default location folderPath -set gameFolder to convertPathToPOSIXString(gameFolder) -set gameFolder to quoted form of gameFolder -set gameName to do shell script ("basename " & gameFolder) -do shell script "/usr/local/bin/bash -l " & currentPath & "../audiogame-manager.sh -l " & gameName & " &> /dev/null &" -do shell script "say -v alex Launching " & gameName & ", please wait..." From c51eeeb40af0211e2699b7d25ad3f421e4d98dfa Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Mon, 3 Apr 2023 10:21:49 -0700 Subject: [PATCH 4/6] Add Ultimate SounDoku --- audiogame-manager.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 5f57e64..75cd331 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1151,6 +1151,7 @@ gameList=( "Triple Triad" "Troopanum2" "Tube Sim" + "Ultimate SounDoku" "Undead Assault" "Villains From Beyond" "VIP Mud" @@ -2966,6 +2967,17 @@ export norh=false # Must install a voice, and rhvoice works easily with 64 bit. wineserver -w add_launcher "c:\Program Files\NASoft\TubeSim\tsMain.exe" ;; + "Ultimate SounDoku") + export winVer="win7" + install_wine_bottle vb6run dx8vb speechsdk quartz + download "http://download.dracoent.com/Windows/classic/USSetup.exe" + wine "${cache}/USSetup.exe" /sp- /silent + # warning warning warning: Do not change location, or installer will not function. + # FIXME: Hacky, but it works. Install dotnet20 by itself so it actually doesn't hang. + winetricks -q dotnet20 + wineserver -k # Damn you, dotnet. + add_launcher "c:\Program Files\Draconis Entertainment\Ultimate Soundoku\soundoku.exe" + ;; "Undead Assault") export winVer="win7" install_wine_bottle speechsdk From 9abe1cb36c289d72263c2e5f95dfed8d0d6a79f2 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Wed, 5 Apr 2023 16:10:55 -0700 Subject: [PATCH 5/6] Add two more Dan Z games, lost and maze craze. Also moved super deekout to the Dan Z bottle, please reinstall super deekout to fix the bottle --- audiogame-manager.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 75cd331..a874976 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -353,6 +353,10 @@ get_bottle() { # tunmi13 games group "battle-of-the-hunter"*) ;& "challenge-of-the-horse"*) export WINEPREFIX="${HOME}/.local/wine/tunmi13";; + # Dan Z games group + "lost"*) ;& + "maze-craze"*) ;& + "super-deekout"*) export WINEPREFIX="$HOME/.local/wine/dan-z" ;; *) export WINEPREFIX="${HOME}/.local/wine/${game%|*}";; esac # Wine version for bottles @@ -1082,10 +1086,12 @@ gameList=( "Light Cars" "Lockpick" "Lone Wolf" + "Lost" "Lunimals" "Manamon" "Manamon 2" #"Marina Break" + "Maze Craze" #"Minecraft" "Mist World" "Monkey Business" @@ -2287,6 +2293,14 @@ EOF xdotool key --clearmodifiers Return 2> /dev/null wineserver -w add_launcher "c:\Program Files\Lone Wolf\lw.exe" + ;; + "Lost") + export bottle=dan-z + install_wine_bottle speechsdk + download "https://agarchive.net/games/danZ/lost.zip" + unzip -d "$WINEPREFIX/drive_c/Program Files/lost" "$cache/lost.zip" + find "$WINEPREFIX/drive_c/Program Files/lost" -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; + add_launcher 'c:\Program Files\lost\lost.exe' ;; "Lunimals") export bottle="aprone" @@ -2324,6 +2338,24 @@ EOF find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; add_launcher "c:\nyanchangame\MarinaBreak\marinabreak.exe" ;; + "Maze Craze") + export bottle=dan-z + install_wine_bottle vb6run dx8vb + download "http://www.danielzingaro.com/maze_craze_setup.exe" + ${wine} "${cache}/maze_craze_setup.exe" & + xdotool sleep 15 key --delay 100 y 2> /dev/null + xdotool sleep 3 key --delay 250 alt+n 2> /dev/null + xdotool key --delay 250 alt+a 2> /dev/null + xdotool key --delay 250 space 2> /dev/null + xdotool key --delay 250 alt+n 2> /dev/null + xdotool key --delay 250 alt+n 2> /dev/null + xdotool key --delay 250 alt+n 2> /dev/null + xdotool key --delay 250 alt+i 2> /dev/null + xdotool sleep 15 key --delay 250 alt+f 2> /dev/null + xdotool sleep 3 key --delay 250 n 2> /dev/null + ${wine}server -k + add_launcher "c:\Program Files\Maze Craze 1.4\mazecraze.exe" + ;; "Minecraft") export WINEARCH=win64 export winVer="win7" @@ -2704,6 +2736,7 @@ EOF add_launcher "c:\Program Files\space_defender\sdefender.exe" ;; "Super Deekout") + export bottle=dan-z install_wine_bottle vb6run dx8vb download "http://www.danielzingaro.com/superdeekout_setup.exe" "http://www.danielzingaro.com/sd_full.exe" ${wine} "${cache}/superdeekout_setup.exe" & From 6211a182766247416dcd9c6f79cac422921bf3e5 Mon Sep 17 00:00:00 2001 From: stormdragon2976 Date: Wed, 5 Apr 2023 22:41:50 -0400 Subject: [PATCH 6/6] Removed rhvoice from the dan-z bottle because it seems to break stuff if used. --- audiogame-manager.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index a874976..b2287ff 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -356,7 +356,10 @@ get_bottle() { # Dan Z games group "lost"*) ;& "maze-craze"*) ;& - "super-deekout"*) export WINEPREFIX="$HOME/.local/wine/dan-z" ;; + "super-deekout"*) + export norh="true" + export WINEPREFIX="$HOME/.local/wine/dan-z" + ;; *) export WINEPREFIX="${HOME}/.local/wine/${game%|*}";; esac # Wine version for bottles