Merge branch 'testing' in preparation for new binary release.

This commit is contained in:
Storm Dragon 2021-04-24 15:51:56 -04:00
commit 4f206e13cc

View File

@ -68,8 +68,10 @@ update() {
if [[ "${continue,,}" =~ ^y|ye|yes$ ]]; then if [[ "${continue,,}" =~ ^y|ye|yes$ ]]; then
if [[ -w "$0" ]]; then if [[ -w "$0" ]]; then
wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}" wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}"
chmod +x "$0"
else else
sudo wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}" sudo wget --quiet -O "${filePath}" "https://stormgames.wolfe.casa/downloads/${downloadFile}"
sudo chmod +x "$0"
fi fi
echo "${0##*/} has been updated. Please launch the program again to use the latest version." echo "${0##*/} has been updated. Please launch the program again to use the latest version."
exit 0 exit 0
@ -462,10 +464,12 @@ game_launcher() {
fi fi
fi fi
export WINEPREFIX="${HOME}/.local/wine/${game%|*}" export WINEPREFIX="${HOME}/.local/wine/${game%|*}"
# Work around possible wrong path for start.exe
[[ -e "${WINEPREFIX}/drive_c/windows/system32/start.exe" ]] || ln -sr "${WINEPREFIX}/drive_c/windows/command/start.exe" "${WINEPREFIX}/drive_c/windows/system32/start.exe"
if [[ -d "${WINEPREFIX}/drive_c/windows/syswow64" ]]; then if [[ -d "${WINEPREFIX}/drive_c/windows/syswow64" ]]; then
wine64 start /realtime /d "${winePath}" "$wineExec" wine64 start /realtime /d "${winePath}" "$wineExec"
else else
wine start /realtime /d "${winePath}" "$wineExec" wine start /d "${winePath}" "$wineExec" /realtime
fi fi
fi fi
exit 0 exit 0
@ -527,6 +531,7 @@ gameList=(
"AudioDisc" "AudioDisc"
"Battle of the Hunter" "Battle of the Hunter"
"Battle Zone" "Battle Zone"
"Beatstar Pro"
"Bloodshed" "Bloodshed"
"Castaways" "Castaways"
"Castaways 2" "Castaways 2"
@ -591,6 +596,7 @@ gameList=(
"Triple Triad" "Triple Triad"
"Tube Sim" "Tube Sim"
"Undead Assault" "Undead Assault"
"Villains From Beyond"
"VIP Mud" "VIP Mud"
#"World of War" #"World of War"
) )
@ -671,7 +677,7 @@ case "${game}" in
"Battle of the Hunter") "Battle of the Hunter")
export winVer="win7" export winVer="win7"
install_wine_bottle speechsdk install_wine_bottle speechsdk
download "https://tunmi13.dev/projects/bth.zip" download "https://stormgames.wolfe.casa/downloads/bth.zip"
unzip -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/bth.zip" unzip -d "$WINEPREFIX/drive_c/Program Files/$game" "${cache}/bth.zip"
find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
add_launcher "c:\Program Files\\${game}/bth.exe" add_launcher "c:\Program Files\\${game}/bth.exe"
@ -684,6 +690,13 @@ case "${game}" in
add_launcher "c:\Program Files\Battle Zone\ss.exe" add_launcher "c:\Program Files\Battle Zone\ss.exe"
rm -fv "${WINEPREFIX}/drive_c/Program Files/Battle Zone/nvdaControllerClient32.dll" rm -fv "${WINEPREFIX}/drive_c/Program Files/Battle Zone/nvdaControllerClient32.dll"
;; ;;
"Beatstar Pro")
export winVer="win7"
install_wine_bottle speechsdk mf
download "https://oriolgomez.com/games/beat_windows.zip"
unzip -d "$WINEPREFIX/drive_c/Program Files/Beatstar Pro" "${cache}/beat_windows.zip"
add_launcher "c:\Program Files\Beatstar Pro/beatstar.exe"
;;
"Bloodshed") "Bloodshed")
export winVer="win7" export winVer="win7"
install_wine_bottle speechsdk install_wine_bottle speechsdk
@ -742,7 +755,7 @@ case "${game}" in
install_wine_bottle install_wine_bottle
download "http://oriolgomez.com/games/road_en.zip" download "http://oriolgomez.com/games/road_en.zip"
unzip -d "$WINEPREFIX/drive_c/Program Files/death on the road" "${cache}/road_en.zip" unzip -d "$WINEPREFIX/drive_c/Program Files/death on the road" "${cache}/road_en.zip"
add_launcher "c:\Program Files\death on the road/game.exe" add_launcher "c:\Program Files\death on the road\game.exe"
;; ;;
"Deathmatch") "Deathmatch")
export winVer="win7" export winVer="win7"
@ -1233,6 +1246,13 @@ EOF
find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
add_launcher "c:\Program Files\undead_assault\Undead Assault.exe" add_launcher "c:\Program Files\undead_assault\Undead Assault.exe"
;; ;;
"Villains From Beyond")
export winVer="win7"
install_wine_bottle speechsdk
download "http://oriolgomez.com/games/villains_en.zip"
unzip -d "$WINEPREFIX/drive_c/Program Files/villains from beyond" "${cache}/villains_en.zip"
add_launcher "c:\Program Files\villains from beyond\game.exe"
;;
"VIP Mud") "VIP Mud")
export winVer="win7" export winVer="win7"
install_wine_bottle vb6run dx8vb speechsdk install_wine_bottle vb6run dx8vb speechsdk