From 25994e89109e111615e5413cabe9a53ffb85e4bf Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 27 Feb 2014 08:59:35 +0100 Subject: [PATCH] * AlternativeCost - Fix to rule text generation. --- .../mage/sets/alarareborn/FirewildBorderpost.java | 7 ++----- Mage/src/mage/abilities/costs/AlternativeCost2.java | 2 ++ .../mage/abilities/costs/AlternativeCost2Impl.java | 9 +++++++++ .../costs/AlternativeCostSourceAbility.java | 12 ++++++------ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java b/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java index a3d63b14bb6..78f22c55734 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java +++ b/Mage.Sets/src/mage/sets/alarareborn/FirewildBorderpost.java @@ -30,18 +30,15 @@ package mage.sets.alarareborn; import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTappedAbility; -import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.AlternativeCostSourceAbility; -import mage.abilities.costs.CompositeCost; -import mage.abilities.costs.Cost; import mage.abilities.costs.common.ReturnToHandTargetCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; diff --git a/Mage/src/mage/abilities/costs/AlternativeCost2.java b/Mage/src/mage/abilities/costs/AlternativeCost2.java index b603d724ef8..0689dadb18a 100644 --- a/Mage/src/mage/abilities/costs/AlternativeCost2.java +++ b/Mage/src/mage/abilities/costs/AlternativeCost2.java @@ -82,4 +82,6 @@ public interface AlternativeCost2 extends Cost { */ boolean isActivated(); + Cost getCost(); + } diff --git a/Mage/src/mage/abilities/costs/AlternativeCost2Impl.java b/Mage/src/mage/abilities/costs/AlternativeCost2Impl.java index aacd871c23b..9b382e2b0af 100644 --- a/Mage/src/mage/abilities/costs/AlternativeCost2Impl.java +++ b/Mage/src/mage/abilities/costs/AlternativeCost2Impl.java @@ -147,4 +147,13 @@ public class AlternativeCost2Impl > extends Co public AlternativeCost2Impl copy() { return new AlternativeCost2Impl(this); } + + @Override + public Cost getCost() { + if (this.iterator().hasNext()) { + return this.iterator().next(); + } + return null; + } + } diff --git a/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java b/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java index 290b9e6d14b..529b505fd5e 100644 --- a/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java +++ b/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.StaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.costs.mana.ManaCost; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; @@ -110,8 +110,8 @@ public class AlternativeCostSourceAbility extends StaticAbility