diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat index 6376bd781..7c2f6357f 100644 --- a/projects/mtg/bin/Res/sets/GPT/_cards.dat +++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat @@ -307,7 +307,7 @@ text=Enchant creature Enchanted creature can't attack or block. Enchanted cr target=creature auto=cantattack auto=cantblock -alias=1148 +auto=@each my upkeep:life:1 controller id=96882 name=Pillory of the Sleepless color=White,Black diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat index 93a2b5135..0d1b0dfac 100644 --- a/projects/mtg/bin/Res/sets/LEG/_cards.dat +++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat @@ -508,7 +508,7 @@ mana={B} [/card] [card] text={B}, {T}, Sacrifice a creature: Return target creature card from your graveyard to play. Play this ability only during your upkeep. -auto={B},{T},{s(creature|myinplay)}:moveTo(myinplay) target(creature|mygraveyard) +auto={B}{T}{s(creature|myinplay)}:moveTo(myinplay) target(creature|mygraveyard) id=1444 name=Hell's Caretaker rarity=R diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat index 47b574fef..be0a7974b 100644 --- a/projects/mtg/bin/Res/sets/POR/_cards.dat +++ b/projects/mtg/bin/Res/sets/POR/_cards.dat @@ -1121,7 +1121,7 @@ type=Sorcery text=Return target creature card from your graveyard to your hand. target=creature|myGraveyard id=4236 -alias=1174 +auto=moveTo(myHand) name=Raise Dead rarity=C mana={B} diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index ffcdcff85..f0b631e5f 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -463,7 +463,7 @@ mana={1} text=Enchant land At the beginning of the upkeep of enchanted land's controller, Cursed Land deals 1 damage to that player. target=land id=1148 -alias=1200 +auto=@each my upkeep:damage:1 controller name=Cursed Land rarity=U type=Enchantment @@ -623,6 +623,19 @@ subtype=Dwarf toughness=1 [/card] [card] +text={T}, Sacrifice an artifact: Put a +1/+1 counter on target creature. Play this ability only during your upkeep. +id=1286 +name=Dwarven Weaponsmith +auto={T}{S(artifact|myinplay)}:counter(1/1,1) target(creature) +color=Red +type=Creature +mana={1}{R} +power=1 +subtype=Dwarf +toughness=1 +rarity=U +[/card] +[card] text= id=1287 name=Earth Elemental @@ -734,6 +747,7 @@ subtype=Aura [card] text=Enchant enchantment At the beginning of the upkeep of enchanted enchantment's controller, Feedback deals 1 damage to that player. target=enchantment +auto=@each my upkeep:damage:1 controller id=1200 name=Feedback rarity=U @@ -1657,9 +1671,11 @@ subtype=Aura text=At the beginning of each player's upkeep, Power Surge deals X damage to that player, where X is the number of untapped lands he or she controlled at the beginning of this turn. id=1311 name=Power Surge -rarity=R +auto=@each my upkeep:foreach(land[-tapped]|myinplay) damage:1 controller +auto=@each opponent upkeep:foreach(land[-tapped]|opponentinplay) damage:1 opponent type=Enchantment mana={R}{R} +rarity=R [/card] [card] text={T}: Prodigal Sorcerer deals 1 damage to target creature or player. @@ -1704,8 +1720,8 @@ mana={B} [card] text=Return target artifact card from your graveyard to your hand. target=artifact|myGraveyard +auto=moveTo(myHand) id=1219 -alias=1174 name=Reconstruction rarity=C type=Sorcery @@ -2398,7 +2414,7 @@ toughness=3 text=Enchant creature At the beginning of the upkeep of enchanted creature's controller, Wanderlust deals 1 damage to that player. target=creature id=1276 -alias=1200 +auto=@each my upkeep:damage:1 controller name=Wanderlust rarity=U type=Enchantment @@ -2420,6 +2436,7 @@ toughness=3 [card] text=Enchant artifact At the beginning of the upkeep of enchanted artifact's controller, Warp Artifact deals 1 damage to that player. target=artifact +auto=@each my upkeep:damage:1 controller id=1185 name=Warp Artifact rarity=R @@ -2464,6 +2481,10 @@ subtype=Aura [card] text=Each player discards his or her hand and draws seven cards. id=1326 +auto=moveto(opponentgraveyard) all(*|opponenthand) +auto=draw:7 opponent +auto=moveto(mygraveyard) all(*|myhand) +auto=draw:7 controller name=Wheel of Fortune rarity=R type=Sorcery @@ -2534,4 +2555,4 @@ mana={1}{B}{B} power=2 subtype=Zombie toughness=3 -[/card] +[/card] \ No newline at end of file diff --git a/projects/mtg/bin/Res/sets/RV/todo.dat b/projects/mtg/bin/Res/sets/RV/todo.dat index ae395039b..1b74990a4 100644 --- a/projects/mtg/bin/Res/sets/RV/todo.dat +++ b/projects/mtg/bin/Res/sets/RV/todo.dat @@ -105,18 +105,7 @@ color=Blue type=Sorcery mana={U}{U} [/card] -[card] -text={T}, Sacrifice an artifact: Put a +1/+1 counter on target creature. Play this ability only during your upkeep. -id=1286 -name=Dwarven Weaponsmith -rarity=U -color=Red -type=Creature -mana={1}{R} -power=1 -subtype=Dwarf -toughness=1 -[/card] + [card] text=All artifacts have "At the beginning of your upkeep, sacrifice this artifact unless you pay {2}." id=1199 diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 9caa2cfb3..a7007e654 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -3235,53 +3235,6 @@ class APowerLeak:public TriggeredAbility{ } }; -//Power Surge -class APowerSurge:public TriggeredAbility{ - public: - int totalLands; - APowerSurge(int _id, MTGCardInstance * _source):TriggeredAbility(_id,_source){ - totalLands = 0; - } - - int trigger(){ - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_EOT){ - //That's ugly but untapped land at the beginning of the turn are opponent's untapped lands at the end of the turn - totalLands = 0; - MTGInPlay * inPlay = game->opponent()->game->inPlay; - for (int i = 0; i < inPlay->nb_cards; i++){ - MTGCardInstance * card = inPlay->cards[i]; - if (!card->isTapped() && card->hasType("land")){ - totalLands++; - } - } - } - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UPKEEP && totalLands){ - return 1; - } - return 0; - } - - int resolve(){ - if (totalLands) game->mLayers->stackLayer()->addDamage(source,game->currentPlayer,totalLands); - totalLands = 0; - return 1; - } - - virtual ostream& toString(ostream& out) const - { - out << "APowerSurge ::: totalLands : " << totalLands - << " ("; - return TriggeredAbility::toString(out) << ")"; - } - APowerSurge * clone() const{ - APowerSurge * a = NEW APowerSurge(*this); - a->isClone = 1; - return a; - } -}; - - - //1176 Sacrifice class ASacrifice:public InstantAbility{ public: @@ -3430,36 +3383,6 @@ class AAspectOfWolf:public ListMaintainerAbility{ } }; -//1276 Wanderlust, 1148 Cursed Lands -class AWanderlust:public TriggeredAbility{ - public: - AWanderlust(int _id, MTGCardInstance * _source, MTGCardInstance * _target):TriggeredAbility(_id,_source, _target){} - - int trigger(){ - if (newPhase != currentPhase && newPhase == Constants::MTG_PHASE_UPKEEP && ((MTGCardInstance *) target)->controller()==game->currentPlayer){ - return 1; - } - return 0; - } - - int resolve(){ - game->mLayers->stackLayer()->addDamage(source,((MTGCardInstance *) target)->controller(),1); - return 1; - } - - virtual ostream& toString(ostream& out) const - { - out << "AWanderlust ::: ("; - return TriggeredAbility::toString(out) << ")"; - } - AWanderlust * clone() const{ - AWanderlust * a = NEW AWanderlust(*this); - a->isClone = 1; - return a; - } -}; - - //1284 Dragon Whelp class ADragonWhelp: public APowerToughnessModifierUntilEndOfTurn{ public: diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index b661f4ca5..a58be5bea 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1038,11 +1038,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver( NEW APowerLeak(_id ,card, card->target)); break; } - case 1311: //Power Surge - { - game->addObserver( NEW APowerSurge(_id ,card)); - break; - } case 1358: //Purelace { if (card->target){ @@ -1197,11 +1192,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } - case 1185: //Warp Artifact - { - game->addObserver(NEW ARegularLifeModifierAura(_id, card, card->target, Constants::MTG_PHASE_UPKEEP, -1)); - break; - } case 1192: //BrainGeyser { Player * player = spell->getNextPlayerTarget(); @@ -1216,11 +1206,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AControlStealAura(_id, card, card->target)); break; } - case 1200 : //Feedback - { - game->addObserver(NEW AWanderlust(_id, card, card->target)); - break; - } case 1218: //Psychic Venom { game->addObserver(NEW APsychicVenom(_id, card, card->target)); @@ -1332,19 +1317,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AFastbond(_id, card)); break; } - case 1326: //Wheel of fortune - { - for (int i = 0; i < 2; i++){ - MTGHand * hand = game->players[i]->game->hand; - for (int j = hand->nb_cards-1; j>=0; j--){ - game->players[i]->game->putInGraveyard(hand->cards[j]); - } - for(int j = 0; j < 7; j++){ - game->players[i]->game->drawFromLibrary(); - } - } - break; - } case 1238: //Cockatrice { game->addObserver(NEW AOldSchoolDeathtouch(_id,card));