do not score disabled scripted modifiers from expansions

fixes #405
farin · Oct 1, 2021 · cb9f9a2 · cb9f9a2
1 parent 04f71aa
commit cb9f9a2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/jcloisterzone/feature/City.java b/src/main/java/com/jcloisterzone/feature/City.java
@@ -145,7 +145,7 @@ public PointsExpression getStructurePoints(GameState state, boolean completed) {
                 exprItems.add(new ExprItem("darmstadtium", 3));
             }
 
-            scoreScriptedModifiers(exprItems, java.util.Map.of("tiles", tileCount, "completed", completed));
+            scoreScriptedModifiers(state, exprItems, java.util.Map.of("tiles", tileCount, "completed", completed));
         }
 
         String name = "city";

diff --git a/src/main/java/com/jcloisterzone/feature/Field.java b/src/main/java/com/jcloisterzone/feature/Field.java
@@ -176,7 +176,7 @@ private PointsExpression getCityPoints(GameState state, String exprName, int poi
             }
         }
 
-        scoreScriptedModifiers(exprItems, java.util.Map.of("cities", cityCount, "castles", castleCount));
+        scoreScriptedModifiers(state, exprItems, java.util.Map.of("cities", cityCount, "castles", castleCount));
         return new PointsExpression(exprName, List.ofAll(exprItems));
     }
 

diff --git a/src/main/java/com/jcloisterzone/feature/ModifiedFeature.java b/src/main/java/com/jcloisterzone/feature/ModifiedFeature.java
@@ -33,8 +33,10 @@ default <T> T getModifier(GameState state, FeatureModifier<T> modifier, T defaul
         return (T) getModifiers().get((FeatureModifier<?>) modifier).getOrElse(defaultValue);
     }
 
-    default Set<FeatureModifier<?>> getScriptedModifiers() {
-        return getModifiers().keySet().filter(mod -> mod.getScoringScript() != null);
+    default Set<FeatureModifier<?>> getScriptedModifiers(GameState state) {
+        return getModifiers().keySet().filter(mod ->
+            mod.getScoringScript() != null && (mod.getEnabledBy() == null || mod.getEnabledBy().apply(state))
+        );
     }
 
     default Map<FeatureModifier<?>, Object> mergeModifiers(ModifiedFeature<C> other) {
@@ -71,8 +73,8 @@ default Map<FeatureModifier<?>, Object> mergeModifiers(Map<FeatureModifier<?>, O
         return HashMap.ofEntries(entries);
     }
 
-    default void scoreScriptedModifiers(java.util.List<ExprItem> exprItems, java.util.Map<String, Object> members) {
-        Set<FeatureModifier<?>> scriptedModifiers = getScriptedModifiers();
+    default void scoreScriptedModifiers(GameState state, java.util.List<ExprItem> exprItems, java.util.Map<String, Object> members) {
+        Set<FeatureModifier<?>> scriptedModifiers = getScriptedModifiers(state);
         if (!scriptedModifiers.isEmpty()) {
             try (Context context = Context.create("js")) {
                 Value bindings = context.getBindings("js");

diff --git a/src/main/java/com/jcloisterzone/feature/Monastery.java b/src/main/java/com/jcloisterzone/feature/Monastery.java
@@ -151,7 +151,7 @@ public PointsExpression getStructurePoints(GameState state, boolean completed) {
         }
         String baseName = isShrine(state) ? "shrine" : "monastery";
 
-        scoreScriptedModifiers(exprItems, java.util.Map.of("tiles", adjacent + 1, "completed", completed));
+        scoreScriptedModifiers(state, exprItems, java.util.Map.of("tiles", adjacent + 1, "completed", completed));
         return new PointsExpression(completed ? baseName : baseName + ".incomplete",  List.ofAll(exprItems));
     }
 

diff --git a/src/main/java/com/jcloisterzone/feature/Road.java b/src/main/java/com/jcloisterzone/feature/Road.java
@@ -173,7 +173,7 @@ public PointsExpression getStructurePoints(GameState state, boolean completed) {
             exprItems.add(new ExprItem(meeplesCount, "meeples", 2 * meeplesCount));
         }
 
-        scoreScriptedModifiers(exprItems, java.util.Map.of("tiles", tileCount, "completed", completed));
+        scoreScriptedModifiers(state, exprItems, java.util.Map.of("tiles", tileCount, "completed", completed));
         return new PointsExpression(completed ? "road" : "road.incomplete", List.ofAll(exprItems));
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            scoreScriptedModifiers(exprItems, java.util.Map.of("cities", cityCount, "castles", castleCount));
+            scoreScriptedModifiers(state, exprItems, java.util.Map.of("cities", cityCount, "castles", castleCount));
             return new PointsExpression(exprName, List.ofAll(exprItems));
         }
@@ Expand Down @@