Fixed some primitives from issue WagicProject#1085, fixed _BLINK_UEOT…

…_ macro, improved several abilities to allow the usage og "and" option.

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

@@ -203,7 +203,7 @@
 #AUTO_DEFINE _RENOWN_($c) this(cantargetcard(*[-renown]) transforms((,newability[@combatdamaged(player) from(this):counter(1/1.$c) && becomes(renown) forever]))
 
 # Exile card. Return it to the battlefield under its owner's control at the beginning of the next end step.
-#AUTO_DEFINE _BLINK_UEOT_ name(Blink ueot) all(this) transforms((,newability[moveto(exile)],newability[if cantargetcard(*[-token]|*) then phaseactionmulti[endofturn once] moveto(ownerbattlefield)]))
+#AUTO_DEFINE _BLINK_UEOT_  moveto(exile) and!( transforms((,newability[phaseaction[endofturn once checkex] moveto(ownerbattlefield)])) forever )!
 
 # Connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
 #AUTO_DEFINE _CONNIVES_ draw:1 && transforms((,newability[if type(*[-land]|myhand)~morethan~0 then choice name(Discard a nonland) name(Discard a nonland) target(*[-land]|myhand) reject && counter(1/1) all(this)],newability[if type(land|myhand)~morethan~0 then choice name(Discard a land) name(Discard a land) target(land|myhand) reject])) oneshot

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

@@ -1,6 +1,6 @@
 #Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#I sorted this programmatically so the other comments are removed except for AUTO_DEFINE - Vitty85 26-07-2023
+#I sorted this programmatically so the other comments are removed except for AUTO_DEFINE - Vitty85 27-07-2023
 [card]
 name=Abandon Reason
 target=<upto:2>creature
@@ -1438,7 +1438,7 @@ type=Instant
 [/card]
 [card]
 name=Aetherling
-auto={U}:_BLINK_UEOT_
+auto={U}:name(Blink ueot) _BLINK_UEOT_
 auto={U}:unblockable
 auto={1}:1/-1
 auto={1}:-1/1
@@ -4354,7 +4354,7 @@ toughness=2
 [/card]
 [card]
 name=Anurid Brushhopper
-auto={D(*|myhand)}{D(*|myhand)}:_BLINK_UEOT_
+auto={D(*|myhand)}{D(*|myhand)}:name(Blink ueot) _BLINK_UEOT_
 text=Discard two cards: Exile Anurid Brushhopper. Return it to the battlefield under its owner's control at the beginning of the next end step.
 mana={1}{G}{W}
 type=Creature
@@ -5585,7 +5585,7 @@ type=Instant
 [card]
 name=Argent Sphinx
 abilities=flying
-auto=aslongas(artifact|mybattlefield) {U}:_BLINK_UEOT_ >2
+auto=aslongas(artifact|mybattlefield) {U}:name(Blink ueot) name(Blink ueot) _BLINK_UEOT_ >2
 text=Flying -- Metalcraft {U}: Exile Argent Sphinx. Return it to the battlefield under your control at the beginning of the next end step. Activate this ability only if you control three or more artifacts.
 mana={2}{U}{U}
 type=Creature
@@ -43487,7 +43487,7 @@ toughness=6
 [/card]
 [card]
 name=Frenetic Sliver
-auto=lord(sliver) {0}:flipacoin winability _BLINK_UEOT_ winabilityend loseability sacrifice loseabilityend flipend
+auto=lord(sliver) {0}:flipacoin winability name(Blink ueot) _BLINK_UEOT_ winabilityend loseability sacrifice loseabilityend flipend
 text=All Slivers have "{0}: If this permanent is on the battlefield, flip a coin. If you win the flip, exile this permanent and return it to the battlefield under its owner's control at the beginning of the next end step. If you lose the flip, sacrifice it."
 mana={1}{U}{R}
 type=Creature
@@ -45740,7 +45740,7 @@ toughness=3
 [card]
 name=Ghost Council of Orzhova
 auto=choice target(opponent) life:-1 && life:1 controller
-auto={1}{S(creature|mybattlefield)}:_BLINK_UEOT_
+auto={1}{S(creature|mybattlefield)}:name(Blink ueot) _BLINK_UEOT_
 text=When Ghost Council of Orzhova enters the battlefield, target opponent loses 1 life and you gain 1 life. -- {1}, Sacrifice a creature: Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step.
 mana={W}{W}{B}{B}
 type=Legendary Creature
@@ -54716,7 +54716,7 @@ type=Sorcery
 [card]
 name=Hikari, Twilight Guardian
 abilities=flying
-auto=@movedTo(spirit,arcane|mystack):may _BLINK_UEOT_
+auto=@movedTo(spirit,arcane|mystack):may name(Blink ueot) _BLINK_UEOT_
 text=Flying -- Whenever you cast a Spirit or Arcane spell, you may exile Hikari, Twilight Guardian. If you do, return it to the battlefield under its owner's control at the beginning of the next end step.
 mana={3}{W}{W}
 type=Legendary Creature
@@ -64872,9 +64872,9 @@ toughness=*
 [/card]
 [card]
 name=Krovikan Plague
