Merge pull request #39 from WagicProject/master

getting master

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -17341,7 +17341,7 @@ auto={C(0/0,-8,Loyalty)}:name(-8: 8 damage to creatures) damage:8 all(creature)
 auto={C(0/0,-9,Loyalty)}:name(-9: 9 damage to creatures) damage:9 all(creature)
 auto={C(0/0,-10,Loyalty)}:name(-10: 10 damage to creatures) damage:10 all(creature)
 text=+1: Put two 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step. -- 0: Discard all the cards in your hand, then draw that many cards plus one. -- -X: Chandra, Flamecaller deals X damage to each creature.
-mana={1}{G}{G}
+mana={4}{R}{R}
 type=Planeswalker
 subtype=Chandra
 [/card]
@@ -22719,11 +22719,7 @@ toughness=3
 [/card]
 [card]
 name=Cryptolith Rite
-auto=lord(creature|mybattlefield) transforms((,newability[{T}:add{G}])) forever
-auto=lord(creature|mybattlefield) transforms((,newability[{T}:add{B}])) forever
-auto=lord(creature|mybattlefield) transforms((,newability[{T}:add{W}])) forever
-auto=lord(creature|mybattlefield) transforms((,newability[{T}:add{U}])) forever
-auto=lord(creature|mybattlefield) transforms((,newability[{T}:add{R}])) forever
+auto=lord(creature|mybattlefield) transforms((,newability[{T}:add{G}],newability[{T}:add{U}],newability[{T}:add{R}],newability[{T}:add{B}],newability[{T}:add{W}]))
 text=Creatures you control have "{T}: Add one mana of any color to your mana pool."
 mana={1}{G}
 type=Enchantment
@@ -37023,8 +37019,8 @@ type=Instant
 [/card]
 [card]
 name=Fevered Visions
-auto=@at my endofturn:draw:1
-auto=@at opponent endofturn:draw:1 opponent && if type(*|opponenthand)~morethan~3 then damage:2 opponent
+auto=@each my endofturn:draw:1
+auto=@each opponent endofturn:draw:1 opponent && if type(*|opponenthand)~morethan~3 then damage:2 opponent
 text=At the beginning of each player's end step, that player draws a card. If the player is your opponent and has four or more cards in hand, Fevered Visions deals 2 damage to him or her.
 mana={1}{U}{R}
 type=Enchantment
@@ -106144,8 +106140,7 @@ toughness=2
 name=Stormtide Leviathan
 abilities=islandwalk
 auto=lord(land) transforms((island))
-auto=lord(creature[-islandwalk]) cantattack
-auto=lord(creature) flyersonly
+auto=lord(creature[-flying;-islandwalk]) cantattack
 text=Islandwalk -- All lands are Islands in addition to their original type. -- Creatures without flying or islandwalk can't attack.
 mana={5}{U}{U}{U}
 type=Creature

projects/mtg/src/AllAbilities.cpp

@@ -3936,7 +3936,12 @@ int AACloner::resolve()
             spell->source->addType(*it);
         }
         spell->source->modifiedbAbi = _target->modifiedbAbi;
-        spell->source->basicAbilities = _target->origbasicAbilities;
+        //spell->source->basicAbilities = _target->origbasicAbilities;
+        for(int k = 0; k < Constants::NB_BASIC_ABILITIES; k++)
+        {
+            if(_target->model->data->basicAbilities[k])
+               spell->source->basicAbilities[k] = _target->model->data->basicAbilities[k];
+        }
         delete spell;
     }
     return 1;

projects/mtg/src/MTGCardInstance.cpp

@@ -100,7 +100,13 @@ void MTGCardInstance::copy(MTGCardInstance * card)
     MTGCard * source = card->model;
     CardPrimitive * data = source->data;
 
-    basicAbilities = card->origbasicAbilities;
+    //basicAbilities = card->origbasicAbilities;
+    for(int k = 0; k < Constants::NB_BASIC_ABILITIES; k++)
+    {
+        if(card->model->data->basicAbilities[k])
+            basicAbilities[k] = card->model->data->basicAbilities[k];
+    }
+
     origbasicAbilities = card->origbasicAbilities;
     modifiedbAbi = card->modifiedbAbi;
     for (size_t i = 0; i < data->types.size(); i++)

projects/mtg/src/MTGGameZones.cpp

@@ -435,7 +435,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
     if (from == g->players[0]->game->battlefield || from == g->players[1]->game->battlefield)
     {
         if(to != g->players[0]->game->battlefield || to != g->players[1]->game->battlefield)
-        if (copy->previous && copy->previous->MeldedFrom.size())
+        if (copy->previous && copy->previous->MeldedFrom.size() && !copy->isACopier && !copy->isToken)//!copier & !token fix kiki-jiki clones crash
         {
             vector<string> names = split(copy->previous->MeldedFrom, '|');
             MTGCard * cardone = MTGCollection()->getCardByName(names[0]);