Merge pull request #933 from kevlahnota/master

added AER Cards
2017-02-10 16:53:28 +08:00
parent b3de6a283d 37fa69fc39
commit d6f666d9a0
8 changed files with 2905 additions and 44 deletions
--- a/projects/mtg/bin/Res/missing_cards_by_sets/AER.txt
+++ b/projects/mtg/bin/Res/missing_cards_by_sets/AER.txt
@@ -0,0 +1,149 @@
+[card]
+name=Aid from the Cowl
+text=Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, reveal the top card of your library. If it's a permanent card, you may put it onto the battlefield. Otherwise, you may put it on the bottom of your library.
+mana={3}{G}{G}
+type=Enchantment
+[/card]
+[card]
+name=Ajani's Aid
+text=When Ajani's Aid enters the battlefield, you may search your library and/or graveyard for a card named Ajani, Valiant Protector, reveal it, and put it into your hand. If you search your library this way, shuffle it. -- Sacrifice Ajani's Aid: Prevent all combat damage a creature of your choice would deal this turn.
+mana={2}{G}{W}
+type=Enchantment
+[/card]
+[card]
+name=Baral, Chief of Compliance
+text=Instant and sorcery spells you cast cost {1} less to cast. -- Whenever a spell or ability you control counters a spell, you may draw a card. If you do, discard a card.
+mana={1}{U}
+type=Legendary Creature
+subtype=Human Wizard
+power=1
+toughness=3
+[/card]
+[card]
+name=Battle at the Bridge
+other={improvise} name(Improvise)
+text=Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.) -- Target creature gets -X/-X until end of turn. You gain X life.
+mana={X}{B}
+type=Sorcery
+[/card]
+[card]
+name=Crackdown Construct
+text=Whenever you activate an ability of an artifact or creature that isn't a mana ability, Crackdown Construct gets +1/+1 until end of turn.
+mana={4}
+type=Artifact Creature
+subtype=Construct
+power=2
+toughness=2
+[/card]
+[card]
+name=Dark Intimations
+text=Each opponent sacrifices a creature or planeswalker, then discards a card. You return a creature or planeswalker card from your graveyard to your hand, then draw a card. -- When you cast a Bolas planeswalker spell, exile Dark Intimations from your graveyard. That planeswalker enters the battlefield with an additional loyalty counter on it.
+mana={2}{U}{B}{R}
+type=Sorcery
+[/card]
+[card]
+name=Deft Dismissal
+text=Deft Dismissal deals 3 damage divided as you choose among one, two, or three target attacking or blocking creatures.
+mana={3}{W}
+type=Instant
+[/card]
+[card]
+name=Destructive Tampering
+text=Choose one — --Destroy target artifact. --Creatures without flying can't block this turn.
+mana={2}{R}
+type=Sorcery
+[/card]
+[card]
+name=Disallow
+text=Counter target spell, activated ability, or triggered ability. (Mana abilities can't be targeted.)
+mana={1}{U}{U}
+type=Instant
+[/card]
+[card]
+name=Exquisite Archangel
+abilities=flying
+text=Flying -- If you would lose the game, instead exile Exquisite Archangel and your life total becomes equal to your starting life total.
+mana={5}{W}{W}
+type=Creature
+subtype=Angel
+power=5
+toughness=5
+[/card]
+[card]
+name=Hungry Flames
+text=Hungry Flames deals 3 damage to target creature and 2 damage to target player.
+mana={2}{R}
+type=Instant
+[/card]
+[card]
+name=Indomitable Creativity
+target=<prex>artifact,creature|battlefield
+auto=destroy and!( if cantargetcard(*[creature;artifact]|nonbattlezone) then reveal:x revealzone(targetcontrollerlibrary) revealuntil(*[creature;artifact]|targetcontrollerlibrary) optionone all(*|reveal)  moveto(exile) and!(moveto(ownerbattlefield))! optiononeend revealend )!
+text=Destroy X target artifacts and/or creatures. For each permanent destroyed this way, its controller reveals cards from the top of his or her library until an artifact or creature card is revealed and exiles that card. Those players put the exiled cards onto the battlefield, then shuffle their libraries.
+mana={X}{R}{R}{R}
+type=Sorcery
+[/card]
+[card]
+name=Inspiring Statuary
+text=Nonartifact spells you cast have improvise. (Your artifacts can help cast those spells. Each artifact you tap after you're done activating mana abilities pays for {1}.)
+mana={3}
+type=Artifact
+[/card]
+[card]
+name=Invigorated Rampage
+text=Choose one — --Target creature gets +4/+0 and gains trample until end of turn. --Two target creatures each get +2/+0 and gain trample until end of turn.
+mana={1}{R}
+type=Instant
+[/card]
+[card]
+name=Merchant's Dockhand
+text={3}{U}, {T}, Tap X untapped artifacts you control: Look at the top X cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
+mana={1}
+type=Artifact Creature
+subtype=Construct
+power=1
+toughness=2
+[/card]
+[card]
+name=Monstrous Onslaught
+text=Monstrous Onslaught deals X damage divided as you choose among any number of target creatures, where X is the greatest power among creatures you control as you cast Monstrous Onslaught.
+mana={3}{G}{G}
+type=Sorcery
+[/card]
+[card]
+name=Night Market Guard
+text=Night Market Guard can block an additional creature each combat.
+mana={3}
+type=Artifact Creature
+subtype=Construct
+power=3
+toughness=1
+[/card]
+[card]
+name=Pia's Revolution
+text=Whenever a nontoken artifact is put into your graveyard from the battlefield, return that card to your hand unless target opponent has Pia's Revolution deal 3 damage to him or her.
+mana={2}{R}
+type=Enchantment
+[/card]
+[card]
+name=Tezzeret's Betrayal
+text=Destroy target creature. You may search your library and/or graveyard for a card named Tezzeret, Master of Metal, reveal it, and put it into your hand. If you search your library this way, shuffle it.
+mana={3}{U}{B}
+type=Sorcery
+[/card]
+[card]
+name=Whir of Invention
+other={improvise} name(Improvise)
+text=Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.) -- Search your library for an artifact card with converted mana cost X or less, put it onto the battlefield, then shuffle your library.
+mana={X}{U}{U}{U}
+type=Instant
+[/card]
+[card]
+name=Winding Constrictor
+text=If one or more counters would be placed on an artifact or creature you control, that many plus one of each of those kinds of counters are placed on that permanent instead. -- If you would get one or more counters, you get that many plus one of each of those kinds of counters instead.
+mana={B}{G}
+type=Creature
+subtype=Snake
+power=2
+toughness=3
+[/card]
--- a/projects/mtg/bin/Res/sets/AER/_cards.dat
+++ b/projects/mtg/bin/Res/sets/AER/_cards.dat
@@ -0,0 +1,976 @@
+[meta]
+author=Wagic Team
+name=Aether Revolt
+year=2017
+total=194
+[/meta]
+[card]
+primitive=Aegis Automaton
+id=423808
+rarity=C
+[/card]
+[card]
+primitive=Aerial Modification
+id=423668
+rarity=U
+[/card]
+[card]
+primitive=Aeronaut Admiral
+id=423669
+rarity=U
+[/card]
+[card]
+primitive=Aether Chaser
+id=423743
+rarity=C
+[/card]
+[card]
+primitive=Aether Herder
+id=423769
+rarity=C
+[/card]
+[card]
+primitive=Aether Inspector
+id=423670
+rarity=C
+[/card]
+[card]
+primitive=Aether Poisoner
+id=423718
+rarity=C
+[/card]
+[card]
+primitive=Aether Swooper
+id=423693
+rarity=C
+[/card]
+[card]
+primitive=Aethergeode Miner
+id=423671
+rarity=R
+[/card]
+[card]
+primitive=Aethersphere Harvester
+id=423809
+rarity=R
+[/card]
+[card]
+primitive=Aetherstream Leopard
+id=423770
+rarity=C
+[/card]
+[card]
+primitive=Aethertide Whale
+id=423694
+rarity=R
+[/card]
+[card]
+primitive=Aetherwind Basker
+id=423771
+rarity=M
+[/card]
+[card]
+primitive=Aid from the Cowl
+id=423772
+rarity=R
+[/card]
+[card]
+primitive=Airdrop Aeronauts
+id=423672
+rarity=U
+[/card]
+[card]
+primitive=Ajani Unyielding
+id=423794
+rarity=M
+[/card]
+[card]
+primitive=Ajani's Aid
+id=425695
+rarity=R
+[/card]
+[card]
+primitive=Ajani's Comrade
+id=425694
+rarity=U
+[/card]
+[card]
+primitive=Ajani, Valiant Protector
+id=425692
+rarity=M
+[/card]
+[card]
+primitive=Alley Evasion
+id=423673
+rarity=C
+[/card]
+[card]
+primitive=Alley Strangler
+id=423719
+rarity=C
+[/card]
+[card]
+primitive=Audacious Infiltrator
+id=423674
+rarity=C
+[/card]
+[card]
+primitive=Augmenting Automaton
+id=423810
+rarity=C
+[/card]
+[card]
+primitive=Baral's Expertise
+id=423696
+rarity=R
+[/card]
+[card]
+primitive=Baral, Chief of Compliance
+id=423695
+rarity=R
+[/card]
+[card]
+primitive=Barricade Breaker
+id=423811
+rarity=U
+[/card]
+[card]
+primitive=Bastion Enforcer
+id=423675
+rarity=C
+[/card]
+[card]
+primitive=Bastion Inventor
+id=423697
+rarity=C
+[/card]
+[card]
+primitive=Battle at the Bridge
+id=423720
+rarity=R
+[/card]
+[card]
+primitive=Call for Unity
+id=423676
+rarity=R
+[/card]
+[card]
+primitive=Caught in the Brights
+id=423677
+rarity=C
+[/card]
+[card]
+primitive=Chandra's Revolution
+id=423744
+rarity=C
+[/card]
+[card]
+primitive=Cogwork Assembler
+id=423812
+rarity=U
+[/card]
+[card]
+primitive=Consulate Crackdown
+id=423678
+rarity=R
+[/card]
+[card]
+primitive=Consulate Dreadnought
+id=423813
+rarity=U
+[/card]
+[card]
+primitive=Consulate Turret
+id=423814
+rarity=C
+[/card]
+[card]
+primitive=Conviction
+id=423679
+rarity=C
+[/card]
+[card]
+primitive=Countless Gears Renegade
+id=423680
+rarity=C
+[/card]
+[card]
+primitive=Crackdown Construct
+id=423815
+rarity=U
+[/card]
+[card]
+primitive=Cruel Finality
+id=423721
+rarity=C
+[/card]
+[card]
+primitive=Daredevil Dragster
+id=423816
+rarity=U
+[/card]
+[card]
+primitive=Daring Demolition
+id=423722
+rarity=C
+[/card]
+[card]
+primitive=Dark Intimations
+id=423795
+rarity=R
+[/card]
+[card]
+primitive=Dawnfeather Eagle
+id=423681
+rarity=C
+[/card]
+[card]
+primitive=Deadeye Harpooner
+id=423682
+rarity=U
+[/card]
+[card]
+primitive=Decommission
+id=423683
+rarity=C
+[/card]
+[card]
+primitive=Defiant Salvager
+id=423723
+rarity=C
+[/card]
+[card]
+primitive=Deft Dismissal
+id=423684
+rarity=U
+[/card]
+[card]
+primitive=Destructive Tampering
+id=423745
+rarity=C
+[/card]
+[card]
+primitive=Disallow
+id=423698
+rarity=R
+[/card]
+[card]
+primitive=Dispersal Technician
+id=423699
+rarity=C
+[/card]
+[card]
+primitive=Druid of the Cowl
+id=423773
+rarity=C
+[/card]
+[card]
+primitive=Efficient Construction
+id=423700
+rarity=U
+[/card]
+[card]
+primitive=Embraal Gear-Smasher
+id=423746
+rarity=C
+[/card]
+[card]
+primitive=Enraged Giant
+id=423747
+rarity=U
+[/card]
+[card]
+primitive=Exquisite Archangel
+id=423685
+rarity=M
+[/card]
+[card]
+primitive=Fatal Push
+id=423724
+rarity=U
+[/card]
+[card]
+primitive=Felidar Guardian
+id=423686
+rarity=U
+[/card]
+[card]
+primitive=Fen Hauler
+id=423725
+rarity=C
+[/card]
+[card]
+primitive=Filigree Crawler
+id=423817
+rarity=C
+[/card]
+[card]
+primitive=Foundry Assembler
+id=423818
+rarity=C
+[/card]
+[card]
+primitive=Foundry Hornet
+id=423726
+rarity=U
+[/card]
+[card]
+primitive=Fourth Bridge Prowler
+id=423727
+rarity=C
+[/card]
+[card]
+primitive=Freejam Regent
+id=423748
+rarity=R
+[/card]
+[card]
+primitive=Frontline Rebel
+id=423749
+rarity=C
+[/card]
+[card]
+primitive=Ghirapur Osprey
+id=423687
+rarity=C
+[/card]
+[card]
+primitive=Gifted Aetherborn
+id=423728
+rarity=U
+[/card]
+[card]
+primitive=Glint-Sleeve Siphoner
+id=423729
+rarity=R
+[/card]
+[card]
+primitive=Gonti's Aether Heart
+id=423819
+rarity=M
+[/card]
+[card]
+primitive=Gonti's Machinations
+id=423730
+rarity=U
+[/card]
+[card]
+primitive=Greenbelt Rampager
+id=423774
+rarity=R
+[/card]
+[card]
+primitive=Greenwheel Liberator
+id=423775
+rarity=R
+[/card]
+[card]
+primitive=Gremlin Infestation
+id=423750
+rarity=U
+[/card]
+[card]
+primitive=Heart of Kiran
+id=423820
+rarity=M
+[/card]
+[card]
+primitive=Herald of Anguish
+id=423731
+rarity=M
+[/card]
+[card]
+primitive=Heroic Intervention
+id=423776
+rarity=R
+[/card]
+[card]
+primitive=Hidden Herbalists
+id=423777
+rarity=U
+[/card]
+[card]
+primitive=Hidden Stockpile
+id=423796
+rarity=U
+[/card]
+[card]
+primitive=Highspire Infusion
+id=423778
+rarity=C
+[/card]
+[card]
+primitive=Hinterland Drake
+id=423701
+rarity=C
+[/card]
+[card]
+primitive=Hope of Ghirapur
+id=423821
+rarity=R
+[/card]
+[card]
+primitive=Hungry Flames
+id=423751
+rarity=U
+[/card]
+[card]
+primitive=Ice Over
+id=423702
+rarity=C
+[/card]
+[card]
+primitive=Illusionist's Stratagem
+id=423703
+rarity=U
+[/card]
+[card]
+primitive=Implement of Combustion
+id=423822
+rarity=C
+[/card]
+[card]
+primitive=Implement of Examination
+id=423823
+rarity=C
+[/card]
+[card]
+primitive=Implement of Ferocity
+id=423824
+rarity=C
+[/card]
+[card]
+primitive=Implement of Improvement
+id=423825
+rarity=C
+[/card]
+[card]
+primitive=Implement of Malice
+id=423826
+rarity=C
+[/card]
+[card]
+primitive=Indomitable Creativity
+id=423752
+rarity=M
+[/card]
+[card]
+primitive=Inspiring Roar
+id=425693
+rarity=C
+[/card]
+[card]
+primitive=Inspiring Statuary
+id=423827
+rarity=R
+[/card]
+[card]
+primitive=Invigorated Rampage
+id=423753
+rarity=U
+[/card]
+[card]
+primitive=Ironclad Revolutionary
+id=423732
+rarity=U
+[/card]
+[card]
+primitive=Irontread Crusher
+id=423828
+rarity=C
+[/card]
+[card]
+primitive=Kari Zev's Expertise
+id=423755
+rarity=R
+[/card]
+[card]
+primitive=Kari Zev, Skyship Raider
+id=423754
+rarity=R
+[/card]
+[card]
+primitive=Lathnu Sailback
+id=423756
+rarity=C
+[/card]
+[card]
+primitive=Leave in the Dust
+id=423704
+rarity=C
+[/card]
+[card]
+primitive=Lifecraft Awakening
+id=423779
+rarity=U
+[/card]
+[card]
+primitive=Lifecraft Cavalry
+id=423780
+rarity=C
+[/card]
+[card]
+primitive=Lifecrafter's Bestiary
+id=423829
+rarity=R
+[/card]
+[card]
+primitive=Lifecrafter's Gift
+id=423781
+rarity=U
+[/card]
+[card]
+primitive=Lightning Runner
+id=423757
+rarity=M
+[/card]
+[card]
+primitive=Maulfist Revolutionary
+id=423782
+rarity=U
+[/card]
+[card]
+primitive=Maverick Thopterist
+id=423797
+rarity=U
+[/card]
+[card]
+primitive=Mechanized Production
+id=423705
+rarity=M
+[/card]
+[card]
+primitive=Merchant's Dockhand
+id=423830
+rarity=R
+[/card]
+[card]
+primitive=Metallic Mimic
+id=423831
+rarity=R
+[/card]
+[card]
+primitive=Metallic Rebuke
+id=423706
+rarity=C
+[/card]
+[card]
+primitive=Midnight Entourage
+id=423733
+rarity=R
+[/card]
+[card]
+primitive=Mobile Garrison
+id=423832
+rarity=C
+[/card]
+[card]
+primitive=Monstrous Onslaught
+id=423783
+rarity=U
+[/card]
+[card]
+primitive=Narnam Renegade
+id=423784
+rarity=U
+[/card]
+[card]
+primitive=Natural Obsolescence
+id=423785
+rarity=C
+[/card]
+[card]
+primitive=Negate
+id=423707
+rarity=C
+[/card]
+[card]
+primitive=Night Market Aeronaut
+id=423734
+rarity=C
+[/card]
+[card]
+primitive=Night Market Guard
+id=423833
+rarity=C
+[/card]
+[card]
+primitive=Oath of Ajani
+id=423798
+rarity=R
+[/card]
+[card]
+primitive=Ornithopter
+id=423834
+rarity=U
+[/card]
+[card]
+primitive=Outland Boar
+id=423799
+rarity=U
+[/card]
+[card]
+primitive=Pacification Array
+id=423835
+rarity=U
+[/card]
+[card]
+primitive=Paradox Engine
+id=423836
+rarity=M
+[/card]
+[card]
+primitive=Peacewalker Colossus
+id=423837
+rarity=R
+[/card]
+[card]
+primitive=Peema Aether-Seer
+id=423786
+rarity=U
+[/card]
+[card]
+primitive=Pendulum of Patterns
+id=425699
+rarity=C
+[/card]
+[card]
+primitive=Perilous Predicament
+id=423735
+rarity=U
+[/card]
+[card]
+primitive=Pia's Revolution
+id=423758
+rarity=R
+[/card]
+[card]
+primitive=Planar Bridge
+id=423838
+rarity=M
+[/card]
+[card]
+primitive=Precise Strike
+id=423759
+rarity=C
+[/card]
+[card]
+primitive=Prey Upon
+id=423787
+rarity=C
+[/card]
+[card]
+primitive=Prizefighter Construct
+id=423839
+rarity=C
+[/card]
+[card]
+primitive=Quicksmith Rebel
+id=423760
+rarity=R
+[/card]
+[card]
+primitive=Quicksmith Spy
+id=423708
+rarity=R
+[/card]
+[card]
+primitive=Ravenous Intruder
+id=423761
+rarity=U
+[/card]
+[card]
+primitive=Reckless Racer
+id=423762
+rarity=U
+[/card]
+[card]
+primitive=Release the Gremlins
+id=423763
+rarity=R
+[/card]
+[card]
+primitive=Renegade Map
+id=423840
+rarity=C
+[/card]
+[card]
+primitive=Renegade Rallier
+id=423800
+rarity=U
+[/card]
+[card]
+primitive=Renegade Wheelsmith
+id=423801
+rarity=U
+[/card]
+[card]
+primitive=Renegade's Getaway
+id=423736
+rarity=C
+[/card]
+[card]
+primitive=Reservoir Walker
+id=423841
+rarity=C
+[/card]
+[card]
+primitive=Resourceful Return
+id=423737
+rarity=C
+[/card]
+[card]
+primitive=Restoration Specialist
+id=423688
+rarity=U
+[/card]
+[card]
+primitive=Reverse Engineer
+id=423709
+rarity=U
+[/card]
+[card]
+primitive=Ridgescale Tusker
+id=423788
+rarity=U
+[/card]
+[card]
+primitive=Rishkar's Expertise
+id=423790
+rarity=R
+[/card]
+[card]
+primitive=Rishkar, Peema Renegade
+id=423789
+rarity=R
+[/card]
+[card]
+primitive=Rogue Refiner
+id=423802
+rarity=U
+[/card]
+[card]
+primitive=Salvage Scuttler
+id=423710
+rarity=U
+[/card]
+[card]
+primitive=Scrap Trawler
+id=423842
+rarity=R
+[/card]
+[card]
+primitive=Scrapper Champion
+id=423764
+rarity=U
+[/card]
+[card]
+primitive=Scrounging Bandar
+id=423791
+rarity=C
+[/card]
+[card]
+primitive=Secret Salvage
+id=423738
+rarity=R
+[/card]
+[card]
+primitive=Servo Schematic
+id=423843
+rarity=U
+[/card]
+[card]
+primitive=Shielded Aether Thief
+id=423711
+rarity=U
+[/card]
+[card]
+primitive=Shipwreck Moray
+id=423712
+rarity=C
+[/card]
+[card]
+primitive=Shock
+id=423765
+rarity=C
+[/card]
+[card]
+primitive=Siege Modification
+id=423766
+rarity=U
+[/card]
+[card]
+primitive=Silkweaver Elite
+id=423792
+rarity=C
+[/card]
+[card]
+primitive=Skyship Plunderer
+id=423713
+rarity=U
+[/card]
+[card]
+primitive=Sly Requisitioner
+id=423739
+rarity=U
+[/card]
+[card]
+primitive=Solemn Recruit
+id=423689
+rarity=R
+[/card]
+[card]
+primitive=Spire Patrol
+id=423803
+rarity=U
+[/card]
+[card]
+primitive=Spire of Industry
+id=423851
+rarity=R
+[/card]
+[card]
+primitive=Sram's Expertise
+id=423691
+rarity=R
+[/card]
+[card]
+primitive=Sram, Senior Edificer
+id=423690
+rarity=R
+[/card]
+[card]
+primitive=Submerged Boneyard
+id=425701
+rarity=C
+[/card]
+[card]
+primitive=Sweatworks Brawler
+id=423767
+rarity=C
+[/card]
+[card]
+primitive=Take into Custody
+id=423714
+rarity=C
+[/card]
+[card]
+primitive=Tezzeret the Schemer
+id=423804
+rarity=M
+[/card]
+[card]
+primitive=Tezzeret's Betrayal
+id=425698
+rarity=R
+[/card]
+[card]
+primitive=Tezzeret's Simulacrum
+id=425700
+rarity=U
+[/card]
+[card]
+primitive=Tezzeret's Touch
+id=423805
+rarity=U
+[/card]
+[card]
+primitive=Tezzeret, Master of Metal
+id=425697
+rarity=M
+[/card]
+[card]
+primitive=Thopter Arrest
+id=423692
+rarity=U
+[/card]
+[card]
+primitive=Tranquil Expanse
+id=425696
+rarity=C
+[/card]
+[card]
+primitive=Treasure Keeper
+id=423844
+rarity=U
+[/card]
+[card]
+primitive=Trophy Mage
+id=423715
+rarity=U
+[/card]
+[card]
+primitive=Unbridled Growth
+id=423793
+rarity=C
+[/card]
+[card]
+primitive=Universal Solvent
+id=423845
+rarity=C
+[/card]
+[card]
+primitive=Untethered Express
+id=423846
+rarity=U
+[/card]
+[card]
+primitive=Vengeful Rebel
+id=423740
+rarity=U
+[/card]
+[card]
+primitive=Verdant Automaton
+id=423847
+rarity=C
+[/card]
+[card]
+primitive=Walking Ballista
+id=423848
+rarity=R
+[/card]
+[card]
+primitive=Watchful Automaton
+id=423849
+rarity=C
+[/card]
+[card]
+primitive=Welder Automaton
+id=423850
+rarity=C
+[/card]
+[card]
+primitive=Weldfast Engineer
+id=423806
+rarity=U
+[/card]
+[card]
+primitive=Whir of Invention
+id=423716
+rarity=R
+[/card]
+[card]
+primitive=Wind-Kin Raiders
+id=423717
+rarity=U
+[/card]
+[card]
+primitive=Winding Constrictor
+id=423807
+rarity=U
+[/card]
+[card]
+primitive=Wrangle
+id=423768
+rarity=C
+[/card]
+[card]
+primitive=Yahenni's Expertise
+id=423742
+rarity=R
+[/card]
+[card]
+primitive=Yahenni, Undying Partisan
+id=423741
+rarity=R
+[/card]
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -3862,6 +3862,7 @@ public:
            spell->resolve();
            myToken = spell->source;
            spell->source->owner = tokenReciever;
+            spell->source->lastController = tokenReciever;
            spell->source->isToken = 1;
            spell->source->fresh = 1;
            spell->source->entersBattlefield = 1;
--- a/projects/mtg/include/MTGAbility.h
+++ b/projects/mtg/include/MTGAbility.h
@@ -220,7 +220,7 @@ public:
        ATTACK_COST = 36,
        BLOCK_COST = 37,
        GRANTEDFLASHBACK_COST = 38,
-        FORCED_TOKEN_CREATOR,
+        FORCED_TOKEN_CREATOR = 39,
    };
 };

