Merge branch 'testing' in preparation for binary release.

This commit is contained in:
Storm Dragon 2022-03-06 22:36:10 -05:00
commit 11139ce376
4 changed files with 89 additions and 16 deletions

View File

@ -378,7 +378,6 @@ get_bottle() {
"super-liam"*) ;& "super-liam"*) ;&
"the-great-toy-robbery"*) export WINEPREFIX="${HOME}/.local/wine/l-works";; "the-great-toy-robbery"*) export WINEPREFIX="${HOME}/.local/wine/l-works";;
# Oriol Gomez games group # Oriol Gomez games group
"beatstar-pro"*) ;&
"bombercats"*) ;& "bombercats"*) ;&
"copter-mission"*) ;& "copter-mission"*) ;&
"danger-on-the-wheel"*) ;& "danger-on-the-wheel"*) ;&
@ -502,18 +501,21 @@ winetricks() {
echo "1" > "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" echo "1" > "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage"
fi fi
# Download or update agm's copy of winetricks # Download or update agm's copy of winetricks
if [[ ! -e "${cache}/winetricks" ]]; then winetricksPath="${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager"
mkdir -p "${winetricksPath}"
if [[ ! -e "${winetricksPath}/winetricks" ]]; then
checkWinetricksUpdate="true" checkWinetricksUpdate="true"
download "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" download "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
chmod 700 "${cache}/winetricks" mv "${cache}/winetricks" "${winetricksPath}"
chmod 755 "${winetricksPath}/winetricks"
else else
if [[ "$checkWinetricksUpdate" != "true" ]]; then if [[ "$checkWinetricksUpdate" != "true" ]]; then
checkWinetricksUpdate="true" checkWinetricksUpdate="true"
${cache}/winetricks --self-update ${winetricksPath}/winetricks --self-update
fi fi
fi fi
# Run the requested winetricks parameters # Run the requested winetricks parameters
${cache}/winetricks "$@" ${winetricksPath}/winetricks "$@"
} }
install_rhvoice() { install_rhvoice() {
@ -815,10 +817,16 @@ if [[ -z "$DISPLAY" ]]; then
export DISPLAY=":0" export DISPLAY=":0"
fi fi
# Settings file # Settings file
cache="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache" cache="${XDG_CACHE_HOME:-$HOME/.cache}/audiogame-manager"
configFile="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/games.conf" configFile="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/games.conf"
mkdir -p "${cache}" mkdir -p "${cache}"
mkdir -p "${configFile%/*}" mkdir -p "${configFile%/*}"
# Update the cache for older versions of audiogame-manager
if [[ -d "${configFile%/*}/cache" ]]; then
{ mv -v "${configFile%/*}/cache/"* "${cache}"
rmdir -v "${configFile%/*}/cache/"; } | dialog \
--backtitle "Audiogame Manager" --progressbox "Updating cache, please wait..." -1 -1
fi
checkWinetricksUpdate="false" checkWinetricksUpdate="false"
# Turn off debug messages # Turn off debug messages
export WINEDEBUG="-all" export WINEDEBUG="-all"
@ -847,7 +855,7 @@ gameList=(
"AudioQuake" "AudioQuake"
"Battle of the Hunter" "Battle of the Hunter"
"Battle Zone" "Battle Zone"
"Beatstar Pro" #"Beatstar Pro"
"BG 2048" "BG 2048"
"BG 15 Puzzle" "BG 15 Puzzle"
"BG Aces Up Solitaire" "BG Aces Up Solitaire"
@ -965,6 +973,7 @@ gameList=(
"RS Games" "RS Games"
"Run For Your Life" "Run For Your Life"
#"Sammy Center" #"Sammy Center"
"Scramble!"
"Screaming Strike 2" "Screaming Strike 2"
"Sketchbook" "Sketchbook"
"Sequence Storm" "Sequence Storm"
@ -1069,9 +1078,9 @@ done
case "${game}" in case "${game}" in
"A Hero's Call") "A Hero's Call")
export winVer="win7" export winVer="win7"
install_wine_bottle xna31 speechsdk corefonts install_wine_bottle speechsdk corefonts
# Dotnet is evil. That is all. # Dotnet is evil. That is all.
DISPLAY="" winetricks -q dotnet40 LC_ALL=C DISPLAY="" winetricks -q dotnet462 xna40
wineserver -k # Really! wineserver -k # Really!
download "http://files.OutOfSightGames.com/files/a-heros-call.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll" download "http://files.OutOfSightGames.com/files/a-heros-call.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/a-heros-call.zip" unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/a-heros-call.zip"
@ -1136,9 +1145,9 @@ case "${game}" in
add_launcher "c:\Program Files\Battle Zone\ss.exe" add_launcher "c:\Program Files\Battle Zone\ss.exe"
;; ;;
"Beatstar Pro") "Beatstar Pro")
export bottle="oriol-gomez" export WINEARCH=win64
export winVer="win7" export winVer="win7"
install_wine_bottle speechsdk mf install_wine_bottle sapi mf
download "https://oriolgomez.com/games/beat_windows.zip" download "https://oriolgomez.com/games/beat_windows.zip"
unzip -d "$WINEPREFIX/drive_c/Program Files/Beatstar Pro" "${cache}/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" add_launcher "c:\Program Files\Beatstar Pro\beatstar.exe"
@ -1691,12 +1700,17 @@ case "${game}" in
;; ;;
"Entombed") "Entombed")
export winVer="win7" export winVer="win7"
#install_wine_bottle dotnet35 msvcrt40 speechsdk
install_wine_bottle speechsdk msvcrt40 install_wine_bottle speechsdk msvcrt40
# Ok, more dotnet. # Ok, more dotnet.
DISPLAY="" winetricks -q dotnet48 xna40 LC_ALL=C DISPLAY="" winetricks -q dotnet462
wineserver -k # Sigh. wineserver -k # Sigh.
download "http://blind-games.com/newentombed/EntombedSetup.exe" download "http://blind-games.com/newentombed/EntombedSetup.exe" "https://download.microsoft.com/download/E/C/1/EC1B2340-67A0-4B87-85F0-74D987A27160/SSCERuntime-ENU.exe"
mkdir -p "${WINEPREFIX}/drive_c/temp"
pushd "${WINEPREFIX}/drive_c/temp"
7z e "${cache}/SSCERuntime-ENU.exe"
wine msiexec /i "${WINEPREFIX}/drive_c/temp/SSCERuntime_x86-ENU.msi" /q
rm *
popd
wine "${cache}/EntombedSetup.exe" /silent wine "${cache}/EntombedSetup.exe" /silent
add_launcher "c:\Program Files\Entombed\Entombed.exe" add_launcher "c:\Program Files\Entombed\Entombed.exe"
;; ;;
@ -2163,6 +2177,15 @@ 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\Sam Tupy\SammyCenter\SammyCenter.exe" add_launcher "c:\Program Files\Sam Tupy\SammyCenter\SammyCenter.exe"
;; ;;
"Scramble!")
winetricksSettings="vd=1024x768"
export winVer="win7"
install_wine_bottle speechsdk
download "https://stevend.net/downloads/scramble_win32.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/scramble_win32.zip"
find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
add_launcher "c:\Program Files\scramble_win32\scramble.exe"
;;
"Screaming Strike 2") "Screaming Strike 2")
export winVer="win7" export winVer="win7"
install_wine_bottle fakejapanese speechsdk install_wine_bottle fakejapanese speechsdk
@ -2399,6 +2422,9 @@ EOF
"Three D velocity") "Three D velocity")
export winVer="win10" export winVer="win10"
install_wine_bottle speechsdk install_wine_bottle speechsdk
# Dotnet is evil. That is all.
LC_ALL=C winetricks -q dotnet472
wineserver -k # Ha ha ha.
download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll" download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip" unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip"
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" "{}" \;

