Merge branch 'testing' latest bug fixes.

This commit is contained in:
Storm Dragon 2022-10-15 18:08:50 -04:00
commit f2cdcaa62a
4 changed files with 46 additions and 10 deletions

View File

@ -80,7 +80,7 @@ Note that currently the 64 bit wine version of SAPI does not work. Games that in
add_launcher "c:\Program Files\My Awesome Game\mag.exe" add_launcher "c:\Program Files\My Awesome Game\mag.exe"
;; ;;
In some cases, however, this will cause the game to not function at all. For these cases, we have a fake dll that can take the place of the original. You just need to make sure the fake dll is downloaded during game installation and then move it into place. For an example of how this works, please take a look at the "RS Games" entry in audiogame-manager.sh. In some cases, however, this will cause the game to not function at all. For these cases, we have a fake dll that can take the place of the original. You just need to make sure the fake dll is downloaded during game installation and then move it into place. For an example of how this works, please take a look at the "A Hero's Call" entry in audiogame-manager.sh.
### Dealing with compressed files ### Dealing with compressed files

View File

@ -381,6 +381,9 @@ get_bottle() {
"run-for-your-life"*) ;& "run-for-your-life"*) ;&
"thief"*) ;& "thief"*) ;&
"villains-from-beyond"*) export WINEPREFIX="${HOME}/.local/wine/oriol-gomez";; "villains-from-beyond"*) export WINEPREFIX="${HOME}/.local/wine/oriol-gomez";;
# pbgames group
"dark-destroyer"*) ;&
"PBGames TMP") export WINEPREFIX="$HOME/.local/wine/pbgames" ;;
# tunmi13 games group # tunmi13 games group
"battle-of-the-hunter"*) ;& "battle-of-the-hunter"*) ;&
"challenge-of-the-horse"*) export WINEPREFIX="${HOME}/.local/wine/tunmi13";; "challenge-of-the-horse"*) export WINEPREFIX="${HOME}/.local/wine/tunmi13";;
@ -788,6 +791,9 @@ game_launcher() {
cp "${cache}/bk3-dict.dat" "${dictPath}/dict.dat" cp "${cache}/bk3-dict.dat" "${dictPath}/dict.dat"
fi fi
if [[ -d "${dictPath}/dict" ]]; then if [[ -d "${dictPath}/dict" ]]; then
if [[ ! -e "${dictPath}/data/nvdaControllerClient.dll" ]]; then
cp "${cache}/nvda2speechd32.dll" "${dictPath}/data/nvdaControllerClient.dll"
fi
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
if [[ ! -d "${dictPath}/dict" ]]; then if [[ ! -d "${dictPath}/dict" ]]; then
@ -985,6 +991,7 @@ gameList=(
"Crazy Tennis" "Crazy Tennis"
"Crime Hunter" "Crime Hunter"
"Danger on the Wheel" "Danger on the Wheel"
#"Dark Destroyer"
"Daytona and the Book of Gold" "Daytona and the Book of Gold"
"Death on the Road" "Death on the Road"
"Deathmatch" "Deathmatch"
@ -1006,7 +1013,7 @@ gameList=(
"GMA Tank Commander" "GMA Tank Commander"
"Grizzly Gulch" "Grizzly Gulch"
"Hammer of Glory" "Hammer of Glory"
#"Hearthstone" "Hearthstone"
"Hunter" "Hunter"
"Insect Therapy" "Insect Therapy"
"Interceptor" "Interceptor"
@ -1022,6 +1029,7 @@ gameList=(
"Manamon" "Manamon"
"Manamon 2" "Manamon 2"
#"Marina Break" #"Marina Break"
"Minecraft"
"Monkey Business" "Monkey Business"
"MudSplat French" "MudSplat French"
"MudSplat English" "MudSplat English"
@ -1785,6 +1793,13 @@ 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\danger on the wheel\game.exe" add_launcher "c:\Program Files\danger on the wheel\game.exe"
;; ;;
"Dark Destroyer")
export bottle=pbgames
install_wine_bottle speechsdk ie6
download "https://www.agarchive.net/games/pb/Dark-Destroyer-Setup.exe"
wine "$cache/Dark-Destroyer-Setup.exe" /silent
add_launcher 'c:\Pbgames\Dark_destroyer\darkdestroyer.exe'
;;
"Daytona and the Book of Gold") "Daytona and the Book of Gold")
export bottle="aprone" export bottle="aprone"
export winVer="win7" export winVer="win7"
@ -1927,11 +1942,12 @@ case "${game}" in
"Eurofly") "Eurofly")
export winVer="win7" export winVer="win7"
export winetricksSettings="vd=1024x768" export winetricksSettings="vd=1024x768"
install_wine_bottle speechsdk install_wine_bottle speechsdk comctl32
download "http://www.stefankiss.sk/programy/eurofly/Launcher_1.2.zip" "http://www.stefankiss.sk/programy/eurofly/Eurofly_2_ful_setup.exe" download "https://www.stefankiss.sk/files/eurofly2/Launcher_1.2.zip" "https://www.stefankiss.sk/files/eurofly2/Eurofly_2_ful_setup.exe"
wine "${cache}/Eurofly_2_ful_setup.exe" /silent wine "${cache}/Eurofly_2_ful_setup.exe" /silent
unzip -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip" unzip -o -d "$WINEPREFIX/drive_c/Eurofly" "${cache}/Launcher_1.2.zip"
add_launcher "c:\Eurofly\launcher.exe" add_launcher "c:\Eurofly\launcher.exe"
echo "Note: On first and sometimes later launch, Eurofly may take a very long time to download required files, please be patient..."
;; ;;
"Extant") "Extant")
install_wine_bottle speechsdk install_wine_bottle speechsdk
@ -2000,7 +2016,7 @@ case "${game}" in
export winVer="win10" export winVer="win10"
install_wine_bottle ie8 vcrun2015 speechsdk install_wine_bottle ie8 vcrun2015 speechsdk
# This download url breaks the download function, so grab it manually. # This download url breaks the download function, so grab it manually.
wget -O "${cache}/Hearthstone.exe" "https://www.battle.net/download/getInstallerForGame?os=win&gameProgram=HEARTHSTONE&version=Live" wget -O "${cache}/Hearthstone.exe" "https://us.battle.net/download/getInstaller?os=win&installer=Hearthstone-Setup.exe"
wget -O "${cache}/Hearthstone_patch.zip" "https://github.com/HearthstoneAccess/HearthstoneAccess/releases/latest/download/patch.zip" wget -O "${cache}/Hearthstone_patch.zip" "https://github.com/HearthstoneAccess/HearthstoneAccess/releases/latest/download/patch.zip"
wine "${cache}/Hearthstone.exe" /silent wine "${cache}/Hearthstone.exe" /silent
unzip -o "${cache}/Hearthstone_patch.zip" -d "${WINEPREFIX}/drive_c/Program Files/Hearthstone" unzip -o "${cache}/Hearthstone_patch.zip" -d "${WINEPREFIX}/drive_c/Program Files/Hearthstone"
@ -2178,6 +2194,26 @@ EOF
wineserver -w wineserver -w
find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; find "${WINEPREFIX}" -type f -name "nvdaControllerClient.dll" -exec cp -v "$cache/nvda2speechd32.dll" "{}" \;
add_launcher "c:\nyanchangame\MarinaBreak\marinabreak.exe" add_launcher "c:\nyanchangame\MarinaBreak\marinabreak.exe"
;;
"Minecraft")
export WINEARCH=win64
export winVer="win7"
install_wine_bottle
get_installer "accessibility-plus-extended-1.18-curseforge-v1.9.0.jar" "https://www.curseforge.com/minecraft/mc-mods/accessibility-plus-extended/download"
get_installer "Mambience-5.2.0+1.19.jar" "https://www.curseforge.com/minecraft/mc-mods/mambience/download"
get_installer "easy-life-1.18-v1.5.1.jar" "https://www.curseforge.com/minecraft/mc-mods/easy-life/download"
get_installer "numpad-camera-controls-1.18-v1.5.1.jar" "https://www.curseforge.com/minecraft/mc-mods/numpad-keypad-camera-controls/download"
download "https://www.python.org/ftp/python/3.7.9/python-3.7.9-amd64.exe"
wine "$cache/python-3.7.9-amd64.exe" /silent
wine 'c:\windows\py.exe' -m pip install portablemc portablemc-fabric
# Now just need to install latest fabric, portablemc start --dry fabric
wine 'c:\users\'"$USER"'\AppData\Local\Programs\Python\Python37\Scripts\portablemc.exe' start --dry fabric:
# Also need to copy all mods into right place.
mkdir "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/.minecraft/mods"
for x in "accessibility-plus-extended-1.18-curseforge-v1.9.0.jar" "Mambience-5.2.0+1.19.jar" "easy-life-1.18-v1.5.1.jar" "numpad-camera-controls-1.18-v1.5.1.jar" ; do
cp "$cache/$x" "$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/.minecraft/mods"
done
# And of course, add the launcher.
;; ;;
"Monkey Business") "Monkey Business")
export winVer="win7" export winVer="win7"

