From 0ebc582ab4c64b9ab4aecf2ac82233386b2718cf Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 2 Dec 2011 23:26:58 +0000 Subject: [PATCH] Making the order of chooseable actions more intuitive (most possible - first). --- .../lotro/cards/set6/dunland/Card6_001.java | 14 +++++++------- .../lotro/cards/set6/dwarven/Card6_010.java | 14 +++++++------- .../gempukku/lotro/cards/set6/elven/Card6_012.java | 14 +++++++------- .../gempukku/lotro/cards/set6/rohan/Card6_097.java | 14 +++++++------- .../gempukku/lotro/cards/set6/shire/Card6_111.java | 14 +++++++------- .../gempukku/lotro/cards/set7/elven/Card7_028.java | 14 +++++++------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_001.java index 206927d68..9bde70d6c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dunland/Card6_001.java @@ -54,13 +54,6 @@ public class Card6_001 extends AbstractPermanent { final Collection cardsToBeWounded = woundEffect.getAffectedCardsMinusPrevented(game); final ActivateCardAction action = new ActivateCardAction(self); List possibleCosts = new LinkedList(); - 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( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dwarven/Card6_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dwarven/Card6_010.java index 088f16f2d..f6f70f493 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dwarven/Card6_010.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/dwarven/Card6_010.java @@ -51,13 +51,6 @@ public class Card6_010 extends AbstractPermanent { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) { final ActivateCardAction action = new ActivateCardAction(self); List possibleCosts = new LinkedList(); - 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)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_012.java index be2657088..fd6365418 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/elven/Card6_012.java @@ -54,13 +54,6 @@ public class Card6_012 extends AbstractPermanent { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) { ActivateCardAction action = new ActivateCardAction(self); List possibleCosts = new LinkedList(); - 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( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_097.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_097.java index 38de6f426..30c41afad 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_097.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_097.java @@ -54,13 +54,6 @@ public class Card6_097 extends AbstractPermanent { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)) { ActivateCardAction action = new ActivateCardAction(self); List possibleCosts = new LinkedList(); - 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( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/shire/Card6_111.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/shire/Card6_111.java index 98c0cd9a7..04c8f60dc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/shire/Card6_111.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/shire/Card6_111.java @@ -53,13 +53,6 @@ public class Card6_111 extends AbstractPermanent { final ActivateCardAction action = new ActivateCardAction(self); List possibleCosts = new LinkedList(); - 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( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_028.java index 746e9a761..cbeb11c62 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_028.java @@ -43,13 +43,6 @@ public class Card7_028 extends AbstractPermanent { if (TriggerConditions.startOfPhase(game, effectResult, Phase.REGROUP)) { OptionalTriggerAction action = new OptionalTriggerAction(self); List possibleCosts = new LinkedList(); - 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(