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

Lurker skirmish order resolving.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-12-02 10:59:04 +00:00
parent 21f322afdd
commit c04b2e2f6c
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java
View File

@@ -19,7 +19,7 @@ public enum Keyword implements Filterable {
PIPEWEED("Pipeweed"),
DAMAGE("Damage", true, true), DEFENDER("Defender", true, true), AMBUSH("Ambush", true, true), FIERCE("Fierce", true), ARCHER("Archer", true),
UNHASTY("Unhasty", true), MUSTER("Muster", true), TOIL("Toil", true, true),
UNHASTY("Unhasty", true), MUSTER("Muster", true), TOIL("Toil", true, true), LURKER("Lurker", true),
RANGER("Ranger", true), TRACKER("Tracker", true), VILLAGER("Villager", true), MACHINE("Machine", true), ENGINE("Engine", true),
SOUTHRON("Southron", true), EASTERLING("Easterling", true), VALIANT("Valiant", true), KNIGHT("Knight", true), FORTIFICATION("Fortification", true),

20
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.logic.timing.processes.turn.skirmish;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -28,9 +29,14 @@ public class PlayoutSkirmishesGameProcess implements GameProcess {
final List<Assignment> assignments = gameState.getAssignments();
if (assignments.size() > 0) {
Set<PhysicalCard> fps = new HashSet<PhysicalCard>();
for (Assignment assignment : assignments)
fps.add(assignment.getFellowshipCharacter());
Set<PhysicalCard> nonLurkerSkirmishFps = new HashSet<PhysicalCard>();
Set<PhysicalCard> lurkerSkirmishFps = new HashSet<PhysicalCard>();
for (Assignment assignment : assignments) {
if (Filters.filter(assignment.getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), Keyword.LURKER).size() > 0)
lurkerSkirmishFps.add(assignment.getFellowshipCharacter());
else
nonLurkerSkirmishFps.add(assignment.getFellowshipCharacter());
}
String playerChoosingSkirmishOrder = gameState.getCurrentPlayerId();
if (game.getModifiersQuerying().hasFlagActive(gameState, ModifierFlag.SKIRMISH_ORDER_BY_FIRST_SHADOW_PLAYER))
@@ -38,7 +44,13 @@ public class PlayoutSkirmishesGameProcess implements GameProcess {
SystemQueueAction chooseNextSkirmishAction = new SystemQueueAction();
ChooseActiveCardEffect chooseNextSkirmish = new ChooseActiveCardEffect(null, playerChoosingSkirmishOrder, "Choose next skirmish to resolve", Filters.in(fps)) {
Set<PhysicalCard> skirmishChoice;
if (nonLurkerSkirmishFps.size() > 0)
skirmishChoice = nonLurkerSkirmishFps;
else
skirmishChoice = lurkerSkirmishFps;
ChooseActiveCardEffect chooseNextSkirmish = new ChooseActiveCardEffect(null, playerChoosingSkirmishOrder, "Choose next skirmish to resolve", Filters.in(skirmishChoice)) {
@Override
protected void cardSelected(LotroGame game, PhysicalCard card) {
final Assignment assignment = findAssignment(assignments, card);