Version 1.0.4 Bugfix collecting points for chapel or flowers. Add sup…

…plementary rule that allows for normal meeples to use flowers. Dependency upgrades.

requirements.txt

@@ -1,2 +1,2 @@
-numpy==1.21.1
-Pillow==8.3.1
+numpy==1.21.2
+Pillow==8.3.2

setup.py

@@ -1,13 +1,13 @@
 from setuptools import setup, find_namespace_packages
 
 setup(name='wingedsheep-carcassonne',
-      version='1.0.3',
+      version='1.0.4',
       description='Carcassonne implementation',
       author='Vincent Bons',
       url='https://github.com/wingedsheep/carcassonne',
       download_url='https://github.com/wingedsheep/carcassonne',
       license='MIT',
-      install_requires=['numpy>=1.21.1',
-                        'pillow>=8.3.1'],
+      install_requires=['numpy>=1.21.2',
+                        'pillow>=8.3.2'],
       packages=find_namespace_packages(),
       package_data={"": ["*.png", "*.jpg"]})

wingedsheep/carcassonne/tile_sets/supplementary_rules.py

@@ -4,6 +4,7 @@
 class SupplementaryRule(Enum):
     FARMERS = "farmers"
     ABBOTS = "abbots"
+    NORMAL_MEEPLES_CAN_USE_FLOWERS = "normal_meeples_can_use_flowers"
 
     def to_json(self):
         return self.value

wingedsheep/carcassonne/utils/points_collector.py

@@ -80,7 +80,10 @@ def remove_meeples_and_collect_points(cls, game_state: CarcassonneGameState, coo
                         meeples_per_player = []
                         for _ in range(game_state.players):
                             meeples_per_player.append([])
-                        meeples_per_player[meeple_of_player].append(coordinate_with_side)
+
+                        for meeple_position in game_state.placed_meeples[meeple_of_player]:
+                            if coordinate_with_side == meeple_position.coordinate_with_side:
+                                meeples_per_player[meeple_of_player].append(meeple_position)
 
                         MeepleUtil.remove_meeples(game_state=game_state, meeples=meeples_per_player)
 

wingedsheep/carcassonne/utils/possible_move_finder.py

@@ -74,6 +74,10 @@ def __possible_meeple_positions(game_state: CarcassonneGameState) -> [Coordinate
         if last_played_tile.chapel:
             playing_positions.append(CoordinateWithSide(coordinate=last_played_position, side=Side.CENTER))
 
+        if last_played_tile.flowers \
+                and SupplementaryRule.NORMAL_MEEPLES_CAN_USE_FLOWERS in game_state.supplementary_rules:
+            playing_positions.append(CoordinateWithSide(coordinate=last_played_position, side=Side.CENTER))
+
         for side in [Side.TOP, Side.RIGHT, Side.BOTTOM, Side.LEFT]:
             if last_played_tile.get_type(side) == TerrainType.CITY:
                 connected_cities = CityUtil.find_city(