Fixed tooltip text of Angus Mackenzie and added Blistering Firecat.

Mage.Sets/src/mage/sets/legends/AngusMackenzie.java

@@ -34,6 +34,7 @@ import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.PreventAllDamageByAllEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -62,10 +63,12 @@ public class AngusMackenzie extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
+        Effect effect = new PreventAllDamageByAllEffect(Duration.EndOfTurn, true);
+        effect.setText("Prevent all combat damage that would be dealt this turn");
         // {G}{W}{U}, {tap}: Prevent all combat damage that would be dealt this turn. Activate this ability only before the combat damage step.
         Ability ability = new ActivateIfConditionActivatedAbility(
                 Zone.BATTLEFIELD, 
-                new PreventAllDamageByAllEffect(Duration.EndOfTurn, true),
+                effect,
                 new ManaCostsImpl("{G}{W}{U}"), 
                 BeforeCombatDamageCondition.getInstance()
         );

Mage.Sets/src/mage/sets/onslaught/BlisteringFirecat.java

@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.onslaught;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.OnEventTriggeredAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.abilities.keyword.HasteAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.SacrificeSourceEffect;
+import mage.abilities.keyword.MorphAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class BlisteringFirecat extends CardImpl {
+
+    public BlisteringFirecat(UUID ownerId) {
+        super(ownerId, 189, "Blistering Firecat", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{R}{R}{R}");
+        this.expansionSetCode = "ONS";
+        this.subtype.add("Elemental");
+        this.subtype.add("Cat");
+
+        this.color.setRed(true);
+        this.power = new MageInt(7);
+        this.toughness = new MageInt(1);
+
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+        // Haste
+        this.addAbility(HasteAbility.getInstance());
+        // At the beginning of the end step, sacrifice Blistering Firecat.
+         this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect()));
+        // Morph {R}{R}
+        this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}{R}")));
+    }
+
+    public BlisteringFirecat(final BlisteringFirecat card) {
+        super(card);
+    }
+
+    @Override
+    public BlisteringFirecat copy() {
+        return new BlisteringFirecat(this);
+    }
+}

Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java

@@ -88,7 +88,8 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl {
             sb.append(" Activate this ability only ");
         }
         if (condition.toString() != null) {
-            if (!condition.toString().startsWith("during")) {
+            if (!condition.toString().startsWith("during") &&
+                !condition.toString().startsWith("before")) {
                 sb.append("if ");
             }
             sb.append(condition.toString()).append(".");

Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java

@@ -1,12 +1,10 @@
-/*
+    /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
 package mage.abilities.decorator;
 
 import java.util.UUID;
-
-import mage.constants.Zone;
 import mage.abilities.ActivatedAbilityImpl;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.Cost;
@@ -15,6 +13,7 @@ import mage.abilities.costs.mana.ManaCosts;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
 import mage.constants.EffectType;
+import mage.constants.Zone;
 import mage.game.Game;
 
 /**

Mage/src/mage/abilities/effects/common/PreventAllDamageByAllEffect.java

@@ -90,6 +90,9 @@ public class PreventAllDamageByAllEffect extends PreventionEffectImpl {
 
     @Override
     public String getText(Mode mode) {
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
         StringBuilder sb = new StringBuilder("Prevent all ");
         if (onlyCombat) {
             sb.append("combat ");