Merge pull request #858 from kevlahnota/master

add CD geared attribute

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

@@ -20228,7 +20228,7 @@ type=Instant
 name=Conduit of Ruin
 alias=401847
 auto=may moveto(myhand) target(creature[colorless;manacost>=7]|mylibrary)
-auto=lord(creature|mycastingzone) conduited
+auto=lord(creature|mycastingzone) conduited dontremove
 text=When you cast Conduit of Ruin, you may search your library for a colorless creature card with converted mana cost 7 or greater, reveal it, then shuffle your library and put that card on top of it. -- The first creature spell you cast each turn costs {2} less to cast.
 mana={6}
 type=Creature
@@ -81030,7 +81030,8 @@ toughness=11
 [/card]
 [card]
 name=Polis Crusher
-abilities=Trample, protection from(enchantment)
+abilities=Trample
+auto=protection from(enchantment)
 auto=this(cantargetcard(*[-monstrous]) {4}{R}{G}:becomes(monstrous) forever && counter(1/1,3) && transforms((,newAbility[@combatdamaged(player) source(this[monstrous]):destroy target(enchantment|opponentbattlefield)])) forever
 text=Trample, protection from enchantments -- {4}{R}{G}: Monstrosity 3. (If this creature isn't monstrous, put three +1/+1 counters on it and it becomes monstrous.) -- Whenever Polis Crusher deals combat damage to a player, if Polis Crusher is monstrous, destroy target enchantment that player controls.
 mana={2}{R}{G}
@@ -99101,7 +99102,7 @@ toughness=5
 [card]
 name=Sky Scourer
 abilities=flying
-auto=@movedTo(*[colorless]|mystack):+1/0 ueot
+auto=@movedTo(*[colorless]|mystack):1/0 ueot
 text=Devoid (This card has no color.) -- Flying -- Whenever you cast a colorless spell, Sky Scourer gets +1/+0 until end of turn.
 mana={1}{B}
 abilities=devoid
@@ -102207,7 +102208,7 @@ toughness=2
 [/card]
 [card]
 name=Spatial Contortion
-auto=+3/-3 ueot
+auto=3/-3 ueot
 target=creature|battlefield
 text=({C} represents colorless mana.) -- Target creature gets +3/-3 until end of turn.
 mana={1}{C}
@@ -102727,7 +102728,7 @@ toughness=6
 [card]
 name=Sphinx of the Final Word
 abilities=nofizzle,flying,opponentshroud
-auto=lord(*|mystack) nofizzle
+auto=lord(*[instant;sorcery]|mystack) nofizzle
 text=Sphinx of the Final Word can't be countered. -- Flying, hexproof -- Instant and sorcery spells you control can't be countered by spells or abilities.
 mana={5}{U}{U}
 type=Creature
@@ -104338,7 +104339,7 @@ toughness=4
 [/card]
 [card]
 name=Stalking Drone
-auto={c}:+1/+2 ueot limit:1
+auto={c}:1/2 limit:1
 text=Devoid (This card has no color.) -- {C}: Stalking Drone gets +1/+2 until end of turn. Activate this ability only once each turn. ({C} represents colorless mana.)
 mana={1}{G}
 abilities=devoid
@@ -105065,7 +105066,7 @@ type=Enchantment
 [card]
 name=Steppe Glider
 abilities=flying,vigilance
-auto={w}{1}:target(creature[counter{1/1.1}]) transforms((newability[flying ueot],newability[vigilance ueot])) ueot
+auto={w}{1}:target(creature[counter{1/1.1}]) transforms((newability[flying],newability[vigilance])) ueot
 text=Flying, vigilance -- {1}{W}: Target creature with a +1/+1 counter on it gains flying and vigilance until end of turn.
 mana={4}{W}
 type=Creature
@@ -105454,8 +105455,8 @@ toughness=3
 [/card]
 [card]
 name=Stone Haven Outfitter
-auto=lord(creature[gear >=1]) +1/+1
+auto=lord(creature[geared]|mybattlefield) 1/1
-auto=@movedto(graveyard) from(creature[gear >=1|mybattlefield):draw:1 controller
+auto=@movedto(graveyard) from(creature[geared]|mybattlefield):draw:1 controller
 text=Equipped creatures you control get +1/+1. -- Whenever an equipped creature you control dies, draw a card.
 mana={1}{W}
 type=Creature
@@ -105554,7 +105555,7 @@ toughness=2
 [card]
 name=Stoneforge Masterwork
 auto={2}:equip
-auto=teach(mytgt) type:creature[share!types!]:Battlefield/type:creature[share!types!]:Battlefield nonstatic
+auto=teach(creature) transforms((,newability[foreach(other creature[share!types!]|mybattlefield) 1/1]))
 text=Equipped creature gets +1/+1 for each other creature you control that shares a creature type with it. -- Equip {2}
 mana={1}
 type=Artifact

projects/mtg/include/CardDescriptor.h

@@ -65,6 +65,7 @@ class CardDescriptor: public MTGCardInstance
   int CDopponentDamaged;
   int CDcontrollerDamaged;
   int CDdamager;
+  int CDgeared;
 };
 
 #endif

projects/mtg/src/CardDescriptor.cpp

@@ -24,6 +24,7 @@ CardDescriptor::CardDescriptor()
     CDopponentDamaged = 0;
     CDcontrollerDamaged = 0;
     CDdamager = 0;
+    CDgeared = 0;
 }
 
 int CardDescriptor::init()
@@ -211,6 +212,11 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card)
         match = NULL;
     }
     
+    if ((CDgeared == -1 && card->equipment > 0) || (CDgeared == 1 && card->equipment < 1))
+    {
+        match = NULL;
+    }
+
     if ((isMultiColored == -1 && card->isMultiColored) || (isMultiColored == 1 && !card->isMultiColored))
     {
         match = NULL;

projects/mtg/src/CardGui.cpp

@@ -1361,6 +1361,17 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                         cd.unsecuresetfresh(1);
                     }
                 }
+                else if (attribute.find("geared") != string::npos)
+                {
+                    if (minus)
+                    {
+                        cd.CDgeared = -1;
+                    }
+                    else
+                    {
+                        cd.CDgeared = 1;
+                    }
+                }
                 //creature is a level up creature
                 else if (attribute.find("leveler") != string::npos)
                 {

projects/mtg/src/TargetChooser.cpp

@@ -444,6 +444,17 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         cd->unsecuresetfresh(1);
                     }
                 }
+                else if (attribute.find("geared") != string::npos)
+                {
+                    if (minus)
+                    {
+                        cd->CDgeared = -1;
+                    }
+                    else
+                    {
+                        cd->CDgeared = 1;
+                    }
+                }
                 //creature is a level up creature
                 else if (attribute.find("leveler") != string::npos)
                 {