Merge pull request #905 from kevlahnota/master

Added KLD primitives

projects/mtg/bin/Res/missing_cards_by_sets/C16.txt

@@ -0,0 +1,234 @@
+[card]
+name=Ancient Excavation
+text=Draw cards equal to the number of cards in your hand, then discard a card for each card drawn this way. -- Basic landcycling {2} ({2}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+mana={2}{U}{B}
+type=Instant
+[/card]
+[card]
+name=Assault Suit
+text=Equipped creature gets +2/+2, has haste, can't attack you or a planeswalker you control, and can't be sacrificed. -- At the beginning of each opponent's upkeep, you may have that player gain control of equipped creature until end of turn. If you do, untap it. -- Equip {3}
+mana={4}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
+name=Chain of Vapor
+text=Return target nonland permanent to its owner's hand. Then that permanent's controller may sacrifice a land. If the player does, he or she may copy this spell and may choose a new target for that copy.
+mana={U}
+type=Instant
+[/card]
+[card]
+name=Charging Cinderhorn
+text=Haste -- At the beginning of each player's end step, if no creatures attacked this turn, put a fury counter on Charging Cinderhorn. Then Charging Cinderhorn deals damage equal to the number of fury counters on it to that player.
+mana={3}{R}
+type=Creature
+subtype=Elemental Ox
+power=4
+toughness=2
+[/card]
+[card]
+name=Collective Voyage
+text=Join forces — Starting with you, each player may pay any amount of mana. Each player searches his or her library for up to X basic land cards, where X is the total amount of mana paid this way, puts them onto the battlefield tapped, then shuffles his or her library.
+mana={G}
+type=Sorcery
+[/card]
+[card]
+name=Command Tower
+text={T}: Add to your mana pool one mana of any color in your commander's color identity.
+type=Land
+[/card]
+[card]
+name=Commander's Sphere
+text={T}: Add to your mana pool one mana of any color in your commander's color identity. -- Sacrifice Commander's Sphere: Draw a card.
+mana={3}
+type=Artifact
+[/card]
+[card]
+name=Conqueror's Flail
+text=Equipped creature gets +1/+1 for each color among permanents you control. -- As long as Conqueror's Flail is attached to a creature, your opponents can't cast spells during your turn. -- Equip {2}
+mana={2}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
+name=Cruel Entertainment
+text=Choose target player and another target player. The first player controls the second player during the second player's next turn, and the second player controls the first player during the first player's next turn.
+mana={6}{B}
+type=Sorcery
+[/card]
+[card]
+name=Curse of Vengeance
+text=Enchant player -- Whenever enchanted player casts a spell, put a spite counter on Curse of Vengeance. -- When enchanted player loses the game, you gain X life and draw X cards, where X is the number of spite counters on Curse of Vengeance.
+mana={B}
+type=Enchantment
+subtype=Aura Curse
+[/card]
+[card]
+name=Decimate
+text=Destroy target artifact, target creature, target enchantment, and target land.
+mana={2}{R}{G}
+type=Sorcery
+[/card]
+[card]
+name=Deepglow Skate
+text=When Deepglow Skate enters the battlefield, double the number of each kind of counter on any number of target permanents.
+mana={4}{U}
+type=Creature
+subtype=Fish
+power=3
+toughness=3
+[/card]
+[card]
+name=Divergent Transformations
+anyzone=changecost(colorless:-1) forcedalive
+text=Undaunted (This spell costs {1} less to cast for each opponent.) -- Exile two target creatures. For each of those creatures, its controller reveals cards from the top of his or her library until he or she reveals a creature card, puts that card onto the battlefield, then shuffles the rest into his or her library.
+mana={6}{R}
+type=Instant
+[/card]
+[card]
+name=Entrapment Maneuver
+text=Target player sacrifices an attacking creature. You create X 1/1 white Soldier creature tokens, where X is that creature's toughness.
+mana={3}{W}
+type=Instant
+[/card]
+[card]
+name=Faerie Artisans
+abilities=flying
+text=Flying -- Whenever a nontoken creature enters the battlefield under an opponent's control, create a token that's a copy of that creature except it's an artifact in addition to its other types. Then exile all other tokens created with Faerie Artisans.
+mana={3}{U}
+type=Creature
+subtype=Faerie Artificer
+power=2
+toughness=2
+[/card]
+[card]
+name=Manifold Insights
+text=Reveal the top ten cards of your library. Starting with the next opponent in turn order, each opponent chooses a different nonland card from among them. Put the chosen cards into your hand and the rest on the bottom of your library in a random order.
+mana={2}{U}
+type=Sorcery
+[/card]
+[card]
+name=Minds Aglow
+text=Join forces — Starting with you, each player may pay any amount of mana. Each player draws X cards, where X is the total amount of mana paid this way.
+mana={U}
+type=Sorcery
+[/card]
+[card]
+name=Oath of Druids
+text=At the beginning of each player's upkeep, that player chooses target player who controls more creatures than he or she does and is his or her opponent. The first player may reveal cards from the top of his or her library until he or she reveals a creature card. If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard.
+mana={1}{G}
+type=Enchantment
+[/card]
+[card]
+name=Opal Palace
+text={T}: Add {C} to your mana pool. -- {1}, {T}: Add to your mana pool one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of additional +1/+1 counters on it equal to the number of times it's been cast from the command zone this game.
+type=Land
+[/card]
+[card]
+name=Orzhov Advokist
+text=At the beginning of your upkeep, each player may put two +1/+1 counters on a creature he or she controls. If a player does, creatures that player controls can't attack you or a planeswalker you control until your next turn.
+mana={2}{W}
+type=Creature
+subtype=Human Advisor
+power=1
+toughness=4
+[/card]
+[card]
+name=Parting Thoughts
+text=Destroy target creature. You draw X cards and you lose X life, where X is the number of counters on that creature.
+mana={2}{B}
+type=Sorcery
+[/card]
+[card]
+name=Read the Runes
+text=Draw X cards. For each card drawn this way, discard a card unless you sacrifice a permanent.
+mana={X}{U}
+type=Instant
+[/card]
+[card]
+name=Reyhan, Last of the Abzan
+#wagic don't support commander atm
+auto=counter(1/1,3)
+text=Reyhan, Last of the Abzan enters the battlefield with three +1/+1 counters on it. -- Whenever a creature you control dies or is put into the command zone, if it had one or more +1/+1 counters on it, you may put that many +1/+1 counters on target creature. -- Partner (You can have two commanders if both have partner.)
+mana={1}{B}{G}
+type=Legendary Creature
+subtype=Human Warrior
+power=0
+toughness=0
+[/card]
+[card]
+name=Selfless Squire
+abilities=flash
+text=Flash -- When Selfless Squire enters the battlefield, prevent all damage that would be dealt to you this turn. -- Whenever damage that would be dealt to you is prevented, put that many +1/+1 counters on Selfless Squire.
+mana={3}{W}
+type=Creature
+subtype=Human Soldier
+power=1
+toughness=1
+[/card]
+[card]
+name=Selvala, Explorer Returned
+text=Parley — {T}: Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
+mana={1}{G}{W}
+type=Legendary Creature
+subtype=Elf Scout
+power=2
+toughness=4
+[/card]
+[card]
+name=Tempt with Discovery
+text=Tempting offer — Search your library for a land card and put it onto the battlefield. Each opponent may search his or her library for a land card and put it onto the battlefield. For each opponent who searches a library this way, search your library for a land card and put it onto the battlefield. Then each player who searched a library this way shuffles it.
+mana={3}{G}
+type=Sorcery
+[/card]
+[card]
+name=Thrasios, Triton Hero
+#wagic don't support commander atm
+text={4}: Scry 1, then reveal the top card of your library. If it's a land card, put it onto the battlefield tapped. Otherwise, draw a card. -- Partner (You can have two commanders if both have partner.)
+mana={G}{U}
+type=Legendary Creature
+subtype=Merfolk Wizard
+power=1
+toughness=3
+[/card]
+[card]
+name=Thunderfoot Baloth
+abilities=trample
+#wagic doesnt have commander zone
+text=Trample -- Lieutenant — As long as you control your commander, Thunderfoot Baloth gets +2/+2 and other creatures you control get +2/+2 and have trample.
+mana={4}{G}{G}
+type=Creature
+subtype=Beast
+power=5
+toughness=5
+[/card]
+[card]
+name=Tymna the Weaver
+abilities=lifelink
+#wagic don't support commander atm
+text=Lifelink -- At the beginning of your postcombat main phase, you may pay X life, where X is the number of opponents that were dealt combat damage this turn. If you do, draw X cards. -- Partner (You can have two commanders if both have partner.)
+mana={1}{W}{B}
+type=Legendary Creature
+subtype=Human Cleric
+power=2
+toughness=2
+[/card]
+[card]
+name=Vial Smasher the Fierce
+#wagic don't support commander atm
+text=Whenever you cast your first spell each turn, Vial Smasher the Fierce deals damage equal to that spell's converted mana cost to an opponent chosen at random. -- Partner (You can have two commanders if both have partner.)
+mana={1}{B}{R}
+type=Legendary Creature
+subtype=Goblin Berserker
+power=2
+toughness=3
+[/card]
+[card]
+name=Zedruu the Greathearted
+text=At the beginning of your upkeep, you gain X life and draw X cards, where X is the number of permanents you own that your opponents control. -- {R}{W}{U}: Target opponent gains control of target permanent you control.
+mana={1}{R}{W}{U}
+type=Legendary Creature
+subtype=Minotaur Monk
+power=2
+toughness=4
+[/card]

projects/mtg/bin/Res/missing_cards_by_sets/KLD.txt

@@ -0,0 +1,251 @@
+[card]
+name=Aetherborn Marauder
+text=Flying, lifelink -- When Aetherborn Marauder enters the battlefield, move any number of +1/+1 counters from other permanents you control onto Aetherborn Marauder.
+mana={3}{B}
+type=Creature
+subtype=Aetherborn Rogue
+power=2
+toughness=2
+[/card]
+[card]
+name=Aetherstorm Roc
+text=Flying -- Whenever Aetherstorm Roc or another creature enters the battlefield under your control, you get {E} (an energy counter). -- Whenever Aetherstorm Roc attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it and tap up to one target creature defending player controls.
+mana={2}{W}{W}
+type=Creature
+subtype=Bird
+power=3
+toughness=3
+[/card]
+[card]
+name=Animation Module
+text=Whenever one or more +1/+1 counters are placed on a permanent you control, you may pay {1}. If you do, create a 1/1 colorless Servo artifact creature token. -- {3}, {T}: Choose a counter on target permanent or player. Give that permanent or player another counter of that kind.
+mana={1}
+type=Artifact
+[/card]
+[card]
+name=Bomat Courier
+text=Haste -- Whenever Bomat Courier attacks, exile the top card of your library face down. (You can't look at it.) -- {R}, Discard your hand, Sacrifice Bomat Courier: Put all cards exiled with Bomat Courier into their owners' hands.
+mana={1}
+type=Artifact Creature
+subtype=Construct
+power=1
+toughness=1
+[/card]
+[card]
+name=Captured by the Consulate
+text=Enchant creature you don't control -- Enchanted creature can't attack. -- Whenever an opponent casts a spell, if it has a single target, change the target to enchanted creature if able.
+mana={3}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Combustible Gearhulk
+abilities=first strike
+text=First strike -- When Combustible Gearhulk enters the battlefield, target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then Combustible Gearhulk deals damage to that player equal to the total converted mana cost of those cards.
+mana={4}{R}{R}
+type=Artifact Creature
+subtype=Construct
+power=6
+toughness=6
+[/card]
+[card]
+name=Confiscation Coup
+text=Choose target artifact or creature. You get {E}{E}{E}{E} (four energy counters), then you may pay an amount of {E} equal to that permanent's converted mana cost. If you do, gain control of it.
+mana={3}{U}{U}
+type=Sorcery
+[/card]
+[card]
+name=Consulate Surveillance
+text=When Consulate Surveillance enters the battlefield, you get {E}{E}{E}{E} (four energy counters). -- Pay {E}{E}: Prevent all damage that would be dealt to you this turn by a source of your choice.
+mana={3}{W}
+type=Enchantment
+[/card]
+[card]
+name=Die Young
+text=Choose target creature. You get {E}{E} (two energy counters), then you may pay any amount of {E}. The creature gets -1/-1 until end of turn for each {E} paid this way.
+mana={1}{B}
+type=Sorcery
+[/card]
+[card]
+name=Dovin Baan
+auto=counter(0/0,3,loyalty)
+auto={C(0/0,1,Loyalty)}:name(+1: loyalty) donothing restriction{compare(cantargetoppocre)~lessthan~1}
+auto={C(0/0,1,Loyalty)}:name(+1: -3/0 target creature) target(creature) transforms((,newability[-3/0],newability[noactivatedability])) uynt restriction{compare(cantargetoppocre)~morethan~0}
+auto={C(0/0,-1,Loyalty)}:name(-1: gain 2 life and draw a card) life:2 && draw:1
+text=+1: Until your next turn, up to one target creature gets -3/-0 and its activated abilities can't be activated. -- -1: You gain 2 life and draw a card. -- -7: You get an emblem with "Your opponents can't untap more than two permanents during their untap steps."
+mana={2}{W}{U}
+type=Planeswalker
+subtype=Dovin
+[/card]
+[card]
+name=Dubious Challenge
+text=Look at the top ten cards of your library, exile up to two creature cards from among them, then shuffle your library. Target opponent may choose one of the exiled cards and put it onto the battlefield under his or her control. Put the rest onto the battlefield under your control.
+mana={3}{G}
+type=Sorcery
+[/card]
+[card]
+name=Eager Construct
+text=When Eager Construct enters the battlefield, each player may scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
+mana={2}
+type=Artifact Creature
+subtype=Construct
+power=2
+toughness=2
+[/card]
+[card]
+name=Eliminate the Competition
+text=As an additional cost to cast Eliminate the Competition, sacrifice X creatures. -- Destroy X target creatures.
+mana={4}{B}
+type=Sorcery
+[/card]
+[card]
+name=Fairgrounds Trumpeter
+#buggy must set custom restriction
+auto=@counteradded(1/1) from(*|mybattlefield) turnlimited:phaseaction[endofturn sourceinplay] counter(1/1,1)
+text=At the beginning of each end step, if a +1/+1 counter was placed on a permanent under your control this turn, put a +1/+1 counter on Fairgrounds Trumpeter.
+mana={2}{G}
+type=Creature
+subtype=Elephant
+power=2
+toughness=2
+[/card]
+[card]
+name=Fortuitous Find
+text=Choose one or both — -- • Return target artifact card from your graveyard to your hand. -- • Return target creature card from your graveyard to your hand.
+mana={2}{B}
+type=Sorcery
+[/card]
+[card]
+name=Gearshift Ace
+abilities=first strike
+text=First strike -- Whenever Gearshift Ace crews a Vehicle, that Vehicle gains first strike until end of turn.
+mana={1}{W}
+type=Creature
+subtype=Dwarf Pilot
+power=2
+toughness=1
+[/card]
+[card]
+name=Gonti, Lord of Luxury
+abilities=deathtouch
+text=Deathtouch -- When Gonti, Lord of Luxury enters the battlefield, look at the top four cards of target opponent's library, exile one of them face down, then put the rest on the bottom of that library in a random order. For as long as that card remains exiled, you may look at it, you may cast it, and you may spend mana as though it were mana of any type to cast it.
+mana={2}{B}{B}
+type=Legendary Creature
+subtype=Aetherborn Rogue
+power=2
+toughness=3
+[/card]
+[card]
+name=Harnessed Lightning
+text=Choose target creature. You get {E}{E}{E} (three energy counters), then you may pay any amount of {E}. Harnessed Lightning deals that much damage to that creature.
+mana={1}{R}
+type=Instant
+[/card]
+[card]
+name=Insidious Will
+text=Choose one — -- • Counter target spell. -- • You may choose new targets for target spell. -- • Copy target instant or sorcery spell. You may choose new targets for the copy.
+mana={2}{U}{U}
+type=Instant
+[/card]
+[card]
+name=Liberating Combustion
+text=Liberating Combustion deals 6 damage to target creature. You may search your library and/or graveyard for a card named Chandra, Pyrogenius, reveal it, and put it into your hand. If you search your library this way, shuffle it.
+mana={4}{R}
+type=Sorcery
+[/card]
+[card]
+name=Lost Legacy
+text=Name a nonartifact, nonland card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. That player shuffles his or her library, then draws a card for each card exiled from hand this way.
+mana={1}{B}{B}
+type=Sorcery
+[/card]
+[card]
+name=Midnight Oil
+text=Midnight Oil enters the battlefield with seven hour counters on it. -- At the beginning of your draw step, draw an additional card and remove two hour counters from Midnight Oil. -- Your maximum hand size is equal to the number of hour counters on Midnight Oil. -- Whenever you discard a card, you lose 1 life.
+mana={2}{B}{B}
+type=Enchantment
+[/card]
+[card]
+name=Nature's Way
+text=Target creature you control gains vigilance and trample until end of turn. It deals damage equal to its power to target creature you don't control.
+mana={1}{G}
+type=Sorcery
+[/card]
+[card]
+name=Panharmonicon
+text=If an artifact or creature entering the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
+mana={4}
+type=Artifact
+[/card]
+[card]
+name=Revoke Privileges
+text=Enchant creature -- Enchanted creature can't attack, block, or crew Vehicles.
+mana={2}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Saheeli Rai
+auto=counter(0/0,3,loyalty)
+text=+1: Scry 1. Saheeli Rai deals 1 damage to each opponent. -- -2: Create a token that's a copy of target artifact or creature you control, except it's an artifact in addition to its other types. That token gains haste. Exile it at the beginning of the next end step. -- -7: Search your library for up to three artifact cards with different names, put them onto the battlefield, then shuffle your library.
+mana={1}{U}{R}
+type=Planeswalker
+subtype=Saheeli
+[/card]
+[card]
+name=Saheeli's Artistry
+target=*[artifact;creature]
+auto=if cantargetcard(artifact) then choice name(clone artifact) clone
+auto=if cantargetcard(creature) then choice name(clone creature) clone addtype(artifact)
+text=Choose one or both — -- • Create a token that's a copy of target artifact. -- • Create a token that's a copy of target creature, except it's an artifact in addition to its other types.
+mana={4}{U}{U}
+type=Sorcery
+[/card]
+[card]
+name=Shrewd Negotiation
+text=Exchange control of target artifact you control and target artifact or creature you don't control.
+mana={4}{U}
+type=Sorcery
+[/card]
+[card]
+name=Spark of Creativity
+text=Choose target creature. Exile the top card of your library. You may have Spark of Creativity deal damage to that creature equal to the exiled card's converted mana cost. If you don't, you may play that card until end of turn.
+mana={R}
+type=Sorcery
+[/card]
+[card]
+name=Speedway Fanatic
+text=Haste -- Whenever Speedway Fanatic crews a Vehicle, that Vehicle gains haste until end of turn.
+mana={1}{R}
+type=Creature
+subtype=Human Pilot
+power=2
+toughness=1
+[/card]
+[card]
+name=Subtle Strike
+text=Choose one or both — -- • Target creature gets -1/-1 until end of turn. -- • Put a +1/+1 counter on target creature.
+mana={1}{B}
+type=Instant
+[/card]
+[card]
+name=Take Down
+text=Choose one — -- • Take Down deals 4 damage to target creature with flying. -- • Take Down deals 1 damage to each creature with flying.
+mana={G}
+type=Sorcery
+[/card]
+[card]
+name=Verdant Crescendo
+text=Search your library for a basic land card and put it onto the battlefield tapped. Search your library and graveyard for a card named Nissa, Nature's Artisan, reveal it, and put it into your hand. Then shuffle your library.
+mana={3}{G}
+type=Sorcery
+[/card]
+[card]
+name=Veteran Motorist
+text=When Veteran Motorist enters the battlefield, scry 2. -- Whenever Veteran Motorist crews a Vehicle, that Vehicle gets +1/+1 until end of turn.
+mana={R}{W}
+type=Creature
+subtype=Dwarf Pilot
+power=3
+toughness=1
+[/card]

projects/mtg/src/MTGAbility.cpp

@@ -384,6 +384,23 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
                 return 0;
         }
         
+        //Ensnaring Bridge
+        check = restriction[i].find("powermorethanopponenthand");
+        if (check != string::npos)//for opponent creatures
+        {
+            Player * checkCurrent = card->controller();
+            if(card->power <= checkCurrent->opponent()->game->hand->nb_cards)
+                return 0;
+        }
+
+        check = restriction[i].find("powermorethancontrollerhand");
+        if (check != string::npos)//for controller creatures
+        {
+            Player * checkCurrent = card->controller();
+            if(card->power <= checkCurrent->game->hand->nb_cards)
+                return 0;
+        }
+        //end
 
         check = restriction[i].find("morecardsthanopponent");
         if (check != string::npos)