From f7a527fcaf0832f8371fc8cb0fd764b65faa3e9f Mon Sep 17 00:00:00 2001
From: Giulio <giulio97.migani@gmail.com>
Date: Sat, 12 Jun 2021 13:09:12 +0200
Subject: [PATCH] simplifying init

Co-authored-by: Alberto Xamin <alberto@xamin.it>
---
 backend/bang/game.py    | 39 ++++++++++++++++++------------------
 backend/bang/players.py | 44 +++++++----------------------------------
 2 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/backend/bang/game.py b/backend/bang/game.py
index 1710b06..a6f2725 100644
--- a/backend/bang/game.py
+++ b/backend/bang/game.py
@@ -44,6 +44,26 @@ class Game:
         self.characters_to_distribute = 2 # personaggi da dare a inizio partita
         self.debug = False
 
+    def reset(self):
+        print('resetting lobby')
+        self.players.extend(self.spectators)
+        self.spectators = []
+        for bot in [p for p in self.players if p.is_bot]:
+            bot.game = None
+        self.players = [p for p in self.players if not p.is_bot]
+        print(self.players)
+        self.started = False
+        self.is_handling_death = False
+        self.waiting_for = 0
+        self.incremental_turn = 0
+        self.turn = 0
+        self.pending_winners = []
+        for p in self.players:
+            p.reset()
+            p.notify_self()
+        eventlet.sleep(0.5)
+        self.notify_room()
+
     def notify_room(self, sid=None):
         if len([p for p in self.players if p.character == None]) != 0 or sid:
             self.sio.emit('room', room=self.name if not sid else sid, data={
@@ -549,25 +569,6 @@ class Game:
             corpse.notify_self()
             self.next_turn()
 
-    def reset(self):
-        print('resetting lobby')
-        self.players.extend(self.spectators)
-        self.spectators = []
-        for bot in [p for p in self.players if p.is_bot]:
-            bot.game = None
-        self.players = [p for p in self.players if not p.is_bot]
-        print(self.players)
-        self.started = False
-        self.is_handling_death = False
-        self.waiting_for = 0
-        self.incremental_turn = 0
-        self.turn = 0
-        self.pending_winners = []
-        for p in self.players:
-            p.reset()
-            p.notify_self()
-        eventlet.sleep(0.5)
-        self.notify_room()
 
     def check_event(self, ev):
         if self.deck == None or len(self.deck.event_cards) == 0: return False
diff --git a/backend/bang/players.py b/backend/bang/players.py
index 00906ad..a26ea09 100644
--- a/backend/bang/players.py
+++ b/backend/bang/players.py
@@ -28,44 +28,9 @@ class Player:
         self.name = name
         self.sid = sid
         self.sio = sio
-        self.hand: cs.Card = []
-        self.equipment: cs.Card = []
-        self.role: r.Role = None
-        self.character: chars.Character = None
-        self.real_character: chars.Character = None
-        self.lives = 0
-        self.max_lives = 0
-        self.game: g = None
-        self.is_my_turn = False
-        self.is_waiting_for_action = True
-        self.has_played_bang = False
-        self.pending_action: PendingAction = None
-        self.available_characters = []
-        self.was_shot = False
-        self.on_pick_cb = None
-        self.on_failed_response_cb = None
-        self.event_type: str = None
-        self.expected_response = []
-        self.attacker: Player = None
-        self.target_p: str = None
-        self.is_drawing = False
-        self.can_play_vendetta = True
-        self.is_giving_life = False
-        self.is_using_checchino = False
-        self.choose_text = 'choose_card_to_get'
-        self.using_rimbalzo = 0 # 0 no, 1 scegli giocatore, 2 scegli carta
-        self.can_play_ranch = True
-        self.is_playing_ranch = False
-        self.mancato_needed = 0
-        self.molly_discarded_cards = 0
         self.is_bot = bot
-        self.bang_used = 0
-        self.special_use_count = 0
-        self.is_dead = False
-        self.death_turn = 0
-        self.is_ghost = False
-        self.not_chosen_character = None
-        self.noStar = False
+        self.game: g = None
+        self.reset()
 
     def reset(self):
         self.hand: cs.Card = []
@@ -103,6 +68,11 @@ class Player:
         self.is_ghost = False
         self.death_turn = 0
         self.noStar = False
+        self.can_play_vendetta = True
+        self.is_giving_life = False
+        self.choose_text = 'choose_card_to_get'
+        self.using_rimbalzo = 0 # 0 no, 1 scegli giocatore, 2 scegli carta
+        self.bang_used = 0
 
     def join_game(self, game):
         self.game = game