From da3936abfb768ca03d0b248121df7d2dbdee8e15 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 31 May 2014 11:06:07 +0200
Subject: [PATCH] Fixed tooltip text of Resistance Fighter, Crimson Hellkite
 and Maze of Ith.

---
 .../sets/seventhedition/CrimsonHellkite.java     |  7 +++++--
 Mage.Sets/src/mage/sets/thedark/MazeOfIth.java   | 16 ++++++++++------
 .../common/PreventDamageByTargetEffect.java      | 12 ++++++++++--
 .../target/common/TargetAttackingCreature.java   |  5 +++++
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java b/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java
index 64e7552a75..39c212afc7 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java
@@ -36,6 +36,7 @@ import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.costs.mana.VariableManaCost;
 import mage.abilities.dynamicvalue.common.ManacostVariableValue;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -69,13 +70,15 @@ public class CrimsonHellkite extends CardImpl<CrimsonHellkite> {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {X}, {tap}: Crimson Hellkite deals X damage to target creature. Spend only red mana this way.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}"));
+        Effect effect = new DamageTargetEffect(new ManacostVariableValue());
+        effect.setText("{this} deals X damage to target creature. Spend only red mana this way");
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}"));
         ability.addCost(new TapSourceCost());
         VariableCost variableCost = ability.getManaCostsToPay().getVariableCosts().get(0);
         if (variableCost instanceof VariableManaCost) {
             ((VariableManaCost) variableCost).setFilter(filterRedMana);
         }
-        ability.addTarget(new TargetCreaturePermanent());
+        ability.addTarget(new TargetCreaturePermanent(true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java b/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java
index 68eb1fe86b..081d4907d0 100644
--- a/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java
+++ b/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java
@@ -28,17 +28,17 @@
 package mage.sets.thedark;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.PreventDamageByTargetEffect;
 import mage.abilities.effects.common.PreventDamageToTargetEffect;
 import mage.abilities.effects.common.UntapTargetEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.target.common.TargetAttackingCreature;
 
@@ -54,9 +54,13 @@ public class MazeOfIth extends CardImpl<MazeOfIth> {
 
         // {tap}: Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost());
-        ability.addEffect(new PreventDamageByTargetEffect(Duration.EndOfTurn, true));
-        ability.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE, true));
-        ability.addTarget(new TargetAttackingCreature());
+        Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true);
+        effect.setText("Prevent all combat damage that would be dealt to");
+        ability.addEffect(effect);
+        effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE, true);
+        effect.setText("and dealt by that creature this turn");
+        ability.addEffect(effect);
+        ability.addTarget(new TargetAttackingCreature(true));
         this.addAbility(ability);
     }
 
diff --git a/Mage/src/mage/abilities/effects/common/PreventDamageByTargetEffect.java b/Mage/src/mage/abilities/effects/common/PreventDamageByTargetEffect.java
index 720359c6e1..60daa1b1cc 100644
--- a/Mage/src/mage/abilities/effects/common/PreventDamageByTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/PreventDamageByTargetEffect.java
@@ -80,12 +80,20 @@ public class PreventDamageByTargetEffect extends PreventionEffectImpl<PreventDam
         }
         if (amountToPrevent == Integer.MAX_VALUE) {
             StringBuilder sb = new StringBuilder();
-            sb.append("Prevent all damage target ");
+            sb.append("Prevent all");
+            if (onlyCombat) {
+                sb.append("combat ");
+            }
+            sb.append(" damage target ");
             sb.append(mode.getTargets().get(0).getTargetName()).append(" would deal ").append(duration.toString());
             return sb.toString();
         } else {
             StringBuilder sb = new StringBuilder();
-            sb.append("Prevent the next ").append(amountToPrevent).append(" damage that ");
+            sb.append("Prevent the next ").append(amountToPrevent);
+            if (onlyCombat) {
+                sb.append("combat ");
+            }
+            sb.append(" damage that ");
             sb.append(mode.getTargets().get(0).getTargetName()).append(" would deal ").append(duration.toString());
             return sb.toString();
         }
diff --git a/Mage/src/mage/target/common/TargetAttackingCreature.java b/Mage/src/mage/target/common/TargetAttackingCreature.java
index 4f8edad189..d3fc045d2a 100644
--- a/Mage/src/mage/target/common/TargetAttackingCreature.java
+++ b/Mage/src/mage/target/common/TargetAttackingCreature.java
@@ -41,6 +41,11 @@ public class TargetAttackingCreature extends TargetPermanent<TargetAttackingCrea
         this(1, 1, new FilterAttackingCreature(), false);
     }
 
+    public TargetAttackingCreature(boolean required) {
+        this(1, 1, new FilterAttackingCreature(), false);
+        this.setRequired(required);
+    }
+    
     public TargetAttackingCreature(int numTargets) {
         this(numTargets, numTargets, new FilterAttackingCreature(), false);
     }