Merge branch 'testing' latest code and bug fixes.

This commit is contained in:
Storm Dragon 2022-11-10 18:16:48 -05:00
commit 50bb4a5383

View File

@ -776,6 +776,9 @@ game_launcher() {
fi fi
fi fi
# for games that require custom scripts before launch or custom launch parameters # for games that require custom scripts before launch or custom launch parameters
if [[ "$game" =~ haunted-party ]]; then
pgrep -u "$USER" nvda2speechd &> /dev/null || ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &
fi
if [[ "$game" =~ laser-breakout ]]; then if [[ "$game" =~ laser-breakout ]]; then
pgrep -u "$USER" nvda2speechd &> /dev/null || ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd & pgrep -u "$USER" nvda2speechd &> /dev/null || ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &
fi fi
@ -805,6 +808,9 @@ game_launcher() {
if [[ "$game" =~ bop-it-emulator ]]; then if [[ "$game" =~ bop-it-emulator ]]; then
"${0%/*}/speech/speak_window_title.sh" bop.exe & "${0%/*}/speech/speak_window_title.sh" bop.exe &
fi fi
if [[ "$game" =~ breu2-shadow-hunt ]]; then
pgrep -u "$USER" nvda2speechd &> /dev/null || ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &
fi
if [[ "$game" =~ road-to-rage\| ]]; then if [[ "$game" =~ road-to-rage\| ]]; then
"${0%/*}/speech/speak_window_title.sh" trtr.exe & "${0%/*}/speech/speak_window_title.sh" trtr.exe &
fi fi
@ -819,9 +825,6 @@ game_launcher() {
wine "$winePath\\$wineExec" wine "$winePath\\$wineExec"
exit 0 exit 0
fi fi
if [[ "$game" =~ rs-games ]]; then
pgrep -u "$USER" nvda2speechd &> /dev/null || ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &
fi
if [[ "$game" =~ screaming-strike-2 ]]; then if [[ "$game" =~ screaming-strike-2 ]]; then
pushd "$(winepath "$winePath")" pushd "$(winepath "$winePath")"
wine "$wineExec" wine "$wineExec"
@ -980,6 +983,7 @@ gameList=(
"Bombercats" "Bombercats"
"Bop It Emulator" "Bop It Emulator"
#"Breed Memorial" #"Breed Memorial"
"Breu2 Shadow Hunt"
"Castaways" "Castaways"
"Castaways 2" "Castaways 2"
"Challenge of the Horse" "Challenge of the Horse"
@ -1016,6 +1020,7 @@ gameList=(
"GMA Tank Commander" "GMA Tank Commander"
"Grizzly Gulch" "Grizzly Gulch"
"Hammer of Glory" "Hammer of Glory"
"haunted Party"
"Hearthstone" "Hearthstone"
"Hunter" "Hunter"
"Insect Therapy" "Insect Therapy"
@ -1677,6 +1682,16 @@ case "${game}" in
7z x -o"$WINEPREFIX/drive_c/Program Files/Bop It" "${cache}/BopItEmulator3.1PasswordIsBopIt.7z" -pBopIt 7z x -o"$WINEPREFIX/drive_c/Program Files/Bop It" "${cache}/BopItEmulator3.1PasswordIsBopIt.7z" -pBopIt
add_launcher "c:\Program Files\Bop It\bop.exe" add_launcher "c:\Program Files\Bop It\bop.exe"
;; ;;
"Breu2 Shadow Hunt")
get_installer "breu2.zip" "https://breu.itch.io/shadowhunt"
download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll"
export WINEARCH=win64
export winVer="win8"
install_wine_bottle
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/breu2.zip"
find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
add_launcher "c:\Program Files\breu2\breu2.exe"
;;
"Bombercats") "Bombercats")
export bottle="oriol-gomez" export bottle="oriol-gomez"
export winVer="win7" export winVer="win7"
@ -2031,6 +2046,16 @@ case "${game}" in
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\hammer of glory\game.exe" add_launcher "c:\Program Files\hammer of glory\game.exe"
;; ;;
"haunted Party")
get_installer "hp.zip" "https://tunmi13.itch.io/haunted-party"
download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll"
export WINEARCH=win64
export winVer="win8"
install_wine_bottle
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/hp.zip"
find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
add_launcher "c:\Program Files\hp\hp.exe"
;;
"Hearthstone") "Hearthstone")
export winVer="win10" export winVer="win10"
install_wine_bottle ie8 vcrun2015 speechsdk install_wine_bottle ie8 vcrun2015 speechsdk
@ -2420,9 +2445,9 @@ EOF
"RS Games") "RS Games")
export winVer="win7" export winVer="win7"
install_wine_bottle speechsdk install_wine_bottle speechsdk
download "http://rsgames.org/rsdownloads/rsgclient/rsgames-client-setup-2.01.exe" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" download "http://rsgames.org/rsdownloads/rsgclient/rsgames-client-setup-2.01.exe" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
wine "${cache}/rsgames-client-setup-2.01.exe" /silent wine "${cache}/rsgames-client-setup-2.01.exe" /silent
find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \; find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
add_launcher "c:\Program Files\RS Games Client\rsg.exe" add_launcher "c:\Program Files\RS Games Client\rsg.exe"
;; ;;
"Run For Your Life") "Run For Your Life")