Preparing to merge.

"Error processing game output: 'gbk' codec can't decode byte 0xac in
position 33: illegal multibyte sequence"
as reported by nicotomia from the audiogames.net forum.

DoomTTS.ps1

@@ -0,0 +1,231 @@
+# Change the next line to $true to enable the script
+$useTextToSpeech = $true
+# Set this to $true to use SAPI, $false to use nvdaControllerClient or fall back to clipboard
+$useSAPI = $false
+# Set the speech rate. -10 to 10, default 0
+$speechRate = 0
+
+# Do not edit below this line.
+######################################################################
+
+# Exit if text-to-speech is disabled
+if (-not $useTextToSpeech) {
+    exit
+}
+
+# Define antigrep, and sed patterns
+$antigrepPatterns = @(
+    '^P_StartScript:',
+    '^[Ff]luidsynth:',
+    '^(Facing|INTRO|MAP[0-9]+|README)',
+    '^ *TITLEMAP',
+    'key card',
+    '^\[Toby Accessibility Mod\] (INTRO|READMe)([0-9]+).*',
+    "^(As |Computer Voice:|I |I've|Monorail|Ugh|What|Where)",
+    [regex]::Escape('Ugh... Huh? What the hell was that?! Better go check it out...')
+)
+
+$sedPatterns = @(
+    @("\[Toby Accessibility Mod\] M_", "[Toby Accessibility Mod] "),
+    @("^\[Toby Accessibility Mod\] ", ""),
+    @("^MessageBoxMenu$", "Confirmation menu: Press Y for yes or N for no"),
+    @("^Mainmenu$", "Main menu"),
+    @("^Playerclassmenu$", "Player class menu"),
+    @("^Skillmenu$", "Difficulty menu"),
+    @("^NGAME", "New game"),
+    @("^LOADG$", "Load game"),
+    @("^SAVEG$", "Save game"),
+    @("^QUITG$", "Quit game"),
+    @('"cl_run" = "true"', "Run"),
+    @('"cl_run" = "false"', "Walk"),
+    @('.*/:Game saved. \(', ""),
+    @('^\*\*\*', ""),
+    @('^\+', "")
+)
+
+# Check PowerShell version
+$requiredPowershellVersion = [Version]"5.1"
+$currentPowershellVersion = $PSVersionTable.PSVersion
+
+$logFile = ".\DoomTTS.log"
+Set-Content -Path $logFile -Value "Logging started $(Get-Date -Format 'dddd MMMM dd, yyyy') at $(Get-Date -Format 'hh:mmtt')"
+Add-Content -Path $logFile -Value "Powershell $currentPowershellVersion"
+if ($currentVersion -lt $requiredVersion) {
+    Add-Content -Path $logFile -Value "PowerShell version $requiredPowershellVersion or later is required. Exiting."
+    exit
+}
+
+# Function for logging
+function Write-Log {
+    param (
+        [string]$Message,
+        [string]$Type = "INFO"  # Can be INFO, ERROR, or SPEECH
+    )
+
+    $timestamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
+    $logMessage = "$Message [$Type] [$timestamp]"
+    
+    # Append the message to the log file
+    Add-Content -Path $logFile -Value $logMessage
+
+    # If it's an error, also write to the console
+    if ($Type -eq "ERROR") {
+        Write-Host $logMessage -ForegroundColor Red
+    }
+}
+
+# Function to load NVDA DLL and check if NVDA is running
+function Initialize-NVDA {
+    try {
+        # Declare the P/Invoke signatures
+        $signature = @"
+        [DllImport("kernel32.dll")]
+        public static extern IntPtr LoadLibrary(string dllToLoad);
+
+        [DllImport("kernel32.dll")]
+        public static extern IntPtr GetProcAddress(IntPtr hModule, string procedureName);
+
+        [DllImport("kernel32.dll")]
+        public static extern bool FreeLibrary(IntPtr hModule);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        public delegate int NvdaTestIfRunning();
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        public delegate void NvdaSpeakText([MarshalAs(UnmanagedType.LPWStr)] string text);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        public delegate void NvdaBrailleMessage([MarshalAs(UnmanagedType.LPWStr)] string message);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        public delegate void NvdaCancelSpeech();
+"@
+
+        Add-Type -MemberDefinition $signature -Name "NvdaFunctions" -Namespace "Win32Functions"
+
+        # Load the NVDA client library
+        $dllPath = ".\nvdaControllerClient.dll"
+        $nvdaDll = [Win32Functions.NvdaFunctions]::LoadLibrary($dllPath)
+        if ($nvdaDll -eq [IntPtr]::Zero) {
+            throw "Failed to load nvdaControllerClient.dll"
+        }
+
+        # Define function pointers
+        $nvdaTestIfRunning = [System.Runtime.InteropServices.Marshal]::GetDelegateForFunctionPointer(
+            [Win32Functions.NvdaFunctions]::GetProcAddress($nvdaDll, "nvdaController_testIfRunning"),
+            [Type][Win32Functions.NvdaFunctions+NvdaTestIfRunning]
+        )
+
+        $nvdaSpeakText = [System.Runtime.InteropServices.Marshal]::GetDelegateForFunctionPointer(
+            [Win32Functions.NvdaFunctions]::GetProcAddress($nvdaDll, "nvdaController_speakText"),
+            [Type][Win32Functions.NvdaFunctions+NvdaSpeakText]
+        )
+
+        $nvdaBrailleMessage = [System.Runtime.InteropServices.Marshal]::GetDelegateForFunctionPointer(
+            [Win32Functions.NvdaFunctions]::GetProcAddress($nvdaDll, "nvdaController_brailleMessage"),
+            [Type][Win32Functions.NvdaFunctions+NvdaBrailleMessage]
+        )
+
+        $nvdaCancelSpeech = [System.Runtime.InteropServices.Marshal]::GetDelegateForFunctionPointer(
+            [Win32Functions.NvdaFunctions]::GetProcAddress($nvdaDll, "nvdaController_cancelSpeech"),
+            [Type][Win32Functions.NvdaFunctions+NvdaCancelSpeech]
+        )
+
+        # Test if NVDA is running
+        $res = $nvdaTestIfRunning.Invoke()
+        if ($res -ne 0) {
+            $errorMessage = [ComponentModel.Win32Exception]::new([System.Runtime.InteropServices.Marshal]::GetLastWin32Error()).Message
+            throw "NVDA is not running or communication failed. Error: $errorMessage"
+        }
+
+        return @{
+            SpeakText = $nvdaSpeakText
+            BrailleMessage = $nvdaBrailleMessage
+            CancelSpeech = $nvdaCancelSpeech
+        }
+    }
+    catch {
+        Write-Log -Message "Error initializing NVDA: $_" -Type "ERROR"
+        return $null
+    }
+}
+
+# Function to speak text using SAPI, NVDA, or copy to clipboard
+function Speak-Text {
+    param (
+        [string]$text
+    )
+    
+    Write-Log -Message "Speaking: $text" -Type "SPEECH"
+    
+    if ($useSAPI) {
+        try {
+            $tts = New-Object -ComObject SAPI.SPVoice
+            $tts.Rate = $speechRate
+            $tts.Speak($text)
+        } catch {
+            Write-Log -Message "Error using SAPI: $_" -Type "ERROR"
+        }
+    } else {
+        $nvdaFunctions = Initialize-NVDA
+        if ($nvdaFunctions) {
+            try {
+                $nvdaFunctions.SpeakText.Invoke($text)
+            } catch {
+                Write-Log -Message "Error using nvdaControllerClient.dll: $_" -Type "ERROR"
+                Set-Clipboard -Value $text
+            }
+        } else {
+            Set-Clipboard -Value $text
+            Write-Log -Message "Failed to initialize NVDA, text copied to clipboard" -Type "INFO"
+        }
+    }
+}
+
+# Process the output with grep, antigrep, and sed-like functionality
+function Process-Output {
+    param (
+        [string]$line,
+        [string[]]$antigrepPatterns,
+        [array]$sedPatterns
+    )
+
+    # Apply antigrep (exclude lines)
+    foreach ($pattern in $antigrepPatterns) {
+        if ($line -match $pattern) {
+            return  # Skip this line
+        }
+    }
+
+    # Apply sed (modify lines)
+    foreach ($pattern in $sedPatterns) {
+        $line = $line -replace $pattern[0], $pattern[1]
+    }
+
+    return $line
+}
+
+
+# Start reading the piped output
+$stream = [System.IO.StreamReader]::new([Console]::OpenStandardInput(), [System.Text.Encoding]::UTF8)
+# Use the 40 - line to let us know when to start speaking.
+$startProcessing = $false
+                                                                                                                                                                          
+while ($null -ne ($line = $stream.ReadLine())) {
+    Write-Log -Message "Raw input: $line" -Type "INFO"
+                                                                                                                                                                          
+    # Check for the separator
+    if ($line -match '^-{5,}$') {
+        $startProcessing = $true
+        continue  # Skip the separator
+    }
+                                                                                                                                                                          
+    # Only process lines after we've seen the separator
+    if ($startProcessing) {
+        $processedLine = Process-Output -line $line -antigrepPatterns $antigrepPatterns -sedPatterns $sedPatterns
+        if ($processedLine) {
+            Write-Log -Message "Processed line: $processedLine" -Type "INFO"
+            Speak-Text -text $processedLine
+        }
+    }
+}

