diff --git a/projects/mtg/bin/Res/ai/baka/deck10.txt b/projects/mtg/bin/Res/ai/baka/deck10.txt index b8c9e0625..94c4279e9 100644 --- a/projects/mtg/bin/Res/ai/baka/deck10.txt +++ b/projects/mtg/bin/Res/ai/baka/deck10.txt @@ -18,10 +18,6 @@ 48592 48592 48592 -139476 -139476 -139476 -139476 1303 1303 1303 diff --git a/projects/mtg/bin/Res/ai/baka/deck13.txt b/projects/mtg/bin/Res/ai/baka/deck13.txt index 79227ac5f..c3b93012c 100644 --- a/projects/mtg/bin/Res/ai/baka/deck13.txt +++ b/projects/mtg/bin/Res/ai/baka/deck13.txt @@ -14,10 +14,6 @@ 175062 175062 175062 -139476 -139476 -139476 -139476 1264 1264 1264 diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index 874971ba5..bca8cedce 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -601,7 +601,7 @@ subtype=Elemental toughness=5 [/card] [card] -text=Enchant creature When Earthbind comes into play, if enchanted creature has flying, Earthbind deals 2 damage to that creature and Earthbind gains "Enchanted creature loses flying." +text=Enchant creature When Earthbind comes into play, if enchanted creature has flying, Earthbind deals 2 damage to that creature and Earthbind gains "Enchanted creature loses flying." target=creature id=1288 name=Earthbind @@ -670,7 +670,7 @@ type=Instant mana={W}{W} [/card] [card] -text=Enchant land Enchanted land has "At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life." +text=Enchant land Enchanted land has "At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life." target=land id=1345 name=Farmstead @@ -1508,7 +1508,7 @@ subtype=Thopter toughness=2 [/card] [card] -text=Enchant creature When Paralyze comes into play, tap enchanted creature. Enchanted creature doesn't untap during its controller's untap step. Enchanted creature has "At the beginning of your upkeep, you may pay {4}. If you do, untap this creature." +text=Enchant creature When Paralyze comes into play, tap enchanted creature. Enchanted creature doesn't untap during its controller's untap step. Enchanted creature has "At the beginning of your upkeep, you may pay {4}. If you do, untap this creature." target=creature id=1171 name=Paralyze @@ -2485,7 +2485,7 @@ type=Sorcery mana={2}{W}{W} [/card] [card] -text=Zombie creatures have swampwalk. All Zombies have "{B}: Regenerate this permanent." +text=Zombie creatures have swampwalk. All Zombies have "{B}: Regenerate this permanent." auto=lord(zombie) swampwalk auto=lord(zombie) {B}:regenerate id=1188 diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 1fc3a8966..e02df1394 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -68,6 +68,7 @@ Nyxathid.txt orcish_lumberjack.txt paralysis.txt paralysis2.txt +persuasion.txt plague_rats.txt protomatter_powder.txt resurrection.txt diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index f7319a7ff..40c80ee27 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -201,7 +201,7 @@ int MTGCardInstance::hasSummoningSickness(){ int MTGCardInstance::changeController(Player * newController){ Player * originalOwner = controller(); if (originalOwner == newController) return 0; - MTGCardInstance * copy = originalOwner->game->inPlay->removeCard(this); + MTGCardInstance * copy = originalOwner->game->inPlay->removeCard(this,0); newController->game->inPlay->addCard(copy); //summoningSickness = 1; return 1; diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 5dcce8ea9..8ad33b2ec 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -95,14 +95,9 @@ MTGCardInstance * MTGPlayerCards::putInGraveyard(MTGCardInstance * card){ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to){ MTGCardInstance * copy = NULL; - //Special case, a card is not a new object if it goes from inplay to inplay, because it technically doesn't change zone - int newObject = 1; - if ((from = g->players[0]->game->inPlay || from = g->players[1]->game->inPlay) && - (to = g->players[0]->game->inPlay || to = g->players[1]->game->inPlay) { - newObject = 0; - } - - if (copy = from->removeCard(card,newObject)){ + GameObserver *g = GameObserver::GetInstance(); + + if (copy = from->removeCard(card)){ if (GameOptions::GetInstance()->values[OPTIONS_SFXVOLUME].getIntValue() > 0){ if (to == graveyard){ @@ -114,7 +109,6 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone } if (card->isToken){ - GameObserver *g = GameObserver::GetInstance(); if (to != g->players[0]->game->inPlay && to != g->players[1]->game->inPlay){ //Token leaves play: we destroy it //TODO DELETE Object