External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Renown - Fixed name of active status to be renowned.

Browse source
This commit is contained in:
LevelX2 2015-07-07 12:08:20 +02:00
parent d7eed8934e
commit c1afa57485
6 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/magicorigins/RelicSeeker.java
View file

@ -29,7 +29,7 @@ package mage.sets.magicorigins;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BecomesRenownSourceTriggeredAbility; import mage.abilities.common.BecomesRenownedSourceTriggeredAbility;
import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
import mage.abilities.keyword.RenownAbility; import mage.abilities.keyword.RenownAbility;
import mage.cards.CardImpl; 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. // 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); 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));
} }

2
Mage.Sets/src/mage/sets/magicorigins/ValeronWardens.java
View file

@ -89,7 +89,7 @@ class ValeronWardensTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType().equals(EventType.BECOMES_RENOWN); return event.getType().equals(EventType.BECOMES_RENOWNED);
} }
@Override @Override

14
Mage/src/mage/abilities/common/BecomesRenownSourceTriggeredAbility.java → Mage/src/mage/abilities/common/BecomesRenownedSourceTriggeredAbility.java
View file

@ -15,27 +15,27 @@ import mage.game.events.GameEvent;
* *
* @author LevelX2 * @author LevelX2
*/ */
public class BecomesRenownSourceTriggeredAbility extends TriggeredAbilityImpl { public class BecomesRenownedSourceTriggeredAbility extends TriggeredAbilityImpl {
private int renownValue; private int renownValue;
public BecomesRenownSourceTriggeredAbility(Effect effect, boolean optional) { public BecomesRenownedSourceTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional); super(Zone.BATTLEFIELD, effect, optional);
} }
public BecomesRenownSourceTriggeredAbility(final BecomesRenownSourceTriggeredAbility ability) { public BecomesRenownedSourceTriggeredAbility(final BecomesRenownedSourceTriggeredAbility ability) {
super(ability); super(ability);
this.renownValue = ability.renownValue; this.renownValue = ability.renownValue;
} }
@Override @Override
public BecomesRenownSourceTriggeredAbility copy() { public BecomesRenownedSourceTriggeredAbility copy() {
return new BecomesRenownSourceTriggeredAbility(this); return new BecomesRenownedSourceTriggeredAbility(this);
} }
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.BECOMES_RENOWN; return event.getType() == GameEvent.EventType.BECOMES_RENOWNED;
} }
@Override @Override
@ -53,6 +53,6 @@ public class BecomesRenownSourceTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public String getRule() { public String getRule() {
return "When {this} becomes renown, " + super.getRule(); return "When {this} becomes renowned, " + super.getRule();
} }
} }

8
Mage/src/mage/abilities/effects/common/RegenerateAllEffect.java
View file

@ -25,12 +25,11 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.effects.common; package mage.abilities.effects.common;
import mage.constants.Outcome;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -40,10 +39,9 @@ import mage.target.targetpointer.FixedTarget;
* *
* @author LevelX2 * @author LevelX2
*/ */
public class RegenerateAllEffect extends OneShotEffect {
public class RegenerateAllEffect extends OneShotEffect { private final FilterPermanent filter;
private FilterPermanent filter;
public RegenerateAllEffect(FilterPermanent filter) { public RegenerateAllEffect(FilterPermanent filter) {
super(Outcome.DestroyPermanent); super(Outcome.DestroyPermanent);

2
Mage/src/mage/abilities/keyword/RenownAbility.java
View file

@ -91,7 +91,7 @@ class BecomeRenownSourceEffect extends OneShotEffect {
} }
new AddCountersSourceEffect(CounterType.P1P1.createInstance(renownValue), true).apply(game, source); new AddCountersSourceEffect(CounterType.P1P1.createInstance(renownValue), true).apply(game, source);
permanent.setRenown(true); 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 true;
} }
return false; return false;

3
Mage/src/mage/game/events/GameEvent.java
View file

@ -51,6 +51,7 @@ public class GameEvent implements Serializable {
public enum EventType { public enum EventType {
//Game events //Game events
//Game events
BEGINNING, BEGINNING,
PREVENT_DAMAGE, PREVENTED_DAMAGE, PREVENT_DAMAGE, PREVENTED_DAMAGE,
//Turn-based events //Turn-based events
@ -173,7 +174,7 @@ public class GameEvent implements Serializable {
UNFLIP, UNFLIPPED, UNFLIP, UNFLIPPED,
TRANSFORM, TRANSFORMED, TRANSFORM, TRANSFORMED,
BECOMES_MONSTROUS, BECOMES_MONSTROUS,
BECOMES_RENOWN, BECOMES_RENOWNED,
PHASE_OUT, PHASED_OUT, PHASE_OUT, PHASED_OUT,
PHASE_IN, PHASED_IN, PHASE_IN, PHASED_IN,
TURNFACEUP, TURNEDFACEUP, TURNFACEUP, TURNEDFACEUP,