TobyCustom/'

@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-
-pushd "$doomPath"
-
-# Set up the pk3 and wad files 
-gameOption=(
-    "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
-    "${doomPath}/TobyAccMod_V${tobyVersion}.pk3"
-    "${doomPath}/PB-Toby-Compatibility-Addon.pk3"
-    "${doomPath}/Toby-Universal-Pickup-Beacon-Prototype.pk3"
-    "${doomPath}/TobyDeathArena_V1-0.wad"
-)
-
-# Death match setup
-ipAddress="$(dialog --backtitle "Deathmatch Options" \
-    --clear \
-    --no-tags \
-    --ok-label "Join" \
-    --cancel-label "Exit" \
-    --extra-button \
-    --extra-label "Host" \
-    --inputbox "Enter ip or URL, required for join." -1 -1 --stdout)"
-buttonCode=$?
-[[ $buttonCode -eq 1 ]] && exit 0
-if [[ $buttonCode -eq 0 ]]; then
-    if [[ "${#ipAddress}" -lt 3 ]]; then
-        dialog --backtitle "Deathmatch" --clear --msgbox "No ip address or URL given." -1 -1 --stdout
-        exit 1
-    fi
-    flags=('-join' "${ipAddress}")
-else
-    # List of maps included:
-    maps=(
-        "1" "Com Station (2-4 players)"
-        "2" "Warehouse (2-4 players)"
-        "3" "Sector 3 (2-4 players)"
-        "4" "Dungeon of Doom (2-4 players)"
-        "5" "Ocean Fortress (2-4 players)"
-        "6" "Water Treatment Facility (2-4 players)"
-        "7" "Phobos Base Site 4 (2-4 players)"
-        "8" "Hangar Bay 18 (2-4 players)")
-    # Array of how many players a given map supports in dialog rangebox syntax
-    declare -a mapPlayers=(
-        [1]="2 4"
-        [2]="2 4"
-        [3]="2 4"
-        [4]="2 4"
-        [5]="2 4"
-        [6]="2 4"
-        [7]="2 4"
-        [8]="2 4")
-    map="$(dialog --backtitle "Select Map" \
-        --clear \
-        --no-tags \
-        --cancel-label "Exit" \
-        --ok-label "Next" \
-        --menu "Please select one" 0 0 0 "${maps[@]}" --stdout)"
-    fraglimit="$(dialog --backtitle "Fraglimit" \
-        --clear \
-        --ok-label "Next" \
-        --cancel-label "Exit" \
-        --rangebox "Select Fraglimit" -1 -1 1 500 20 --stdout)"
-    [[ $? -eq 1 ]] && exit 0
-    # Get ip address
-    yourIpAddress="$(curl -4s https://icanhazip.com)"
-    players="$(dialog --backtitle "Host Deathmatch Game" \
-        --clear \
-        --ok-label "Next" \
-        --cancel-label "Exit" \
-        --rangebox "Select number of players. Remember to give them your IP address: ${yourIpAddress}" -1 -1 ${mapPlayers[$map]} --stdout)"
-    [[ $? -eq 1 ]] && exit 0
-    skillLevel="$(dialog --backtitle "Host Deathmatch Game" \
-        --clear \
-        --ok-label "Start" \
-        --cancel-label "Exit" \
-        --extra-button \
-        --extra-label "Bots Only" \
-        --rangebox "Select difficulty. 1 easiest, 5 hardest." -1 -1 1 5 3 --stdout)"
-    code=$?
-    [[ $code -eq 1 ]] && exit 0
-    if [[ $code -eq 3 ]]; then
-        players=1
-        dialog --backtitle "Preparing to Launch" \
-            --msgbox "When the game starts, press \` to open the console. Type addbot, press enter. Repeat addbot for as many bots as you would like. Press \`    again to close the console." -1 -1 --stdout
-    fi
-    flags=(
-            '-host' "${players}"
-            '-skill' "${skillLevel}"
-            '-deathmatch'
-            '+set' 'sv_cheats' '1'
-            '+fraglimit' "$fraglimit"
-            '+dmflags' '16384' '+dmflags' '4' '+dmflags' '128' '+dmflags' '4096'
-            '+dmflags2' '512'   '+dmflags2' '1024'
-                    '-extratic' '-dup' '3'
-            '-warp' "$map"
-    )
-fi
-
-# Check for and include if present a wad. Some people may not have it.
-if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then
-    gameOption+=" DoomMetalVol7.wad"
-elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
-    gameOption+=" DoomMetalVol6.wad"
-fi
-
-# Extend the search for new messages to be read.
-grepStrings+=('-e' ' died.'
-    '-e' 'Ectoplasmic Surge!'
-    '-e' ' has been '
-    '-e' '^(Armor|Health) boosted!'
-    '-e' 'Lesser demon energy'
-    '-e' '^Found '
-    '-e' 'Got the '
-    '-e' 'Picked up '
-    '-e' '^(Mega|Soul)sphere$'
-    '-e' '^Took '
-    '-e' ' was .*(\.|!)'
-    '-e' '^Vanguard of the gods!$'
-    '-e' "You've found "
-    '-e' 'You (collected|got|found|picked up) ')
-
-# Launch the game and pipe things to be spoken through speech-dispatcher.
-# This also leaves the console output intact for people who may want to read it.
-exec stdbuf -oL ${gzdoom} ${gameOption[@]} "${flags[@]}" | while IFS= read -r l ; do echo "$l" | { grep "${grepStrings[@]}" | grep "${antiGrepStrings[@]}" | sed "${sedStrings[@]}" | spd-say -e ${spd_module} ${spd_pitch} ${spd_rate} ${spd_voice} ${spd_volume} -- > /dev/null 2>&1; }; echo "$l";done

