Laurent - 10E added Demon's Horn, dragon's claw and co. works well you have to click the card to get 1 life as the card state "may"..also added consume spirit (alias of drain life RV)

- ICE complete update, reorganized all cards alphabetically both in cards.dat and todo.dat + some few addition - tentatively added a generic millstone, first step to add the keyword "deplete" to the parser.. still working on this one.
2009-05-20 20:03:51 +00:00
parent dce2adc6fc
commit 215c7448c9
8 changed files with 1150 additions and 2161 deletions
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -62,6 +62,15 @@ subtype=Human Cleric
 toughness=4
 [/card]
 [card]
+text=Whenever a player plays a white spell, you may gain 1 life.
+id=129466
+name=Angel's Feather
+rarity=U
+color=Artifact
+type=Artifact
+mana={2}
+[/card]
+[card]
 text=Target creature gets +3/+3 and gains flying until end of turn. (It can't be blocked except by creatures with flying or reach.)
 target=creature
 auto=:3/3
@@ -89,7 +98,7 @@ toughness=4
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Angel of Mercy comes into play, you gain 3 life.
 abilities=flying
-auto=gainlife:3
+auto=life:3
 id=129465
 name=Angel of Mercy
 rarity=U
@@ -213,6 +222,19 @@ type=Sorcery
 mana={X}{R}
 [/card]
 [card]
+text={R}, Sacrifice Bloodfire Colossus: Bloodfire Colossus deals 6 damage to each creature and each player.
+id=129709
+name=Bloodfire Colossus
+auto={R}{S}:damage:6 all(creature,player)
+rarity=R
+color=Red
+type=Creature
+mana={6}{R}{R}
+power=6
+subtype=Giant
+toughness=6
+[/card]
+[card]
 text=Bloodrock Cyclops attacks each turn if able.
 abilities=mustattack
 id=130384
@@ -348,6 +370,17 @@ subtype=Faerie
 toughness=1
 [/card]
 [card]
+text=Spend only black mana on X.     Consume Spirit deals X damage to target creature or player and you gain X life.
+id=129505
+alias=1156
+target=creature,player
+name=Consume Spirit
+rarity=U
+color=Black
+type=Sorcery
+mana={X}{1}{B}
+[/card]
+[card]
 text=Sacrifice Composite Golem: Add {W}{U}{B}{R}{G} to your mana pool.
 auto={s}:Add {W}{U}{B}{R}{G}
 id=135275
@@ -429,6 +462,15 @@ type=Sorcery
 mana={3}{R}
 [/card]
 [card]
+text=Whenever a player plays a black spell, you may gain 1 life.
+id=129523
+name=Demon's Horn
+rarity=U
+color=Artifact
+type=Artifact
+mana={2}
+[/card]
+[card]
 text=Destroy target enchantment.
 target=enchantment
 auto=destroy
@@ -463,6 +505,15 @@ type=Enchantment
 mana={4}{R}{R}
 [/card]
 [card]
+text=Whenever a player plays a red spell, you may gain 1 life.
+id=129527
+name=Dragon's Claw
+rarity=U
+color=Artifact
+type=Artifact
+mana={2}
+[/card]
+[card]
 text=
 id=135216
 name=Dross Crocodile
@@ -513,6 +564,16 @@ subtype=Elemental
 toughness=5
 [/card]
 [card]
+text=Return all creatures to their owners' hands.
+id=129541
+name=Evacuation
+auto=moveTo(ownerhand) all(creature)
+rarity=R
+color=Blue
+type=Instant
+mana={3}{U}{U}
+[/card]
+[card]
 text=Other Elf creatures get +1/+1 and have forestwalk. (They're unblockable as long as defending player controls a Forest.)
 id=129534
 auto=lord(elf) 1/1 other
@@ -555,7 +616,7 @@ toughness=7
 text=Essence Drain deals 3 damage to target creature or player and you gain 3 life.
 target=creature,player
 auto=damage:3
-auto=gainlife:3
+auto=life:3
 id=135191
 name=Essence Drain
 rarity=C
@@ -1056,6 +1117,15 @@ subtype=Kavu
 toughness=3
 [/card]
 [card]
+text=Whenever a player plays a blue spell, you may gain 1 life.
+id=129619
+name=Kraken's Eye
+rarity=U
+color=Artifact
+type=Artifact
+mana={2}
+[/card]
+[card]
 text=Lava Axe deals 5 damage to target player.
 target=player
 auto=Damage 5
@@ -1394,6 +1464,17 @@ type=Instant
 mana={1}{G}
 [/card]
 [card]
+text=Target player gains 8 life.
+id=129655
+target=player
+auto=life:8
+name=Natural Spring
+rarity=C
+color=Green
+type=Sorcery
+mana={3}{G}{G}
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  Nightmare's power and toughness are each equal to the number of Swamps you control.
 abilities=flying
 id=129659
@@ -2554,6 +2635,15 @@ type=Sorcery
 mana={2}{W}{W}
 [/card]
 [card]
+text=Whenever a player plays a green spell, you may gain 1 life.
+id=129809
+name=Wurm's Tooth
+rarity=U
+color=Artifact
+type=Artifact
+mana={2}
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {T}: Add {G} or {U} to your mana pool. Yavimaya Coast deals 1 damage to you.
 id=129810
 auto={T}:Add {1}
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -50,15 +50,6 @@ type=Enchantment
 mana={3}{W}{W}
 [/card]
 [card]
-text=Whenever a player plays a white spell, you may gain 1 life.
-id=129466
-name=Angel's Feather
-rarity=U
-color=Artifact
-type=Artifact
-mana={2}
-[/card]
-[card]
 text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature gets +2/+2 and has &quot;{T}: This creature deals 1 damage to target creature or player.&quot;
 id=130530
 name=Arcane Teachings
@@ -68,7 +59,6 @@ type=Enchantment
 mana={2}{R}
 subtype=Aura
 [/card]
-
 [card]
 text=Gain control of target Aura that's attached to a permanent. Attach it to another permanent it can enchant.
 id=130976
@@ -183,19 +173,6 @@ color=Black
 type=Sorcery
 mana={3}{B}{B}
 [/card]
-[card]
-text={R}, Sacrifice Bloodfire Colossus: Bloodfire Colossus deals 6 damage to each creature and each player.
-id=129709
-name=Bloodfire Colossus
-rarity=R
-color=Red
-type=Creature
-mana={6}{R}{R}
-power=6
-subtype=Giant
-toughness=6
-[/card]
-
 [card]
 text=When Bogardan Firefiend is put into a graveyard from play, it deals 2 damage to target creature.
 id=130534
@@ -208,7 +185,6 @@ power=2
 subtype=Elemental Spirit
 toughness=1
 [/card]
-
 [card]
 text=Whenever Cephalid Constable deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands.
 id=135261
@@ -322,15 +298,6 @@ type=Sorcery
 mana={3}{R}{R}
 [/card]
 [card]
-text=Spend only black mana on X.     Consume Spirit deals X damage to target creature or player and you gain X life.
-id=129505
-name=Consume Spirit
-rarity=U
-color=Black
-type=Sorcery
-mana={X}{1}{B}
-[/card]
-[card]
 text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Whenever enchanted creature attacks or blocks, its controller loses 3 life.
 id=129590
 name=Contaminated Bond
@@ -387,15 +354,6 @@ type=Instant
 mana={2}{U}
 [/card]
 [card]
-text=Whenever a player plays a black spell, you may gain 1 life.
-id=129523
-name=Demon's Horn
-rarity=U
-color=Artifact
-type=Artifact
-mana={2}
-[/card]
-[card]
 text=When Denizen of the Deep comes into play, return each other creature you control to its owner's hand.
 id=135250
 name=Denizen of the Deep
@@ -443,15 +401,7 @@ color=Artifact
 type=Artifact
 mana={2}
 [/card]
-[card]
-text=Whenever a player plays a red spell, you may gain 1 life.
-id=129527
-name=Dragon's Claw
-rarity=U
-color=Artifact
-type=Artifact
-mana={2}
-[/card]
+
 [card]
 text=At the beginning of each player's upkeep, that player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in his or her hand.
 id=135246
@@ -500,16 +450,6 @@ power=1
 subtype=Elf Berserker
 toughness=1
 [/card]
-
-[card]
-text=Return all creatures to their owners' hands.
-id=129541
-name=Evacuation
-rarity=R
-color=Blue
-type=Instant
-mana={3}{U}{U}
-[/card]
 [card]
 text=Faerie Conclave comes into play tapped.     {T}: Add {U} to your mana pool.     {1}{U}: Faerie Conclave becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land. (It can't be blocked except by creatures with flying or reach.)
 id=106531
@@ -795,15 +735,6 @@ subtype=Human Knight
 toughness=2
 [/card]
 [card]
-text=Whenever a player plays a blue spell, you may gain 1 life.
-id=129619
-name=Kraken's Eye
-rarity=U
-color=Artifact
-type=Artifact
-mana={2}
-[/card]
-[card]
 text=At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, Lavaborn Muse deals 3 damage to him or her.
 id=130373
 name=Lavaborn Muse
@@ -955,15 +886,7 @@ color=Black
 type=Enchantment
 mana={2}{B}{B}
 [/card]
-[card]
-text=Target player gains 8 life.
-id=129655
-name=Natural Spring
-rarity=C
-color=Green
-type=Sorcery
-mana={3}{G}{G}
-[/card]
+
 [card]
 text=First strike (This creature deals combat damage before creatures without first strike.)  When Nekrataal comes into play, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
 id=129658
@@ -1315,6 +1238,7 @@ toughness=3
 text=Target player loses 4 life and you gain 4 life.
 id=129739
 name=Soul Feast
+target=player
 rarity=U
 color=Black
 type=Sorcery
@@ -1745,13 +1669,5 @@ power=2
 subtype=Spirit
 toughness=3
 [/card]
-[card]
-text=Whenever a player plays a green spell, you may gain 1 life.
-id=129809
-name=Wurm's Tooth
-rarity=U
-color=Artifact
-type=Artifact
-mana={2}
-[/card]
+

--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -35,6 +35,17 @@ subtype=Human Wizard
 toughness=2
 [/card]
 [card]
+text=Blightning deals 3 damage to target player. That player discards two cards.
+id=174917
+target=player
+auto=damage:3
+auto=discard:2
+name=Blightning
+rarity=C
+type=Sorcery
+mana={1}{B}{R}
+[/card]
+[card]
 text=Flying     When Broodmate Dragon comes into play, put a 4/4 red Dragon creature token with flying into play.
 abilities=flying
 auto=token(Dragon,creature dragon, 4/4,flying red)
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -121,14 +121,6 @@ subtype=Elf Shaman
 toughness=1
 [/card]
 [card]
-text=Blightning deals 3 damage to target player. That player discards two cards.
-id=174917
-name=Blightning
-rarity=C
-type=Sorcery
-mana={1}{B}{R}
-[/card]
-[card]
 text=When Blister Beetle comes into play, target creature gets -1/-1 until end of turn.
 id=174893
 name=Blister Beetle
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -2141,7 +2141,6 @@ class AMillstone:public TargetAbility{
 };


-
 //1172 Pestilence
 class APestilence: public ActivatedAbility{
 public:
@@ -2629,6 +2628,28 @@ class AStasis:public ActivatedAbility{

 //--------------Addon Abra------------------

+
+//GenericMillstone
+class ADeplete:public TargetAbility{
+ public:
+	 int nbcards;
+	  ADeplete(int _id, MTGCardInstance * card, ManaCost * _cost, int _nbcards,TargetChooser * _tc = NULL, int _tap = 1):TargetAbility(_id,card, _tc, _cost,0,_tap){
+      if (!tc) tc= NEW PlayerTargetChooser(card);
+	  }
+
+  int resolve(){
+    Player * player = tc->getNextPlayerTarget();
+    if (!player) return 0;
+    MTGLibrary * library = player->game->library;
+    for (int i = 0; i < nbcards; i++){
+      if (library->nb_cards)
+	player->game->putInZone(library->cards[library->nb_cards-1],library, player->game->graveyard);
+    }
+    return 1;
+  }
+
+};
+
 // Generic Karma
 class ADamageForTypeControlled: public TriggeredAbility{
 public:
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -1129,7 +1129,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
    }
  case 1126:// Millstone
    {
-      game->addObserver( NEW AMillstone(_id ,card));
+	game->addObserver( NEW AMillstone(_id ,card));
      break;
    }
  case 1215: //Power Leak
@@ -1179,6 +1179,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
      game->addObserver(ability);
      break;
    }
+
  case 1142: //Wooden Sphere
    {
      int cost[] = {Constants::MTG_COLOR_ARTIFACT, 1};
@@ -1679,6 +1680,33 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
      game->addObserver(NEW ADamageForTypeControlled(_id, card,"artifact"));
      break;
    }
+
+//-- addon 10E---
+	case 129523: //Demon's Horn
+	      {
+      game->addObserver( NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_BLACK, NEW ManaCost() , 1));
+      break;
+    }
+	case 129527: //Dragon's Claw
+	      {
+      game->addObserver( NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_RED, NEW ManaCost() , 1));
+      break;
+    }
+	case 129619: //Kraken's Eye
+	      {
+      game->addObserver( NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_BLUE, NEW ManaCost() , 1));
+      break;
+    }
+  	case 129809: //Wurm's Tooth
+	      {
+      game->addObserver( NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_GREEN, NEW ManaCost() , 1));
+      break;
+    }
+    case 129466: //Angel's Feather
+	      {
+      game->addObserver( NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_WHITE, NEW ManaCost() , 1));
+      break;
+    }
  default:
    break;
  }