Merge pull request #741 from zethfoxster/master

pushing to master

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

@@ -54596,6 +54596,14 @@ power=4
 toughness=8
 [/card]
 [card]
+name=Isochron Scepter
+auto=may imprint notatarget(instant[manacost<=2]|myhand)
+auto={2}{t}:activate castcard(copied noevent named!:imprintedcard:!)
+text=Imprint — When Isochron Scepter enters the battlefield, you may exile an instant card with converted mana cost 2 or less from your hand. -- {2}, {T}: You may copy the exiled card. If you do, you may cast the copy without paying its mana cost.
+mana={2}
+type=Artifact
+[/card]
+[card]
 name=Isolated Chapel
 auto=aslongas(plains,swamp|myBattlefield) tap(noevent) <1 oneshot
 auto={T}:Add{W}
@@ -102430,6 +102438,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Spellbinder
+auto={4}:equip
+auto=may imprint notatarget(instant|myhand)
+auto=@combatdamaged(player) from(mytgt):activate castcard(copied noevent named!:imprintedcard:!)
+text=Imprint — When Spellbinder enters the battlefield, you may exile an instant card from your hand. -- Whenever equipped creature deals combat damage to a player, you may copy the exiled card. If you do, you may cast the copy without paying its mana cost. -- Equip {4}
+mana={3}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
 name=Spell Blast
 target=*[manacost=prex]|stack
 auto=fizzle

projects/mtg/src/AllAbilities.cpp

@@ -7189,6 +7189,13 @@ void AACastCard::Update(float dt)
        return;
    if(cardNamed.size() && !theNamedCard)
    {
+       if (cardNamed.find("imprintedcard") != string::npos)
+       {
+           if (source && source->currentimprintName.size())
+           {
+               cardNamed = source->currentimprintName;
+           }
+       }
        theNamedCard = makeCard();
    }
    if(putinplay)

projects/mtg/src/MTGAbility.cpp

@@ -2503,9 +2503,12 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     found = s.find("imprint");
     if (found != string::npos)
     {
-        MTGAbility * a = NEW AAImprint(observer, id, card, target);
-        a->oneShot = 1;
-        return a;
+        if (s.find("imprintedcard") == string::npos)
+        {
+            MTGAbility * a = NEW AAImprint(observer, id, card, target);
+            a->oneShot = 1;
+            return a;
+        }
     }
 
     //phaseout

projects/mtg/src/MTGGameZones.cpp

@@ -980,7 +980,11 @@ void MTGInPlay::untapAll()
 
 MTGGameZone * MTGGameZone::intToZone(int zoneId, Player * p, Player * p2)
 {
-
+    if (p2 != p && p2 && (p != p2->opponent()))
+    {
+        p = p2->opponent();
+        //these cases are generally handled this is a edge case fix.
+    }
     switch (zoneId)
     {
     case MY_GRAVEYARD: