Improved kicker cards comparison criteria (now it's possible to search for a multi kicked card in stack), added a new castcard mode with multikicker option, added all Zendikar Risings primitives to borderline collection, changed in all primitives the restriction "kicker" with a new sintax "if paid(kicker) then" in order to fit with the new kicker logic comparison criteria and castcard option.

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

@@ -1207,7 +1207,7 @@ toughness=1
 name=AEther Figment
 abilities=unblockable
 kicker={3}
-auto=kicker counter(1/1,2)
+auto=if paid(kicker) then counter(1/1,2)
 text=Kicker {3} (You may pay an additional {3} as you cast this spell.) -- AEther Figment is unblockable. -- If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it.
 mana={1}{U}
 type=Creature
@@ -1771,7 +1771,7 @@ name=Agonizing Demise
 target=creature[-black]
 kicker={1}{R}
 auto=bury
-auto=kicker dynamicability<!mytgt powerstrike targetcontroller!>
+auto=if paid(kicker) then dynamicability<!mytgt powerstrike targetcontroller!>
 text=Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.) -- Destroy target nonblack creature. It can't be regenerated. If Agonizing Demise was kicked, it deals damage equal to that creature's power to the creature's controller.
 mana={3}{B}
 type=Instant
@@ -4437,7 +4437,7 @@ toughness=4
 [card]
 name=Apex Hawks
 abilities=flying
-auto=kicker counter(1/1,kicked)
+auto=if paid(kicker) then counter(1/1,kicked)
 kicker=multi{1}{W}
 text=Multikicker (You may pay an additional  any number of times as you cast this spell.) -- Flying -- Apex Hawks enters the battlefield with a +1/+1 counter on it for each time it was kicked.
 type=Creature
@@ -5528,7 +5528,7 @@ toughness=1
 name=Ardent Soldier
 kicker={2}
 auto=vigilance
-auto=kicker counter(1/1,1)
+auto=if paid(kicker) then counter(1/1,1)
 text=Kicker {2} (You may pay an additional {2} as you cast this spell.) -- Vigilance -- If Ardent Soldier was kicked, it enters the battlefield with a +1/+1 counter on it.
 mana={1}{W}
 type=Creature
@@ -10407,7 +10407,7 @@ toughness=*
 [card]
 name=Benalish Emissary
 kicker={1}{G}
-auto=kicker destroy target(land)
+auto=if paid(kicker) then destroy target(land)
 text=Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.) -- When Benalish Emissary enters the battlefield, if it was kicked, destroy target land.
 mana={2}{W}
 type=Creature
@@ -10438,8 +10438,8 @@ toughness=2
 [card]
 name=Benalish Lancer
 kicker={2}{W}
-auto=kicker counter(1/1,2)
+auto=if paid(kicker) then counter(1/1,2)
-auto=kicker first strike
+auto=if paid(kicker) then first strike
 text=Kicker {2}{W} (You may pay an additional {2}{W} as you cast this spell.) -- If Benalish Lancer was kicked, it enters the battlefield with two +1/+1 counters on it and with first strike.
 mana={2}{W}
 type=Creature
@@ -13374,8 +13374,8 @@ toughness=1
 name=Bold Defense
 kicker={3}{W}
 auto=all(creature|myBattlefield) 1/1 ueot
-auto=kicker all(creature|myBattlefield) 1/1 ueot
+auto=if paid(kicker) then all(creature|myBattlefield) 1/1 ueot
-auto=kicker all(creature|myBattlefield) first strike ueot
+auto=if paid(kicker) then all(creature|myBattlefield) first strike ueot
 text=Kicker {3}{W} (You may pay an additional {3}{W} as you cast this spell.) -- Creatures you control get +1/+1 until end of turn. If Bold Defense was kicked, instead creatures you control get +2/+2 and gain first strike until end of turn.
 mana={2}{W}
 type=Instant
@@ -14702,9 +14702,9 @@ kicker={2}
 auto=damage:1 all(creature[-flying])
 auto=damage:1 opponent
 auto=damage:1 controller
-auto=kicker damage:3 all(creature[-flying])
+auto=if paid(kicker) then damage:3 all(creature[-flying])
-auto=kicker damage:3 opponent
+auto=if paid(kicker) then damage:3 opponent
-auto=kicker damage:3 controller
+auto=if paid(kicker) then damage:3 controller
 text=Kicker {2} (You may pay an additional {2} as you cast this spell.) -- Breath of Darigaaz deals 1 damage to each creature without flying and each player. If Breath of Darigaaz was kicked, it deals 4 damage to each creature without flying and each player instead.
 mana={1}{R}
 type=Sorcery
@@ -15935,7 +15935,7 @@ name=Burst Lightning
 target=creature,player
 kicker={4}
 auto=damage:2
-auto=kicker damage:2
+auto=if paid(kicker) then damage:2
 text=Kicker {4} (You may pay an additional {4} as you cast this spell.) -- Burst Lightning deals 2 damage to target creature or player. If Burst Lightning was kicked, it deals 4 damage to that creature or player instead.
 mana={R}
 type=Instant
@@ -16695,8 +16695,8 @@ name=Canopy Surge
 kicker={2}
 auto=damage:1 all(creature[flying])
 auto=damage:1 all(player)
-auto=kicker damage:3 all(creature[flying])
+auto=if paid(kicker) then damage:3 all(creature[flying])
-auto=kicker damage:3 all(player)
+auto=if paid(kicker) then damage:3 all(player)
 text=Kicker {2} (You may pay an additional {2} as you cast this spell.) -- Canopy Surge deals 1 damage to each creature with flying and each player. If Canopy Surge was kicked, it deals 4 damage to each creature with flying and each player instead.
 mana={1}{G}
 type=Sorcery
@@ -20036,7 +20036,7 @@ toughness=2
 [card]
 name=Citanul Woodreaders
 kicker={2}{G}
-auto=kicker draw:2
+auto=if paid(kicker) then draw:2
 text=Kicker {2}{G} (You may pay an additional {2}{G} as you cast this spell.) -- When Citanul Woodreaders enters the battlefield, if it was kicked, draw two cards.
 mana={2}{G}
 type=Creature
@@ -21871,7 +21871,7 @@ toughness=5
 name=Conqueror's Pledge
 kicker={6}
 auto=token(Kor Soldier,Creature Kor Soldier,1/1,white)*6
