Issue #38. Sort players by scores and by their first seat

Author: Nihisil

project/game/player.py

@@ -16,9 +16,14 @@ class PlayerInterface(object):
     discards = None
     melds = None
     in_riichi = None
+
+    # current player seat
     seat = 0
     # where is sitting dealer, based on this information we can calculate player wind
     dealer_seat = 0
+    # it is important to know initial seat for correct players sorting
+    first_seat = 0
+
     # position based on scores
     position = 0
     scores = None

project/game/table.py

@@ -63,6 +63,13 @@ def init_round(self, round_number, count_of_honba_sticks, count_of_riichi_sticks
         # 13 - tiles in each player hand
         self.count_of_remaining_tiles = 136 - 14 - self.count_of_players * 13
 
+        if round_number == 0 and count_of_honba_sticks == 0:
+            i = 0
+            seats = [0, 1, 2, 3]
+            for player in self.players:
+                player.first_seat = seats[i - dealer_seat]
+                i += 1
+
     def add_called_meld(self, player_seat, meld):
         # when opponent called meld it is means
         # that he discards tile from hand, not from wall
@@ -140,7 +147,7 @@ def get_player(self, player_seat):
         return self.players[player_seat]
 
     def get_players_sorted_by_scores(self):
-        return sorted(self.players, key=lambda x: x.scores or 0, reverse=True)
+        return sorted(self.players, key=lambda x: (x.scores or 0, -x.first_seat), reverse=True)
 
     @property
     def round_wind(self):

project/game/tests/tests_table.py

@@ -79,6 +79,11 @@ def test_set_scores_and_recalculate_player_position(self):
         table = Table()
         table.init_round(0, 0, 0, 0, 0, [])
 
+        self.assertEqual(table.get_player(0).first_seat, 0)
+        self.assertEqual(table.get_player(1).first_seat, 1)
+        self.assertEqual(table.get_player(2).first_seat, 2)
+        self.assertEqual(table.get_player(3).first_seat, 3)
+
         scores = [230, 110, 55, 405]
         table.set_players_scores(scores)