TobyCustom/ArmyOfDarknessDoom.json

@@ -10,10 +10,11 @@
     }
   ],
   "files": [
-    "Addons/MENU/TobyV{toby_base_version}_*",
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
     "aoddoom1.wad"
   ],
   "optional_files": [
+    "DOOM Metal X IDKFA Soundtrack.pk3",
     "DoomMetalVol7.wad",
     "DoomMetalVol6.wad"
   ],

TobyCustom/DoomGuyVersesTheDaleks.json

@@ -0,0 +1,25 @@
+{
+  "name": "DoomGuy Verses the Daleks",
+  "dependencies": [
+    {
+      "file": "DoomguyVsTheDaleks_V1.1.wad",
+      "url": "https://www.moddb.com/mods/doomguy-vs-the-daleks",
+      "messages": [
+        "Place \"DoomguyVsTheDaleks_V1.1.wad\" in the Toby Doom directory. On Linux/Mac this is ~/.local/games/doom"
+      ]
+    }
+  ],
+  "files": [
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
+    "Addons/DOOM/TobyV*_Decorations.pk3",
+    "Addons/DOOM/TobyV*_Guns.pk3",
+    "Addons/DOOM/TobyV*_Pickups.pk3",
+    "DoomguyVsTheDaleks_V1.1.wad"
+  ],
+  "optional_files": [
+    "DOOM Metal X IDKFA Soundtrack.pk3",
+    "DoomMetalVol7.wad",
+    "DoomMetalVol6.wad"
+  ],
+  "use_map_menu": true
+}

