From 970bef84d1f3d2ac6a85e3e8f61b9acc631a5f3f Mon Sep 17 00:00:00 2001
From: Loki <loki@magefree>
Date: Thu, 15 Sep 2011 23:44:13 +0300
Subject: [PATCH] 2 cards with kicker redone and fix AE

---
 Mage.Client/src/main/resources/zen.txt           |  2 +-
 .../src/mage/sets/zendikar/KorAeronaut.java      | 11 ++++++++---
 .../src/mage/sets/zendikar/KorSanctifiers.java   | 16 +++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Mage.Client/src/main/resources/zen.txt b/Mage.Client/src/main/resources/zen.txt
index 6955de149dd..062c57abe64 100644
--- a/Mage.Client/src/main/resources/zen.txt
+++ b/Mage.Client/src/main/resources/zen.txt
@@ -37,7 +37,7 @@
 37|Sunspring Expedition
 38|Windborne Charge
 39|World Queller
-40|Ęther Figment
+40|AEther Figment
 41|Archive Trap
 42|Archmage Ascension
 43|Caller of Gales
diff --git a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java
index 4e230bdb44e..a1578debbf5 100644
--- a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java
+++ b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java
@@ -32,7 +32,11 @@ import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.condition.common.KickedCondition;
+import mage.abilities.costs.mana.KickerManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.KickerAbility;
@@ -54,12 +58,13 @@ public class KorAeronaut extends CardImpl<KorAeronaut> {
         this.color.setWhite(true);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
+        this.getSpellAbility().addOptionalCost(new KickerManaCost("{1}{W}"));
 
         this.addAbility(FlyingAbility.getInstance());
-        KickerAbility ability = new KickerAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false);
-        ability.addManaCost(new ManaCostsImpl("{1}{W}"));
+
+        EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false);
         ability.addTarget(new TargetCreaturePermanent());
-        this.addAbility(ability);
+        this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, target creature gains flying until end of turn"));
     }
 
     public KorAeronaut(final KorAeronaut card) {
diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java
index 2927f2ecdad..8f860de1e05 100644
--- a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java
+++ b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java
@@ -30,13 +30,14 @@ package mage.sets.zendikar;
 
 import java.util.UUID;
 
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.costs.mana.ColoredManaCost;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.condition.common.KickedCondition;
+import mage.abilities.costs.mana.KickerManaCost;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.DestroyTargetEffect;
-import mage.abilities.keyword.KickerAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.FilterPermanent;
@@ -63,10 +64,11 @@ public class KorSanctifiers extends CardImpl<KorSanctifiers> {
 		this.color.setWhite(true);
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
-        KickerAbility kickerAbility = new KickerAbility(new DestroyTargetEffect(), false);
-        kickerAbility.addCost(new ColoredManaCost(Constants.ColoredManaSymbol.W));
-        kickerAbility.addTarget(new TargetPermanent(filter));
-        this.addAbility(kickerAbility);
+        this.getSpellAbility().addOptionalCost(new KickerManaCost("{W}"));
+
+        EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, destroy target artifact or enchantment"));
     }
 
     public KorSanctifiers (final KorSanctifiers card) {