From 8d6e0122bb7253d29700bc4519067ed4160ddf84 Mon Sep 17 00:00:00 2001
From: Vittorio Alfieri <vittorioalfieri@gmail.com>
Date: Fri, 27 Aug 2021 23:47:47 +0200
Subject: [PATCH] Added/fixed primitives.

---
 CHANGELOG.md                                  |  5 +++-
 .../bin/Res/sets/primitives/borderline.txt    | 24 ++++++++++---------
 projects/mtg/bin/Res/sets/primitives/mtg.txt  |  2 +-
 .../bin/Res/sets/primitives/unsupported.txt   | 10 --------
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 119c5ab58..44ec3c900 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,11 @@
 
 ## [master] (https://github.com/WagicProject/wagic/tree/master)
 
+### 27/08/21
+- *Committed:* Added/fixed primitives. ([Vitty85](https://github.com/Vitty85)) 
+
 ### 26/08/21
-- *Committed:* Added/fixed primitives, Added keywords "showopponenthand" and "showcontrollerhand" to allow controller and opponent to play with their hand revealed, added "mytarg" prefix to check values for a card target as like we do for "storedcard" prefix (e.g. "Redirect"), fixed "undocpy" keyoword for all cards (e.g. "Renegade Doppelganger") that have to be back from a previous copy. ([Vitty85](https://github.com/Vitty85)) 
+- *Committed:* Added/fixed primitives, Added keywords "showopponenthand" and "showcontrollerhand" to allow controller and opponent to play with their hand revealed, added "mytarg" prefix to check values for a card target as like we do for "storedcard" prefix (e.g. "Redirect"), fixed "undocpy" keyoword for all cards (e.g. "Renegade Doppelganger") that have to be back from a previous copy. https://github.com/WagicProject/wagic/commit/1ce0facf215f2af172e7e42b1f4d0ea25a7df38d ([Vitty85](https://github.com/Vitty85)) 
 
 ### 25/08/21
 - *Committed:* Added/fixed primitives, Improved AI: now it can plays cards using morph cost too. https://github.com/WagicProject/wagic/commit/bbc25e2727b1007ecb28888ce26482d856187298 ([Vitty85](https://github.com/Vitty85)) 
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 2b6c520a0..27ede843b 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -50532,16 +50532,6 @@ mana={GU}{GU}
 type=Instant
 [/card]
 [card]
-name=Rescind
-abilities=cycling
-target=*
-auto=moveTo(ownerHand)
-autohand=__CYCLING__({2})
-text=Return target permanent to its owner's hand. -- Cycling 2 ( 2 , Discard this card: Draw a card.)
-mana={1}{U}{U}
-type=Instant
-[/card]
-[card]
 name=Rescue from the Underworld
 target=creature|mygraveyard
 auto=phaseaction[my upkeep once]:moveto(mybattlefield) && moveTo(mybattlefield) target(creature|mygraveyard)
@@ -63128,7 +63118,7 @@ toughness=2
 [/card]
 [card]
 name=Tactical Advantage
-target=creature[blocking,blocked]|myBattlefield
+target=creature[blocking;blocked]|myBattlefield
 auto=2/2 ueot
 text=Target blocking or blocked creature you control gets +2/+2 until end of turn.
 mana={W}
@@ -71574,6 +71564,18 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Whip Vine
+abilities=defender,reach,doesnotuntap
+auto=@each my untap sourcetap:may name(Untap Whip Vine) untap
+auto={T}:name(Tap blocked flying creature):target(creature[flying;blocked]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+text=Defender; reach (This creature can block creatures with flying.) -- You may choose not to untap Whip Vine during your untap step. -- {T}: Tap target creature with flying blocked by Whip Vine. That creature doesn't untap during its controller's untap step for as long as Whip Vine remains tapped.
+mana={2}{G}
+type=Creature
+subtype=Plant Wall
+power=1
+toughness=4
+[/card]
+[card]
 name=Whiptongue Hydra
 abilities=reach
 auto=@movedto(creature[flying]|graveyard):counter(1/1) oneshot
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 89dc9f743..760627a04 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -94102,7 +94102,7 @@ power=5
 toughness=5
 [/card]
 [card]
-name=
+name=Rescind
 abilities=cycling
 target=*
 auto=moveTo(ownerhand)
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index 7b7bb8ac9..9c4e76473 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -12573,16 +12573,6 @@ mana={5}{R}
 type=Sorcery
 [/card]
 [card]
-name=Whip Vine
-abilities=defender,reach
-text=Defender; reach (This creature can block creatures with flying.) -- You may choose not to untap Whip Vine during your untap step. -- {T}: Tap target creature with flying blocked by Whip Vine. That creature doesn't untap during its controller's untap step for as long as Whip Vine remains tapped.
-mana={2}{G}
-type=Creature
-subtype=Plant Wall
-power=1
-toughness=4
-[/card]
-[card]
 name=Whipgrass Entangler
 text={1}{W}: Until end of turn, target creature gains "This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield."
 mana={2}{W}