From 6628225c56769bcc7b32fe336d51bd189544637d Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew"
 <wagic.the.homebrew@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Mon, 8 Dec 2008 12:27:48 +0000
Subject: [PATCH] Erwan - Fixed a few bugs with Ice Age cards - removed 2 ice
 age cards that can not work currently

---
 projects/mtg/bin/Res/sets/ICE/_cards.dat | 36 ++++--------------------
 projects/mtg/bin/Res/sets/ICE/todo.dat   | 21 ++++++++++++++
 projects/mtg/include/AllAbilities.h      |  2 +-
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index ab5211157..509330c85 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -105,21 +105,6 @@ mana={B}
 subtype=aura
 [/card]
 [card]
-text=When Prismatic Ward comes into play, choose a color; all damage dealt to target creature by sources of that color is reduced to 0.
-id=2707
-target=creature
-auto=:protection from blue
-auto=:protection from green
-auto=:protection from black
-auto=:protection from red
-auto=:protection from white
-name=Prismatic Ward
-rarity=C
-type=Enchantment 
-mana={1}{W}
-subtype=aura
-[/card]
-[card]
 text=When Regeneration comes into play, choose target creature.{G}: Regenerate creature Regeneration enchants.
 target=creature
 auto={G}:regenerate
@@ -1160,6 +1145,7 @@ mana={1}{W}
 [/card]
 [card]
 text=Target creature gains first strike until end of turn. Draw a card at the beginning of the next turn's upkeep.
+target=creature
 id=2702
 auto=:first strike
 auto=@next upkeep:draw:1
@@ -1179,21 +1165,9 @@ type=Instant
 mana={1}{U}
 [/card]
 [card]
-text={T}: Target creature gets +2/+2 until end of turn. If that creature leaves play this turn, bury Kjeldoran Elite Guard. Use this ability only when attack or defense is announced.
-id=2694
-auto={T}:2/2 target(creature)
-name=Kjeldoran Elite Guard
-rarity=U
-type=Creature 
-mana={3}{W}
-power=2
-subtype=Soldier
-toughness=2
-[/card]
-[card]
 text={1}{W}: Target green creature gains first strike until end of turn.
 id=2693
-auto={1}{W}:first strike target(creature)
+auto={1}{W}:first strike target(creature[green])
 name=Kelsinko Ranger
 rarity=C
 type=Creature 
@@ -1405,7 +1379,7 @@ rarity=R
 type=Creature 
 mana={2}{W}{W}
 power=1
-subtype=Knights
+subtype=human knight
 toughness=1
 [/card]
 [card]
@@ -1420,11 +1394,11 @@ subtype=Lhurgoyf
 toughness=1
 [/card]
 [card]
-text={T} target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
+text=Tap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
 id=2503
 target=artifact,creature,land
 auto=tap
-auto=draw:1
+auto=@next upkeep:draw:1
 name=Enervate
 rarity=C
 type=Instant
diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat
index 664865b6d..ed8c9d670 100644
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -824,6 +824,18 @@ mana={R}
 subtype=aura
 [/card]
 [card]
+text={T}: Target creature gets +2/+2 until end of turn. If that creature leaves play this turn, bury Kjeldoran Elite Guard. Use this ability only when attack or defense is announced.
+id=2694
+auto={T}:2/2 target(creature)
+name=Kjeldoran Elite Guard
+rarity=U
+type=Creature 
+mana={3}{W}
+power=2
+subtype=Soldier
+toughness=2
+[/card]
+[card]
 text=All creatures able to block target creature must do so. Lure does not prevent a creature from blocking more than one creature if blocker has that ability. If blocker is forced to block more creatures than it is allowed to, defender chooses which of these creatures to block, but must block as many creatures as allowed.
 id=2577
 name=Lure
@@ -863,6 +875,15 @@ mana={U}
 subtype=aura
 [/card]
 [card]
+text=When Prismatic Ward comes into play, choose a color; all damage dealt to target creature by sources of that color is reduced to 0.
+id=2707
+target=creature
+rarity=C
+type=Enchantment 
+mana={1}{W}
+subtype=aura
+[/card]
+[card]
 text=Target creature gets +2/+2 as long as any opponent controls any red cards. That creature cannot be blocked by red creatures.
 id=2709
 name=Red Scarab
diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 8ee0b9ec8..6089d775e 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -2909,7 +2909,7 @@ class ALostOrderofJarkeld:public ListMaintainerAbility{
   }
 
   int canBeInList(MTGCardInstance * card){
-    if (card==source || (game->currentPlayer->game->inPlay->hasCard(card) && card->isACreature()) ) return 1;
+    if (source->controller()->opponent()->game->inPlay->hasCard(card) && card->isACreature() ) return 1;
     return 0;
   }