-auto=kicker token(Kor Soldier,Creature Kor Soldier,1/1,white)*6
+auto=if paid(kicker) then token(Kor Soldier,Creature Kor Soldier,1/1,white)*6
 text=Kicker {6} (You may pay an additional {6} as you cast this spell.) -- Put six 1/1 white Kor Soldier creature tokens onto the battlefield. If Conqueror's Pledge was kicked, put twelve of those tokens onto the battlefield instead.
 mana={2}{W}{W}{W}
 type=Sorcery
@@ -27130,7 +27130,7 @@ toughness=3
 [/card]
 [card]
 name=Deathforge Shaman
-auto=kicker choice target(player) damage:twicekicked
+auto=if paid(kicker) then choice target(player) damage:twicekicked
 kicker=multi{R}
 text=Multikicker {R} (You may pay an additional {R} any number of times as you cast this spell.) -- When Deathforge Shaman enters the battlefield, it deals damage to target player equal to twice the number of times it was kicked.
 mana={4}{R}
@@ -28737,7 +28737,7 @@ type=Land
 name=Desolation Angel
 abilities=flying
 kicker={W}{W}
-auto=kicker destroy all(land|opponentBattlefield)
+auto=if paid(kicker) then destroy all(land|opponentBattlefield)
 auto=destroy all(land|myBattlefield)
 text=Kicker {W}{W} (You may pay an additional {W}{W} as you cast this spell.) -- Flying -- When Desolation Angel enters the battlefield, destroy all lands you control. If it was kicked, destroy all lands instead.
 mana={3}{B}{B}
@@ -28749,7 +28749,7 @@ toughness=4
 [card]
 name=Desolation Giant
 kicker={W}{W}
-auto=kicker destroy all(creature|opponentBattlefield)
+auto=if paid(kicker) then destroy all(creature|opponentBattlefield)
 auto=destroy all(other creature|myBattlefield)
 text=Kicker {W}{W} (You may pay an additional {W}{W} as you cast this spell.) -- When Desolation Giant enters the battlefield, destroy all other creatures you control. If it was kicked, destroy all other creatures instead.
 mana={2}{R}{R}
@@ -29927,7 +29927,7 @@ name=Dismantling Blow
 target=artifact,enchantment
 kicker={2}{U}
 auto=destroy
-auto=kicker draw:2 controller
+auto=if paid(kicker) then draw:2 controller
 text=Kicker {2}{U} (You may pay an additional {2}{U} as you cast this spell.) -- Destroy target artifact or enchantment. -- If Dismantling Blow was kicked, draw two cards.
 mana={2}{W}
 type=Instant
@@ -33000,8 +33000,8 @@ toughness=3
 [card]
 name=Duskwalker
 kicker={3}{B}
-auto=kicker counter(1/1,2)
+auto=if paid(kicker) then counter(1/1,2)
-auto=kicker fear
+auto=if paid(kicker) then fear
 text=Kicker {3}{B} (You may pay an additional {3}{B} as you cast this spell.) -- If Duskwalker was kicked, it enters the battlefield with two +1/+1 counters on it and with fear. (It can't be blocked except by artifact creatures and/or black creatures.)
 mana={B}
 type=Creature
@@ -35718,7 +35718,7 @@ toughness=1
 [card]
 name=Enclave Elite
 abilities=islandwalk
-auto=kicker counter(1/1,kicked)
+auto=if paid(kicker) then counter(1/1,kicked)
 kicker=multi{1}{U}
 text=Multikicker {1}{U} (You may pay an additional {1}{U} any number of times as you cast this spell.) -- Islandwalk -- Enclave Elite enters the battlefield with a +1/+1 counter on it for each time it was kicked.
 mana={2}{U}
@@ -37393,7 +37393,7 @@ toughness=1
 [/card]
 [card]
 name=Everflowing Chalice
-auto=kicker counter(0/0,kicked,charge)
+auto=if paid(kicker) then counter(0/0,kicked,charge)
 auto={T}:thisforeach(counter{0/0.1.charge}) add{1}
 kicker=multi{2}
 text=Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.) -- Everflowing Chalice enters the battlefield with a charge counter on it for each time it was kicked. -- {T}: Add {1} to your mana pool for each charge counter on Everflowing Chalice.
@@ -37828,7 +37828,7 @@ name=Explosive Growth
 target=creature
 kicker={5}
 auto=2/2
-auto=kicker 3/3
+auto=if paid(kicker) then 3/3
 text=Kicker {5} (You may pay an additional {5} as you cast this spell.) -- Target creature gets +2/+2 until end of turn. If Explosive Growth was kicked, that creature gets +5/+5 until end of turn instead.
 mana={G}
 type=Instant
@@ -38394,8 +38394,8 @@ toughness=2
 [card]
 name=Faerie Squadron
 kicker={3}{U}
-auto=kicker counter(1/1,2)
+auto=if paid(kicker) then counter(1/1,2)
-auto=kicker flying
+auto=if paid(kicker) then flying
 text=Kicker {3}{U} (You may pay an additional {3}{U} as you cast this spell.) -- If Faerie Squadron was kicked, it enters the battlefield with two +1/+1 counters on it and with flying.
 mana={U}
 type=Creature
@@ -44664,7 +44664,7 @@ toughness=2
 [/card]
 [card]
 name=Gatekeeper of Malakir
-auto=kicker target(player) ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ targetedplayer
+auto=if paid(kicker) then target(player) ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ targetedplayer
 kicker={B}
 text=Kicker {B} (You may pay an additional {B} as you cast this spell.) -- When Gatekeeper of Malakir enters the battlefield, if it was kicked, target player sacrifices a creature.
 mana={B}{B}
@@ -46337,7 +46337,7 @@ name=Gigantiform
 target=creature
 kicker={4}
 auto=teach(creature) becomes(,8/8,trample)
-auto=kicker may moveto(mybattlefield) and!( transforms((,newability[retarget target(creature)])) )! notatarget(Gigantiform|mylibrary)
+auto=if paid(kicker) then may moveto(mybattlefield) and!( transforms((,newability[retarget target(creature)])) )! notatarget(Gigantiform|mylibrary)
 text=Kicker {4} -- Enchant creature -- Enchanted creature is 8/8 and has trample. -- When Gigantiform enters the battlefield, if it was kicked, you may search your library for a card named Gigantiform, put it onto the battlefield, then shuffle your library.
 mana={3}{G}{G}
 type=Enchantment
