Merge branch 'testing' in preparation for binary release.

LICENSE

@@ -508,8 +508,6 @@ EXHIBIT A. Common Public Attribution License Version 1.0.
 
     Contributor Michael Taboada.
 
-    Contributor Jeremiah Ticket.
-
     [NOTE: The text of this Exhibit A may differ slightly from the text of the
     notices in the Source Code files of the Original Code. You should use the
     text of this Exhibit A rather than the text found in the Original Code

audiogame-manager.sh

@@ -27,8 +27,6 @@ cat << EOF
 
     Contributor Michael Taboada.
 
-    Contributor Jeremiah Ticket.
-
     Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 
     Attribution Phrase (not exceeding 10 words): A Stormux project
@@ -113,6 +111,42 @@ open_url() {
 fi
 }
 
+# Create desktop launcher file
+desktop_launcher() {
+    local desktopFile="${HOME}/audiogame-manager.desktop"
+    if [[ -e "${desktopFile}" ]]; then
+        echo "the file ${desktopFile} exists. Cannot create the launcher."
+        exit 1
+    fi
+    local dotDesktop
+    local terminal
+    # Try to find an accessible terminal
+    for i in mate-terminal lxterminal terminator gnome-terminal ; do
+        if command -v $i &> /dev/null ; then
+            terminal="$i"
+            break
+        fi
+    done
+    dotDesktop=('[Desktop Entry]'
+        'Name=Audiogame manager'
+        'GenericName=Audiogame Manager'
+        'Comment=Play audio games'
+        "Exec=${terminal} -t \"Audiogame Manager\" -e \"/usr/bin/bash -c 'nohup $(readlink -e "$0") 2> /dev/null'\""
+        'Terminal=false'
+        'Type=Application'
+        'StartupNotify=false'
+        'Keywords=game;'
+        'Categories=Game;'
+        'Version=1.0')
+    for i in "${dotDesktop[@]}" ; do
+        echo "$i" >> "${desktopFile}"
+    done
+    desktop-file-install --dir "${HOME}/.local/share/applications" -m 755 "${desktopFile}"
+    xdg-desktop-icon install ~/.local/share/applications/audiogame-manager.desktop
+    rm "${desktopFile}"
+    exit 0
+}
+
 # Create the clipboard reading function for Sequence Storm
 write_sequence_storm_reader() {
     if -e ~/.SequenceStormReader ]]; then
@@ -321,6 +355,14 @@ get_bottle() {
     # Handles games that use the same wine bottle
     case "${game}" in 
         "bg-"*) export WINEPREFIX="${HOME}/.local/wine/bg";;
+        # l-works games group
+        "duck-hunt"*) ;&
+        "judgement-day"*) ;&
+        "lockpick"*) ;&
+        "pigeon-panic"*) ;&
+        "super-egg-hunt"*) ;&
+        "super-liam"*) ;&
+        "the-great-toy-robbery"*) export WINEPREFIX="${HOME}/.local/wine/l-works";;
         # Oriol Gomez games group
         "beatstar-pro"*) ;&
         "bombercats"*) ;&
@@ -869,8 +911,8 @@ gameList=(
     #"Fartman"
     "Finger Panic"
     "Fuck That Bird"
+    "Future Life"
     "GMA Tank Commander"
-    "Golden Crayon"
     "Hammer of Glory"
     #"Hearthstone"
     "Hunter"
@@ -897,6 +939,7 @@ gameList=(
     "Park Boss"
     "Perilous Hearts"
     "Pontes Kickups!"
+    "Pigeon Panic"
     #"Psycho Strike"
     "Q9"
     "Rhythm Rage"
@@ -923,7 +966,7 @@ gameList=(
     "Technoshock"
     "Ten Pin Alley"
     "The Blind Swordsman"
-    "The Gate"
+    #"The Gate"
     "The Great Toy Robbery"
     "Thief"
     "Traders of Known Space"
@@ -959,6 +1002,7 @@ fi
 declare -A command=(
     [c]="Check your system for necessary components."
     [C]="Clear the cache. All game installers will be deleted."
+    [D]="Create desktop shortcut. You can launch audiogame-manager from the desktop or applications menu."
     [d]="Debug mode, wine will be much more verbose when games are launched with this flag."
     [h]="This help screen."
     [i]="Install games."
@@ -979,6 +1023,7 @@ while getopts "${args}" i ; do
     case "$i" in
         c) checklist;;
         C) clear_cache;;
+        D) desktop_launcher;;
         d)
             unset WINEDEBUG
             game_launcher
@@ -1555,6 +1600,7 @@ case "${game}" in
         add_launcher "c:\Program Files\reality software\death match project alpha\dm1.exe"
     ;;
     "Duck Hunt")
+        export bottle="l-works"
         install_wine_bottle vb6run dx8vb speechsdk
         download "http://files.l-works.net/dhsetup.exe"
         wine "${cache}/dhsetup.exe" /silent
