ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arbitrary multiple card choice now works correctly.

Browse Source 
Saruman no longer can be assigned to skirmish.
This commit is contained in:
marcins78@gmail.com
2011-10-04 22:08:27 +00:00
parent bc644258ff
commit 91547d8202
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/decisions/ArbitraryCardsSelectionDecision.java
View File

@@ -75,7 +75,7 @@ public abstract class ArbitraryCardsSelectionDecision extends AbstractAwaitingDe
if (response.equals("")) if (response.equals(""))
cardIds = new String[0]; cardIds = new String[0];
else else
cardIds = response.split(" "); cardIds = response.split(",");
if (cardIds.length < _minimum || cardIds.length > _maximum) if (cardIds.length < _minimum || cardIds.length > _maximum)
throw new DecisionResultInvalidException(); throw new DecisionResultInvalidException();

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java
View File

@@ -39,7 +39,7 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess {
Filters.keyword(Keyword.FIERCE), Filters.keyword(Keyword.FIERCE),
minionFilter); 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) { if (minions.size() > 0) {
final Collection<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(), final Collection<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(),
Filters.or( Filters.or(

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java
View File

@@ -42,7 +42,7 @@ public class ShadowPlayerAssignsHisMinionsGameProcess implements GameProcess {
Filters.keyword(Keyword.FIERCE), Filters.keyword(Keyword.FIERCE),
minionFilter); 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) { if (minions.size() > 0) {
final Collection<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(), final Collection<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(),
Filters.or( Filters.or(