From df835712a2321043dcd8f600499ecbf385591019 Mon Sep 17 00:00:00 2001
From: FenrisulfrX <wil.edu@gmail.com>
Date: Tue, 31 Mar 2015 14:15:26 -0300
Subject: [PATCH] Fixes to Duskwalker and Kuva Titan

Fixes them to not use Triggered Abilities.
---
 Mage.Sets/src/mage/sets/invasion/Duskwalker.java | 14 ++++++--------
 Mage.Sets/src/mage/sets/invasion/KavuTitan.java  | 13 ++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/invasion/Duskwalker.java b/Mage.Sets/src/mage/sets/invasion/Duskwalker.java
index 99e6110669..b84257e1b6 100644
--- a/Mage.Sets/src/mage/sets/invasion/Duskwalker.java
+++ b/Mage.Sets/src/mage/sets/invasion/Duskwalker.java
@@ -30,10 +30,8 @@ package mage.sets.invasion;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
-
-import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.common.KickedCondition;;
-import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.FearAbility;
@@ -62,11 +60,11 @@ public class Duskwalker extends CardImpl {
         this.addAbility(new KickerAbility("{3}{B}"));
         
         // If Duskwalker was kicked, it enters the battlefield with two +1/+1 counters on it and with fear.
-        Ability ability = new ConditionalTriggeredAbility(
-                new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2))),
-                KickedCondition.getInstance(),"If {this} was kicked, it enters the battlefield with two +1/+1 counters on it and with fear.");
-		ability.addEffect(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield));
-		this.addAbility(ability);
+        Ability ability = new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),
+                KickedCondition.getInstance(), true,
+                "If {this} was kicked, it enters the battlefield with two +1/+1 counters on it and with fear.", "");
+        ability.addEffect(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield));
+        this.addAbility(ability);
     }
 
     public Duskwalker(final Duskwalker card) {
diff --git a/Mage.Sets/src/mage/sets/invasion/KavuTitan.java b/Mage.Sets/src/mage/sets/invasion/KavuTitan.java
index c648af4ab1..fc79256dae 100644
--- a/Mage.Sets/src/mage/sets/invasion/KavuTitan.java
+++ b/Mage.Sets/src/mage/sets/invasion/KavuTitan.java
@@ -32,9 +32,8 @@ import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.common.KickedCondition;
-import mage.abilities.decorator.ConditionalTriggeredAbility;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.KickerAbility;
@@ -61,11 +60,11 @@ public class KavuTitan extends CardImpl {
         // Kicker {2}{G}
         this.addAbility(new KickerAbility("{2}{G}"));
         // If Kavu Titan was kicked, it enters the battlefield with three +1/+1 counters on it and with trample.
-        Ability ability = new ConditionalTriggeredAbility(
-                new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3))),
-                KickedCondition.getInstance(),"If Kavu Titan was kicked, it enters the battlefield with three +1/+1 counters on it and with trample.");
-		ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield));
-		this.addAbility(ability);
+        Ability ability = new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)),
+                KickedCondition.getInstance(), true,
+                "If Kavu Titan was kicked, it enters the battlefield with three +1/+1 counters on it and with trample.", "");
+        ability.addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield));
+        this.addAbility(ability);
     }
 
     public KavuTitan(final KavuTitan card) {