arreglo intercambio y fin de partida

TukiLaCosa · Nov 13, 2023 · e6fcd5f · e6fcd5f
1 parent 375847d
commit e6fcd5f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/routers/games/games.py b/app/routers/games/games.py
@@ -272,7 +272,7 @@ async def card_interchange_response(game_name: str, game_data: InterchangeInform
     with db_session:
         json_msg = {
             "event": utils.Events.EXCHANGE_DONE,
-            "player_name": get_player_name_by_id(game_data.player_id),
+            "player_name": get_player_name_by_id(player.id),
             "objective_player_name": get_player_name_by_id(objective_player.id)
         }
         await player_connections.send_event_to_all_players_in_game(game_name, json_msg)

diff --git a/app/routers/games/intention.py b/app/routers/games/intention.py
@@ -13,10 +13,11 @@
 )
 
 
-async def send_intention_event(action_type: ActionType, objective_player: Player):
+async def send_intention_event(action_type: ActionType, player: Player, objective_player: Player):
     json_msg = {
         "event": action_type,
-        "defense_cards": player_cards_to_defend_himself(action_type, objective_player)
+        "defense_cards": player_cards_to_defend_himself(action_type, objective_player),
+        "player_id": player.id
     }
 
     await player_connections.send_event_to(objective_player.id, json_msg)
@@ -33,7 +34,7 @@ def create_intention_in_game(game: Game, action_type: ActionType, player: Player
     )
     game.intention = intention
 
-    asyncio.ensure_future(send_intention_event(action_type, objective_player))
+    asyncio.ensure_future(send_intention_event(action_type, player, objective_player))
 
     return intention
 

diff --git a/app/routers/games/services.py b/app/routers/games/services.py
@@ -404,7 +404,7 @@ def draw_card(game_name: str, game_data: DrawInformationIn) -> DrawInformationOu
 
 @db_session
 def get_game_result(name: str) -> GameResult:
-    game: Game = find_game_by_name(name)
+    game : Game = find_game_by_name(name)
 
     if game.status != GameStatus.ENDED:
         raise HTTPException(
@@ -435,8 +435,8 @@ def get_game_result(name: str) -> GameResult:
                     Pierden los eliminados y el último infectado.'''
         winners = game.players.select(
             lambda p: p.rol in [PlayerRol.THE_THING, PlayerRol.INFECTED])[:]
-        losers = game.players.select(
-            lambda p: p.rol == PlayerRol.ELIMINATED)[:]
+        losers = list(game.players.select(
+            lambda p: p.rol == PlayerRol.ELIMINATED)[:])
         losers.append(game.last_infected)
 
     # elif the_thing_declared_a_wrong_victory(game):