diff --git a/res/cardsfolder/ob_nixilis_the_fallen.txt b/res/cardsfolder/ob_nixilis_the_fallen.txt index be246809f58..fe639a4ada6 100644 --- a/res/cardsfolder/ob_nixilis_the_fallen.txt +++ b/res/cardsfolder/ob_nixilis_the_fallen.txt @@ -1,9 +1,11 @@ Name:Ob Nixilis, the Fallen ManaCost:3 B B Types:Legendary Creature Demon -Text:Landfall - Whenever a land enters the battlefield under your control, you may have target player lose 3 life. If you do, put three +1/+1 counters on Ob Nixilis, the Fallen. +Text:no text PT:3/3 -K:Landfall +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLose | Optional$ True | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may have target player lose 3 life. If you do, put three +1/+1 counters on CARDNAME. +SVar:TrigLose:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | SubAbility$ SVar=DBPutCounter +SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3 SVar:BuffedBy:Land SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/ob_nixilis_the_fallen.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 87dc92ffd96..95356c5c47a 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -2492,8 +2492,7 @@ public class GameActionUtil { //***CREATURES END HERE*** public static void executeLandfallEffects(Card c) { - if(c.getName().equals("Ob Nixilis, the Fallen")) landfall_Ob_Nixilis(c); - else if(c.getName().equals("Lotus Cobra")) landfall_Lotus_Cobra(c); + if(c.getName().equals("Lotus Cobra")) landfall_Lotus_Cobra(c); else if(c.getName().equals("Avenger of Zendikar")) landfall_Avenger_of_Zendikar(c); else if(c.getName().equals("Eternity Vessel")) landfall_Eternity_Vessel(c); } @@ -2623,26 +2622,6 @@ public class GameActionUtil { else return true; } - private static void landfall_Ob_Nixilis(Card c) { - final Card crd = c; - Ability ability = new Ability(c, "0") { - @Override - public void resolve() { - crd.getController().getOpponent().loseLife(3, crd); - crd.addCounter(Counters.P1P1, 3); - } - }; - - StringBuilder sb = new StringBuilder(); - sb.append("Landfall: ").append(c.getController().getOpponent()); - sb.append(" loses 3 life and ").append(c.getName()).append(" gets three +1/+1 counters."); - ability.setStackDescription(sb.toString()); - - if(c.getController().equals(AllZone.HumanPlayer)) { - if(showLandfallDialog(c)) AllZone.Stack.add(ability); - } else if(c.getController().equals(AllZone.ComputerPlayer)) AllZone.Stack.add(ability); - } - private static void landfall_Lotus_Cobra(final Card c) { Ability ability = new Ability(c, "0") { @Override