diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java b/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java index 218eb307fc..ad700127cc 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java @@ -56,7 +56,7 @@ public class BatonOfCourage extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // Remove a charge counter from Baton of Courage: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java b/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java index dad83e18d8..a5006adeac 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/ClearwaterGoblet.java @@ -51,7 +51,7 @@ public class ClearwaterGoblet extends CardImpl { this.expansionSetCode = "5DN"; // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // At the beginning of your upkeep, you may gain life equal to the number of charge counters on Clearwater Goblet. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(new CountersCount(CounterType.CHARGE)), TargetController.YOU, true)); } diff --git a/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java b/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java index 31aa69f8d7..059d1f76c6 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/EngineeredExplosives.java @@ -58,7 +58,7 @@ public class EngineeredExplosives extends CardImpl { this.expansionSetCode = "5DN"; // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // {2}, Sacrifice Engineered Explosives: Destroy each nonland permanent with converted mana cost equal to the number of charge counters on Engineered Explosives. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EngineeredExplosivesEffect(), new ManaCostsImpl("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java b/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java index ef57a36836..811e9a4600 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SawtoothThresher.java @@ -56,7 +56,7 @@ public class SawtoothThresher extends CardImpl { this.toughness = new MageInt(1); // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // Remove two +1/+1 counters from Sawtooth Thresher: Sawtooth Thresher gets +4/+4 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } diff --git a/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java b/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java index a5ebb27753..f4a36ca551 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/SkyreachManta.java @@ -49,7 +49,7 @@ public class SkyreachManta extends CardImpl { this.toughness = new MageInt(0); // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // Flying this.addAbility(FlyingAbility.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java index b62afa3c94..13fc76cb00 100644 --- a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java +++ b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java @@ -57,7 +57,7 @@ public class EtchedOracle extends CardImpl { this.toughness = new MageInt(0); // Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.) - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // {1}, Remove four +1/+1 counters from Etched Oracle: Target player draws three cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(4))); diff --git a/Mage.Sets/src/mage/sets/planechase/PentadPrism.java b/Mage.Sets/src/mage/sets/planechase/PentadPrism.java index 2ec25226bc..488a322cbb 100644 --- a/Mage.Sets/src/mage/sets/planechase/PentadPrism.java +++ b/Mage.Sets/src/mage/sets/planechase/PentadPrism.java @@ -47,7 +47,7 @@ public class PentadPrism extends CardImpl { this.expansionSetCode = "HOP"; // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); // Remove a charge counter from Pentad Prism: Add one mana of any color to your mana pool. this.addAbility(new AnyColorManaAbility(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)))); } diff --git a/Mage.Sets/src/mage/sets/planechase/SuntouchedMyr.java b/Mage.Sets/src/mage/sets/planechase/SuntouchedMyr.java index 6ca3efebcd..5de6e02a4b 100644 --- a/Mage.Sets/src/mage/sets/planechase/SuntouchedMyr.java +++ b/Mage.Sets/src/mage/sets/planechase/SuntouchedMyr.java @@ -48,7 +48,7 @@ public class SuntouchedMyr extends CardImpl { this.toughness = new MageInt(0); // Sunburst - this.addAbility(new SunburstAbility()); + this.addAbility(new SunburstAbility(this)); } public SuntouchedMyr(final SuntouchedMyr card) { diff --git a/Mage/src/mage/abilities/keyword/SunburstAbility.java b/Mage/src/mage/abilities/keyword/SunburstAbility.java index 9f42bdc4b9..c7271b2fcd 100644 --- a/Mage/src/mage/abilities/keyword/SunburstAbility.java +++ b/Mage/src/mage/abilities/keyword/SunburstAbility.java @@ -33,6 +33,7 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.SunburstCount; import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; import mage.constants.CardType; import mage.constants.Outcome; import mage.counters.Counter; @@ -49,12 +50,18 @@ import mage.players.Player; public class SunburstAbility extends EntersBattlefieldAbility{ - public SunburstAbility(){ + private final static String ruleCreature ="Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)"; + private final static String ruleNonCreature ="Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)"; + private boolean isCreature; + + public SunburstAbility(Card card){ super(new SunburstEffect(),""); + isCreature = card.getCardType().contains(CardType.CREATURE); } public SunburstAbility(final SunburstAbility ability){ super(ability); + this.isCreature = ability.isCreature; } @@ -65,7 +72,7 @@ public class SunburstAbility extends EntersBattlefieldAbility{ @Override public String getRule() { - return "Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)"; + return isCreature ? ruleCreature : ruleNonCreature; } @@ -114,5 +121,4 @@ class SunburstEffect extends OneShotEffect { return new SunburstEffect(this); } - -} \ No newline at end of file +}