From 5e4902c2296979c188ed77f6250939747b9f9166 Mon Sep 17 00:00:00 2001
From: "solo81@web.de" <solo81@web.de@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sat, 29 Jan 2011 16:05:01 +0000
Subject: [PATCH] - Completed code for Helm of Kaldra.

- Added Kaldra token (keyword:"newtarget" --> rev2922).

- Added test for Kaldra.
---
 projects/mtg/bin/Res/sets/5DN/_cards.dat     |  5 ++++
 projects/mtg/bin/Res/sets/primitives/mtg.txt | 18 ++++++++----
 projects/mtg/bin/Res/test/_tests.txt         |  1 +
 projects/mtg/bin/Res/test/kaldra.txt         | 31 ++++++++++++++++++++
 4 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 projects/mtg/bin/Res/test/kaldra.txt

diff --git a/projects/mtg/bin/Res/sets/5DN/_cards.dat b/projects/mtg/bin/Res/sets/5DN/_cards.dat
index 0b0e06d6b..b7219375c 100644
--- a/projects/mtg/bin/Res/sets/5DN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/5DN/_cards.dat
@@ -419,6 +419,11 @@ id=72928
 rarity=R
 [/card]
 [card]
+primitive=Kaldra
+id=-47449
+rarity=T
+[/card]
+[card]
 primitive=Krark-Clan Engineers
 id=50201
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 6ade9d3a2..4407304ea 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -28257,12 +28257,7 @@ auto=first strike
 auto=trample
 auto=haste
 auto={2}:equip
-# Following line does not work yet: It's not possible to specify
-# a target for an equip action. Even if that gets implemented,
-# targetting a token that's just being created might not work.
-# It currently doesn't matter though since the sword can't be
-# implemented anyway.
-# auto --- aslongas(Sword of Kaldra|mybattlefield) aslongas(Shield of Kaldra|mybattlefield) {1}:token(Kaldra,Legendary Creature Avatar,4/4) && attach target(Kaldra)
+auto={1}:aslongas(Sword of Kaldra|mybattlefield) aslongas(Shield of Kaldra|mybattlefield):token(-47449)
 text=Equipped creature has first strike, trample, and haste. -- {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. -- Equip {2}
 mana={3}
 type=Legendary Artifact
@@ -32064,6 +32059,17 @@ power=*
 toughness=*
 [/card]
 [card]
+name=Kaldra
+auto=all(helm of kaldra) newtarget
+auto=all(shield of kaldra) newtarget
+auto=all(sword of kaldra) newtarget
+type=Legendary Creature
+subtype=Avatar
+power=4
+toughness=4
+id=-47449
+[/card]
+[card]
 name=Kaleidostone
 auto=draw:1
 auto={5}{T}{S}:Add {W}{U}{B}{R}{G}
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index b0bb260a0..f7dabb029 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -340,6 +340,7 @@ jodahs_avenger.txt
 juggernaut.txt
 jump.txt
 juniper_order_ranger.txt
+kaldra.txt
 karns_touch_i233.txt
 keldon_warlord.txt
 keldon_warlord2.txt
diff --git a/projects/mtg/bin/Res/test/kaldra.txt b/projects/mtg/bin/Res/test/kaldra.txt
new file mode 100644
index 000000000..4cc6da943
--- /dev/null
+++ b/projects/mtg/bin/Res/test/kaldra.txt
@@ -0,0 +1,31 @@
+#Testing Kaldra token (keyword:newtarget).
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Fervor,Sword of Kaldra,Shield of Kaldra,Helm of Kaldra
+manapool:{1}
+life:20
+[PLAYER2]
+life:20
+[DO]
+Helm of Kaldra
+next
+#combatbegins
+next
+#attackers
+Kaldra
+next
+#blockers
+next
+#combatdamage
+next
+#combatend
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Fervor,Sword of Kaldra,Shield of Kaldra,Helm of Kaldra,Kaldra
+manapool:{0}
+life:20
+[PLAYER2]
+life:11
+[END]
\ No newline at end of file