diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/LocationMatchesEvaluator.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/LocationMatchesEvaluator.java deleted file mode 100644 index 377abd5df..000000000 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/LocationMatchesEvaluator.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gempukku.lotro.cards.modifiers.evaluator; - -import com.gempukku.lotro.common.Filterable; -import com.gempukku.lotro.filters.Filters; -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.GameState; -import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; -import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator; - -public class LocationMatchesEvaluator implements Evaluator { - private Filterable[] _filters; - private int _matches; - private int _default; - - public LocationMatchesEvaluator(int defaultValue, int matches, Filterable... filters) { - _default = defaultValue; - _matches = matches; - _filters = filters; - } - - @Override - public int evaluateExpression(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { - return Filters.and(_filters).accepts(gameState, modifiersQuerying, gameState.getCurrentSite()) ? _matches : _default; - } -} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java index 09c3f3831..92acf81a9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_026.java @@ -3,7 +3,8 @@ package com.gempukku.lotro.cards.set1.dwarven; import com.gempukku.lotro.cards.AbstractOldEvent; import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; -import com.gempukku.lotro.cards.modifiers.evaluator.LocationMatchesEvaluator; +import com.gempukku.lotro.cards.modifiers.conditions.LocationCondition; +import com.gempukku.lotro.cards.modifiers.evaluator.ConditionEvaluator; import com.gempukku.lotro.common.*; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; @@ -31,7 +32,7 @@ public class Card1_026 extends AbstractOldEvent { final PlayEventAction action = new PlayEventAction(self); action.appendEffect( new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, - new LocationMatchesEvaluator(2, 4, Keyword.UNDERGROUND), + new ConditionEvaluator(2, 4, new LocationCondition(Keyword.UNDERGROUND)), Race.DWARF)); return action; }