Merge branch 'testing' latest games and fixes.

audiogame-manager.sh

@@ -320,6 +320,7 @@ download() {
     for i in "${source[@]}" ; do
         local dest="${i##*/}"
         dest="${dest//%20/ }"
+        dest="${dest%\?*}"
         # Remove the destination file if it is empty.
         test -s "${cache}/${dest}" || rm -f "${cache}/${dest}" 2> /dev/null
         if [[ "${redownload}" == "true" ]] && [[ -e "${cache}/${dest}" ]]; then
@@ -796,11 +797,14 @@ game_launcher() {
                 fi
                 pgrep -u "$USER" nvda2speechd &> /dev/null || ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &
             fi
-            if [[ ! -d "${dictPath}/dict" ]]; then
+            if [[ ! -d "${dictPath}/dict" ]] && [[ ! -r "${cache}/bk3-dict.dat" ]]; then
                 find "${WINEPREFIX}/drive_c/nyanchangame/bk3" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \;
                 "${0%/*}/speech/clipboard_translator.sh" play.exe &
             fi
         fi
+        if [[ "$game" =~ bop-it-emulator ]]; then
+            "${0%/*}/speech/speak_window_title.sh" bop.exe &
+        fi
         if [[ "$game" =~ road-to-rage\| ]]; then
             "${0%/*}/speech/speak_window_title.sh" trtr.exe &
         fi
@@ -910,9 +914,6 @@ unset noCache
 # Manual installation is not default, make sure it's unset
 unset manualInstall
 
-# Set up logging
-echo -e "\n\n-----> Logging started at $(date '+%A, %B %d, %Y at %I:%M%p')\n" >> "${cache}/audiogame-manager.log"
-exec &> >(command tee -a "${cache}/audiogame-manager.log")
 
 # The list of games available for installation.
 # Use menu friendly names.
@@ -977,6 +978,7 @@ gameList=(
     "Bokurano Daibouken 2"
     "Bokurano Daibouken 3"
     "Bombercats"
+    "Bop It Emulator"
     #"Breed Memorial"
     "Castaways"
     "Castaways 2"
@@ -985,6 +987,7 @@ gameList=(
     #"Chopper Challenge"
     "Christmas WhoopAss"
     "Code Dungeon"
+    "Coin Collector"
     #"Constant Battle"
     "Copter Mission"
     "Crazy Party"
@@ -1667,6 +1670,13 @@ case "${game}" in
         find "${WINEPREFIX}" -type f -name 'nvdaControllerClient.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
         add_launcher "c:\nyanchangame\bk3\play.exe"
     ;;
+    "Bop It Emulator")
+        export winVer="win7"
+        install_wine_bottle
+        download "http://www.masonasons.me/softs/BopItEmulator3.1PasswordIsBopIt.7z"
+        7z x -o"$WINEPREFIX/drive_c/Program Files/Bop It" "${cache}/BopItEmulator3.1PasswordIsBopIt.7z" -pBopIt
+        add_launcher "c:\Program Files\Bop It\bop.exe"
+    ;;
     "Bombercats")
         export bottle="oriol-gomez"
         export winVer="win7"
@@ -1727,6 +1737,15 @@ case "${game}" in
         echo "$USER|n/a" >> "$WINEPREFIX/drive_c/Program Files/x-sight interactive/chopper challenge/config.dat"
         add_launcher "c:\Program Files\x-sight interactive\chopper challenge\Chopper.exe"
     ;;
+    "Coin Collector")
+        export WINEARCH=win64
+        export winVer="win7"
+        download "https://www.dropbox.com/s/v55q7t9n84otmcd/coin%20collector.rar?dl=1" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll"
+        install_wine_bottle
+        unrar x "$cache/coin collector.rar" -op"$WINEPREFIX/drive_c/Program Files"
+        find "$WINEPREFIX/drive_c/Program Files/coin collector" -type f -name "nvdaControllerClient64.dll" -exec cp -v "$cache/nvda2speechd64.dll" "{}" \;
+        add_launcher "c:\Program Files\coin collector\game.exe"
+    ;;
     "Constant Battle")
         export winVer="win7"
         install_wine_bottle cjkfonts speechsdk