--- a/projects/mtg/src/CardGui.cpp
+++ b/projects/mtg/src/CardGui.cpp
@@ -359,6 +359,22 @@ void CardGui::Render()
    //draw line
    if (game)
    {
+        JQuadPtr ssMask = card->getObserver()->getResourceManager()->GetQuad("white");
+
+        //choose attacker mask
+        if(card->isInPlay(game) && (card->hasSummoningSickness() || card->attackCost > 0) && !card->isPhased && card->isCreature())
+        {
+            if(game->getCurrentGamePhase() > MTG_PHASE_FIRSTMAIN && game->getCurrentGamePhase() < MTG_PHASE_SECONDMAIN &&
+                card->controller() == game->currentPlayer && game->currentPlayer->hasPossibleAttackers())
+            {
+                if(card->controller()->isHuman() && ssMask)
+                {
+                    ssMask->SetColor(ARGB(170,64,64,64));
+                    renderer->RenderQuad(ssMask.get(), actX, actY, actT, (27 * actZ + 1) / 16, 40 * actZ / 16);
+                }
+            }
+        }
+
        if (card && card->isTargetted())
        {
            if(card->isTapped())
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -3546,6 +3546,42 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
        return  NEW ATransformer(observer, id, card, target, stypes, sabilities,newPower,ptFound,newToughness,ptFound,vector<string>(),false,forceForever,untilYourNextTurn);
    }

+    //Remake... (animate artifact...: Remake(Creature: manacost/manacost) - alternative
+    vector<string> splitRemake = parseBetween(s, "remake(", ")");
+    if (splitRemake.size())
+    {
+        vector<string> RemakeParameters = split(splitRemake[1], ':');
+        string stypes = RemakeParameters[0];
+        string newPower = "";
+        string newToughness = "";
+        bool ptFound = false;
+        if(RemakeParameters.size() >1)
+        {
+            vector<string> pt = split(RemakeParameters[1], '/');
+            if(pt.size() > 1)
+            {
+                newPower = pt[0];
+                newToughness = pt[1];
+                ptFound = true;
+            }
+        }
+        string sabilities = "";
+        unsigned int RemakeSize = ptFound?2:1;
+        if(RemakeParameters.size() > RemakeSize)
+        {
+            for(unsigned int i = RemakeSize;i < RemakeParameters.size();i++)
+            { 
+                sabilities.append(RemakeParameters[i].c_str());
+                if(i+1 < RemakeParameters.size())
+                    sabilities.append(",");
+            }
+        }
+        if (oneShot || forceUEOT || forceForever)
+            return NEW ATransformerInstant(observer, id, card, target, stypes, sabilities,newPower,ptFound,newToughness,ptFound,vector<string>(),false,forceForever,untilYourNextTurn);
+
+        return  NEW ATransformer(observer, id, card, target, stypes, sabilities,newPower,ptFound,newToughness,ptFound,vector<string>(),false,forceForever,untilYourNextTurn);
+    }
+
    //bloodthirst
    vector<string> splitBloodthirst = parseBetween(s, "bloodthirst:", " ", false);
    if (splitBloodthirst.size())
--- a/projects/mtg/src/Player.cpp
+++ b/projects/mtg/src/Player.cpp
@@ -260,9 +260,7 @@ bool Player::hasPossibleAttackers()
    for (int j = 0; j < nbcards; ++j)
    {
        MTGCardInstance * c = z->cards[j];
-        if (!c->isTapped() &&
-            !c->hasSummoningSickness() &&
-            c->isCreature())
+        if (c->canAttack() && c->isCreature())
            return true;
    }
    return false;