Merge branch 'testing' in preparation for binary release.

This commit is contained in:
Storm Dragon 2021-07-23 18:55:45 -04:00
commit 6daad63de4

View File

@ -695,6 +695,10 @@ game_launcher() {
popd popd
exit 0 exit 0
fi fi
if [[ "$game" =~ warsim ]]; then
wine "$winePath\\$wineExec"
exit 0
fi
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
@ -891,6 +895,7 @@ gameList=(
"Undead Assault" "Undead Assault"
"Villains From Beyond" "Villains From Beyond"
"VIP Mud" "VIP Mud"
"Warsim"
"Windows Attack" "Windows Attack"
#"World of War" #"World of War"
) )
@ -1920,10 +1925,10 @@ EOF
"Space Defender") "Space Defender")
export WINEARCH="win64" export WINEARCH="win64"
export winVer="win7" export winVer="win7"
install_wine_bottle speechsdk install_wine_bottle
download "http://tunmi13.ddns.net/projects/space_defender.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll" download "http://tunmi13.ddns.net/projects/space_defender.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient64.dll"
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/space_defender.zip" unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/space_defender.zip"
find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvdaControllerClient64.dll" "{}" \;
add_launcher "c:\Program Files\space_defender\sdefender.exe" add_launcher "c:\Program Files\space_defender\sdefender.exe"
;; ;;
"Super Egg Hunt") "Super Egg Hunt")
@ -2122,6 +2127,13 @@ EOF
echo "To be sure that each new dialog has had time to complete, wait a second between each press of enter." echo "To be sure that each new dialog has had time to complete, wait a second between each press of enter."
echo "In each subsequent launch, you will need to hit enter a couple times before it starts speaking." echo "In each subsequent launch, you will need to hit enter a couple times before it starts speaking."
;; ;;
"Warsim")
get_installer "Warsim Full Game.zip" "https://huw2k8.itch.io/warsim"
export winVer="win7"
install_wine_bottle
unzip -d "$WINEPREFIX/drive_c/Program Files/Warsim/" "${cache}/Warsim Full Game.zip"
add_launcher "c:\Program Files\Warsim\Warsim.exe"
;;
"Windows Attack") "Windows Attack")
get_installer "WA.exe" "https://drive.google.com/file/d/1BwKGLP37m-Z6nyKdo8LwmU9J1CEqfMb_/view?usp=drivesdk" get_installer "WA.exe" "https://drive.google.com/file/d/1BwKGLP37m-Z6nyKdo8LwmU9J1CEqfMb_/view?usp=drivesdk"
export winVer="win7" export winVer="win7"