From c1afa574851559c1e191f96fd672af24e43fc75c Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 7 Jul 2015 12:08:20 +0200 Subject: [PATCH] * Renown - Fixed name of active status to be renowned. --- .../src/mage/sets/magicorigins/RelicSeeker.java | 4 ++-- .../src/mage/sets/magicorigins/ValeronWardens.java | 2 +- ... => BecomesRenownedSourceTriggeredAbility.java} | 14 +++++++------- .../effects/common/RegenerateAllEffect.java | 8 +++----- Mage/src/mage/abilities/keyword/RenownAbility.java | 2 +- Mage/src/mage/game/events/GameEvent.java | 3 ++- 6 files changed, 16 insertions(+), 17 deletions(-) rename Mage/src/mage/abilities/common/{BecomesRenownSourceTriggeredAbility.java => BecomesRenownedSourceTriggeredAbility.java} (68%) diff --git a/Mage.Sets/src/mage/sets/magicorigins/RelicSeeker.java b/Mage.Sets/src/mage/sets/magicorigins/RelicSeeker.java index c4411ca92a7..cfb3c63e723 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/RelicSeeker.java +++ b/Mage.Sets/src/mage/sets/magicorigins/RelicSeeker.java @@ -29,7 +29,7 @@ package mage.sets.magicorigins; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesRenownSourceTriggeredAbility; +import mage.abilities.common.BecomesRenownedSourceTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.RenownAbility; import mage.cards.CardImpl; @@ -66,7 +66,7 @@ public class RelicSeeker extends CardImpl { // When Relic Seeker becomes renowned, you may search your library for an Equipment card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new BecomesRenownSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new BecomesRenownedSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); } diff --git a/Mage.Sets/src/mage/sets/magicorigins/ValeronWardens.java b/Mage.Sets/src/mage/sets/magicorigins/ValeronWardens.java index 2237ba37683..4a180fd386c 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/ValeronWardens.java +++ b/Mage.Sets/src/mage/sets/magicorigins/ValeronWardens.java @@ -89,7 +89,7 @@ class ValeronWardensTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkEventType(GameEvent event, Game game) { - return event.getType().equals(EventType.BECOMES_RENOWN); + return event.getType().equals(EventType.BECOMES_RENOWNED); } @Override diff --git a/Mage/src/mage/abilities/common/BecomesRenownSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java similarity index 68% rename from Mage/src/mage/abilities/common/BecomesRenownSourceTriggeredAbility.java rename to Mage/src/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java index 44ae09a0f2b..290215f9239 100644 --- a/Mage/src/mage/abilities/common/BecomesRenownSourceTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java @@ -15,27 +15,27 @@ import mage.game.events.GameEvent; * * @author LevelX2 */ -public class BecomesRenownSourceTriggeredAbility extends TriggeredAbilityImpl { +public class BecomesRenownedSourceTriggeredAbility extends TriggeredAbilityImpl { private int renownValue; - public BecomesRenownSourceTriggeredAbility(Effect effect, boolean optional) { + public BecomesRenownedSourceTriggeredAbility(Effect effect, boolean optional) { super(Zone.BATTLEFIELD, effect, optional); } - public BecomesRenownSourceTriggeredAbility(final BecomesRenownSourceTriggeredAbility ability) { + public BecomesRenownedSourceTriggeredAbility(final BecomesRenownedSourceTriggeredAbility ability) { super(ability); this.renownValue = ability.renownValue; } @Override - public BecomesRenownSourceTriggeredAbility copy() { - return new BecomesRenownSourceTriggeredAbility(this); + public BecomesRenownedSourceTriggeredAbility copy() { + return new BecomesRenownedSourceTriggeredAbility(this); } @Override public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.BECOMES_RENOWN; + return event.getType() == GameEvent.EventType.BECOMES_RENOWNED; } @Override @@ -53,6 +53,6 @@ public class BecomesRenownSourceTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "When {this} becomes renown, " + super.getRule(); + return "When {this} becomes renowned, " + super.getRule(); } } diff --git a/Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java b/Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java index fd53bae45be..c23b072fbf3 100644 --- a/Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java @@ -25,12 +25,11 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.abilities.effects.common; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -40,10 +39,9 @@ import mage.target.targetpointer.FixedTarget; * * @author LevelX2 */ +public class RegenerateAllEffect extends OneShotEffect { - public class RegenerateAllEffect extends OneShotEffect { - - private FilterPermanent filter; + private final FilterPermanent filter; public RegenerateAllEffect(FilterPermanent filter) { super(Outcome.DestroyPermanent); diff --git a/Mage/src/mage/abilities/keyword/RenownAbility.java b/Mage/src/mage/abilities/keyword/RenownAbility.java index 96a8b1e8e75..f136de8ca96 100644 --- a/Mage/src/mage/abilities/keyword/RenownAbility.java +++ b/Mage/src/mage/abilities/keyword/RenownAbility.java @@ -91,7 +91,7 @@ class BecomeRenownSourceEffect extends OneShotEffect { } new AddCountersSourceEffect(CounterType.P1P1.createInstance(renownValue), true).apply(game, source); permanent.setRenown(true); - game.fireEvent(GameEvent.getEvent(GameEvent.EventType.BECOMES_RENOWN, source.getSourceId(), source.getSourceId(), source.getControllerId(), renownValue)); + game.fireEvent(GameEvent.getEvent(GameEvent.EventType.BECOMES_RENOWNED, source.getSourceId(), source.getSourceId(), source.getControllerId(), renownValue)); return true; } return false; diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 10ccca9d241..433ad158c39 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -51,6 +51,7 @@ public class GameEvent implements Serializable { public enum EventType { //Game events +//Game events BEGINNING, PREVENT_DAMAGE, PREVENTED_DAMAGE, //Turn-based events @@ -173,7 +174,7 @@ public class GameEvent implements Serializable { UNFLIP, UNFLIPPED, TRANSFORM, TRANSFORMED, BECOMES_MONSTROUS, - BECOMES_RENOWN, + BECOMES_RENOWNED, PHASE_OUT, PHASED_OUT, PHASE_IN, PHASED_IN, TURNFACEUP, TURNEDFACEUP,