TobyCustom/GoMidievilOnTheirAss.json

@@ -10,8 +10,7 @@
     }
   ],
   "files": [
-    "Addons/MENU/TobyV{toby_base_version}_*",
-    "Addons/DOOM/TobyV{toby_base_version}_Proximity.pk3",
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
     "GMOTA_V.1.5.2.pk3"
   ],
   "flags": [

TobyCustom/ProjectMSX.json

@@ -0,0 +1,17 @@
+{
+  "name": "ProjectMSX",
+  "dependencies": [
+    {
+      "file": "projectmsx_v0.2a.pk3",
+      "url": "https://www.moddb.com/mods/project-msx",
+      "messages": [
+        "Place projectmsx_v0.2a.pk3 in the Toby Doom directory. On Linux/Mac this is ~/.local/games/doom."
+      ]
+    }
+  ],
+  "files": [
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
+    "projectmsx_v0.2a.pk3"
+  ],
+  "use_map_menu": true
+}

TobyCustom/Project_Brutality.json

@@ -12,11 +12,12 @@
     }
   ],
   "files": [
-    "Addons/DOOM/TobyV{toby_base_version}_Proximity.pk3",
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
     "PB-Toby-Compatibility-Addon.pk3",
     "Project_Brutality.pk3"
   ],
   "optional_files": [
+    "DOOM Metal X IDKFA Soundtrack.pk3",
     "DoomMetalVol7.wad",
     "DoomMetalVol6.wad"
   ],

