From f98bbe918e8505384daecd5efd4343ba03d6525e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 20:41:24 +0000 Subject: [PATCH] - Removed code again. --- src/forge/CombatUtil.java | 132 -------------------------------------- 1 file changed, 132 deletions(-) diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index ad3b0c90584..ee0a0a22b37 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -1273,62 +1273,6 @@ public class CombatUtil { } //for }//creatureAttacked //Annihilator - - //Beastmaster Ascension - if(!c.getCreatureAttackedThisCombat()) { - PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, c.getController()); - CardList list = new CardList(play.getCards()); - list = list.getName("Beastmaster Ascension"); - - for(Card var:list) { - var.addCounter(Counters.QUEST, 1); - } - } //BMA - - /* - //Fervent Charge - if(!c.getCreatureAttackedThisCombat()) { - PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, c.getController()); - CardList list = new CardList(play.getCards()); - list = list.getName("Fervent Charge"); - - for(Card var:list) { - final Card crd = c; - Ability ability2 = new Ability(var, "0") { - @Override - public void resolve() { - - final Command untilEOT = new Command() { - - private static final long serialVersionUID = 4495506596523335907L; - - public void execute() { - if(AllZone.GameAction.isCardInPlay(crd)) { - crd.addTempAttackBoost(-2); - crd.addTempDefenseBoost(-2); - } - } - };//Command - - - if(AllZone.GameAction.isCardInPlay(crd)) { - crd.addTempAttackBoost(2); - crd.addTempDefenseBoost(2); - - AllZone.EndOfTurn.addUntil(untilEOT); - } - }//resolve - - };//ability - - StringBuilder sb = new StringBuilder(); - sb.append(var.getName()).append(" - ").append(c.getName()).append(" gets +2/+2 until EOT."); - ability2.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability2); - - } - }//Fervent Charge */ //Mijae Djinn if(c.getName().equals("Mijae Djinn")) { @@ -1341,82 +1285,6 @@ public class CombatUtil { } }//Mijae Djinn - if (AllZone.Combat.getAttackers().length == 1) - { - if (c.getKeyword().contains("Whenever this creature attacks alone, it gets +2/+0 until end of turn.") || - c.getKeyword().contains("Whenever CARDNAME attacks alone, it gets +2/+0 until end of turn.")) - { - final Card charger = c; - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - - final Command untilEOT = new Command() { - private static final long serialVersionUID = -6039349249335745813L; - - public void execute() { - if(AllZone.GameAction.isCardInPlay(charger)) { - charger.addTempAttackBoost(-2); - charger.addTempDefenseBoost(0); - } - } - };//Command - - - if(AllZone.GameAction.isCardInPlay(charger)) { - charger.addTempAttackBoost(2); - charger.addTempDefenseBoost(0); - - AllZone.EndOfTurn.addUntil(untilEOT); - } - }//resolve - - };//ability - - StringBuilder sb2 = new StringBuilder(); - sb2.append(c.getName()).append(" - attacks alone and gets +2/+0 until EOT."); - ability2.setStackDescription(sb2.toString()); - - AllZone.Stack.add(ability2); - } - - if (c.getKeyword().contains("Whenever CARDNAME attacks alone, it gets +1/+0 until end of turn.")) - { - final Card charger = c; - Ability ability2 = new Ability(c, "0") { - @Override - public void resolve() { - - final Command untilEOT = new Command() { - private static final long serialVersionUID = -6039349249335745813L; - - public void execute() { - if(AllZone.GameAction.isCardInPlay(charger)) { - charger.addTempAttackBoost(-1); - charger.addTempDefenseBoost(0); - } - } - };//Command - - - if(AllZone.GameAction.isCardInPlay(charger)) { - charger.addTempAttackBoost(1); - charger.addTempDefenseBoost(0); - - AllZone.EndOfTurn.addUntil(untilEOT); - } - }//resolve - - };//ability - - StringBuilder sb2 = new StringBuilder(); - sb2.append(c.getName()).append(" - attacks alone and gets +1/+0 until EOT."); - ability2.setStackDescription(sb2.toString()); - - AllZone.Stack.add(ability2); - } - } - if(c.getName().equals("Zur the Enchanter") && !c.getCreatureAttackedThisCombat()) { //hack, to make sure this doesn't break grabbing an oblivion ring: c.setCreatureAttackedThisCombat(true);