Arbitrary multiple card choice now works correctly.
Saruman no longer can be assigned to skirmish.
This commit is contained in:
@@ -75,7 +75,7 @@ public abstract class ArbitraryCardsSelectionDecision extends AbstractAwaitingDe
|
||||
if (response.equals(""))
|
||||
cardIds = new String[0];
|
||||
else
|
||||
cardIds = response.split(" ");
|
||||
cardIds = response.split(",");
|
||||
|
||||
if (cardIds.length < _minimum || cardIds.length > _maximum)
|
||||
throw new DecisionResultInvalidException();
|
||||
|
||||
@@ -39,7 +39,7 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess {
|
||||
Filters.keyword(Keyword.FIERCE),
|
||||
minionFilter);
|
||||
|
||||
final Collection<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter, Filters.notAssigned());
|
||||
final Collection<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter, Filters.canBeAssignedToSkirmish());
|
||||
if (minions.size() > 0) {
|
||||
final Collection<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(),
|
||||
Filters.or(
|
||||
|
||||
@@ -42,7 +42,7 @@ public class ShadowPlayerAssignsHisMinionsGameProcess implements GameProcess {
|
||||
Filters.keyword(Keyword.FIERCE),
|
||||
minionFilter);
|
||||
|
||||
final Collection<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter, Filters.notAssigned());
|
||||
final Collection<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter, Filters.canBeAssignedToSkirmish());
|
||||
if (minions.size() > 0) {
|
||||
final Collection<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(),
|
||||
Filters.or(
|
||||
|
||||
Reference in New Issue
Block a user