Watchtowers, cound meeple bonus only from normal meeples

changelog.md

@@ -2,11 +2,15 @@
 
 ## upcoming
 
+* responsive final stats
+* improved tunnel tokens positions, artwork addon can defines tunnel shape and position
 * fix bazaar - all tiles in auction are now random and choosen independently
 * fix field score in final game statistics
 * fix tile distribution dialog for connected clients when "hide remaining tiles cheat sheet" is enabled
 * fix: Count of Carcassonne expansion can be added only once to game
 * fix no feedback from "Load Setup From File" button (now switch to Tiles tab same as load on favorite setup)
+* fix: Watchtowers meeple bonus is not count from special meeples
+* classic artwork, several glitches and wrong shapes corrected
 * artworks - shape difinition allows extended shape transformations and deriving shapes from others
 * use webkit native websockets instead of ws library
 

src/main/java/com/jcloisterzone/game/capability/WatchtowerCapability.java

@@ -7,6 +7,7 @@
 import com.jcloisterzone.event.PointsExpression;
 import com.jcloisterzone.event.ScoreEvent;
 import com.jcloisterzone.feature.*;
+import com.jcloisterzone.figure.Follower;
 import com.jcloisterzone.figure.Meeple;
 import com.jcloisterzone.game.Capability;
 import com.jcloisterzone.game.state.GameState;
@@ -94,7 +95,8 @@ public GameState beforeCompletableScore(GameState state, java.util.Set<Completab
                     exprName = "roads";
                     break;
                 case "meeple":
-                    count = state.getDeployedMeeples().values().filter(fp -> {
+                    count = state.getDeployedMeeples().filter((m, fp) -> {
+                        if (!(m instanceof Follower)) return false;
                         Position mpos = fp.getPosition();
                         return Math.abs(pos.x - mpos.x) <= 1 && Math.abs(pos.y - mpos.y) <= 1;
                     }).length();