TobyCustom/Project_BrutalityLatest.json

@@ -11,10 +11,11 @@
     }
   ],
   "files": [
-    "Addons/DOOM/TobyV{toby_base_version}_Proximity.pk3",
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
     "Project_Brutality-Latest.pk3"
   ],
   "optional_files": [
+    "DOOM Metal X IDKFA Soundtrack.pk3",
     "DoomMetalVol7.wad",
     "DoomMetalVol6.wad"
   ],

TobyCustom/WolfenDoom.json

@@ -29,8 +29,7 @@
     ]
   },
   "files": [
-    "Addons/MENU/TobyV{toby_base_version}_*",
-    "Addons/DOOM/TobyV{toby_base_version}_Proximity.pk3"
+    "Addons/MENU/TobyV*_SimpleMenu.pk3"
   ],
   "flags": [
     "+bind", "Ctrl", "+attack",

TobyCustom/Xim-StarWars.json

@@ -1,15 +1,16 @@
 {
-  "name": "Star Wars",
+  "name": "Xim Star Wars",
   "dependencies": [
     {
       "file": "Xim-StarWars-v3.1.5.pk3",
       "url": "https://www.moddb.com/mods/xims-star-wars-doom",
       "messages": [
-        "Place Xim-StarWars-v3.1.5.pk3 in the Toby Doom directory, on Linux or Mac, ~/.local/games/doom"
+        "Extract Xim-StarWars-v3.1.5.6.zip to the Toby Doom directory, on Linux or Mac, ~/.local/games/doom"
       ]
     }
   ],
   "files": [
+    "Addons/MENU/TobyV*_SimpleMenu.pk3",
     "Xim-StarWars-v3.1.5.pk3",
     "Addons/STARWARS/*.pk3"
   ],