From bd84d07562a34a33bcce6945b074e7dcf5eef5d6 Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 22 Mar 2022 22:04:04 +0100 Subject: [PATCH 1/2] fix dsh --- backend/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/server.py b/backend/server.py index 01b3dc4..4ad60d5 100644 --- a/backend/server.py +++ b/backend/server.py @@ -445,10 +445,10 @@ def chat_message(sid, msg, pl=None): sio.emit('chat_message', room=ses.game.name, data={'color': f'red','text':f'🚨 {ses.name} is in debug mode and is changing {cmd[1]} health'}) if cmd[1] == "*": for p in ses.game.players_map: - ses.game.get_player_named(p).lives = int(cmd[2]) + ses.game.get_player_named(p).lives = min(int(cmd[2]), ses.game.get_player_named(p).max_lives) ses.game.get_player_named(p).notify_self() elif cmd[1] in ses.game.players_map: - ses.game.get_player_named(cmd[1]).lives = int(cmd[2]) + ses.game.get_player_named(cmd[1]).lives = min(int(cmd[2]), ses.game.get_player_named(cmd[1]).max_lives) ses.game.get_player_named(cmd[1]).notify_self() else: sio.emit('chat_message', room=sid, data={'color': f'','text':f'{msg} bad format'}) From 8ca795f6801f49c8ed9ebc7b67ecbe04e0ad64a8 Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 22 Mar 2022 22:05:00 +0100 Subject: [PATCH 2/2] restore bad fix for roulette event --- backend/bang/game.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/bang/game.py b/backend/bang/game.py index d00dfd1..1dd0371 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -398,7 +398,7 @@ class Game: if did_lose: target_pl = pls[(pls.index(self.players[self.turn]) + self.player_bangs) % len(pls)] print(f'{self.name}: stop roulette') - target_pl.lives -= 2 + target_pl.lives -= 1 target_pl.heal_if_needed() if len([c for c in target_pl.gold_rush_equipment if isinstance(c, grc.Talismano)]) > 0: target_pl.gold_nuggets += 1 @@ -410,6 +410,7 @@ class Game: self.is_russian_roulette_on = False self.players[self.turn].play_turn() else: + self.player_bangs += 1 target_pl = pls[(pls.index(self.players[self.turn]) + self.player_bangs) % len(pls)] print(f'{self.name}: next in line {target_pl.name}') if target_pl.get_banged(self.deck.event_cards[0]):