-target=creature[-Wall]|myBattlefield
-auto=@next upkeep:draw:1 controller
-auto=teach(creature) {T}:damage:1 target(anytarget) && all(this) counter(0/-1,1)
+target=creature[-wall]|myBattlefield
+auto=@next upkeep:name(Draw a card) draw:1 controller
+auto=teach(creature) transforms((,newability[{T}{C(0/-1.1)}:name(Deal damage) damage:1 target(anytarget)]))
 text=Enchant non-Wall creature you control -- When Krovikan Plague enters the battlefield, draw a card at the beginning of the next turn's upkeep. -- Enchanted creature has "{T}: Put a -0/-1 counter on this creature, and Krovikan Plague deals 1 damage to target creature or player."
 mana={2}{B}
 type=Enchantment
@@ -64971,7 +64971,7 @@ type=Artifact
 [card]
 name=Kudzu
 target=land
-auto=@tapped(mytgt):all(trigger) destroy && all(this) transforms((,newability[target(land) retarget])) forever
+auto=@tapped(mytgt):all(trigger) destroy && all(this) transforms((,newability[name(Attach to land) target(land|battlefield) retarget])) forever
 text=Enchant land -- When enchanted land becomes tapped, destroy it. That land's controller attaches Kudzu to a land of his or her choice.
 mana={1}{G}{G}
 type=Enchantment

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

@@ -1,6 +1,6 @@
 #Planeswalkers Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#We sorted this in alphabetical order - Luruz & Vitty85 26-07-2023
+#We sorted this in alphabetical order - Luruz & Vitty85 27-07-2023
 [card]
 name=Abian, Luvion Usurper
 auto=counter(0/0,5,loyalty)
@@ -1666,10 +1666,9 @@ subtype=Karn
 name=Karn, the Great Creator
 auto=counter(0/0,5,loyalty)
 auto=lord(artifact|opponentBattlefield) noactivatedability
-auto={C(0/0,1,Loyalty)}:name(+1: Becomes a creature) target(artifact[-creature]) transforms((creature,newability[manacost/manacost])) uynt
-auto={C(0/0,1,Loyalty)}:name(+1: Loyalty counter) donothing
-auto={C(0/0,-2,Loyalty)}:name(-2: move a card from exile) moveto(ownerhand) target(artifact|myexile)
-auto={C(0/0,-2,Loyalty)}:name(-2: move a card from sideboard) reveal:type:*:mysideboard revealzone(mysideboard) optionone name(choose card) target(<1>*[artifact]|reveal) moveto(myhand) and!(all(other *|reveal) moveto(ownersideboard))! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownersideboard) and!(all(other *|reveal) moveto(ownersideboard))! optiontwoend revealend
+auto={C(0/0,1,Loyalty)}:name(+1: Transform an artifact) target(artifact[-creature]) transforms((creature,newability[manacost/manacost])) uynt
+auto={C(0/0,1,Loyalty)}:name(+1: Don't transform any artifact) donothing
+auto={C(0/0,-2,Loyalty)}:name(-2: Move a card from outside game) target(artifact|myexile,mysideboard) moveto(myhand)
 text=Activated abilities of artifacts your opponents control can't be activated. -- +1: Until your next turn, up to one target noncreature artifact becomes an artifact creature with power and toughness each equal to its mana value. -- -2: You may choose an artifact card you own from outside the game or in exile, reveal that card, and put it into your hand.
 mana={4}
 type=Legendary Planeswalker
@@ -1763,9 +1762,11 @@ subtype=Kaya
 [card]
 name=Kaya, Ghost Assassin
 auto=counter(0/0,5,loyalty)
-auto={C(0/0,0,Loyalty)}:name(+0: Exile Kaya or creature) ability$!name(Choose creature or this) choice name(Kaya, Ghost Assassin) all(this) (blink)ueot && life:-2 controller _choice name(Creature) target(creature) (blink)ueot controller!$ controller && life:-2
-auto={C(0/0,-1,Loyalty)}:name(-1: Each opponent loses life and you gain) life:-2 opponent && life:2 controller
-auto={C(0/0,-2,Loyalty)}:name(-2: Each opponent discard and draw) ability$!name(discard a card) notatarget(*|myHand) reject!$ opponent && draw:1 controller
+auto={C(0/0,0,Loyalty)}:name(+0: Exile creature) target(creature|battlefield) moveto(exile) and!( life:-2 controller && transforms((,newability[phaseaction[endofturn once checkex] moveto(ownerbattlefield)])) forever )!
+auto={C(0/0,0,Loyalty)}:name(+0: Exile kaya) moveto(exile) and!( life:-2 controller && counter(0/0,hascntloyalty,Loyalty) && transforms((,newability[@next endofturn:name(Return to battlefield) moveto(ownerbattlefield) and!( counter(0/0.hascntloyalty.Loyalty) notrg && counter(0/0.-5.Loyalty) notrg)! ])) forever )!
+auto={C(0/0,0,Loyalty)}:name(+0: Don't exile anything) life:-2 controller
+auto={C(0/0,-1,Loyalty)}:name(-1: Opponent loses life) lifeleech:-2 opponent
+auto={C(0/0,-2,Loyalty)}:name(-2: Each opponent discard and draw) ability$!name(Discard a card) notatarget(*|myHand) reject!$ opponent && draw:1 controller
 text=0: Exile Kaya, Ghost Assassin or up to one target creature. Return that card to the battlefield under its owner's control at the beginning of your next upkeep. You lose 2 life. -- -1: Each opponent loses 2 life and you gain 2 life. -- -2: Each opponent discards a card and you draw a card.
 mana={2}{W}{B}
 type=Legendary Planeswalker