From 9dbfb4f212c750977b0e07877cb5db8325f62e2f Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 27 Feb 2022 01:09:34 -0800 Subject: [PATCH 01/11] Add a few fixes to three d velocity, sadly still not working yet --- audiogame-manager.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index d89d75c..1d5392d 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -2399,6 +2399,9 @@ EOF "Three D velocity") export winVer="win10" 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" unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip" find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; From 0640397000ac99e8d23fe9291e8c3049d3a457eb Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 27 Feb 2022 14:35:38 -0500 Subject: [PATCH 02/11] The game Beatstar Pro has been rewritten and is now only available as x86_64. It is currently not working so has been disabled in audiogame-manager. --- audiogame-manager.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 1d5392d..4d1d141 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -378,7 +378,6 @@ get_bottle() { "super-liam"*) ;& "the-great-toy-robbery"*) export WINEPREFIX="${HOME}/.local/wine/l-works";; # Oriol Gomez games group - "beatstar-pro"*) ;& "bombercats"*) ;& "copter-mission"*) ;& "danger-on-the-wheel"*) ;& @@ -847,7 +846,7 @@ gameList=( "AudioQuake" "Battle of the Hunter" "Battle Zone" - "Beatstar Pro" + #"Beatstar Pro" "BG 2048" "BG 15 Puzzle" "BG Aces Up Solitaire" @@ -1136,9 +1135,9 @@ case "${game}" in add_launcher "c:\Program Files\Battle Zone\ss.exe" ;; "Beatstar Pro") - export bottle="oriol-gomez" + export WINEARCH=win64 export winVer="win7" - install_wine_bottle speechsdk mf + install_wine_bottle sapi 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" From dabfac59b0bdfd519443698b967031f5583c649b Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Mon, 28 Feb 2022 07:36:07 -0500 Subject: [PATCH 03/11] Update the audiogame cache to be stored in the proper place according to the XDG spec. This was easier than I was expecting, so watch for bugs. --- audiogame-manager.sh | 8 +++++++- game-scripts/crazy-party-update.sh | 2 +- game-scripts/swamp-update.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 4d1d141..8dcb63e 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -814,10 +814,16 @@ if [[ -z "$DISPLAY" ]]; then export DISPLAY=":0" fi # 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" mkdir -p "${cache}" 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" # Turn off debug messages export WINEDEBUG="-all" diff --git a/game-scripts/crazy-party-update.sh b/game-scripts/crazy-party-update.sh index 30c0a64..b6c783f 100755 --- a/game-scripts/crazy-party-update.sh +++ b/game-scripts/crazy-party-update.sh @@ -37,7 +37,7 @@ # 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_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" url="http://pragmapragma.free.fr/crazy-party/Crazy-Party-beta77.zip" (rm -v "${cache}/Crazy-Party-beta76.zip" diff --git a/game-scripts/swamp-update.sh b/game-scripts/swamp-update.sh index e69f551..f44b273 100755 --- a/game-scripts/swamp-update.sh +++ b/game-scripts/swamp-update.sh @@ -37,7 +37,7 @@ # 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_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache" +cache="${XDG_CACHE_HOME:-$HOME/.cache}/audiogame-manager" updateURL="https://www.kaldobsky.com/audiogames" updateFiles=("Swamp.zip") From e40c3ce569aaab9616b88a0c51ae5bd5edc68b22 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 1 Mar 2022 17:56:46 -0500 Subject: [PATCH 04/11] Fix for those distros who, for whatever reason, decide to store ~/.cache in RAM... --- audiogame-manager.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 8dcb63e..74c1f36 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -501,18 +501,20 @@ winetricks() { echo "1" > "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" fi # Download or update agm's copy of winetricks - if [[ ! -e "${cache}/winetricks" ]]; then + winetricksPath="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager" + if [[ ! -e "${winetricksPath}/winetricks" ]]; then checkWinetricksUpdate="true" download "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" - chmod 700 "${cache}/winetricks" + mv "${cache}/winetricks" "${winetricksPath}" + chmod 755 "${winetricksPath}/winetricks" else if [[ "$checkWinetricksUpdate" != "true" ]]; then checkWinetricksUpdate="true" - ${cache}/winetricks --self-update + ${winetricksPath}/winetricks --self-update fi fi # Run the requested winetricks parameters - ${cache}/winetricks "$@" + ${winetricksPath}/winetricks "$@" } install_rhvoice() { From cfbfe4224d98514e6c2d2c212b07d688006656a5 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 1 Mar 2022 22:02:04 -0500 Subject: [PATCH 05/11] Hopefully finalized the XDG spec stuff. AGM version of winetricks now stored in XDG_DATA_HOME. --- audiogame-manager.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 74c1f36..ba12236 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -501,7 +501,8 @@ winetricks() { echo "1" > "${XDG_CACHE_HOME:-$HOME/.cache}/winetricks/track_usage" fi # Download or update agm's copy of winetricks - winetricksPath="${XDG_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager" + winetricksPath="${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager" + mkdir -p "${winetricksPath}" if [[ ! -e "${winetricksPath}/winetricks" ]]; then checkWinetricksUpdate="true" download "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" From 7759a7b1631ecfca03d8710f726aea10fa378135 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sat, 5 Mar 2022 21:44:56 -0500 Subject: [PATCH 06/11] New game "Scramble!" added. It is not working yet because of missing dlls, so disabled for now. --- audiogame-manager.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index ba12236..eedfca8 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -973,6 +973,7 @@ gameList=( "RS Games" "Run For Your Life" #"Sammy Center" + #"Scramble!" "Screaming Strike 2" "Sketchbook" "Sequence Storm" @@ -2171,6 +2172,14 @@ EOF find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; add_launcher "c:\Program Files\Sam Tupy\SammyCenter\SammyCenter.exe" ;; + "Scramble!") + 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") export winVer="win7" install_wine_bottle fakejapanese speechsdk From 23661a168a459110b4b5af1511ad769a0b79aef9 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 6 Mar 2022 00:20:50 -0500 Subject: [PATCH 07/11] Game "Scramble!" is working. If you install it though you will need wine 7.1 or lower, 7.3 appears to be broken currently. You can upgrade to 7.3 once it is installed though and it will continue to work. --- audiogame-manager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index eedfca8..adc0ab4 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -973,7 +973,7 @@ gameList=( "RS Games" "Run For Your Life" #"Sammy Center" - #"Scramble!" + "Scramble!" "Screaming Strike 2" "Sketchbook" "Sequence Storm" From 768d7ce168b859641a98fd51c4bb3efbfa9a92a6 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 6 Mar 2022 01:41:23 -0500 Subject: [PATCH 08/11] Added virtual desktop setting to Scramble because it fixed registration problems. --- audiogame-manager.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index adc0ab4..7dc0e86 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -2173,6 +2173,7 @@ EOF 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" From 19394f68e7387ca9277f19fe6221d4d94f92990c Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 6 Mar 2022 01:44:27 -0800 Subject: [PATCH 09/11] A heroes call seems to work now, may need some tweeking to optimize --- audiogame-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 7dc0e86..43887e2 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1078,9 +1078,9 @@ done case "${game}" in "A Hero's Call") export winVer="win7" - install_wine_bottle xna31 speechsdk corefonts + install_wine_bottle speechsdk corefonts # Dotnet is evil. That is all. - DISPLAY="" winetricks -q dotnet40 + LC_ALL=C DISPLAY="" winetricks -q dotnet462 xna40 wineserver -k # Really! 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" From 4b7d85b0706cdea63f30630ff6dbcb856dbd5a58 Mon Sep 17 00:00:00 2001 From: Michael Taboada Date: Sun, 6 Mar 2022 04:51:38 -0800 Subject: [PATCH 10/11] More work on entombed, still not working though --- audiogame-manager.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 43887e2..a109226 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -1700,12 +1700,17 @@ case "${game}" in ;; "Entombed") export winVer="win7" - #install_wine_bottle dotnet35 msvcrt40 speechsdk install_wine_bottle speechsdk msvcrt40 # Ok, more dotnet. - DISPLAY="" winetricks -q dotnet48 xna40 + LC_ALL=C DISPLAY="" winetricks -q dotnet462 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 add_launcher "c:\Program Files\Entombed\Entombed.exe" ;; From 7f4a3f13cc4d591651d2015cb3809b8e0d629732 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 6 Mar 2022 18:54:25 -0500 Subject: [PATCH 11/11] Update script for Scramble, untested, so be careful> --- game-scripts/scramble-update.sh | 47 +++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 game-scripts/scramble-update.sh diff --git a/game-scripts/scramble-update.sh b/game-scripts/scramble-update.sh new file mode 100755 index 0000000..2bd3a77 --- /dev/null +++ b/game-scripts/scramble-update.sh @@ -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