@@ -1667,13 +1713,14 @@ case "${game}" in
         unzip -d "$WINEPREFIX/drive_c/Program Files/fuck that bird" "${cache}/bird_en.zip"
         add_launcher "c:\Program Files\fuck that bird\game.exe"
     ;;
-    "Golden Crayon")
+    "Future Life")
         export winVer="win7"
         install_wine_bottle speechsdk
-        download "http://tunmi13.ddns.net/projects/golden_crayon.zip"
+        get_installer "Future Life.zip" "https://www.mediafire.com/file/phkzxtqjaw6nao9/Future"
-        unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/golden_crayon.zip"
+        unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/Future Life.zip"
-        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
+        chmod +w "$WINEPREFIX/drive_c/Program Files/Future Life"
-        add_launcher "c:\Program Files\\golden_crayon\gc.exe"
+        find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
+        add_launcher "c:\Program Files\Future Life\future_life.exe"
     ;;
     "GMA Tank Commander")
         install_wine_bottle vb6run dx8vb speechsdk
@@ -1813,6 +1860,7 @@ EOF
         add_launcher "c:\Program Files\Lighttech Interactive\Light Cars\lightCars.exe"
     ;;
     "Lockpick")
+        export bottle="l-works"
         install_wine_bottle vb6run dx8vb
         download "http://files.l-works.net/lockpicksetup.exe"
         wine "${cache}/lockpicksetup.exe" /silent
@@ -1950,6 +1998,13 @@ EOF
         wine "${cache}/perilous hearts concept demo.exe" /silent
         add_launcher "c:\Program Files\Perilous Hearts Concept Demo\perilous_hearts.exe"
     ;;
+    "Pigeon Panic")
+        export bottle="l-works"
+        install_wine_bottle vb6run dx8vb
+        download "http://agarchive.net/games/lworks/pigeon%20panic%20setup.exe"
+        wine "${cache}/pigeon panic setup.exe" /silent
+        add_launcher "c:\Program Files\Lworks\Pigeon Panic\pigeonPanic.exe"
+    ;;
     "Psycho Strike")
         install_wine_bottle speechsdk
         download "http://www.vgstorm.com/psycho_strike_installer.exe"
@@ -2006,7 +2061,7 @@ EOF
     ;;
     "Screaming Strike 2")
         export winVer="win7"
-        install_wine_bottle cjkfonts speechsdk
+        install_wine_bottle fakejapanese speechsdk
         download "https://www.nyanchangames.com/softs/screamingStrike2.exe" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
         wine "${cache}/screamingStrike2.exe" &
         xdotool sleep 10 key Return
@@ -2096,12 +2151,14 @@ EOF
         add_launcher "c:\Program Files\SuperDog's Bone Hunt\sbh.exe"
     ;;
     "Super Egg Hunt")
+        export bottle="l-works"
         install_wine_bottle 
         download "http://files.l-works.net/superegghuntsetup.exe"
         wine "${cache}/superegghuntsetup.exe" /silent
         add_launcher "c:\Program Files\Lworks\super egg hunt\superegghunt.exe"
     ;;
     "Super Liam")
+        export bottle="l-works"
         install_wine_bottle vb6run dx8vb
         download "http://files.l-works.net/superliamsetup.exe"
         wine "${cache}/superliamsetup.exe" /silent
@@ -2172,6 +2229,7 @@ EOF
         add_launcher "c:\Program Files\VGStorm.com\The Gate\gate.exe"
     ;;
     "The Great Toy Robbery")
+        export bottle="l-works"
         export winVer="win7"
         install_wine_bottle  speechsdk
         download "http://files.l-works.net/tgtrsetup_2.04.exe" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"

game-scripts/crazy-party-build-games.sh

@@ -25,8 +25,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project

game-scripts/crazy-party-update.sh

@@ -25,8 +25,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project

game-scripts/golden-crayon-update.sh

@@ -1,52 +0,0 @@
-#!/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.
-#
-#    Contributor Jeremiah Ticket.
-#
-#    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_CONFIG_HOME:-$HOME/.config}/storm-games/audiogame-manager/cache"
-pushd ~/.local/wine/golden-crayon/drive_c/Program\ Files/golden_crayon/
-unzip golden_crayon.zip
-rm -r libs/
-mv golden_crayon/* .
-find ~/.local/wine/golden-crayon/ -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
-find ~/.local/wine/golden-crayon/ -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \;
-rmdir golden_crayon/
-popd
-
-exit 0

game-scripts/swamp-update.sh

@@ -25,8 +25,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project

game-scripts/topspeedserver.sh

@@ -25,8 +25,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project

mac/mac-launcher.applescript

@@ -24,8 +24,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project

speech/set-voice.sh

@@ -30,8 +30,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project

wine/mkwine.sh

@@ -25,8 +25,6 @@
 #
 #    Contributor Michael Taboada.
 #
-#    Contributor Jeremiah Ticket.
-#
 #    Attribution Copyright Notice: Audiogame manager copyright 2020 Storm Dragon. All rights reserved.
 #
 #    Attribution Phrase (not exceeding 10 words): A Stormux project