Large Refactor #317
Large Refactor #317
Conversation
update.py
Outdated
| @@ -51,7 +51,8 @@ def check_for_update(voice): | |||
| #print(os.getlogin()) | |||
| process = run_command("sudo runuser -l {} -c 'cd {};pwd'".format(homename,os.getcwd())) | |||
| process = run_command("sudo runuser -l {} -c 'cd {};git fetch'".format(homename,os.getcwd())) | |||
| diff_files = run_command("sudo runuser -l {} -c 'cd {};git diff origin/master --name-only --cached'".format(homename,os.getcwd())).split() | |||
| diff_files = run_command("sudo runuser -l {} -c 'cd {};git diff origin/debugging-error --name-only --cached'".format(homename,os.getcwd())).split() | |||
| # TODO - Replace with this: diff_files = run_command("sudo runuser -l {} -c 'cd {};git diff origin/master --name-only --cached'".format(homename,os.getcwd())).split() | |||
There was a problem hiding this comment.
Will revert this before merging
mchirlin
force-pushed
the
debugging-error
branch
from
cb6319d
to
0817c0b
Compare
|
Thanks! Next time that I have some spare time, I will test out the code changes, are you using bookworm or bullseye for the raspberry pi OS btw? |
|
I think it's bullseye. |
mchirlin
force-pushed
the
debugging-error
branch
from
9aa3372
to
42b1099
Compare
mchirlin
force-pushed
the
debugging-error
branch
from
cf3430d
to
7b75cef
Compare
| move.set_leds(random.randrange(100, 200),0,0) | ||
| # Set moves to random colors | ||
| elif game_mode == Games.Ninja: | ||
| if move_num <= 0: # TODO - How does this happen? |
There was a problem hiding this comment.
I believe this is just for the first controller (move 0) to be a different random color. i.e. one controller is a random value, the rest are red for this game mode.
| # If trigger is no longer being held, reset the start | ||
| if menu_opts[Opts.HOLDING.value] == True and move_button == Button.NONE and move.get_trigger() <= 100: | ||
| menu_opts[Opts.HOLDING.value] = False | ||
| # TODO - do you want to reset the force_start_timer? |
There was a problem hiding this comment.
It should reset once we start holding again, on L243
| move_opt[Opts.random_start.value] = Alive.on.value | ||
| for serial in self.move_opts.keys(): | ||
| for move_opt in self.menu_opts.values(): | ||
| move_opt[Opts.RANDOM_START.value] = False |
| @@ -654,7 +691,7 @@ def game_loop(self): | |||
| self.check_for_new_moves() | |||
| if len(self.tracked_moves) > 0: | |||
| self.check_new_admin() | |||
| self.check_change_mode() | |||
| self.check_change_mode() # TODO - do we want to make this so only admins can change mode? | |||
There was a problem hiding this comment.
it's not a bad idea (especially for larger groups, hitting the buttons can disrupt things) but for a smaller group, let's say 4 players, it's easier than going into admin mode every time. This probably should be a setting that can lock switching modes to admins only, so for conventions it would make sense.
games/zombie.py
Outdated
| super().before_game_loop() | ||
|
|
||
| # Kill first humans | ||
| for random_human in random.sample(set(self.humans), 2): |
There was a problem hiding this comment.
getting the error here:
Traceback (most recent call last):
File "/home/aaron/JoustMania/piparty.py", line 1215, in
piparty.game_loop()
File "/home/aaron/JoustMania/piparty.py", line 697, in game_loop
self.check_start_game()
File "/home/aaron/JoustMania/piparty.py", line 960, in check_start_game
self.start_game()
File "/home/aaron/JoustMania/piparty.py", line 1125, in start_game
zombie.Joust(moves=game_moves, command_queue=self.command_queue, ns=self.ns, red_on_kill=self.red_on_kill,
File "/home/aaron/JoustMania/games/zombie.py", line 61, in init
self.game_loop()
File "/home/aaron/JoustMania/games/game.py", line 388, in game_loop
self.before_game_loop()
File "/home/aaron/JoustMania/games/zombie.py", line 104, in before_game_loop
for random_human in random.sample(set(self.humans), 2):
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/random.py", line 439, in sample
raise TypeError("Population must be a sequence. "
TypeError: Population must be a sequence. For dicts or sets, use sorted(d).
…g, reverted update.py
|
Fantastic work!! Just went through the code, and was able to test all the game modes, |
Refactoring
Bug Fixes
Enhancements