Merge branch 'master' of github.com:WagicProject/wagic

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

@@ -1691,8 +1691,8 @@ toughness=5
 [card]
 name=Amorphous Axe
 auto={3}:equip
-auto=teach(creature) +3/+0
-auto=transforms((allsubtypes))
+auto=teach(creature) 3/0
+auto=teach(creature) transforms((allsubtypes))
 text=Equipped creature gets +3/+0 and is every creature type. -- Equip {3}
 mana={2}
 type=Artifact
@@ -2161,8 +2161,7 @@ toughness=2
 [card]
 name=Angelic Ascension
 target=creature,planeswalker
-auto=moveTo(Exile)
-auto=_ANGELTOKEN_ targetController
+auto=moveTo(Exile) && _ANGELTOKEN_ targetController
 text=Exile target creature or planeswalker. Its controller creates a 4/4 white Angel creature token with flying.
 mana={1}{W}
 type=Instant
@@ -5709,7 +5708,7 @@ name=Barrier Breach
 abilities=cycling
 target=<upto:3>enchantment
 auto=moveTo(exile)
-autohand=__CLYCLING__({2})
+autohand=__CYCLING__({2})
 text=Exile up to three target enchantments. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{G}
 type=Instant
@@ -10294,7 +10293,7 @@ toughness=4
 [/card]
 [card]
 name=Broodbirth Viper
-auto=@combatdamaged(player) from(this):name(Draw a card) draw:1 controller
+auto=@combatdamaged(player) from(this):name(Draw a card) may draw:1 controller
 text=Myriad (Whenever this creature attacks, for each opponent other than defending player, you may put a token that's a copy of this creature onto the battlefield tapped and attacking that player or a planeswalker he or she controls. Exile the tokens at end of combat.) -- Whenever Broodbirth Viper deals combat damage to a player, you may draw a card.
 mana={4}{U}
 type=Creature
@@ -36252,7 +36251,7 @@ toughness=3
 [card]
 name=Harmonious Archon
 abilities=flying
-auto=lord(creature[-archon]|battlefield) transforms((,setpower=3,settoughness=3)) forever
+auto=lord(creature[-archon]|battlefield) transforms((,setpower=3,settoughness=3))
 auto=create(Human:creature Human:1/1:white)*2
 text=Flying -- Non-Archon creatures have base power and toughness 3/3. -- When Harmonious Archon enters the battlefield, create two 1/1 white Human creature tokens.
 mana={4}{W}{W}
@@ -37259,7 +37258,7 @@ toughness=4
 [card]
 name=Herald's Horn
 auto=chooseatype transforms(([@each my upkeep:name(Reveal) reveal:1 optionone target(*[chosentype]|reveal) transforms(([may moveTo(myhand)])) oneshot optiononeend optiontwo target(*|reveal) moveto(mylibrary) optiontwoend revealend)])) chooseend
-auto=lord(*[creature;chosentype]|mycastingzone) altercost(colorless,-1)
+auto=lord(*[creature&chosentype]|mycastingzone) altercost(colorless,-1)
 text=As Herald's Horn enters the battlefield, choose a creature type. -- Creature spells you cast of the chosen type cost {1} less to cast. -- At the beginning of your upkeep, look at the top card of your library. If it's a creature card of the chosen type, you may reveal it and put it into your hand.
 mana={3}
 type=Artifact
@@ -38798,7 +38797,7 @@ toughness=0
 [card]
 name=Hungering Yeti
 abilities=flash
-other={4}{R} name(cast as it has flah)
+other={4}{R} name(cast as it has flash)
 restriction=myturnonly
 otherrestriction=type(*[blue;green]|mybattlefield)~morethan~0
 text=As long as you control a green or blue permanent, you may cast Hungering Yeti as though it had flash. (You may cast it any time you could cast an instant.)
@@ -44234,7 +44233,7 @@ toughness=3
 [card]
 name=Kinjalli's Sunwing
 abilities=flying
-auto=@movedto(creature|opponentbattlefield):tap all(trigger)
+auto=@movedto(creature|opponentbattlefield):tap(noevent) all(trigger)
 text=Flying -- Creatures your opponents control enter the battlefield tapped.
 mana={2}{W}
 type=Creature
@@ -48308,6 +48307,7 @@ toughness=2
 [/card]
 [card]
 name=Lutri, the Spellchaser
+abilities=flash
 auto=if casted(this) then castcard(copied noevent) target(*[instant;sorcery]|mystack)
 text=Companion - Each nonland card in your starting deck has a different name. (If this card is your chosen companion, you may put it into your hand from outside the game for {3} any time you could cast a sorcery.) -- Flash -- When Lutri, the Spellchaser enters the battlefield, if you cast it, copy target instant or sorcery spell you control. You may choose new targets for the copy.
 mana={1}{UR}{UR}
@@ -49129,7 +49129,7 @@ toughness=4
 [card]
 name=Manglehorn
 auto=may destroy target(artifact)
-auto=@movedto(artifact|opponentbattlefield):tap all(trigger[to])
+auto=@movedto(artifact|opponentbattlefield):tap(noevent) all(trigger[to])
 text=When Manglehorn enters the battlefield, you may destroy target artifact. -- Artifacts your opponents control enter the battlefield tapped.
 mana={2}{G}
 type=Creature
@@ -52805,7 +52805,7 @@ toughness=1
 [/card]
 [card]
 name=Myr Custodian