@@ -47197,7 +47197,7 @@ toughness=1
 [/card]
 [card]
 name=Gnarlid Pack
-auto=kicker counter(1/1,kicked)
+auto=if paid(kicker) then counter(1/1,kicked)
 kicker=multi{1}{G}
 text=Multikicker {1}{G} (You may pay an additional {1}{G} any number of times as you cast this spell.) -- Gnarlid Pack enters the battlefield with a +1/+1 counter on it for each time it was kicked.
 mana={1}{G}
@@ -47444,8 +47444,8 @@ type=Land
 [card]
 name=Goblin Bushwhacker
 kicker={R}
-auto=kicker all(creature|myBattlefield) 1/0 ueot
+auto=if paid(kicker) then all(creature|myBattlefield) 1/0 ueot
-auto=kicker all(creature|myBattlefield) haste ueot
+auto=if paid(kicker) then all(creature|myBattlefield) haste ueot
 text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- When Goblin Bushwhacker enters the battlefield, if it was kicked, creatures you control get +1/+0 and gain haste until end of turn.
 mana={R}
 type=Creature
@@ -48114,7 +48114,7 @@ toughness=2
 name=Goblin Ruinblaster
 abilities=haste
 kicker={R}
-auto=kicker destroy target(land[-basic])
+auto=if paid(kicker) then destroy target(land[-basic])
 text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Haste -- When Goblin Ruinblaster enters the battlefield, if it was kicked, destroy target nonbasic land.
 mana={2}{R}
 type=Creature
@@ -53195,7 +53195,7 @@ subtype=Equipment
 name=Heartstabber Mosquito
 abilities=flying
 kicker={2}{B}
-auto=kicker destroy target(creature)
+auto=if paid(kicker) then destroy target(creature)
 text=Kicker {2}{B} (You may pay an additional {2}{B} as you cast this spell.) -- Flying -- When Heartstabber Mosquito enters the battlefield, if it was kicked, destroy target creature.
 mana={3}{B}
 type=Creature
@@ -56289,7 +56289,8 @@ subtype=Elf
 [/card]
 [card]
 name=Hunting Wilds
-auto=moveto(mybattlefield) and!(tap(noevent) && kicker untap && kicker becomes(Creature,3/3,haste,green) forever )! target(<upto:2>forest|mylibrary)
+auto=if paid(kicker) then moveto(mybattlefield) and!(tap(noevent) && untap && becomes(Creature,3/3,haste,green) forever )! target(<upto:2>forest|mylibrary)
+auto=ifnot paid(kicker) then moveto(mybattlefield) and!(tap(noevent))! target(<upto:2>forest|mylibrary)
 kicker={3}{G}
 text=Kicker {3}{G} (You may pay an additional {3}{G} as you cast this spell.) -- Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. -- If Hunting Wilds was kicked, untap all Forests put onto the battlefield this way. They become 3/3 green creatures with haste that are still lands.
 mana={3}{G}
@@ -56500,7 +56501,7 @@ subtype=Aura
 name=Hypnotic Cloud
 target=player
 auto=ability$!name(discard) target(*|myhand) reject!$ targetedplayer
-auto=kicker ability$!name(discard) target(<2>*|myhand) reject!$ targetedplayer
+auto=if paid(kicker) then ability$!name(discard) target(<2>*|myhand) reject!$ targetedplayer
 kicker={4}
 text=Kicker {4} (You may pay an additional {4} as you cast this spell.) -- Target player discards a card. If Hypnotic Cloud was kicked, that player discards three cards instead.
 mana={1}{B}
@@ -58655,7 +58656,7 @@ name=Into the Roil
 target=*[-land]
 kicker={1}{U}
 auto=moveTo(ownerhand)
-auto=kicker draw:1 controller
+auto=if paid(kicker) then draw:1 controller
 text=Kicker {1}{U} (You may pay an additional {1}{U} as you cast this spell.) -- Return target nonland permanent to its owner's hand. If Into the Roil was kicked, draw a card.
 mana={1}{U}
 type=Instant
@@ -60205,7 +60206,7 @@ name=Jilt
 kicker={1}{R}
 target=creature
 auto=moveto(ownerhand)
-auto=kicker damage:2 target(creature)
+auto=if paid(kicker) then damage:2 target(creature)
 text=Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.) -- Return target creature to its owner's hand. If Jilt was kicked, it deals 2 damage to another target creature.
 mana={1}{U}
 type=Instant
@@ -60446,7 +60447,7 @@ toughness=1
 [/card]
 [card]
 name=Joraga Warcaller
-auto=kicker counter(1/1,kicked)
+auto=if paid(kicker) then counter(1/1,kicked)
 kicker=multi{1}{G}
 auto=thisforeach(counter{1/1.1}) lord(other elf|myBattlefield) 1/1
 text=Multikicker {1}{G} (You may pay an additional {1}{G} any number of times as you cast this spell.) -- Joraga Warcaller enters the battlefield with a +1/+1 counter on it for each time it was kicked. -- Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller.
@@ -61789,7 +61790,7 @@ toughness=2
 name=Kavu Aggressor
 abilities=cantblock
 kicker={4}
-auto=kicker counter(1/1,1)
+auto=if paid(kicker) then counter(1/1,1)
 text=Kicker {4} (You may pay an additional {4} as you cast this spell.) -- Kavu Aggressor can't block. -- If Kavu Aggressor was kicked, it enters the battlefield with a +1/+1 counter on it.
 mana={2}{R}
 type=Creature
@@ -61918,8 +61919,8 @@ toughness=2
 [card]
 name=Kavu Titan
 kicker={2}{G}
-auto=kicker counter(1/1,3)
+auto=if paid(kicker) then counter(1/1,3)
-auto=kicker trample
+auto=if paid(kicker) then trample
 text=Kicker {2}{G} (You may pay an additional {2}{G} as you cast this spell.) -- If Kavu Titan was kicked, it enters the battlefield with three +1/+1 counters on it and with trample.
 mana={1}{G}
 type=Creature
@@ -63852,7 +63853,7 @@ toughness=5
 name=Kor Aeronaut
 abilities=flying
 kicker={1}{W}
-auto=kicker flying target(creature) ueot
+auto=if paid(kicker) then flying target(creature) ueot
 text=Kicker {1}{W} (You may pay an additional {1}{W} as you cast this spell.) -- Flying -- When Kor Aeronaut enters the battlefield, if it was kicked, target creature gains flying until end of turn.
 mana={W}{W}
 type=Creature
