From a79de8a3251db44ef20d4cc144c70ff98e562406 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Sun, 19 Oct 2025 17:16:53 -0700 Subject: [PATCH] cleanupBadCode --- mesh_bot.py | 26 ++++++++++++++++++++++---- modules/games/blackjack.py | 2 -- modules/games/dopewar.py | 1 - modules/games/golfsim.py | 13 +++++++------ modules/games/mmind.py | 2 -- modules/games/videopoker.py | 1 - 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index e6d4cdd..f097652 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -823,6 +823,25 @@ def handleGolf(message, nodeID, deviceID): # get player's last command from tracker if not new player last_cmd = "" + + # Ensure player exists in tracker + if not any(entry['nodeID'] == nodeID for entry in golfTracker): + logger.debug("System: GolfSim: New Player: " + str(nodeID)) + golfTracker.append({ + 'nodeID': nodeID, + 'last_played': time.time(), + 'cmd': 'new', + 'hole': 1, + 'distance_remaining': 0, + 'hole_shots': 0, + 'hole_strokes': 0, + 'hole_to_par': 0, + 'total_strokes': 0, + 'total_to_par': 0, + 'par': 0, + 'hazard': '' + }) + # get player's last command from tracker for i in range(len(golfTracker)): if golfTracker[i]['nodeID'] == nodeID: last_cmd = golfTracker[i]['cmd'] @@ -837,14 +856,13 @@ def handleGolf(message, nodeID, deviceID): logger.debug(f"System: {nodeID} PlayingGame golfsim last_cmd: {last_cmd}") - if last_cmd == "" and nodeID != 0: + if last_cmd == "new" and nodeID != 0: # create new player - logger.debug("System: GolfSim: New Player: " + str(nodeID)) - golfTracker.append({'nodeID': nodeID, 'last_played': time.time(), 'cmd': 'new', 'hole': 1, 'distance_remaining': 0, 'hole_shots': 0, 'hole_strokes': 0, 'hole_to_par': 0, 'total_strokes': 0, 'total_to_par': 0, 'par': 0, 'hazard': ''}) + msg = f"Welcome to 🏌️GolfSim⛳️\n" msg += f"Clubs: (D)river, (L)ow Iron, (M)id Iron, (H)igh Iron, (G)ap Wedge, Lob (W)edge\n" - msg += playGolf(nodeID=nodeID, message=message) + msg += playGolf(nodeID=nodeID, message=message, last_cmd=last_cmd) return msg def handleHangman(message, nodeID, deviceID): diff --git a/modules/games/blackjack.py b/modules/games/blackjack.py index fd9ace0..b378c91 100644 --- a/modules/games/blackjack.py +++ b/modules/games/blackjack.py @@ -7,8 +7,6 @@ import time import pickle jack_starting_cash = 100 # Replace 100 with your desired starting cash value -jackTracker= [{'nodeID': 0, 'cmd': 'new', 'cash': jack_starting_cash,\ - 'bet': 0, 'gameStats': {'p_win': 0, 'd_win': 0, 'draw': 0}, 'p_cards':[], 'd_cards':[], 'p_hand':[], 'd_hand':[], 'next_card':[],'last_played': time.time()}] SUITS = ("♥️", "♦️", "♠️", "♣️") RANKS = ( diff --git a/modules/games/dopewar.py b/modules/games/dopewar.py index 5d0838b..43fc3cc 100644 --- a/modules/games/dopewar.py +++ b/modules/games/dopewar.py @@ -14,7 +14,6 @@ dwInventoryDb = [{'userID': 1234567890, 'inventory': 0, 'priceList': [], 'amount dwCashDb = [{'userID': 1234567890, 'cash': starting_cash},] dwGameDayDb = [{'userID': 1234567890, 'day': 0},] dwLocationDb = [{'userID': 1234567890, 'location': 'USA', 'loc_choice': 0},] -dwPlayerTracker = [{'userID': 1234567890, 'last_played': time.time(), 'cmd': 'start'},] # high score is saved in a pickle file dwHighScore = {} diff --git a/modules/games/golfsim.py b/modules/games/golfsim.py index 3195def..6ce3e3d 100644 --- a/modules/games/golfsim.py +++ b/modules/games/golfsim.py @@ -26,7 +26,6 @@ par4_5_range = par4_range + par5_range # Player setup playingHole = False -golfTracker = [{'nodeID': 0, 'last_played': time.time(), 'cmd': '', 'hole': 0, 'distance_remaining': 0, 'hole_shots': 0, 'hole_strokes': 0, 'hole_to_par': 0, 'total_strokes': 0, 'total_to_par': 0, 'par': 0, 'hazard': ''}] # Club functions def hit_driver(): @@ -122,7 +121,7 @@ def getHighScoreGolf(nodeID, strokes, par): return 0 # Main game loop -def playGolf(nodeID, message, finishedHole=False): +def playGolf(nodeID, message, finishedHole=False, last_cmd=''): msg = '' global golfTracker # Course setup @@ -150,8 +149,8 @@ def playGolf(nodeID, message, finishedHole=False): for i in range(len(golfTracker)): if golfTracker[i]['nodeID'] == nodeID: golfTracker[i]['last_played'] = time.time() - - if last_cmd == "" or last_cmd == "new": + + if last_cmd == "new": # Start a new hole if hole <= 9: # Set up hole count restrictions on par @@ -198,17 +197,19 @@ def playGolf(nodeID, message, finishedHole=False): # Set initial parameters before starting a hole distance_remaining = hole_length hole_shots = 0 + last_cmd = 'stroking' # save player's current game state for i in range(len(golfTracker)): if golfTracker[i]['nodeID'] == nodeID: + golfTracker[i]['cmd'] = last_cmd + golfTracker[i]['hole'] = hole golfTracker[i]['distance_remaining'] = distance_remaining golfTracker[i]['cmd'] = 'stroking' golfTracker[i]['par'] = par golfTracker[i]['total_strokes'] = total_strokes golfTracker[i]['total_to_par'] = total_to_par golfTracker[i]['hazard'] = hazard - golfTracker[i]['hole'] = hole golfTracker[i]['last_played'] = time.time() golfTracker[i]['hole_shots'] = hole_shots @@ -408,7 +409,7 @@ def playGolf(nodeID, message, finishedHole=False): logger.debug("System: GolfSim: Player " + str(nodeID) + " has finished their round.") else: # Show player the next hole - msg += playGolf(nodeID, 'new', True) + msg += playGolf(nodeID, '', True, last_cmd='new') msg += "\n🏌️[D, L, M, H, G, W, End]🏌️" return msg diff --git a/modules/games/mmind.py b/modules/games/mmind.py index 8baf805..6aac7bd 100644 --- a/modules/games/mmind.py +++ b/modules/games/mmind.py @@ -6,8 +6,6 @@ import time import pickle from modules.log import * -mindTracker = [{'nodeID': 0, 'last_played': time.time(), 'cmd': '', 'secret_code': '', 'diff': 'n', 'turns': 1}] - def chooseDifficultyMMind(message): usrInput = message.lower() msg = '' diff --git a/modules/games/videopoker.py b/modules/games/videopoker.py index c77d7c4..41f2e6f 100644 --- a/modules/games/videopoker.py +++ b/modules/games/videopoker.py @@ -6,7 +6,6 @@ import pickle from modules.log import * vpStartingCash = 20 -vpTracker= [{'nodeID': 0, 'cmd': 'new', 'time': time.time(), 'cash': vpStartingCash, 'player': None, 'deck': None, 'highScore': 0, 'drawCount': 0}] # Define the Card class class CardVP: