Making the order of chooseable actions more intuitive (most possible - first).

This commit is contained in:
marcins78@gmail.com
2011-12-02 23:26:58 +00:00
parent fdd2e395f8
commit 0ebc582ab4
6 changed files with 42 additions and 42 deletions

View File

@@ -54,13 +54,6 @@ public class Card6_001 extends AbstractPermanent {
final Collection<PhysicalCard> cardsToBeWounded = woundEffect.getAffectedCardsMinusPrevented(game);
final ActivateCardAction action = new ActivateCardAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
possibleCosts.add(
new RemoveTokenEffect(self, self, Token.DUNLAND) {
@Override
@@ -68,6 +61,13 @@ public class Card6_001 extends AbstractPermanent {
return "Remove a DUNLAND token from here";
}
});
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
action.appendCost(
new ChoiceEffect(action, playerId, possibleCosts));
action.appendEffect(

View File

@@ -51,13 +51,6 @@ public class Card6_010 extends AbstractPermanent {
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) {
final ActivateCardAction action = new ActivateCardAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
possibleCosts.add(
new RemoveTokenEffect(self, self, Token.DWARVEN) {
@Override
@@ -65,6 +58,13 @@ public class Card6_010 extends AbstractPermanent {
return "Remove a DWARVEN token from here";
}
});
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
action.appendCost(
new ChoiceEffect(action, playerId, possibleCosts));

View File

@@ -54,13 +54,6 @@ public class Card6_012 extends AbstractPermanent {
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) {
ActivateCardAction action = new ActivateCardAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
possibleCosts.add(
new RemoveTokenEffect(self, self, Token.ELVEN) {
@Override
@@ -68,6 +61,13 @@ public class Card6_012 extends AbstractPermanent {
return "Remove an ELVEN token from here";
}
});
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
action.appendCost(
new ChoiceEffect(action, playerId, possibleCosts));
action.appendEffect(

View File

@@ -54,13 +54,6 @@ public class Card6_097 extends AbstractPermanent {
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) {
ActivateCardAction action = new ActivateCardAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
possibleCosts.add(
new RemoveTokenEffect(self, self, Token.ROHAN) {
@Override
@@ -68,6 +61,13 @@ public class Card6_097 extends AbstractPermanent {
return "Remove a ROHAN token from here";
}
});
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
action.appendCost(
new ChoiceEffect(action, playerId, possibleCosts));
action.appendEffect(

View File

@@ -53,13 +53,6 @@ public class Card6_111 extends AbstractPermanent {
final ActivateCardAction action = new ActivateCardAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
possibleCosts.add(
new RemoveTokenEffect(self, self, Token.SHIRE) {
@Override
@@ -67,6 +60,13 @@ public class Card6_111 extends AbstractPermanent {
return "Remove a SHIRE token from here";
}
});
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
action.appendCost(
new ChoiceEffect(action, playerId, possibleCosts));
action.appendEffect(

View File

@@ -43,13 +43,6 @@ public class Card7_028 extends AbstractPermanent {
if (TriggerConditions.startOfPhase(game, effectResult, Phase.REGROUP)) {
OptionalTriggerAction action = new OptionalTriggerAction(self);
List<Effect> possibleCosts = new LinkedList<Effect>();
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
possibleCosts.add(
new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1) {
@Override
@@ -57,6 +50,13 @@ public class Card7_028 extends AbstractPermanent {
return "Discard a card from hand";
}
});
possibleCosts.add(
new SelfDiscardEffect(self) {
@Override
public String getText(LotroGame game) {
return "Discard this condition";
}
});
action.appendCost(
new ChoiceEffect(action, playerId, possibleCosts));
action.appendEffect(