@@ -63972,7 +63973,7 @@ toughness=2
 [card]
 name=Kor Sanctifiers
 kicker={W}
-auto=kicker destroy target(artifact,enchantment)
+auto=if paid(kicker) then destroy target(artifact,enchantment)
 text=Kicker {W} (You may pay an additional {W} as you cast this spell.) -- When Kor Sanctifiers enters the battlefield, if it was kicked, destroy target artifact or enchantment.
 mana={2}{W}
 type=Creature
@@ -66869,7 +66870,7 @@ toughness=3
 [card]
 name=Lightkeeper of Emeria
 abilities=flying
-auto=kicker life:twicekicked
+auto=if paid(kicker) then life:twicekicked
 kicker=multi{W}
 text=Multikicker {W} (You may pay an additional {W} any number of times as you cast this spell.) -- Flying -- When Lightkeeper of Emeria enters the battlefield, you gain 2 life for each time it was kicked.
 mana={3}{W}
@@ -67635,7 +67636,7 @@ toughness=2
 name=Llanowar Elite
 abilities=trample
 kicker={8}
-auto=kicker counter(1/1,5)
+auto=if paid(kicker) then counter(1/1,5)
 text=Kicker {8} (You may pay an additional {8} as you cast this spell.) -- Trample -- If Llanowar Elite was kicked, it enters the battlefield with five +1/+1 counters on it.
 mana={G}
 type=Creature
@@ -71199,7 +71200,7 @@ toughness=1
 name=Marsh Casualties
 kicker={3}
 auto=all(creature|opponentBattlefield) -1/-1 ueot
-auto=kicker all(creature|opponentBattlefield) -1/-1 ueot
+auto=if paid(kicker) then all(creature|opponentBattlefield) -1/-1 ueot
 text=Kicker {3} (You may pay an additional {3} as you cast this spell.) -- Creatures target player controls get -1/-1 until end of turn. If Marsh Casualties was kicked, those creatures get -2/-2 until end of turn instead.
 mana={B}{B}
 type=Sorcery
@@ -71313,7 +71314,7 @@ type=Sorcery
 [/card]
 [card]
 name=Marshal's Anthem
-auto=kicker moveto(mybattlefield) target(<upto:kicked>creature|mygraveyard)
+auto=if paid(kicker) then moveto(mybattlefield) target(<upto:kicked>creature|mygraveyard)
 auto=lord(creature|mybattlefield) 1/1
 kicker=multi{1}{W}
 text=Multikicker {1}{W} (You may pay an additional {1}{W} any number of times as you cast this spell.) -- Creatures you control get +1/+1. -- When Marshal's Anthem enters the battlefield, return up to X target creature cards from your graveyard to the battlefield, where X is the number of times Marshal's Anthem was kicked.
@@ -75393,7 +75394,7 @@ toughness=6
 [card]
 name=Mold Shambler
 kicker={1}{G}
-auto=kicker destroy target(*[-creature])
+auto=if paid(kicker) then destroy target(*[-creature])
 text=Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.) -- When Mold Shambler enters the battlefield, if it was kicked, destroy target noncreature permanent.
 mana={3}{G}
 type=Creature
@@ -82483,7 +82484,7 @@ toughness=2
 name=Oran-Rief Recluse
 abilities=reach
 kicker={2}{G}
-auto=kicker destroy target(creature[flying])
+auto=if paid(kicker) then destroy target(creature[flying])
 text=Kicker {2}{G} (You may pay an additional {2}{G} as you cast this spell.) -- Reach (This creature can block creatures with flying.) -- When Oran-Rief Recluse enters the battlefield, if it was kicked, destroy target creature with flying.
 mana={2}{G}
 type=Creature
@@ -82966,8 +82967,8 @@ name=Orim's Chant
 target=player
 auto=maxCast(*)0
 kicker={W}
-auto=kicker cantattack all(creature) ueot
+auto=if paid(kicker) then cantattack all(creature) ueot
-auto=kicker cantpwattack all(creature) ueot
+auto=if paid(kicker) then cantpwattack all(creature) ueot
 text=Kicker {W} (You may pay an additional {W} as you cast this spell.) -- Target player can't cast spells this turn. -- If Orim's Chant was kicked, creatures can't attack this turn.
 mana={W}
 type=Instant
@@ -82994,7 +82995,7 @@ name=Orim's Thunder
 target=artifact,enchantment
 auto=destroy
 kicker={R}
-auto=kicker transforms((,newability[dynamicability<!manacoststrike!> target(creature)]))
+auto=if paid(kicker) then transforms((,newability[dynamicability<!manacoststrike!> target(creature)]))
 text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Destroy target artifact or enchantment. If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature.
 mana={2}{W}
 type=Instant
@@ -83003,7 +83004,7 @@ type=Instant
 name=Orim's Touch
 target=creature,player
 kicker={1}
-auto=kicker prevent:2
+auto=if paid(kicker) then prevent:2
 auto=prevent:2
 text=Kicker {1} (You may pay an additional {1} as you cast this spell.) -- Prevent the next 2 damage that would be dealt to target creature or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead.
 mana={W}
@@ -83412,7 +83413,7 @@ type=Enchantment
 name=Overload
 target=artifact
 kicker={2}
-auto=kicker teach(artifact[manacost<=5]) destroy
+auto=if paid(kicker) then teach(artifact[manacost<=5]) destroy
 auto=teach(artifact[manacost<=2]) destroy
 text=Kicker {2} (You may pay an additional {2} as you cast this spell.) -- Destroy target artifact if its converted mana cost is 2 or less. If Overload was kicked, destroy that artifact if its converted mana cost is 5 or less instead.
 mana={R}
@@ -86579,7 +86580,7 @@ subtype=Aura
 name=Pincer Spider
 abilities=reach
 kicker={3}
-auto=kicker counter(1/1,1)
+auto=if paid(kicker) then counter(1/1,1)
 text=Kicker {3} (You may pay an additional {3} as you cast this spell.) -- Reach (This creature can block creatures with flying.) -- If Pincer Spider was kicked, it enters the battlefield with a +1/+1 counter on it.
 mana={2}{G}
 type=Creature
@@ -87654,8 +87655,8 @@ toughness=2
 name=Pouncing Kavu
 abilities=first strike
 kicker={2}{R}
