Laurent - Added discard (see mind rot 10E) works did not try yet with cost (e.g {2}:discard:2) is only random discard function surely needs to be improved.

Added generic Karma Function (ADamageForTypeControlled, see ancient ruin from TMP) tested and work. Happy to be back
2009-05-19 22:22:50 +00:00
parent 0becb3309d
commit c42d0d20ca
6 changed files with 2965 additions and 2931 deletions
@@ -1243,6 +1243,17 @@ type=Artifact
 mana={2}
 [/card]
 [card]
+text=Target player discards two cards.
+id=129645
+target=player
+auto=discard:2
+name=Mind Rot
+rarity=C
+color=Black
+type=Sorcery
+mana={2}{B}
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {1}, {T}, Sacrifice Mind Stone: Draw a card.
 auto={T}:Add{1}
 auto={1}{T}{S}:draw:1
@@ -944,15 +944,7 @@ color=Blue
 type=Instant
 mana={U}
 [/card]
-[card]
-text=Target player discards two cards.
-id=129645
-name=Mind Rot
-rarity=C
-color=Black
-type=Sorcery
-mana={2}{B}
-[/card]
+

 [card]
 text=At the beginning of your upkeep, if twenty or more creature cards are in your graveyard, you win the game.
@@ -25,6 +25,14 @@ mana={2}{R}{R}
 type=Sorcery
 [/card]
 [card]
+text=At the beginning of each player's upkeep, Ancient Runes deals damage to that player equal to the number of artifacts he or she controls.
+id=4801
+name=Ancient Runes
+rarity=U
+type=Enchantment
+mana={2}{R}
+[/card]
+[card]
 text={T}: Add {2} to your mana pool. Ancient Tomb deals 2 damage to you.
 auto={T}: Add {2} && Damage 2 controller
 id=4636
@@ -424,6 +432,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text={2}{B}{B}: Put a -1/-1 counter on target creature.
+id=4664
+abilities=wither
+auto={2}{B}{B}:damage:1 target(creature)
+name=Fevered Convulsions
+rarity=R
+type=Enchantment
+mana={B}{B}
+[/card]
+[card]
 text=Flying
 id=4700
 name=Fighting Drake
@@ -7,25 +7,6 @@ type=Sorcery
 mana={X}{1}{B}
 [/card]
 [card]
-text=First strike     {W}: Target creature gains first strike until end of turn.
-id=4857
-name=Advance Scout
-rarity=C
-type=Creature
-mana={1}{W}
-power=1
-subtype=Human Soldier Scout
-toughness=1
-[/card]
-[card]
-text=Destroy target artifact, creature, or land. Aftershock deals 3 damage to you.
-id=4800
-name=Aftershock
-rarity=C
-type=Sorcery
-mana={2}{R}{R}
-[/card]
-[card]
 text=Sacrifice a creature: Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard.
 id=4596
 name=Altar of Dementia
@@ -41,15 +22,6 @@ rarity=R
 type=Enchantment
 mana={2}{G}{G}
 [/card]
-[card]
-text=At the beginning of each player's upkeep, Ancient Runes deals damage to that player equal to the number of artifacts he or she controls.
-id=4801
-name=Ancient Runes
-rarity=U
-type=Enchantment
-mana={2}{R}
-[/card]
-
 [card]
 text=Flying     Whenever Angelic Protector becomes the target of a spell or ability, Angelic Protector gets +0/+3 until end of turn.
 id=4858
@@ -100,8 +72,6 @@ power=2
 subtype=Sliver
 toughness=2
 [/card]
-
-
 [card]
 text=Flying     When Avenging Angel is put into a graveyard from play, you may put Avenging Angel on top of its owner's library.
 id=4863
@@ -113,7 +83,6 @@ power=3
 subtype=Angel
 toughness=3
 [/card]
-
 [card]
 text=All Sliver creatures have "{2}: This creature gets +1/+0 until end of turn."
 id=4803
@@ -462,17 +431,6 @@ type=Artifact
 mana={4}
 [/card]
 [card]
-text=Other Elf creatures have forestwalk.     Other Elves have shroud. (They can't be the targets of spells or abilities.)
-id=4757
-name=Eladamri, Lord of Leaves
-rarity=R
-type=Legendary Creature
-mana={G}{G}
-power=2
-subtype=Elf Warrior
-toughness=2
-[/card]
-[card]
 text=At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
 id=4758
 name=Eladamri's Vineyard
@@ -617,14 +575,7 @@ rarity=R
 type=Sorcery
 mana={4}{B}
 [/card]
-[card]
-text={2}{B}{B}: Put a -1/-1 counter on target creature.
-id=4664
-name=Fevered Convulsions
-rarity=R
-type=Enchantment
-mana={B}{B}
-[/card]
+
 [card]
 text=Whenever a nontoken creature is put into your graveyard from play, put a 1/1 white Spirit creature token with flying into play.
 id=4874
@@ -634,7 +585,6 @@ type=Enchantment
 mana={2}{W}{W}
 [/card]

-
 [card]
 text={T}: Fireslinger deals 1 damage to target creature or player and 1 damage to you.
 id=4814
@@ -649,6 +649,37 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
        continue;
      }

+      //Discard
+      found = s.find("discard:");
+      if (found != string::npos){
+        unsigned int start = s.find(":",found);
+        unsigned int end = s.find(" ",start);
+        int nbcards;
+        if (end != string::npos){
+	        nbcards = atoi(s.substr(start+1,end-start-1).c_str());
+        }else{
+	        nbcards = atoi(s.substr(start+1).c_str());
+        }
+        if (dryMode){
+          dryModeResult =  BAKA_EFFECT_BAD;
+          break;
+        }
+        if (trigger){
+	        //TODO ?
+        }else{
+	        if (tc){
+	          //TODO ?
+	        }else{
+			      for (int i = 0; i < nbcards; i++){
+					game->opponent()->game->discardRandom(game->opponent()->game->hand);
+				  }
+			}
+		}
+					result++;
+        continue;
+	  }
+
+
      //Change Power/Toughness
      int power, toughness;
      if ( parsePowerToughness(s,&power, &toughness)){
@@ -1642,10 +1673,18 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
      game->addObserver(NEW ATargetterPowerToughnessModifierUntilEOT(id, card, 1,2, NEW ManaCost(cost,1),tc));
      break;
    }
+//---addon Tempest---
+    case 4801: //Ancient Ruine
+    {
+      game->addObserver(NEW ADamageForTypeControlled(_id, card,"artifact"));
+      break;
+    }
  default:
    break;
  }

+
+
  /* Erwan - 2008/11/13: We want to get rid of these basicAbility things.
   * basicAbilities themselves are alright, but creating new object depending on them is dangerous
   * The main reason is that classes that add an ability to a card do NOT create these objects, and therefore do NOT