View File

@ -37,7 +37,7 @@
# Works which are defined in the CPAL as a work which combines Covered Code # 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. # or portions thereof with code not governed by the terms of the CPAL.
cache="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache" cache="${XDG_CACHE_HOME:-$HOME/.cache}/audiogame-manager"
configFile="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/games.conf" configFile="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/games.conf"
url="http://pragmapragma.free.fr/crazy-party/Crazy-Party-beta77.zip" url="http://pragmapragma.free.fr/crazy-party/Crazy-Party-beta77.zip"
(rm -v "${cache}/Crazy-Party-beta76.zip" (rm -v "${cache}/Crazy-Party-beta76.zip"

47
game-scripts/scramble-update.sh Executable file
View File

@ -0,0 +1,47 @@
#!/usr/bin/env bash
#
# âe contents of this file are subject to the Common Public Attribution
# License Version 1.0 (the âcenseâ 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âasis,
# 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.
cache="${XDG_CACHE_HOME:-$HOME/.cache}/audiogame-manager"
url="https://stevend.net/downloads/scramble_win32.zip"
(rm -v "${cache}/scramble_win32.zip"
wget -O "${cache}/scramble_win32.zip" "$url" || { echo "Could not download file."; exit 1; }
unzip -DDod "$HOME/.local/wine/scramble!/drive_c/Program Files" "${cache}/scramble_win32.zip"
find ~/".local/wine/scramble!" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;) | dialog --progressbox "updating Scramble!, please wait..." -1 -1
exit 0

View File

@ -37,7 +37,7 @@
# Works which are defined in the CPAL as a work which combines Covered Code # 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. # or portions thereof with code not governed by the terms of the CPAL.
cache="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache" cache="${XDG_CACHE_HOME:-$HOME/.cache}/audiogame-manager"
updateURL="https://www.kaldobsky.com/audiogames" updateURL="https://www.kaldobsky.com/audiogames"
updateFiles=("Swamp.zip") updateFiles=("Swamp.zip")