-auto=kicker counter(1/1,2)
+auto=if paid(kicker) then counter(1/1,2)
-auto=kicker haste
+auto=if paid(kicker) then haste
 text=Kicker {2}{R} (You may pay an additional {2}{R} as you cast this spell.) -- First strike -- If Pouncing Kavu was kicked, it enters the battlefield with two +1/+1 counters on it and with haste.
 mana={1}{R}
 type=Creature
@@ -87666,8 +87667,8 @@ toughness=1
 [card]
 name=Pouncing Wurm
 kicker={2}{G}
-auto=kicker haste
+auto=if paid(kicker) then haste
-auto=kicker counter(1/1,3)
+auto=if paid(kicker) then counter(1/1,3)
 text=Kicker {2}{G} (You may pay an additional {2}{G} as you cast this spell.) -- If Pouncing Wurm was kicked, it enters the battlefield with three +1/+1 counters on it and with haste.
 mana={3}{G}
 type=Creature
@@ -88622,8 +88623,8 @@ toughness=1
 name=Prison Barricade
 abilities=defender
 kicker={1}{W}
-auto=kicker counter(1/1,1)
+auto=if paid(kicker) then counter(1/1,1)
-auto=kicker canattack
+auto=if paid(kicker) then canattack
 text=Defender (This creature can't attack.) -- Kicker {1}{W} (You may pay an additional {1}{W} as you cast this spell.) -- If Prison Barricade was kicked, it enters the battlefield with a +1/+1 counter on it and with "Prison Barricade can attack as though it didn't have defender."
 mana={1}{W}
 type=Creature
@@ -88741,7 +88742,7 @@ toughness=2
 name=Probe
 auto=ability$!draw:3 _ notatarget(<2>*|myhand) reject!$ controller
 kicker={1}{B}
-auto=kicker target(player) ability$!name(discard 2 cards) notatarget(<2>*|myhand) reject!$ targetedplayer
+auto=if paid(kicker) then target(player) ability$!name(discard 2 cards) notatarget(<2>*|myhand) reject!$ targetedplayer
 text=Kicker {1}{B} (You may pay an additional {1}{B} as you cast this spell.) -- Draw three cards, then discard two cards. -- If Probe was kicked, target player discards two cards.
 mana={2}{U}
 type=Sorcery
@@ -90058,7 +90059,7 @@ subtype=Aura
 name=Quag Vampires
 abilities=swampwalk
 kicker=multi{1}{B}
-auto=kicker counter(1/1,kicked)
+auto=if paid(kicker) then counter(1/1,kicked)
 text=Multikicker {1}{B} (You may pay an additional {1}{B} any number of times as you cast this spell.) -- Swampwalk -- Quag Vampires enters the battlefield with a +1/+1 counter on it for each time it was kicked.
 mana={B}
 type=Creature
@@ -91979,7 +91980,7 @@ toughness=3
 name=Ravaging Riftwurm
 auto=vanishing:2
 kicker={4}
-auto=kicker counter(0/0,3,Time)
+auto=if paid(kicker) then counter(0/0,3,Time)
 text=Kicker {4} (You may pay an additional 4 as you cast this spell.) -- Vanishing 2 (This permanent enters the battlefield with two time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.) -- If Ravaging Riftwurm was kicked, it enters the battlefield with three additional time counters on it.
 mana={1}{G}{G}
 type=Creature
@@ -95640,7 +95641,7 @@ name=Rite of Replication
 target=creature
 auto=clone
 kicker={5}
-auto=kicker clone && clone && clone && clone
+auto=if paid(kicker) then clone && clone && clone && clone
 text=Kicker {5} (You may pay an additional {5} as you cast this spell.) -- Put a token onto the battlefield that's a copy of target creature. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead.
 mana={2}{U}{U}
 type=Sorcery
@@ -99162,7 +99163,7 @@ type=Land
 name=Savage Offensive
 kicker={G}
 auto=all(creature|myBattlefield) first strike
-auto=kicker all(creature|myBattlefield) 1/1
+auto=if paid(kicker) then all(creature|myBattlefield) 1/1
 text=Kicker {G} (You may pay an additional {G} as you cast this spell.) -- Creatures you control gain first strike until end of turn. If Savage Offensive was kicked, they get +1/+1 until end of turn.
 mana={1}{R}
 type=Sorcery
@@ -99889,8 +99890,8 @@ toughness=1
 name=Scorching Lava
 target=creature,player
 kicker={R}
-auto=kicker cantregen
+auto=if paid(kicker) then cantregen
-auto=kicker exiledeath
+auto=if paid(kicker) then exiledeath
 auto=damage:2
 text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Scorching Lava deals 2 damage to target creature or player. If Scorching Lava was kicked, that creature can't be regenerated this turn and if it would die this turn, exile it instead.
 mana={1}{R}
@@ -103983,7 +103984,7 @@ toughness=5
 [card]
 name=Shivan Emissary
 kicker={1}{B}
-auto=kicker bury target(creature[-black])
+auto=if paid(kicker) then bury target(creature[-black])
 text=Kicker {1}{B} (You may pay an additional {1}{B} as you cast this spell.) -- When Shivan Emissary enters the battlefield, if it was kicked, destroy target nonblack creature. It can't be regenerated.
 mana={2}{R}
 type=Creature
@@ -106444,7 +106445,7 @@ toughness=4
 name=Skitter of Lizards
 abilities=haste
 kicker=multi{1}{R}
-auto=kicker counter(1/1,kicked)
+auto=if paid(kicker) then counter(1/1,kicked)
 text=Multikicker {1}{R} (You may pay an additional {1}{R} any number of times as you cast this spell.) -- Haste -- Skitter of Lizards enters the battlefield with a +1/+1 counter on it for each time it was kicked.
 mana={R}
 type=Creature
@@ -106528,7 +106529,7 @@ toughness=4
 name=Skizzik
 abilities=trample,haste,treason
 kicker={R}
-auto=kicker -treason
+auto=if paid(kicker) then -treason
 text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Trample, haste -- At the beginning of the end step, sacrifice Skizzik unless it was kicked.
 mana={3}{R}
 type=Creature
@@ -110320,7 +110321,7 @@ type=Instant
 [/card]
 [card]
 name=Spell Contortion
-auto=kicker draw:kicked
+auto=if paid(kicker) then draw:kicked
 kicker=multi{1}{U}
 target=*|stack
 auto=transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) forever
