From 9129bda9b7f8b1353d9398e53ff279b64511cab7 Mon Sep 17 00:00:00 2001 From: Quercitron Date: Fri, 5 Aug 2016 00:59:42 +0300 Subject: [PATCH] * Hearthcage Giant - Fix that only one Elemental Shaman token is created (fixes #2141). --- Mage.Sets/src/mage/sets/jacevschandra/Hostility.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java | 2 +- .../java/mage/game/permanent/token/ElementalShamanToken.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java b/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java index 2fd96e2170..89e9cba27b 100644 --- a/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java +++ b/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java @@ -133,7 +133,7 @@ class HostilityEffect extends PreventionEffectImpl { class HostilityElementalToken extends ElementalShamanToken { public HostilityElementalToken() { - super("DD2", 1); + super("DD2"); description = description + " with haste"; addAbility(HasteAbility.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java index be48511fd0..7991f8bfd8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java @@ -71,7 +71,7 @@ public class HearthcageGiant extends CardImpl { this.toughness = new MageInt(5); //When Hearthcage Giant enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken("LRW", 2)), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken("LRW"), 2), false)); //Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filterElemental))); diff --git a/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java b/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java index d14c92070d..1f0af12981 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java +++ b/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java @@ -136,7 +136,7 @@ class RebellionOfTheFlamekinEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - CreateTokenEffect createTokenEffect = new CreateTokenEffect(new ElementalShamanToken("LRW", 1)); + CreateTokenEffect createTokenEffect = new CreateTokenEffect(new ElementalShamanToken("LRW")); DoIfCostPaid doIfCostPaid = new DoIfCostPaid(createTokenEffect, new ManaCostsImpl("{1}")); doIfCostPaid.apply(game, source); Permanent token = game.getPermanent(createTokenEffect.getLastAddedTokenId()); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java index 174f5c2419..f7d0fc9872 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -45,7 +45,7 @@ public class ElementalShamanToken extends Token { tokenImageSets.addAll(Arrays.asList("C15", "DD3JVC", "DD2", "LRW")); } - public ElementalShamanToken(String setCode, int tokenType) { + public ElementalShamanToken(String setCode) { super("Elemental Shaman", "3/1 red Elemental Shaman creature token"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode);