storm/toby-doom-launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the keybinding fix part of the program.

Browse Source
This commit is contained in:
Storm Dragon 2025-03-25 15:12:20 -04:00
parent 432a55308f
commit b17f1c0672
1 changed files with 212 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

342
Toby Doom Launcher.py
View File

@ -866,71 +866,154 @@ class DoomLauncher(QMainWindow):
if not self.configFile.exists(): if not self.configFile.exists():
print("Config file not found") print("Config file not found")
return False return False
try: try:
# Read config file # Read config file
with open(self.configFile, 'r') as f: with open(self.configFile, 'r') as f:
configLines = f.readlines() configLines = f.readlines()
changesNeeded = False changesNeeded = False
# Standard controls that should be consistent
standardControls = { standardControls = {
'attack': 'Ctrl', 'attack': '+attack',
'altattack': 'Alt', 'altattack': '+altattack',
'use': 'Space', 'use': '+use',
'turn180': 'X' 'crouch': '+crouch',
'turn180': 'turn180',
'jump': '+jump'
} }
# Standard key bindings
standardKeys = {
'Ctrl': '+attack',
'Alt': '+altattack',
'Space': '+use',
'C': '+crouch',
'X': 'turn180',
'J': '+jump'
}
# Arrow key setup for aiming
arrowControls = {
'UpArrow': '+forward',
'DownArrow': '+back',
'LeftArrow': '+left',
'RightArrow': '+right'
}
# Accessibility controls that need to be in special sections
tobyAccessibilityControls = { tobyAccessibilityControls = {
'E': 'pukename TurnCompass 1', # Turn compass right 'E': 'pukename TurnCompass 1',
'R': 'pukename TurnCompass 0', # Turn compass left 'R': 'pukename TurnCompass 0',
'Q': 'pukename CompassScript', # Compass script 'Q': 'pukename CompassScript',
';': 'netevent Toby_CheckLevelStats', # Check level stats ';': 'netevent Toby_CheckLevelStats',
"'": 'toby_proximity_toggle_keybind', # Toggle proximity detector "'": 'toby_proximity_toggle_keybind',
'Z': '+toby_snap_to_target_keybind' # Target snap function 'Z': '+toby_snap_to_target_keybind'
} }
# Map section prefixes to their control sections # Map section prefixes to their control sections
controlSections = {} controlSections = {}
currentSection = None currentSection = None
for i, line in enumerate(configLines): for i, line in enumerate(configLines):
line = line.strip() line = line.strip()
# Detect section headers # Detect section headers
if line.startswith('[') and line.endswith(']'): if line.startswith('[') and line.endswith(']'):
currentSection = line[1:-1] currentSection = line[1:-1]
# If this is a bindings section, extract the game prefix # If this is a bindings section, extract the game prefix
if '.Bindings' in currentSection: if '.Bindings' in currentSection:
prefix = currentSection.split('.')[0] # e.g., 'Doom', 'Heretic' prefix = currentSection.split('.')[0] # e.g., 'Doom', 'Heretic'
controlSections[prefix] = controlSections.get(prefix, []) + [currentSection] controlSections[prefix] = controlSections.get(prefix, []) + [currentSection]
continue continue
# Check if we're in any Bindings section # Fix main bindings in each game's Bindings section
if currentSection and '.Bindings' in currentSection and '=' in line: if currentSection and currentSection.endswith('.Bindings') and not any(x in currentSection for x in ['Double', 'Automap', 'CompassMod', 'TargetSnap', 'CheckMod', 'ProximityDetector']) and '=' in line:
key, binding = line.split('=', 1) key, binding = line.split('=', 1)
key = key.strip() key = key.strip()
binding = binding.strip() binding = binding.strip()
# Check if this line defines a binding we want to change # Fix the turn180 command specifically (should not have + prefix)
for control, standardKey in standardControls.items(): if binding == '+turn180':
if binding == f"+{control}" and key != standardKey: configLines[i] = f"{key}=turn180\n"
# This is a binding we want to fix changesNeeded = True
configLines[i] = f"{standardKey}=+{control}\n"
# Check if standard keys have correct bindings
if key in standardKeys and binding != standardKeys[key]:
configLines[i] = f"{key}={standardKeys[key]}\n"
changesNeeded = True
print(f"Fixed {key} binding to {standardKeys[key]} in {currentSection}")
# Remove E=+use binding (this should be in CompassMod section)
if key == "E" and binding == "+use":
configLines[i] = f"# {line} # Removed by Toby Launcher\n"
changesNeeded = True
print(f"Removed E=+use binding in {currentSection}")
# Fix arrow key controls
for arrowKey, arrowBinding in arrowControls.items():
if key == arrowKey and binding != arrowBinding:
configLines[i] = f"{arrowKey}={arrowBinding}\n"
changesNeeded = True changesNeeded = True
print(f"Fixed {control} binding in {currentSection} from {key} to {standardKey}") print(f"Fixed {arrowKey} in {currentSection} to {arrowBinding}")
# Check for the Toby accessibility controls across all game types # Make sure all arrow key controls exist in main binding sections
# For each game prefix, check if it has the correct CompassMod.Bindings, etc. for prefix, sections in controlSections.items():
mainBindingSection = f"{prefix}.Bindings"
# Find the index of the main binding section
mainSectionIndex = -1
for i, line in enumerate(configLines):
if line.strip() == f"[{mainBindingSection}]":
mainSectionIndex = i
break
if mainSectionIndex == -1:
continue # Skip if section not found
# Find the end of the section
nextSectionIdx = next((j for j in range(mainSectionIndex+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
# Check existing bindings in this section
existingBindings = {}
existingKeys = {}
for i in range(mainSectionIndex+1, nextSectionIdx):
line = configLines[i].strip()
if '=' in line and not line.startswith('#'):
key, binding = line.split('=', 1)
key = key.strip()
binding = binding.strip()
existingBindings[binding] = key
existingKeys[key] = binding
# Add missing standard key bindings
missingKeys = []
for key, binding in standardKeys.items():
if key not in existingKeys:
missingKeys.append(f"{key}={binding}\n")
# Add missing arrow controls
for arrowKey, arrowBinding in arrowControls.items():
if arrowKey not in existingKeys:
missingKeys.append(f"{arrowKey}={arrowBinding}\n")
# Insert missing controls at the end of the section
if missingKeys:
configLines[nextSectionIdx:nextSectionIdx] = missingKeys
changesNeeded = True
print(f"Added missing standard controls to {mainBindingSection}")
# Now check for the Toby accessibility controls across all game types
for prefix, sections in controlSections.items(): for prefix, sections in controlSections.items():
mainBindingSection = f"{prefix}.Bindings" mainBindingSection = f"{prefix}.Bindings"
compassModSection = f"{prefix}.CompassMod.Bindings" compassModSection = f"{prefix}.CompassMod.Bindings"
proximitySection = f"{prefix}.ProximityDetector.Bindings" proximitySection = f"{prefix}.ProximityDetector.Bindings"
checkModSection = f"{prefix}.CheckMod.Bindings" checkModSection = f"{prefix}.CheckMod.Bindings"
targetSnapSection = f"{prefix}.TargetSnap.Bindings" targetSnapSection = f"{prefix}.TargetSnap.Bindings"
# Check if the accessibility sections exist, create them if not # Check if the accessibility sections exist, create them if not
if compassModSection not in sections: if compassModSection not in sections:
# Add this section after the main Bindings section # Add this section after the main Bindings section
@ -947,131 +1030,130 @@ class DoomLauncher(QMainWindow):
changesNeeded = True changesNeeded = True
print(f"Added {compassModSection} section") print(f"Added {compassModSection} section")
break break
if proximitySection not in sections: # Check if ProximityDetector section needs the apostrophe key binding
# Need to add this section proximityFound = False
for i, line in enumerate(configLines):
if line.strip() == f"[{proximitySection}]":
proximityFound = True
# Find the start and end of this section
sectionStart = i
sectionEnd = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
# Check if the section has the apostrophe binding
hasApostrophe = False
for j in range(sectionStart+1, sectionEnd):
if configLines[j].strip().startswith("'="):
hasApostrophe = True
break
if not hasApostrophe:
# Add the apostrophe binding right after the section header
configLines.insert(sectionStart+1, "'=toby_proximity_toggle_keybind\n")
changesNeeded = True
print(f"Added apostrophe key binding to {proximitySection}")
break
# If ProximityDetector section doesn't exist, create it
if not proximityFound:
for i, line in enumerate(configLines): for i, line in enumerate(configLines):
if line.strip() == f"[{mainBindingSection}]": if line.strip() == f"[{mainBindingSection}]":
# Find the next section # Find the next section
nextSectionIdx = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startsWith('[')), len(configLines)) nextSectionIdx = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
# Insert the new section before the next section # Insert the new section
configLines.insert(nextSectionIdx, f"\n[{proximitySection}]\n") configLines.insert(nextSectionIdx, f"\n[{proximitySection}]\n")
configLines.insert(nextSectionIdx+1, "'=toby_proximity_toggle_keybind\n\n") configLines.insert(nextSectionIdx+1, "'=toby_proximity_toggle_keybind\n\n")
changesNeeded = True changesNeeded = True
print(f"Added {proximitySection} section") print(f"Added {proximitySection} section with apostrophe key binding")
break break
if checkModSection not in sections: # Check if TargetSnap section needs the Z key binding
# Need to add this section targetSnapFound = False
for i, line in enumerate(configLines): for i, line in enumerate(configLines):
if line.strip() == f"[{mainBindingSection}]": if line.strip() == f"[{targetSnapSection}]":
# Find the next section targetSnapFound = True
nextSectionIdx = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
# Insert the new section before the next section # Find the start and end of this section
configLines.insert(nextSectionIdx, f"\n[{checkModSection}]\n") sectionStart = i
configLines.insert(nextSectionIdx+1, "U=netevent Toby_CheckCoordinates\n") sectionEnd = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
configLines.insert(nextSectionIdx+2, "H=netevent Toby_CheckHealth\n")
configLines.insert(nextSectionIdx+3, "N=netevent Toby_CheckArmor\n") # Check if the section has the Z binding
configLines.insert(nextSectionIdx+4, "B=netevent Toby_CheckAmmo\n") hasZKey = False
configLines.insert(nextSectionIdx+5, "K=netevent Toby_CheckKeys\n") for j in range(sectionStart+1, sectionEnd):
configLines.insert(nextSectionIdx+6, "I=netevent Toby_CheckCurrentItem\n") if configLines[j].strip().startswith("Z="):
configLines.insert(nextSectionIdx+7, ";=netevent Toby_CheckLevelStats\n\n") hasZKey = True
break
if not hasZKey:
# Add the Z binding right after the section header
configLines.insert(sectionStart+1, "Z=+toby_snap_to_target_keybind\n")
changesNeeded = True changesNeeded = True
print(f"Added {checkModSection} section") print(f"Added Z key binding to {targetSnapSection}")
break
break
# Check if the target snap section exists, create it if not
if targetSnapSection not in sections: # If TargetSnap section doesn't exist, create it
# Need to add this section if not targetSnapFound:
for i, line in enumerate(configLines): for i, line in enumerate(configLines):
if line.strip() == f"[{mainBindingSection}]": if line.strip() == f"[{mainBindingSection}]":
# Find the next section # Find the next section
nextSectionIdx = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines)) nextSectionIdx = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
# Insert the new section before the next section # Insert the new section
configLines.insert(nextSectionIdx, f"\n[{targetSnapSection}]\n") configLines.insert(nextSectionIdx, f"\n[{targetSnapSection}]\n")
configLines.insert(nextSectionIdx+1, "Z=+toby_snap_to_target_keybind\n\n") configLines.insert(nextSectionIdx+1, "Z=+toby_snap_to_target_keybind\n\n")
changesNeeded = True changesNeeded = True
print(f"Added {targetSnapSection} section with Z key binding") print(f"Added {targetSnapSection} section with Z key binding")
break break
# Check if accessibility keys are correctly set in existing sections # Check for missing bindings in sections that do exist
currentSection = None if checkModSection in sections:
for i, line in enumerate(configLines): # Extract all keys in the CheckMod section
line = line.strip() checkModStart = -1
checkModEnd = -1
# Detect section headers
if line.startswith('[') and line.endswith(']'): for i, line in enumerate(configLines):
currentSection = line[1:-1] if line.strip() == f"[{checkModSection}]":
continue checkModStart = i
checkModEnd = next((j for j in range(i+1, len(configLines)) if configLines[j].strip().startswith('[')), len(configLines))
# Process compass mod bindings break
if currentSection == compassModSection and '=' in line:
key, binding = line.split('=', 1) if checkModStart != -1:
key = key.strip() # Check for semicolon and N keys
binding = binding.strip() hasNKey = False
hasSemicolonKey = False
# Check E and R keys for compass functions
if key == 'E' and binding != 'pukename TurnCompass 1': for i in range(checkModStart+1, checkModEnd):
configLines[i] = "E=pukename TurnCompass 1\n" line = configLines[i].strip()
if line.startswith("N="):
hasNKey = True
elif line.startswith(";="):
hasSemicolonKey = True
# Add missing keys
if not hasNKey:
configLines.insert(checkModEnd-1, "N=netevent Toby_CheckArmor\n")
changesNeeded = True changesNeeded = True
print(f"Fixed E key in {compassModSection}") print(f"Added N key binding to {checkModSection}")
elif key == 'R' and binding != 'pukename TurnCompass 0':
configLines[i] = "R=pukename TurnCompass 0\n" if not hasSemicolonKey:
configLines.insert(checkModEnd-1, ";=netevent Toby_CheckLevelStats\n")
changesNeeded = True changesNeeded = True
print(f"Fixed R key in {compassModSection}") print(f"Added semicolon key binding to {checkModSection}")
elif key == 'Q' and binding != 'pukename CompassScript':
configLines[i] = "Q=pukename CompassScript\n"
changesNeeded = True
print(f"Fixed Q key in {compassModSection}")
# Process proximity detector bindings
if currentSection == proximitySection and '=' in line:
key, binding = line.split('=', 1)
key = key.strip()
binding = binding.strip()
# Check apostrophe key for proximity toggle
if key == "'" and binding != 'toby_proximity_toggle_keybind':
configLines[i] = "'=toby_proximity_toggle_keybind\n"
changesNeeded = True
print(f"Fixed ' key in {proximitySection}")
# Process check mod bindings
if currentSection == checkModSection and '=' in line:
key, binding = line.split('=', 1)
key = key.strip()
binding = binding.strip()
# Check semicolon key for level stats
if key == ";" and binding != 'netevent Toby_CheckLevelStats':
configLines[i] = ";=netevent Toby_CheckLevelStats\n"
changesNeeded = True
print(f"Fixed ; key in {checkModSection}")
# Process target snap bindings
if currentSection == targetSnapSection and '=' in line:
key, binding = line.split('=', 1)
key = key.strip()
binding = binding.strip()
# Check Z key for target snap function
if key == "Z" and binding != '+toby_snap_to_target_keybind':
configLines[i] = "Z=+toby_snap_to_target_keybind\n"
changesNeeded = True
print(f"Fixed Z key in {targetSnapSection}")
# Write the config if needed # Write the config if needed
if changesNeeded: if changesNeeded:
with open(self.configFile, 'w') as f: with open(self.configFile, 'w') as f:
f.writelines(configLines) f.writelines(configLines)
print("Updated GZDoom configuration with standard key bindings") print("Updated GZDoom configuration with standard key bindings")
return changesNeeded return changesNeeded
except Exception as e: except Exception as e:
print(f"Error checking/fixing controls: {e}", file=sys.stderr) print(f"Error checking/fixing controls: {e}", file=sys.stderr)
return False return False
def generate_single_player_script(self): def generate_single_player_script(self):
"""Generate script for single player game""" """Generate script for single player game"""
selectedGame = self.gameCombo.currentText() selectedGame = self.gameCombo.currentText()