diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index 896b1d0c9..ebdf7866b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -274,7 +274,13 @@ public class Filters { } }), Filters.and( - CardType.MINION)); + CardType.MINION, + new Filter() { + @Override + public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { + return (!gameState.isFierceSkirmishes()) || modifiersQuerying.hasKeyword(gameState, physicalCard, Keyword.FIERCE); + } + })); return Filters.and( assignableFilter, diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java index 82705c996..381e63263 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java @@ -1,7 +1,6 @@ package com.gempukku.lotro.logic.timing.processes.turn.assign; import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Filterable; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Side; import com.gempukku.lotro.filters.Filters; @@ -38,13 +37,7 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess { protected void doPlayEffect(final LotroGame game) { final GameState gameState = game.getGameState(); - Filterable minionFilter = CardType.MINION; - if (gameState.isFierceSkirmishes()) - minionFilter = Filters.and( - minionFilter, - Keyword.FIERCE); - - final Collection minions = Filters.filterActive(gameState, game.getModifiersQuerying(), minionFilter, Filters.assignableToSkirmish(Side.FREE_PEOPLE, true, false)); + final Collection minions = Filters.filterActive(gameState, game.getModifiersQuerying(), CardType.MINION, Filters.assignableToSkirmish(Side.FREE_PEOPLE, true, false)); if (minions.size() > 0) { final Collection freePeopleTargets = Filters.filterActive(gameState, game.getModifiersQuerying(), diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java index c28d078f5..d57f1eafa 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java @@ -1,7 +1,6 @@ package com.gempukku.lotro.logic.timing.processes.turn.assign; import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Side; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; @@ -34,10 +33,6 @@ public class ShadowPlayerAssignsHisMinionsGameProcess implements GameProcess { public void process(final LotroGame game) { GameState gameState = game.getGameState(); Filter minionFilter = Filters.and(CardType.MINION, Filters.owner(_playerId), Filters.notAssignedToSkirmish); - if (gameState.isFierceSkirmishes()) - minionFilter = Filters.and( - Keyword.FIERCE, - minionFilter); final Collection minions = Filters.filterActive(gameState, game.getModifiersQuerying(), minionFilter, Filters.assignableToSkirmish(Side.SHADOW, true, false)); if (minions.size() > 0) {