Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

rename face-up/face-down events

Browse source
This commit is contained in:
theelk801 2024-01-17 15:56:11 -05:00
parent c0de1cec19
commit 1a8dce83d0
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/a/AquamorphEntity.java
View file

@ -69,7 +69,7 @@ class AquamorphEntityReplacementEffect extends ReplacementEffectImpl {
public boolean checksEventType(GameEvent event, Game game) { public boolean checksEventType(GameEvent event, Game game) {
switch (event.getType()) { switch (event.getType()) {
case ENTERS_THE_BATTLEFIELD: case ENTERS_THE_BATTLEFIELD:
case TURNFACEUP: case TURN_FACE_UP:
return true; return true;
default: default:
return false; return false;
@ -86,7 +86,7 @@ class AquamorphEntityReplacementEffect extends ReplacementEffectImpl {
} }
} }
} }
if (event.getType() == GameEvent.EventType.TURNFACEUP) { if (event.getType() == GameEvent.EventType.TURN_FACE_UP) {
return event.getTargetId().equals(source.getSourceId()); return event.getTargetId().equals(source.getSourceId());
} }
return false; return false;

2
Mage.Sets/src/mage/cards/f/FatalMutation.java
View file

@ -67,7 +67,7 @@ class FatalMutationAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TURNEDFACEUP; return event.getType() == GameEvent.EventType.TURNED_FACE_UP;
} }
@Override @Override

4
Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java
View file

@ -35,7 +35,7 @@ public class EntersBattlefieldOrTurnedFaceUpTriggeredAbility extends TriggeredAb
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TURNEDFACEUP return event.getType() == GameEvent.EventType.TURNED_FACE_UP
|| event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD; || event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
} }
@ -45,7 +45,7 @@ public class EntersBattlefieldOrTurnedFaceUpTriggeredAbility extends TriggeredAb
return false; return false;
} }
switch (event.getType()) { switch (event.getType()) {
case TURNEDFACEUP: case TURNED_FACE_UP:
return true; return true;
case ENTERS_THE_BATTLEFIELD: case ENTERS_THE_BATTLEFIELD:
return Optional return Optional

2
Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java
View file

@ -50,7 +50,7 @@ public class TurnedFaceUpAllTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TURNEDFACEUP; return event.getType() == GameEvent.EventType.TURNED_FACE_UP;
} }
@Override @Override

2
Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
View file

@ -44,7 +44,7 @@ public class TurnedFaceUpSourceTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TURNEDFACEUP; return event.getType() == GameEvent.EventType.TURNED_FACE_UP;
} }
@Override @Override

2
Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java
View file

@ -35,7 +35,7 @@ public class AsTurnedFaceUpEffect extends ReplacementEffectImpl {
@Override @Override
public boolean checksEventType(GameEvent event, Game game) { public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TURNFACEUP; return event.getType() == GameEvent.EventType.TURN_FACE_UP;
} }
@Override @Override

8
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -571,7 +571,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
@Override @Override
public boolean turnFaceUp(Ability source, Game game, UUID playerId) { public boolean turnFaceUp(Ability source, Game game, UUID playerId) {
GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURNFACEUP, getId(), source, playerId); GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURN_FACE_UP, getId(), source, playerId);
if (!game.replaceEvent(event)) { if (!game.replaceEvent(event)) {
setFaceDown(false, game); setFaceDown(false, game);
for (Ability ability : abilities) { // abilities that were set to not visible face down must be set to visible again for (Ability ability : abilities) { // abilities that were set to not visible face down must be set to visible again
@ -579,7 +579,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
ability.setRuleVisible(true); ability.setRuleVisible(true);
} }
} }
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNEDFACEUP, getId(), source, playerId)); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNED_FACE_UP, getId(), source, playerId));
return true; return true;
} }
return false; return false;
@ -587,10 +587,10 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
@Override @Override
public boolean turnFaceDown(Ability source, Game game, UUID playerId) { public boolean turnFaceDown(Ability source, Game game, UUID playerId) {
GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURNFACEDOWN, getId(), source, playerId); GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURN_FACE_DOWN, getId(), source, playerId);
if (!game.replaceEvent(event)) { if (!game.replaceEvent(event)) {
setFaceDown(true, game); setFaceDown(true, game);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNEDFACEDOWN, getId(), source, playerId)); game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNED_FACE_DOWN, getId(), source, playerId));
return true; return true;
} }
return false; return false;

4
Mage/src/main/java/mage/game/events/GameEvent.java
View file

@ -430,8 +430,8 @@ public class GameEvent implements Serializable {
MEDITATED, MEDITATED,
PHASE_OUT, PHASED_OUT, PHASE_OUT, PHASED_OUT,
PHASE_IN, PHASED_IN, PHASE_IN, PHASED_IN,
TURNFACEUP, TURNEDFACEUP, TURN_FACE_UP, TURNED_FACE_UP,
TURNFACEDOWN, TURNEDFACEDOWN, TURN_FACE_DOWN, TURNED_FACE_DOWN,
/* OPTION_USED /* OPTION_USED
targetId originalId of the ability that triggered the event targetId originalId of the ability that triggered the event
sourceId sourceId of the ability that triggered the event sourceId sourceId of the ability that triggered the event