-auto=_SCRY_(2) && ability$!name(scry 1) _SCRY_(1) !$ opponent
+auto=_SCRY_(2) && ability$!name(scry 1) scry:$c scrycore delayed dontshow donothing scrycoreend scryend!$ opponent
 text=When Myr Custodian enters the battlefield, scry 2. Then each opponent may scry 1. (To scry X, that player looks at the top X cards of their library, then put any number of them on the bottom and the rest on top in any order.)
 mana={3}
 type=Artifact Creature
@@ -54796,7 +54796,7 @@ toughness=3
 [card]
 name=Norn's Choirmaster
 abilities=first strike,flying
-auto=@movetTo(*[iscommander]|myBattlefield):_PROLIFERATE_
+auto=@movedTo(*[iscommander]|myBattlefield):_PROLIFERATE_
 auto=@combat(attacking) source(creature[iscommander]|myBattlefield):_PROLIFERATE_
 text=Flying, first strike -- Whenever a commander you control enters the battlefield or attacks, proliferate. (Choose any number of permanents and/or players, then give each another counter kind of each kind they already have.)
 mana={3}{W}{W}
@@ -62097,7 +62097,7 @@ toughness=1
 [/card]
 [card]
 name=Rage-Scarred Berserker
-auto=1/0 target(creature|myBattlefield) ueot && indestructible ueot
+auto=target(creature|myBattlefield) transforms((,newability[1/0],newability[indestructible])) ueot
 text=When Rage-Scarred Berserker enters the battlefield, target creature you control gets +1/+0 and gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
 mana={4}{B}
 type=Creature
@@ -64682,7 +64682,8 @@ type=Instant
 [card]
 name=Return to the Ranks
 other={convoke} name(Convoke)
-auto=moveto(mybattlefield) target(<prex>creature[manacost<=2]|mygraveyard)
+target=<prex>creature[manacost<=2]|mygraveyard
+auto=moveto(battlefield) 
 text=Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.) -- Return X target creature cards with mana value 2 or less from your graveyard to the battlefield.
 mana={X}{W}{W}
 type=Sorcery
@@ -69663,8 +69664,7 @@ type=Instant
 [card]
 name=Secure the Scene
 target=*[-land]
-auto=moveTo(exile)
-auto=_SOLDIERTOKEN_ targetcontroller
+auto=moveTo(exile) && _SOLDIERTOKEN_ targetcontroller
 text=Exile target nonland permanent. Its controller creates a 1/1 white Soldier creature token.
 mana={4}{W}
 type=Sorcery

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

@@ -711,7 +711,8 @@ toughness=1
 [/card]
 [card]
 name=Acorn Catapult
-auto={1}{T}:damage:1 target(creature,player) && token(Squirrel,Creature Squirrel,1/1,green) targetcontroller
+auto={1}{T}:name(target creature) damage:1 target(creature) && create(Squirrel:Creature Squirrel:1/1:green) targetcontroller
+auto={1}{T}:name(target player) damage:1 target(player) && create(Squirrel:Creature Squirrel:1/1:green) targetedplayer
 text={1}, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
 mana={4}
 type=Artifact
@@ -1411,7 +1412,7 @@ toughness=4
 [/card]
 [card]
 name=Aetherflux Reservoir
-auto=@movedTo(*|mystack):life:pstormcount controller
+auto=@movedTo(*|mystack):life:pstormcountplus1plusend controller
 auto={l:50}:damage:50 target(creature,player)
 text=Whenever you cast a spell, you gain 1 life for each spell you've cast this turn. -- Pay 50 life: Aetherflux Reservoir deals 50 damage to target creature or player.
 mana={4}
@@ -25540,8 +25541,8 @@ subtype=Aura
 [card]
 name=Dance of the Skywise
 target=creature|mybattlefield
-auto=loseabilities ueot
-auto=flying ueot
+auto=ueot loseabilities
+auto=ueot flying
 auto=transforms((,setpower=4,settoughness=4)) ueot
 auto=transforms((Dragon Illusion,blue)) ueot
 text=Until end of turn, target creature you control becomes a blue Dragon Illusion with base power and toughness 4/4, loses all abilities, and gains flying.
@@ -134816,11 +134817,11 @@ type=Artifact
 [/card]
 [card]
 name=Wirewood Channeler
-auto={T}:name(Red) foreach(elf) add{R}
 auto={T}:name(White) foreach(elf) add{W}
-auto={T}:name(Green) foreach(elf) add{G}
+auto={T}:name(Blue) foreach(elf) add{U}
 auto={T}:name(Black) foreach(elf) add{B}
-auto={T}:name(Blue) foreach(elf|myBattlefield) add{U}
+auto={T}:name(Red) foreach(elf) add{R}
+auto={T}:name(Green) foreach(elf) add{G}
 text={T}: Add X mana of any one color to your mana pool, where X is the number of Elves on the battlefield.
 mana={3}{G}
 type=Creature
@@ -135839,8 +135840,8 @@ toughness=5
 [card]
 name=Wormfang Drake
 abilities=flying
-auto=choice sacrifice
 auto=aslongas(other creature|mybattlefield) choice notatarget(other creature|mybattlefield) (blink)forsrc oneshot
+auto=choice sacrifice
 text=Flying -- When Wormfang Drake enters the battlefield, sacrifice it unless you exile a creature you control other than Wormfang Drake. -- When Wormfang Drake leaves the battlefield, return the exiled card to the battlefield under its owner's control.
 mana={2}{U}
 type=Creature