From b8d11f7fac2b65d72426642476e6ff872c4df6ee Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 10:04:44 +0000 Subject: [PATCH] fix up mill function calls. --- src/forge/CardFactory.java | 5 ++--- src/forge/CardFactory_Instants.java | 6 +----- src/forge/CardFactory_Lands.java | 2 +- src/forge/CardFactory_Planeswalkers.java | 2 +- src/forge/CardFactory_Sorceries.java | 5 ++--- src/forge/CombatUtil.java | 2 +- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index eb21f2370e6..a328082b7dc 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -10069,7 +10069,7 @@ public class CardFactory implements NewConstants { @Override public void resolve() { - AllZone.GameAction.mill(getTargetPlayer(), millCards); + getTargetPlayer().mill(millCards); } }; ab1.setChooseTargetAI(CardFactoryUtil.AI_targetHuman()); @@ -10631,8 +10631,7 @@ public class CardFactory implements NewConstants { @Override public void resolve() { Player player = getTargetPlayer(); - AllZone.GameAction.mill(player, - AllZone.getZone(Constant.Zone.Graveyard, player).size()); + player.mill(AllZone.getZone(Constant.Zone.Graveyard, player).size()); } }; ab1.setChooseTargetAI(CardFactoryUtil.AI_targetHuman()); diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index 87e5f7b2895..c55f6cbf53b 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -1470,16 +1470,12 @@ public class CardFactory_Instants { @Override public void chooseTargetAI() { - setTargetPlayer(AllZone.HumanPlayer); - }//chooseTargetAI() @Override public void resolve() { - - AllZone.GameAction.mill(getTargetPlayer(),3); - + getTargetPlayer().mill(3); }//resolve() };//SpellAbility diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java index abc4c3dae93..c12b8c5b27c 100644 --- a/src/forge/CardFactory_Lands.java +++ b/src/forge/CardFactory_Lands.java @@ -2578,7 +2578,7 @@ class CardFactory_Lands { @Override public void resolve() { - AllZone.GameAction.mill(getTargetPlayer(),1); + getTargetPlayer().mill(1); } }; ability.setBeforePayMana(CardFactoryUtil.input_targetPlayer(ability)); diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java index 062a7e80db5..e333b0c3ba5 100644 --- a/src/forge/CardFactory_Planeswalkers.java +++ b/src/forge/CardFactory_Planeswalkers.java @@ -1864,7 +1864,7 @@ class CardFactory_Planeswalkers { card2.subtractCounter(Counters.LOYALTY, 10); turn[0] = AllZone.Phase.getTurn(); - AllZone.GameAction.mill(getTargetPlayer(),20); + getTargetPlayer().mill(20); }//resolve() diff --git a/src/forge/CardFactory_Sorceries.java b/src/forge/CardFactory_Sorceries.java index d19c08d4b1b..b835575eb09 100644 --- a/src/forge/CardFactory_Sorceries.java +++ b/src/forge/CardFactory_Sorceries.java @@ -4598,8 +4598,7 @@ public class CardFactory_Sorceries { @Override public void resolve() { - AllZone.GameAction.mill(getTargetPlayer(), - (cardName.equals("Glimpse the Unthinkable")) ? 10 : 5); + getTargetPlayer().mill((cardName.equals("Glimpse the Unthinkable")) ? 10 : 5); } };//SpellAbility spell.setChooseTargetAI(CardFactoryUtil.AI_targetHuman()); @@ -5605,7 +5604,7 @@ public class CardFactory_Sorceries { public void resolve() { - AllZone.GameAction.mill(getTargetPlayer(),card.getXManaCostPaid()); + getTargetPlayer().mill(card.getXManaCostPaid()); card.getController().gainLife(card.getXManaCostPaid(), card); diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index cfea12ba1fc..f86c71a26df 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -1737,7 +1737,7 @@ public class CombatUtil { }//Preeminent Captain else if(c.getName().equals("Nemesis of Reason") && !c.getCreatureAttackedThisCombat()) { - AllZone.GameAction.mill( c.getController().getOpponent(),10); + c.getController().getOpponent().mill(10); }//Nemesis of Reason else if(c.getName().equals("Novablast Wurm") && !c.getCreatureAttackedThisCombat()) {