From f882fd437bbdaa097f4b61d655c92c923136b60f Mon Sep 17 00:00:00 2001
From: leungclj <leungclj@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sun, 4 Oct 2009 01:39:23 +0000
Subject: [PATCH] J0N4TH4N - removed hard code for Dreamborn Muse

---
 projects/mtg/bin/Res/sets/10E/_cards.dat |  4 +-
 projects/mtg/include/AllAbilities.h      | 60 ------------------------
 projects/mtg/src/MTGAbility.cpp          |  6 ---
 3 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 38856d57f..8f1336fd0 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -640,12 +640,14 @@ mana={2}
 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
 name=Dreamborn Muse
-rarity=R
+auto=@each my upkeep:foreach(*|myhand) deplete:1 controller
+auto=@each opponent upkeep:foreach(*|opponenthand) deplete:1 opponent
 type=Creature
 mana={2}{U}{U}
 power=2
 subtype=Spirit
 toughness=2
+rarity=R
 [/card]
 [card]
 text=
diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 5f5a36f68..68f34780c 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -1218,29 +1218,6 @@ class APowerToughnessModifierUntilEndOfTurn: public ActivatedAbility{
 
 
 
-
-
-//Untap Blockers with simple Mana Mechanism
-class AUntapManaBlocker: public UntapBlocker{
- public:
- AUntapManaBlocker(int id, MTGCardInstance * card, ManaCost * _cost):UntapBlocker(id, card, _cost){
-  }
-
- AUntapManaBlocker(int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost):UntapBlocker(id, card,_target, _cost){
-  }
-  virtual ostream& toString(ostream& out) const
-  {
-    out << "AUntapManaBlocker ::: (";
-    return UntapBlocker::toString(out) << ")";
-  }
-  AUntapManaBlocker * clone() const{
-    AUntapManaBlocker * a =  NEW AUntapManaBlocker(*this);
-    a->isClone = 1;
-    return a;
-  }
-};
-
-
 //Circle of Protections
 class ACircleOfProtection: public TargetAbility{
 protected:
@@ -3899,43 +3876,6 @@ class AARandomDiscarder:public ActivatedAbilityTP{
 };
 
 
-// Dreamborn Muse
-class ADreambornMuse: public TriggeredAbility{
- public:
-	 int nbcards;
- ADreambornMuse(int _id, MTGCardInstance * _source):TriggeredAbility(_id, _source){
- }
-
-  int trigger(){
-    if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UPKEEP) return 1;
-    return 0;
-  }
-
-  int resolve(){
-    int nbcards = game->currentPlayer->game->hand->nb_cards;
-    MTGLibrary * library = game->currentPlayer->game->library;
-    for (int i = 0; i < nbcards; i++){
-      if (library->nb_cards)
-	game->currentPlayer->game->putInZone(library->cards[library->nb_cards-1],library,game->currentPlayer->game->graveyard);
-	}
-	return 1;
-  }
-
-  virtual ostream& toString(ostream& out) const
-  {
-    out << "ADreambornMuse ::: nbcards : " << nbcards
-	<< " (";
-    return TriggeredAbility::toString(out) << ")";
-  }
-
-  ADreambornMuse * clone() const{
-    ADreambornMuse * a =  NEW ADreambornMuse(*this);
-    a->isClone = 1;
-    return a;
-  }
-};
-
-
 //ShieldOfTheAge
 class AShieldOfTheAge: public TargetAbility{
  public:
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 010762bf4..b661f4ca5 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -1510,12 +1510,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
       game->addObserver( NEW ALavaborn(_id ,card, Constants::MTG_PHASE_UPKEEP, -3,-3));
       break;
     }
-  case 135246: //Dreamborn Muse
-    {
-      game->addObserver( NEW ADreambornMuse(_id ,card));
-      break;
-    }
-
   case 129774: // Traumatize
 	  {
 		  int nbcards;