Fixed primitives, changed type of "isFlipped" card variable from bool to int and fixed a related bug on targeting cards with "isFlipped" attribute, improved "disturb" ability (now fi you counter a card casted with disturb it correctly goes to exile), added "decayed" ability, added two new zone alias "mycommandplay" and "opponentcommandplay" for targeting Battlefield and CommandZone at the same time.

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

@@ -17592,7 +17592,7 @@ target=creature
 auto=cantattack
 auto=cantpwattack
 auto=cantblock
-auto={2}{W}:all(this) moveTo(exile)
+auto={2}{W}:name(Exile enchanted creature) imprint
 text=Enchant creature -- Enchanted creature can’t attack or block. -- {2}{W}: Exile enchanted creature.
 mana={2}{W}
 type=Enchantment
@@ -18541,8 +18541,8 @@ type=Instant
 name=Eat to Extinction
 target=creature,planeswalker
 auto=moveto(exile) 
-aicode=activate may moveto(mygraveyard) all(*[zpos=1]|mylibrary)
-auto=name(Look) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put in graveyard) target(<1>*|reveal) moveto(mygraveyard) optiontwoend revealend
+aicode=activate may name(Put in graveyard) target(*[zpos=1]|mylibrary) moveto(mygraveyard)
+auto=name(Look) reveal:1 optionone name(Put On Top) target(<upto:1>*|reveal) moveto(mylibrary) optiononeend optiontwo name(put in graveyard) target(*|reveal) moveto(mygraveyard) optiontwoend revealend
 text=Exile target creature or planeswalker. Look at the top card of your library. You may put that card into your graveyard.
 mana={3}{B}
 type=Instant
@@ -72609,8 +72609,7 @@ toughness=3
 [card]
 name=Westgate Regent
 abilities=flying