@@ -114355,7 +114356,7 @@ subtype=Aura
 name=Strength of Night
 kicker={B}
 auto=all(creature|myBattlefield) 1/1 ueot
-auto=kicker all(creature[zombie]|myBattlefield) 2/2 ueot
+auto=if paid(kicker) then all(creature[zombie]|myBattlefield) 2/2 ueot
 text=Kicker {B} (You may pay an additional {B} as you cast this spell.) -- Creatures you control get +1/+1 until end of turn. If Strength of Night was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
 mana={2}{G}
 type=Instant
@@ -117796,7 +117797,7 @@ type=Sorcery
 [card]
 name=Taste of Paradise
 auto=life:3
-auto=kicker life:thricekicked
+auto=if paid(kicker) then life:thricekicked
 kicker=multi{1}{G}
 text=As an additional cost to cast Taste of Paradise, you may pay {1}{G} any number of times. -- You gain 3 life plus an additional 3 life for each additional {1}{G} you paid.
 mana={3}{G}
@@ -118384,7 +118385,7 @@ type=Instant
 name=Tempest Owl
 abilities=flying
 kicker={4}{U}
-auto=kicker tap target(<upto:3>*)
+auto=if paid(kicker) then tap target(<upto:3>*)
 text=Kicker {4}{U} (You may pay an additional {4}{U} as you cast this spell.) -- Flying -- When Tempest Owl enters the battlefield, if it was kicked, tap up to three target permanents.
 mana={1}{U}
 type=Creature
@@ -119733,7 +119734,7 @@ toughness=4
 [card]
 name=Thicket Elemental
 kicker={1}{g}
-auto=kicker Reveal:1 revealzone(mylibrary) revealuntil(creature|mylibrary) optionone name(Get Creature) target(creature|myreveal) moveto(mybattlefield) optiononeend optiontwo choice name(Shuffle) all(*|myreveal) bottomoflibrary && shuffle controller  optiontwoend revealend
+auto=if paid(kicker) then Reveal:1 revealzone(mylibrary) revealuntil(creature|mylibrary) optionone name(Get Creature) target(creature|myreveal) moveto(mybattlefield) optiononeend optiontwo choice name(Shuffle) all(*|myreveal) bottomoflibrary && shuffle controller  optiontwoend revealend
 text=Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.) -- When Thicket Elemental enters the battlefield, if it was kicked, you may reveal cards from the top of your library until you reveal a creature card. If you do, put that card onto the battlefield and shuffle all other cards revealed this way into your library.
 mana={3}{G}{G}
 type=Creature
@@ -121934,7 +121935,7 @@ toughness=4
 name=Tolarian Emissary
 abilities=flying
 kicker={1}{W}
-auto=kicker destroy target(enchantment)
+auto=if paid(kicker) then destroy target(enchantment)
 text=Kicker {1}{W} (You may pay an additional {1}{W} as you cast this spell.) -- Flying -- When Tolarian Emissary enters the battlefield, if it was kicked, destroy target enchantment.
 mana={2}{U}
 type=Creature
@@ -122221,7 +122222,7 @@ subtype=Equipment
 [card]
 name=Torch Slinger
 kicker={1}{R}
-auto=kicker damage:2 target(creature)
+auto=if paid(kicker) then damage:2 target(creature)
 text=Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.) -- When Torch Slinger enters the battlefield, if it was kicked, it deals 2 damage to target creature.
 mana={2}{R}
 type=Creature
@@ -126295,7 +126296,7 @@ toughness=1
 [card]
 name=Urborg Emissary
 kicker={1}{U}
-auto=kicker moveTo(ownerhand) target(*|battlefield)
+auto=if paid(kicker) then moveTo(ownerhand) target(*|battlefield)
 text=Kicker {1}{U} (You may pay an additional {1}{U} as you cast this spell.) -- When Urborg Emissary enters the battlefield, if it was kicked, return target permanent to its owner's hand.
 mana={2}{B}
 type=Creature
@@ -126345,7 +126346,7 @@ toughness=3
 [card]
 name=Urborg Skeleton
 kicker={3}
-auto=kicker counter(1/1,1)
+auto=if paid(kicker) then counter(1/1,1)
 auto={B}:regenerate
 text=Kicker {3} (You may pay an additional {3} as you cast this spell.) -- {B}: Regenerate Urborg Skeleton. -- If Urborg Skeleton was kicked, it enters the battlefield with a +1/+1 counter on it.
 mana={B}
@@ -126939,7 +126940,7 @@ name=Vampire's Bite
 target=creature
 kicker={2}{B}
 auto=3/0
-auto=kicker lifelink
+auto=if paid(kicker) then lifelink
 text=Kicker {2}{B} (You may pay an additional {2}{B} as you cast this spell.) -- Target creature gets +3/+0 until end of turn. If Vampire's Bite was kicked, that creature gains lifelink until end of turn. (Damage dealt by the creature also causes its controller to gain that much life.)
 mana={B}
 type=Instant
@@ -127917,7 +127918,7 @@ type=Instant
 [card]
 name=Verduran Emissary
 kicker={1}{R}
-auto=kicker bury target(artifact)
+auto=if paid(kicker) then bury target(artifact)
 text=Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.) -- When Verduran Emissary enters the battlefield, if it was kicked, destroy target artifact. It can't be regenerated.
 mana={2}{G}
 type=Creature
@@ -128681,7 +128682,7 @@ name=Vigorous Charge
 target=creature
 kicker={W}
 auto=trample
-auto=kicker transforms((,newability[combatspiritlink])) ueot
+auto=if paid(kicker) then transforms((,newability[combatspiritlink])) ueot
 text=Kicker {W} (You may pay an additional {W} as you cast this spell.) -- Target creature gains trample until end of turn. Whenever that creature deals combat damage this turn, if Vigorous Charge was kicked, you gain life equal to that damage.
 mana={G}
 type=Instant
@@ -128937,7 +128938,7 @@ name=Vines of Vastwood
 target=creature
 kicker={G}
 auto=opponentshroud
-auto=kicker 4/4
+auto=if paid(kicker) then 4/4
 text=Kicker {G} (You may pay an additional {G} as you cast this spell.) -- Target creature can't be the target of spells or abilities your opponents control this turn. If Vines of Vastwood was kicked, that creature gets +4/+4 until end of turn.
 mana={G}
 type=Instant
