From f9d5b59264cb4816eb17e9d4109c58720a3a9ee6 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:05:15 +0000 Subject: [PATCH] convert Ifh-Biff Efreet to AB$DamageAll --- res/cardsfolder/ifh_biff_efreet.txt | 1 + src/forge/AbilityFactory_DealDamage.java | 2 +- src/forge/CardFactory_Creatures.java | 58 ------------------------ 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/res/cardsfolder/ifh_biff_efreet.txt b/res/cardsfolder/ifh_biff_efreet.txt index af1ee99af90..29c935aa39f 100644 --- a/res/cardsfolder/ifh_biff_efreet.txt +++ b/res/cardsfolder/ifh_biff_efreet.txt @@ -4,6 +4,7 @@ Types:Creature Efreet Text:no text PT:3/3 K:Flying +A:AB$DamageAll|Cost$G|NumDmg$1|ValidCards$Creature.withFlying|ValidPlayers$Each|ValidDescription$ each creature with flying and each player. |AnyPlayer$True| SpellDescription$CARDNAME deals 1 damage to each creature with flying and each player. Any player may activate this ability. SVar:Rarity:Rare SVar:Picture:http://resources.wizards.com/magic/cards/an/en-us/card947.jpg SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/34.jpg diff --git a/src/forge/AbilityFactory_DealDamage.java b/src/forge/AbilityFactory_DealDamage.java index 623451ee6ea..cc56cf4104f 100644 --- a/src/forge/AbilityFactory_DealDamage.java +++ b/src/forge/AbilityFactory_DealDamage.java @@ -475,7 +475,7 @@ public class AbilityFactory_DealDamage { for(Card c:list) c.addDamage(dmg, card); - if(players.equals("All")) { + if(players.equals("Each")) { for(Player p:AllZoneUtil.getPlayersInGame()) { p.addDamage(dmg, card); } diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 63ffe88f6bf..3d0443d2e4f 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -12727,64 +12727,6 @@ public class CardFactory_Creatures { }//*************** END ************ END ************************** - //*************** START *********** START ************************** - else if(cardName.equals("Ifh-Biff Efreet")) { - final SpellAbility ability = new Ability(card, "G") { - - @Override - public boolean canPlayAI() { - //todo(sol) setting up some AI for next go through - //CardList human = new CardList(AllZone.Human_Play.getCards()); - //CardList computer = new CardList(AllZone.Computer_Play.getCards()); - - //human = human.getType("Creature").getKeyword("Flying"); - //computer = computer.getType("Creature").getKeyword("Flying"); - - //int compLife = AllZone.ComputerPlayer.getLife(); - //int humanLife = AllZone.HumanPlayer.getLife(); - - // if complife > humanLife && humanlife <= available green mana, try to kill human - - if (card.getController().equals(AllZone.ComputerPlayer)){ - // needs to be careful activating ability if human has green mana available - } - else{ - // should try to kill human's flyers but spare own - return true; - } - - return false; - } - - @Override - public void resolve() { - //get all creatures - CardList list = AllZoneUtil.getCreaturesInPlay(); - list = list.getKeyword("Flying"); - - for(int i = 0; i < list.size(); i++) { - if(CardFactoryUtil.canDamage(card, list.get(i))) list.get(i).addDamage(1, card); - } - - AllZone.HumanPlayer.addDamage(1, card); - AllZone.ComputerPlayer.addDamage(1, card); - }//resolve() - };//SpellAbility - - StringBuilder sbDesc = new StringBuilder(); - sbDesc.append("G: Ifh-Biff Efreet deals 1 damage to each creature with "); - sbDesc.append("flying and each player. Any player may activate this ability"); - ability.setDescription(sbDesc.toString()); - - StringBuilder sbStack = new StringBuilder(); - sbStack.append(card).append(" deals 1 damage to each flying creature and each player."); - ability.setStackDescription(sbStack.toString()); - - ability.getRestrictions().setAnyPlayer(true); - card.addSpellAbility(ability); - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if (cardName.equals("Roc Egg")) { final SpellAbility ability = new Ability(card, "0") {