-auto=@targeted(this) from(*|opponentzones) restriction{type(*|opponenthand)~equalto~0}:name(Counter spell) target(*|opponentzones) fizzle
-auto=@targeted(this) from(*|opponentzones) restriction{type(*|opponenthand)~morethan~0}:choice name(Discard or counter) name(Discard or counter) target(*|opponentzones) transforms((,newability[pay[[{0}]] name(Discard a card) target(*|myhand) reject?fizzle])) oneshot
+auto=@targeted(this) from(*|opponentzones):choice name(Discard a card to cast this spell) name(Discard a card to cast this spell) target(*|opponentzones) transforms((,newability[if type(*|myhand)~morethan~0 then choice name(Discard a card) name(Discard a card) donothing],newability[choice name(Don't discard card) fizzle])) oneshot
 auto=@combatdamaged(player) from(this):name(Put 1/1 counters) counter(1/1,thatmuch)
 text=Flying -- Ward — Discard a card. (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player discards a card.) -- Whenever Westgate Regent deals combat damage to a player, put that many +1/+1 counters on it.
 mana={3}{B}{B}

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

@@ -19501,7 +19501,7 @@ target=creature
 auto=cantattack
 auto=cantpwattack
 auto=cantblock
-auto={3}{w}{w}{s}:sacrifice all(mytgt)
+auto={3}{W}{W}{S}:name(Exile enchanted creature) imprint
 text=Enchant creature -- Enchanted creature can't attack or block. -- {3}{W}{W}, Sacrifice Choking Restraints: Exile enchanted creature.
 mana={2}{W}
 type=Enchantment

projects/mtg/include/MTGCardInstance.h

@@ -96,7 +96,7 @@ public:
     bool exerted;
     bool turningOver;
     bool isMorphed;
-    bool isFlipped;
+    int isFlipped;
     string MeldedFrom;
     bool isPhased;
     bool isCascaded;

projects/mtg/include/MTGDefinitions.h

@@ -326,7 +326,8 @@ class Constants
       HASDISTURB = 199,
       DAYBOUND = 200,
       NIGHTBOUND = 201,
-      NB_BASIC_ABILITIES = 202,
+      DECAYED = 202,
+      NB_BASIC_ABILITIES = 203,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics

projects/mtg/src/AIPlayerBaka.cpp

@@ -635,7 +635,7 @@ int OrderedAIAction::getEfficiency()
     {
         efficiency = 0; // AI does not have to use the doubleside ability to avoid loops but it can randomly choose to flip card and cast its back side.
         if(std::rand() % 2)
-            ats->source->isFlipped = !ats->source->isFlipped;
+            ats->source->isFlipped = (ats->source->isFlipped > 0)?0:1;
     }
     else if (ATokenCreator * atc = dynamic_cast<ATokenCreator *>(a))
     {

projects/mtg/src/ActionStack.cpp

@@ -585,7 +585,7 @@ Interruptible(observer, id)
 int PutInGraveyard::resolve()
 {
     MTGGameZone * zone = card->getCurrentZone();
-    if (card->basicAbilities[(int)Constants::EXILEDEATH] || card->basicAbilities[(int)Constants::GAINEDEXILEDEATH])
+    if (card->basicAbilities[(int)Constants::EXILEDEATH] || card->basicAbilities[(int)Constants::GAINEDEXILEDEATH] || (card->basicAbilities[(int)Constants::HASDISTURB] && card->alternateCostPaid[ManaCost::MANA_PAID_WITH_RETRACE] == 1))
     {
         card->basicAbilities[(int)Constants::GAINEDEXILEDEATH] = 0;
         card->controller()->game->putInZone(card, zone, card->owner->game->exile);

projects/mtg/src/AllAbilities.cpp

@@ -2461,7 +2461,7 @@ AACounter::AACounter(GameObserver* observer, int id, MTGCardInstance * source, M
         if (target)
         {
             MTGCardInstance * _target = (MTGCardInstance *) target;
-            if(_target->isFlipped && _target->hasType(Subtypes::TYPE_PLANESWALKER))//is flipping pw
+            if(_target->isFlipped > 0 && _target->hasType(Subtypes::TYPE_PLANESWALKER))//is flipping pw
                 return 0;
 
             AbilityFactory af(game);
@@ -4606,9 +4606,9 @@ int AATurnSide::resolve()
         if(_target->mutation && _target->parentCards.size() > 0) return 0; // Mutated down cards cannot be turned, they will follow the fate of top-card
         MTGCard * fcard;
         MTGCardInstance* sideCard;
-        if(_target->controller()->isAI() && _target->isFlipped) _target->isFlipped = false; // If it's AI calling back we just have to reset isFLipped flag and then return.
-        if(!_target->isFlipped && _SideName == "") return 0; // No need to turn front if card has not been flipped before.
-        if(!_target->isFlipped){
+        if(_target->controller()->isAI() && _target->isFlipped > 0) _target->isFlipped = 0; // If it's AI calling back we just have to reset isFLipped flag and then return.
+        if(_target->isFlipped == 0 && _SideName == "") return 0; // No need to turn front if card has not been flipped before.
+        if(_target->isFlipped == 0){
             if(_SideName == "backside" && _target->backSide != "") 
                 _SideName = _target->backSide; // Added to allow to turn a card on its backside.
             fcard = MTGCollection()->getCardByName(_SideName);
@@ -4673,7 +4673,7 @@ int AATurnSide::resolve()
         _target->formattedText = sideCard->formattedText;
         _target->magicText = sideCard->magicText;
         _target->colors = sideCard->colors;
-        _target->isFlipped = !_target->isFlipped;
+        _target->isFlipped = (_target->isFlipped > 0)?0:1;
         _target->mPropertiesChangedSinceLastUpdate = true;
         SAFE_DELETE(sideCard);
         return 1;
@@ -4704,7 +4704,7 @@ int AAFlip::resolve()
     int activatedanyability = 0;
     MTGCardInstance * Flipper = (MTGCardInstance*)source;
     this->oneShot = true;
-    if(Flipper->isFlipped && forcetype == "")
+    if(Flipper->isFlipped > 0 && forcetype == "")
     {
         game->removeObserver(this);
         return 0;
@@ -4735,7 +4735,7 @@ int AAFlip::resolve()
         }
 
         AbilityFactory af(game);
-        _target->isFlipped = true;
+        _target->isFlipped = 1;
         GameObserver * game = _target->getObserver();
         if(flipStats.size())
         {
@@ -4929,13 +4929,13 @@ int AAFlip::testDestroy()
     MTGCardInstance * _target = (MTGCardInstance *) target;
     if(target)
     {
-        if(_target->isFlipped)
+        if(_target->isFlipped > 0)
         {
             this->forceDestroy = 1;
             //_target->getObserver()->removeObserver(this);
             //originally added as a safegaurd to insure the ability was removed
             //it's been so long and so much has changed that it appears to do nothing but cause a crash now
-            _target->isFlipped = false;
+            _target->isFlipped = 0;
             return 1;
         }
     }

projects/mtg/src/CardDescriptor.cpp

@@ -293,7 +293,7 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card)
         match = NULL;
     }
 
-    if (isFlipped != card->isFlipped)
+    if ((isFlipped == -1 && card->isFlipped > 0) || (isFlipped == 1 && card->isFlipped == 0))
     {
         match = NULL;
     }

projects/mtg/src/CardGui.cpp

@@ -1561,11 +1561,11 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                 {
                     if (minus)
                     {
-                        cd.isFlipped = false;
+                        cd.isFlipped = -1;
                     }
                     else
                     {
-                        cd.isFlipped = true;
+                        cd.isFlipped = 1;
                     }
                 }
                 //Has x in cost

projects/mtg/src/MTGAbility.cpp

@@ -6223,7 +6223,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell)
     {
         MTGPlayerCards * zones = card->controller()->game;
         MTGPlayerCards * Endzones = card->owner->game;//put them in thier owners respective zones as per rules.
-        if (card->basicAbilities[(int)Constants::EXILEDEATH] || card->basicAbilities[(int)Constants::GAINEDEXILEDEATH])
+        if (card->basicAbilities[(int)Constants::EXILEDEATH] || card->basicAbilities[(int)Constants::GAINEDEXILEDEATH] || (card->basicAbilities[(int)Constants::HASDISTURB] && card->alternateCostPaid[ManaCost::MANA_PAID_WITH_RETRACE] == 1))
         {
             card->basicAbilities[(int)Constants::GAINEDEXILEDEATH] = 0;
             card->controller()->game->putInZone(card, card->getCurrentZone(), card->owner->game->exile);
@@ -6557,7 +6557,7 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
             for(unsigned int k = 0; k < card->getObserver()->mLayers->actionLayer()->mObjects.size(); ++k)
             {
                 ActivatedAbility * check = dynamic_cast<ActivatedAbility*>(card->getObserver()->mLayers->actionLayer()->mObjects[k]);
-                turnSide = card->isFlipped && !card->isInPlay(card->getObserver());
+                turnSide = card->isFlipped > 0 && !card->isInPlay(card->getObserver());
                 if(!turnSide && check && check->source == card && check->counters)
                     return 0;
             }

projects/mtg/src/MTGCardInstance.cpp

@@ -230,7 +230,7 @@ void MTGCardInstance::initMTGCI()
     turningOver = false;
     isMorphed = false;
     MeldedFrom = "";
-    isFlipped = false;
+    isFlipped = 0;
     isPhased = false;
     isCascaded = false;
     phasedTurn = -1;
@@ -512,7 +512,7 @@ int MTGCardInstance::totem(bool noregen)
 int MTGCardInstance::toGrave( bool forced )
 {
     Player * p = controller();
-    if (basicAbilities[(int)Constants::EXILEDEATH] || basicAbilities[(int)Constants::GAINEDEXILEDEATH])
+    if (basicAbilities[(int)Constants::EXILEDEATH] || basicAbilities[(int)Constants::GAINEDEXILEDEATH] || (basicAbilities[(int)Constants::HASDISTURB] && alternateCostPaid[ManaCost::MANA_PAID_WITH_RETRACE] == 1))
     {
         p->game->putInZone(this, p->game->inPlay, owner->game->exile);
         basicAbilities[(int)Constants::GAINEDEXILEDEATH] = 0;

projects/mtg/src/MTGDefinitions.cpp

@@ -232,7 +232,8 @@ const char* Constants::MTGBasicAbilities[] = {
     "isprey", //Creature has been haunted by some other card.
     "hasdisturb", //Retrace cost is a disturb cost (e.g. "Beloved Beggar")
     "daybound", //Card has daybound (e.g. "Brutal Cathar")
-    "nightbound" //Card has nightbound (e.g. "Moonrage Brute")
+    "nightbound", //Card has nightbound (e.g. "Moonrage Brute")
+    "decayed" //Card has decayd.
 };
 
 map<string,int> Constants::MTGBasicAbilitiesMap;

projects/mtg/src/MTGGameZones.cpp

@@ -407,7 +407,7 @@ void MTGPlayerCards::showHand()
 // Moves a card to its owner's graveyard
 MTGCardInstance * MTGPlayerCards::putInGraveyard(MTGCardInstance * card)
 {
-    if (card->getCurrentZone() != card->controller()->game->hand && (card->basicAbilities[(int)Constants::EXILEDEATH] || card->basicAbilities[(int)Constants::GAINEDEXILEDEATH]))
+    if (card->getCurrentZone() != card->controller()->game->hand && (card->basicAbilities[(int)Constants::EXILEDEATH] || card->basicAbilities[(int)Constants::GAINEDEXILEDEATH] || (card->basicAbilities[(int)Constants::HASDISTURB] && card->alternateCostPaid[ManaCost::MANA_PAID_WITH_RETRACE] == 1)))
     {
          MTGCardInstance* ret = putInZone(card, card->getCurrentZone(), card->owner->game->exile);
          ret->basicAbilities[(int)Constants::GAINEDEXILEDEATH] = 0;

projects/mtg/src/TargetChooser.cpp

@@ -269,6 +269,11 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 zones[nbzones++] = MTGGameZone::MY_HAND;
                 zones[nbzones++] = MTGGameZone::MY_COMMANDZONE;
             }
+            else if (zoneName.compare("mycommandplay") == 0)
+            {
+                zones[nbzones++] = MTGGameZone::MY_BATTLEFIELD;
+                zones[nbzones++] = MTGGameZone::MY_COMMANDZONE;
+            }
             else if (zoneName.compare("opponentcastingzone") == 0)
             {
                 zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;
@@ -282,6 +287,11 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 zones[nbzones++] = MTGGameZone::OPPONENT_HAND;
                 zones[nbzones++] = MTGGameZone::OPPONENT_COMMANDZONE;
             }
+            else if (zoneName.compare("opponentcommandplay") == 0)
+            {
+                zones[nbzones++] = MTGGameZone::OPPONENT_BATTLEFIELD;
+                zones[nbzones++] = MTGGameZone::OPPONENT_COMMANDZONE;
+            }
             else if (zoneName.compare("mynonplaynonexile") == 0)
             {
                 zones[nbzones++] = MTGGameZone::MY_GRAVEYARD;
@@ -612,11 +622,11 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 {
                     if (minus)
                     {
-                        cd->isFlipped = false;
+                        cd->isFlipped = -1;
                     }
                     else
                     {
-                        cd->isFlipped = true;
+                        cd->isFlipped = 1;
                     }
                 }
                 //Has x in cost