@@ -129582,7 +129583,7 @@ toughness=1
 [card]
 name=Vodalian Serpent
 kicker={2}
-auto=kicker counter(1/1,4)
+auto=if paid(kicker) then counter(1/1,4)
 auto=aslongas(island|opponentBattlefield) cantattack <1
 auto=aslongas(island|opponentBattlefield) cantpwattack <1
 text=Kicker {2} (You may pay an additional {2} as you cast this spell.) -- Vodalian Serpent can't attack unless defending player controls an Island. -- If Vodalian Serpent was kicked, it enters the battlefield with four +1/+1 counters on it.
@@ -130303,7 +130304,7 @@ subtype=Aura
 name=Voyager Drake
 abilities=flying
 kicker=multi{U}
-auto=kicker target(<upto:kicked>creature) flying ueot
+auto=if paid(kicker) then target(<upto:kicked>creature) flying ueot
 text=Multikicker {U} (You may pay an additional {U} any number of times as you cast this spell.) -- Flying -- When Voyager Drake enters the battlefield, up to X target creatures gain flying until end of turn, where X is the number of times Voyager Drake was kicked.
 mana={3}{U}
 type=Creature
@@ -132168,8 +132169,8 @@ toughness=4
 name=Waterspout Elemental
 abilities=flying
 kicker={U}
-auto=kicker moveto(ownerhand) all(other creature|battlefield)
+auto=if paid(kicker) then moveto(ownerhand) all(other creature|battlefield)
-auto=kicker turns:-1 controller
+auto=if paid(kicker) then turns:-1 controller
 text=Kicker {U} (You may pay an additional {U} as you cast this spell.) -- Flying -- When Waterspout Elemental enters the battlefield, if it was kicked, return all other creatures to their owners' hands and you skip your next turn.
 mana={3}{U}{U}
 type=Creature
@@ -134946,7 +134947,7 @@ toughness=1
 [/card]
 [card]
 name=Wolfbriar Elemental
-auto=kicked token(Wolf,creature wolf,2/2,green)*kicked
+auto=if paid(kicker) then token(Wolf,creature wolf,2/2,green)*kicked
 kicker=multi{G}
 text=Multikicker {G} (You may pay an additional {G} any number of times as you cast this spell.) -- When Wolfbriar Elemental enters the battlefield, put a 2/2 green Wolf creature token onto the battlefield for each time it was kicked.
 mana={2}{G}{G}

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

@@ -1604,6 +1604,18 @@ type=Legendary Planeswalker
 subtype=Yanling
 [/card]
 [card]
+name=Nahiri, Heir of the Ancients
+aicode=activate moveTo(myHand) target(*[warrior;equipment;zpos<=6]|myLibrary)
+auto=counter(0/0,4,loyalty)
+auto={C(0/0,1,Loyalty)}:name(+1: Create a 1/1 Kor and equip) token(Kor Warrior,Creature Kor Warrior,1/1,white) and!(transforms((,newability[may target(equipment|mybattlefield) newhook])) oneshot)!
+auto={C(0/0,-2,Loyalty)}:name(-2: Look six and put a Warrior or Equipment) name(Reveal six cards from top) reveal:6 optionone name(Get a card) target(*[warrior;equipment]|reveal) moveTo(myHand) optiononeend optiontwo name(put on bottom) all(*|reveal) bottomoflibrary optiontwoend revealend
+auto={C(0/0,-3,Loyalty)}:name(-3: Deals damage twice equipments) damage:twicetype:equipment:myBattlefield target(*[creature;planeswalker]) oneshot
+text=+1: Create a 1/1 white Kor Warrior creature token. You may attach an Equipment you control to it. -- -2: Look at the top six cards of your library. You may reveal a Warrior or Equipment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. -- -3: Nahiri, Heir of the Ancients deals damage to target creature or planeswalker equal to twice the number of Equipment you control.
+mana={2}{R}{W}
+type=Legendary Planeswalker
+subtype=Nahiri
+[/card]
+[card]
 name=Nahiri, Storm of Stone
 auto=counter(0/0,6,loyalty)
 auto=this(variable{controllerturn}>0) lord(creature|myBattlefield) first strike

projects/mtg/include/AllAbilities.h

@@ -7122,7 +7122,8 @@ public:
     bool putinplay;
     bool asNormalMadness;
     bool alternative;
-    AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool restricted,bool copied,bool _asNormal,string nameCard,string abilityName,bool _noEvent, bool putinplay,bool asNormalMadness = false,bool alternative = false);
+    int kicked;
+    AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool restricted,bool copied,bool _asNormal,string nameCard,string abilityName,bool _noEvent, bool putinplay,bool asNormalMadness = false,bool alternative = false,int kicked = 0);
 
     int testDestroy(){return 0;};
     void Update(float dt);

projects/mtg/include/CardDescriptor.h

@@ -35,6 +35,7 @@ class CardDescriptor: public MTGCardInstance
 
   Operator mode;
   int powerComparisonMode;
+  int kickedComparisonMode;
   int toughnessComparisonMode;
   int manacostComparisonMode;
   int counterComparisonMode;

projects/mtg/src/AllAbilities.cpp

@@ -8463,8 +8463,8 @@ AEquip * AEquip::clone() const
 }
 
 // casting a card for free, or casting a copy of a card.
-AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool _restricted,bool _copied,bool asNormal,string _namedCard,string _name,bool _noEvent,bool putinplay,bool madness, bool alternative) :
+AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool _restricted,bool _copied,bool asNormal,string _namedCard,string _name,bool _noEvent,bool putinplay,bool madness, bool alternative, int kicked) :
-   MTGAbility(observer, _id, _source),restricted(_restricted),asCopy(_copied),normal(asNormal),cardNamed(_namedCard),nameThis(_name),noEvent(_noEvent),putinplay(putinplay), asNormalMadness(madness), alternative(alternative)
+   MTGAbility(observer, _id, _source),restricted(_restricted),asCopy(_copied),normal(asNormal),cardNamed(_namedCard),nameThis(_name),noEvent(_noEvent),putinplay(putinplay), asNormalMadness(madness), alternative(alternative), kicked(kicked)
 {
     target = _target;
     andAbility = NULL;
@@ -8739,6 +8739,10 @@ int AACastCard::resolveSpell()
         }
         if(alternative)
             copy->alternateCostPaid[ManaCost::MANA_PAID_WITH_ALTERNATIVE] = 1;
