Fixed meeple counts and removed unused imports.

wingedsheep · May 18, 2020 · 63d6430 · 63d6430
1 parent 28b6907
commit 63d6430
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/examples/four_player_game_random_moves.py b/examples/four_player_game_random_moves.py
@@ -18,24 +18,24 @@ def print_state(carcassonne_game_state: CarcassonneGameState):
         },
         "meeples": {
             "player 1": {
-                "normal": str(carcassonne_game_state.meeples[0]) + " / " + str(carcassonne_game_state.meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL, game.state.placed_meeples[0])))),
+                "normal": str(carcassonne_game_state.meeples[0]) + " / " + str(carcassonne_game_state.meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL or x.meeple_type == MeepleType.FARMER, game.state.placed_meeples[0])))),
                 "abbots": str(carcassonne_game_state.abbots[0]) + " / " + str(carcassonne_game_state.abbots[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.ABBOT, game.state.placed_meeples[0])))),
-                "big": str(carcassonne_game_state.big_meeples[0]) + " / " + str(carcassonne_game_state.big_meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG, game.state.placed_meeples[0]))))
+                "big": str(carcassonne_game_state.big_meeples[0]) + " / " + str(carcassonne_game_state.big_meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG or x.meeple_type == MeepleType.BIG_FARMER, game.state.placed_meeples[0]))))
             },
             "player 2": {
-                "normal": str(carcassonne_game_state.meeples[1]) + " / " + str(carcassonne_game_state.meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL, game.state.placed_meeples[1])))),
+                "normal": str(carcassonne_game_state.meeples[1]) + " / " + str(carcassonne_game_state.meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL or x.meeple_type == MeepleType.FARMER, game.state.placed_meeples[1])))),
                 "abbots": str(carcassonne_game_state.abbots[1]) + " / " + str(carcassonne_game_state.abbots[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.ABBOT, game.state.placed_meeples[1])))),
-                "big": str(carcassonne_game_state.big_meeples[1]) + " / " + str(carcassonne_game_state.big_meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG, game.state.placed_meeples[1]))))
+                "big": str(carcassonne_game_state.big_meeples[1]) + " / " + str(carcassonne_game_state.big_meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG or x.meeple_type == MeepleType.BIG_FARMER, game.state.placed_meeples[1]))))
             },
             "player 3": {
-                "normal": str(carcassonne_game_state.meeples[2]) + " / " + str(carcassonne_game_state.meeples[2] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL, game.state.placed_meeples[2])))),
+                "normal": str(carcassonne_game_state.meeples[2]) + " / " + str(carcassonne_game_state.meeples[2] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL or x.meeple_type == MeepleType.FARMER, game.state.placed_meeples[2])))),
                 "abbots": str(carcassonne_game_state.abbots[2]) + " / " + str(carcassonne_game_state.abbots[2] + len(list(filter(lambda x: x.meeple_type == MeepleType.ABBOT, game.state.placed_meeples[2])))),
-                "big": str(carcassonne_game_state.big_meeples[2]) + " / " + str(carcassonne_game_state.big_meeples[2] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG, game.state.placed_meeples[2]))))
+                "big": str(carcassonne_game_state.big_meeples[2]) + " / " + str(carcassonne_game_state.big_meeples[2] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG or x.meeple_type == MeepleType.BIG_FARMER, game.state.placed_meeples[2]))))
             },
             "player 4": {
-                "normal": str(carcassonne_game_state.meeples[3]) + " / " + str(carcassonne_game_state.meeples[3] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL, game.state.placed_meeples[3])))),
+                "normal": str(carcassonne_game_state.meeples[3]) + " / " + str(carcassonne_game_state.meeples[3] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL or x.meeple_type == MeepleType.FARMER, game.state.placed_meeples[3])))),
                 "abbots": str(carcassonne_game_state.abbots[3]) + " / " + str(carcassonne_game_state.abbots[3] + len(list(filter(lambda x: x.meeple_type == MeepleType.ABBOT, game.state.placed_meeples[3])))),
-                "big": str(carcassonne_game_state.big_meeples[3]) + " / " + str(carcassonne_game_state.big_meeples[3] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG, game.state.placed_meeples[3]))))
+                "big": str(carcassonne_game_state.big_meeples[3]) + " / " + str(carcassonne_game_state.big_meeples[3] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG or x.meeple_type == MeepleType.BIG_FARMER, game.state.placed_meeples[3]))))
             }
         }
     }

diff --git a/examples/two_player_game_random_moves.py b/examples/two_player_game_random_moves.py
@@ -16,14 +16,14 @@ def print_state(carcassonne_game_state: CarcassonneGameState):
         },
         "meeples": {
             "player 1": {
-                "normal": str(carcassonne_game_state.meeples[0]) + " / " + str(carcassonne_game_state.meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL, game.state.placed_meeples[0])))),
+                "normal": str(carcassonne_game_state.meeples[0]) + " / " + str(carcassonne_game_state.meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL or x.meeple_type == MeepleType.FARMER, game.state.placed_meeples[0])))),
                 "abbots": str(carcassonne_game_state.abbots[0]) + " / " + str(carcassonne_game_state.abbots[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.ABBOT, game.state.placed_meeples[0])))),
-                "big": str(carcassonne_game_state.big_meeples[0]) + " / " + str(carcassonne_game_state.big_meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG, game.state.placed_meeples[0]))))
+                "big": str(carcassonne_game_state.big_meeples[0]) + " / " + str(carcassonne_game_state.big_meeples[0] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG or x.meeple_type == MeepleType.BIG_FARMER, game.state.placed_meeples[0]))))
             },
             "player 2": {
-                "normal": str(carcassonne_game_state.meeples[1]) + " / " + str(carcassonne_game_state.meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL, game.state.placed_meeples[1])))),
+                "normal": str(carcassonne_game_state.meeples[1]) + " / " + str(carcassonne_game_state.meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.NORMAL or x.meeple_type == MeepleType.FARMER, game.state.placed_meeples[1])))),
                 "abbots": str(carcassonne_game_state.abbots[1]) + " / " + str(carcassonne_game_state.abbots[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.ABBOT, game.state.placed_meeples[1])))),
-                "big": str(carcassonne_game_state.big_meeples[1]) + " / " + str(carcassonne_game_state.big_meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG, game.state.placed_meeples[1]))))
+                "big": str(carcassonne_game_state.big_meeples[1]) + " / " + str(carcassonne_game_state.big_meeples[1] + len(list(filter(lambda x: x.meeple_type == MeepleType.BIG or x.meeple_type == MeepleType.BIG_FARMER, game.state.placed_meeples[1]))))
             }
         }
     }
@@ -43,6 +43,5 @@ def print_state(carcassonne_game_state: CarcassonneGameState):
     if action is not None:
         game.step(player, action)
     game.render()
-    i = 0
 
 print_state(carcassonne_game_state=game.state)
diff --git a/test/meeple_util_test.py b/test/meeple_util_test.py
@@ -3,13 +3,11 @@
 
 from main.carcassonne_game_state import CarcassonneGameState
 from main.tile_sets.base_deck import base_tiles
-from main.objects.city import City
 from main.objects.coordinate import Coordinate
 from main.objects.coordinate_with_side import CoordinateWithSide
 from main.objects.meeple_position import MeeplePosition
 from main.objects.meeple_type import MeepleType
 from main.objects.side import Side
-from main.utils.city_util import CityUtil
 from main.utils.meeple_util import MeepleUtil