View File

@ -32,7 +32,7 @@ while pgrep -u "$USER" ^$1 &> /dev/null ; do
continue continue
fi fi
if [[ "${newText}" =~ ^[0-9A-Za-z[:space:][:punct:]]+$ ]]; then if [[ "${newText}" =~ ^[0-9A-Za-z[:space:][:punct:]]+$ ]]; then
spd-say "$newText" spd-say -- "$newText"
echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null
continue continue
fi fi
@ -41,7 +41,7 @@ while pgrep -u "$USER" ^$1 &> /dev/null ; do
$0~originalText { print $2; exitCode = 0; exit} $0~originalText { print $2; exitCode = 0; exit}
END { exit exitCode }' "$dictionaryFile")" END { exit exitCode }' "$dictionaryFile")"
if [[ "${#translatedText}" -ge 1 ]]; then if [[ "${#translatedText}" -ge 1 ]]; then
spd-say "$translatedText" spd-say -- "$translatedText"
echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null
continue continue
fi fi
@ -49,6 +49,6 @@ while pgrep -u "$USER" ^$1 &> /dev/null ; do
if ! [[ "${newText}" =~ ^[0-9[:punct:]]+$ ]]; then if ! [[ "${newText}" =~ ^[0-9[:punct:]]+$ ]]; then
echo "${newText})==:[${translatedText}" >> "$dictionaryFile" echo "${newText})==:[${translatedText}" >> "$dictionaryFile"
fi fi
spd-say "$translatedText" spd-say -- "$translatedText"
echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null
done done

View File

@ -16,7 +16,7 @@ while pgrep -u "$USER" ^$1 &> /dev/null ; do
if [[ "$wnd_title" =~ $lookfor ]]; then if [[ "$wnd_title" =~ $lookfor ]]; then
wnd_title=${BASH_REMATCH[1]} wnd_title=${BASH_REMATCH[1]}
if [[ "$old_title" != "$wnd_title" ]]; then if [[ "$old_title" != "$wnd_title" ]]; then
spd-say "$wnd_title" spd-say -- "$wnd_title"
old_title="$wnd_title" old_title="$wnd_title"
fi fi
fi fi