+        if(kicked > 0){
+            copy->alternateCostPaid[ManaCost::MANA_PAID_WITH_KICKER] = 1;
+            copy->kicked = kicked;
+        }
         if (game->targetChooser)
         {
             game->targetChooser->Owner = source->controller();

projects/mtg/src/CardDescriptor.cpp

@@ -13,6 +13,7 @@ CardDescriptor::CardDescriptor()
     counterToughness = 0;
     counterNB = 0;
     mode = CD_AND;
+    kickedComparisonMode = COMPARISON_NONE;
     powerComparisonMode = COMPARISON_NONE;
     toughnessComparisonMode = COMPARISON_NONE;
     manacostComparisonMode = COMPARISON_NONE;
@@ -152,6 +153,8 @@ MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card)
     }
 
     // Quantified restrictions are always AND-ed:
+    if (kickedComparisonMode && !valueInRange(kickedComparisonMode, card->kicked, kicked))
+        return NULL;
     if (powerComparisonMode && !valueInRange(powerComparisonMode, card->getPower(), power))
         return NULL;
     if (toughnessComparisonMode && !valueInRange(toughnessComparisonMode, card->getToughness(), toughness))
@@ -195,6 +198,8 @@ MTGCardInstance * CardDescriptor::match_and(MTGCardInstance * card)
             match = NULL;
     }
 
+    if (kickedComparisonMode && !valueInRange(kickedComparisonMode, card->kicked, kicked))
+        match = NULL;
     if (powerComparisonMode && !valueInRange(powerComparisonMode, card->getPower(), power))
         match = NULL;
     if (toughnessComparisonMode && !valueInRange(toughnessComparisonMode, card->getToughness(), toughness))
@@ -231,11 +236,6 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card)
     if (excludedSet.any())
         return NULL;
 
-    if ((kicked == -1 && card->kicked) || (kicked == 1 && !card->kicked))
-    {
-        match = NULL;
-    }
-
     if ((hasKickerCost == -1 && (card->getManaCost()->getKicker() || card->basicAbilities[Constants::HASOTHERKICKER])) || (hasKickerCost == 1 && (!card->getManaCost()->getKicker() && !card->basicAbilities[Constants::HASOTHERKICKER])))
     {
         match = NULL;

projects/mtg/src/CardGui.cpp

@@ -1488,14 +1488,8 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                 //Has been kicked
                 else if (attribute.find("kicked") != string::npos)
                 {
-                    if (minus)
+                    cd.kicked = comparisonCriterion;
-                    {
+                    cd.kickedComparisonMode = comparisonMode;
-                        cd.unsecureSetKicked(-1);
-                    }
-                    else
-                    {
-                        cd.unsecureSetKicked(1);
-                    }
                 }
                 //Has kicker cost
                 else if (attribute.find("haskicker") != string::npos)
@@ -1648,27 +1642,25 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                     //Power restrictions
                     cd.setPower(comparisonCriterion);
                     cd.powerComparisonMode = comparisonMode;
-                    //Toughness restrictions
                 }
                 else if (attribute.find("toughness") != string::npos)
                 {
+                    //Toughness restrictions
                     cd.setToughness(comparisonCriterion);
                     cd.toughnessComparisonMode = comparisonMode;
-                    //zpos restrictions
                 }
                 else if (attribute.find("zpos") != string::npos)
                 {//using > or < don't have effect unless like this: >= or <= or =
+                    //zpos restrictions
                     cd.zposition = comparisonCriterion;
                     cd.zposComparisonMode = comparisonMode;
-                    //Manacost restrictions
                 }
                 else if (attribute.find("manacost") != string::npos)
                 {
+                    //Manacost restrictions
                     cd.convertedManacost = comparisonCriterion;
                     cd.manacostComparisonMode = comparisonMode;
-                    //Counter Restrictions
                 }
-                
                 else
                 {
                     int attributefound = 0;

projects/mtg/src/MTGAbility.cpp

@@ -3207,7 +3207,16 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
                 nameCard = splitCastName[1];
             }
         }
-        MTGAbility *a = NEW AACastCard(observer, id, card, target,withRestrictions,asCopy,asNormal,nameCard,newName,sendNoEvent,putinplay, asNormalMadness, alternative);
+        int kicked = 0;
+        if(splitCastCard[1].find("kicked!:") != string::npos)
+        {
+            vector<string> splitCastKicked = parseBetween(splitCastCard[1], "kicked!:", ":!");
+            if(splitCastKicked.size())
+            {
+                kicked = atoi(splitCastKicked[1].c_str());
+            }
+        }
+        MTGAbility *a = NEW AACastCard(observer, id, card, target,withRestrictions,asCopy,asNormal,nameCard,newName,sendNoEvent,putinplay, asNormalMadness, alternative, kicked);
         a->oneShot = false;
         if(splitCastCard[1].find("trigger[to]") != string::npos)
         {

projects/mtg/src/TargetChooser.cpp

@@ -485,14 +485,8 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 //Has been kicked
                 else if (attribute.find("kicked") != string::npos)
                 {
-                    if (minus)
+                    cd->kicked = comparisonCriterion;
-                    {
+                    cd->kickedComparisonMode = comparisonMode;
-                        cd->unsecureSetKicked(-1);
-                    }
-                    else
-                    {
-                        cd->unsecureSetKicked(1);
-                    }
                 }
                 //Has kicker cost
                 else if (attribute.find("haskicker") != string::npos)
@@ -718,25 +712,24 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                     //Power restrictions
                     cd->setPower(comparisonCriterion);
                     cd->powerComparisonMode = comparisonMode;
-                    //Toughness restrictions
                 }
                 else if (attribute.find("toughness") != string::npos)
                 {
+                    //Toughness restrictions
                     cd->setToughness(comparisonCriterion);
                     cd->toughnessComparisonMode = comparisonMode;
-                    //zpos restrictions
                 }
                 else if (attribute.find("zpos") != string::npos)
                 {
+                    //zpos restrictions
                     cd->zposition = comparisonCriterion;
                     cd->zposComparisonMode = comparisonMode;
-                    //Manacost restrictions
                 }
                 else if (attribute.find("manacost") != string::npos)
                 {
+                    //Manacost restrictions
                     cd->convertedManacost = comparisonCriterion;
                     cd->manacostComparisonMode = comparisonMode;
-                    //Counter Restrictions
                 }
                 else if (attribute.find("share!") != string::npos)
                 {