Jonathan - some clean up

This commit is contained in:
leungclj
2009-07-29 01:11:33 +00:00
parent 62048ef486
commit 8149881001
8 changed files with 20 additions and 68 deletions
+1
View File
@@ -2246,6 +2246,7 @@ toughness=6
[card] [card]
text=Untap all permanents you control during each other player's untap step. text=Untap all permanents you control during each other player's untap step.
id=129722 id=129722
auto=@each opponent untap:untap all(*|myinplay)
name=Seedborn Muse name=Seedborn Muse
rarity=R rarity=R
color=Green color=Green
+11
View File
@@ -997,6 +997,17 @@ power=6
toughness=3 toughness=3
[/card] [/card]
[card] [card]
text=Destroy target creature. Its owner gains 4 life.
id=4389
target=creature
auto=destroy
auto=life:4 targetController
name=Path of Peace
rarity=C
type=Sorcery
mana={3}{W}
[/card]
[card]
text=Phantom Warrior is unblockable. text=Phantom Warrior is unblockable.
id=4272 id=4272
name=Phantom Warrior name=Phantom Warrior
-8
View File
@@ -315,14 +315,6 @@ subtype=Bird
toughness=1 toughness=1
[/card] [/card]
[card] [card]
text=Destroy target creature. Its owner gains 4 life.
id=4389
name=Path of Peace
rarity=C
type=Sorcery
mana={3}{W}
[/card]
[card]
text=Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it. text=Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it.
id=4271 id=4271
name=Personal Tutor name=Personal Tutor
+2
View File
@@ -1195,6 +1195,8 @@ mana={U}
[card] [card]
text=At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps he or she controls. text=At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps he or she controls.
id=1352 id=1352
auto=@each upkeep:foreach(swamp|myinplay) damage:1 controller
auto=@each upkeep:foreach(swamp|opponentinplay) damage:1 opponent
name=Karma name=Karma
rarity=U rarity=U
type=Enchantment type=Enchantment
+2
View File
@@ -27,6 +27,8 @@ 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. 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 id=4801
auto=@each upkeep:foreach(artifact|myinplay) damage:1 controller
auto=@each upkeep:foreach(artifact|opponentinplay) damage:1 opponent
name=Ancient Runes name=Ancient Runes
rarity=U rarity=U
type=Enchantment type=Enchantment
+3
View File
@@ -854,6 +854,9 @@ subtype=Aura
text=Destroy target creature. Its owner gains 4 life. text=Destroy target creature. Its owner gains 4 life.
id=5684 id=5684
target=creature target=creature
auto=destroy
auto=life:4 targetController
target=creature
name=Path of Peace name=Path of Peace
rarity=C rarity=C
type=Sorcery type=Sorcery
-33
View File
@@ -4001,39 +4001,6 @@ class ARampageAbility:public MTGAbility{
} }
}; };
// Seedborn Muse
class ASeedbornMuse: public TriggeredAbility{
public:
ASeedbornMuse(int _id, MTGCardInstance * _source):TriggeredAbility(_id, _source){
}
int trigger(){
if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UPKEEP && ((MTGCardInstance *) source)->controller()!= game->currentPlayer){
return 1;
}
return 0;
}
int resolve(){
for (int j = source->controller()->game->inPlay->nb_cards-1; j >=0 ; j--){
MTGCardInstance * current = source->controller()->game->inPlay->cards[j];
current->untap();
}
return 1;
}
virtual ostream& toString(ostream& out) const
{
out << "ASeedbornMuse ::: (";
return TriggeredAbility::toString(out) << ")";
}
ASeedbornMuse * clone() const{
ASeedbornMuse * a = NEW ASeedbornMuse(*this);
a->isClone = 1;
return a;
}
};
//Instant Steal control of a target //Instant Steal control of a target
class AInstantControlSteal: public InstantAbility{ class AInstantControlSteal: public InstantAbility{
public: public:
+1 -27
View File
@@ -1338,7 +1338,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
break; break;
} }
case 1285: //Dwarven Warriors{ case 1285: //Dwarven Warriors
{ {
CreatureTargetChooser * tc = NEW CreatureTargetChooser(card); CreatureTargetChooser * tc = NEW CreatureTargetChooser(card);
tc->maxpower = 2; tc->maxpower = 2;
@@ -1415,11 +1415,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_GREEN)); game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_GREEN));
break; break;
} }
case 1352: //Karma
{
game->addObserver(NEW ADamageForTypeControlled(_id, card,"swamp"));
break;
}
case 1359: //Red Ward case 1359: //Red Ward
{ {
game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_RED)); game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_RED));
@@ -1568,13 +1563,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
break; break;
} }
//---addon Tempest---
case 4801: //Ancient Rune
{
game->addObserver(NEW ADamageForTypeControlled(_id, card,"artifact"));
break;
}
// --- addon Mirage --- // --- addon Mirage ---
case 3410: //Seed of Innocence case 3410: //Seed of Innocence
@@ -1605,15 +1593,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
break; break;
} }
case 5684://Path of Peace
{
Player * p = card->target->controller();
p->game->putInGraveyard(card->target);
p->life+= 4;
break;
}
//-- addon 10E--- //-- addon 10E---
case 129710: //Angelic Chorus case 129710: //Angelic Chorus
@@ -1642,11 +1621,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
game->addObserver( NEW ALavaborn(_id ,card, Constants::MTG_PHASE_UPKEEP, -3,-3)); game->addObserver( NEW ALavaborn(_id ,card, Constants::MTG_PHASE_UPKEEP, -3,-3));
break; break;
} }
case 129722 : //Seddborn Muse
{
game->addObserver( NEW ASeedbornMuse(_id ,card));
break;
}
case 135246: //Dreamborn Muse case 135246: //Dreamborn Muse
{ {
game->addObserver( NEW ADreambornMuse(_id ,card)); game->addObserver( NEW ADreambornMuse(_id ,card));