diff --git a/res/cardsfolder/d/death_or_glory.txt b/res/cardsfolder/d/death_or_glory.txt index a3e02616025..8bfa8b1e172 100644 --- a/res/cardsfolder/d/death_or_glory.txt +++ b/res/cardsfolder/d/death_or_glory.txt @@ -2,7 +2,7 @@ Name:Death or Glory ManaCost:4 W Types:Sorcery Text:no text -A:SP$ TwoPiles | Cost$ 4 W | Defined$ You | Separator$ You | Chooser$ Opponent | ChosenPile$ DBReturn | UnchosenPile$ DBExile | ValidCards$ Creature | Zone$ Graveyard | SpellDescription$ Separate all creature cards in your graveyard into two piles. Exile the pile of an opponent's choice and return the other to the battlefield. +A:SP$ TwoPiles | Cost$ 4 W | Defined$ You | Separator$ You | Chooser$ Opponent | ChosenPile$ DBReturn | UnchosenPile$ DBExile | ValidCards$ Creature | Zone$ Graveyard | AILogic$ Worst | SpellDescription$ Separate all creature cards in your graveyard into two piles. Exile the pile of an opponent's choice and return the other to the battlefield. SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield SVar:DBExile:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Exile SVar:Rarity:Rare diff --git a/res/cardsfolder/d/do_or_die.txt b/res/cardsfolder/d/do_or_die.txt index 7a5824c278c..b4b1f604b39 100644 --- a/res/cardsfolder/d/do_or_die.txt +++ b/res/cardsfolder/d/do_or_die.txt @@ -2,7 +2,7 @@ Name:Do or Die ManaCost:1 B Types:Sorcery Text:no text -A:SP$ TwoPiles | Cost$ 1 B | ValidTgts$ Player | TgtPrompt$ Select target player | Separator$ You | ChosenPile$ DBDestroy | ValidCards$ Creature | Zone$ Battlefield | SpellDescription$ Separate all creatures target player controls into two piles. Destroy all creatures in the pile of that player's choice. They can't be regenerated. +A:SP$ TwoPiles | Cost$ 1 B | ValidTgts$ Player | TgtPrompt$ Select target player | Separator$ You | ChosenPile$ DBDestroy | ValidCards$ Creature | Zone$ Battlefield | AILogic$ Worst | SpellDescription$ Separate all creatures target player controls into two piles. Destroy all creatures in the pile of that player's choice. They can't be regenerated. SVar:DBDestroy:DB$ Destroy | Defined$ Remembered | NoRegen$ True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/do_or_die.jpg diff --git a/res/cardsfolder/l/liliana_of_the_veil.txt b/res/cardsfolder/l/liliana_of_the_veil.txt index a800736c1e5..76097993cdf 100644 --- a/res/cardsfolder/l/liliana_of_the_veil.txt +++ b/res/cardsfolder/l/liliana_of_the_veil.txt @@ -5,7 +5,7 @@ Text:no text Loyalty:3 A:AB$ Discard | Cost$ AddCounter<1/LOYALTY> | NumCards$ 1 | Mode$ TgtChoose | Defined$ Each | Planeswalker$ True | SpellDescription$ Each player discards a card. A:AB$ Sacrifice | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Player | SacValid$ Creature | SacMessage$ Creature | Planeswalker$ True | SpellDescription$ Target player sacrifices a creature. -A:AB$ TwoPiles | Cost$ SubCounter<6/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | Separator$ You | ChosenPile$ DBSacAll | ValidCards$ Permanent | Zone$ Battlefield | Planeswalker$ True | Ultimate$ True | SpellDescription$ Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of his or her choice. +A:AB$ TwoPiles | Cost$ SubCounter<6/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | Separator$ You | ChosenPile$ DBSacAll | ValidCards$ Permanent | Zone$ Battlefield | Planeswalker$ True | Ultimate$ True | AILogic$ Worst | SpellDescription$ Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of his or her choice. SVar:DBSacAll:DB$ SacrificeAll | ValidCards$ Permanent.IsRemembered | SubAbility$ Cleanup SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True diff --git a/src/main/java/forge/card/abilityfactory/effects/TwoPilesEffect.java b/src/main/java/forge/card/abilityfactory/effects/TwoPilesEffect.java index 9f5eef364b3..22f3026d1ea 100644 --- a/src/main/java/forge/card/abilityfactory/effects/TwoPilesEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/TwoPilesEffect.java @@ -233,7 +233,10 @@ public class TwoPilesEffect extends SpellEffect { // for now, this assumes that the outcome will be bad // TODO: This should really have a ChooseLogic param to // figure this out - pile1WasChosen = cmc1 <= cmc2; + pile1WasChosen = cmc1 >= cmc2; + if ("Worst".equals(sa.getParam("AILogic"))) { + pile1WasChosen = !pile1WasChosen; + } if (pile1WasChosen) { JOptionPane.showMessageDialog(null, "Computer chooses the Pile 1", "", JOptionPane.INFORMATION_MESSAGE);