github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated some mana loss text

Browse source
This commit is contained in:
Evan Kranzler 2018-05-25 19:08:52 -04:00
parent 2798490ce5
commit 9e7041f44b
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/cards/k/KruphixGodOfHorizons.java
View file

@ -50,7 +50,7 @@ import mage.game.events.GameEvent;
public class KruphixGodOfHorizons extends CardImpl {
public KruphixGodOfHorizons(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{G}{U}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{3}{G}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.GOD);
@ -86,7 +86,7 @@ class KruphixGodOfHorizonsEffect extends ReplacementEffectImpl {
public KruphixGodOfHorizonsEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "If unused mana would empty from your mana pool, that mana becomes colorless instead";
staticText = "If you would lose unspent mana, that mana becomes colorless instead.";
}
public KruphixGodOfHorizonsEffect(final KruphixGodOfHorizonsEffect effect) {
@ -108,13 +108,13 @@ class KruphixGodOfHorizonsEffect extends ReplacementEffectImpl {
return true;
}
@Override
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.EMPTY_MANA_POOL;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
return event.getPlayerId().equals(source.getControllerId());
}
}
}

9
Mage.Sets/src/mage/cards/o/OmnathLocusOfMana.java
View file

@ -48,7 +48,7 @@ import mage.players.Player;
public class OmnathLocusOfMana extends CardImpl {
public OmnathLocusOfMana(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.ELEMENTAL);
@ -78,7 +78,7 @@ class OmnathRuleEffect extends ContinuousEffectImpl {
public OmnathRuleEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment);
staticText = "Green mana doesn't empty from your mana pool as steps and phases end";
staticText = "You don’t lose unspent green mana as steps and phases end";
}
public OmnathRuleEffect(final OmnathRuleEffect effect) {
@ -93,10 +93,11 @@ class OmnathRuleEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Player player = game.getPlayer(source.getControllerId());
if (player != null){
if (player != null) {
player.getManaPool().addDoNotEmptyManaType(ManaType.GREEN);
}
return false; }
return false;
}
@Override
public boolean apply(Game game, Ability source) {

13
Mage.Sets/src/mage/cards/u/Upwelling.java
View file

@ -51,8 +51,7 @@ import mage.players.Player;
public class Upwelling extends CardImpl {
public Upwelling(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}");
// Mana pools don't empty as steps and phases end.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UpwellingRuleEffect()));
@ -73,7 +72,7 @@ class UpwellingRuleEffect extends ContinuousEffectImpl {
public UpwellingRuleEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment);
staticText = "Mana pools don't empty as steps and phases end";
staticText = "Players don’t lose unspent mana as steps and phases end";
}
public UpwellingRuleEffect(final UpwellingRuleEffect effect) {
@ -89,9 +88,9 @@ class UpwellingRuleEffect extends ContinuousEffectImpl {
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
for (UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) {
for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null){
if (player != null) {
ManaPool pool = player.getManaPool();
pool.addDoNotEmptyManaType(ManaType.WHITE);
pool.addDoNotEmptyManaType(ManaType.GREEN);
@ -99,11 +98,11 @@ class UpwellingRuleEffect extends ContinuousEffectImpl {
pool.addDoNotEmptyManaType(ManaType.RED);
pool.addDoNotEmptyManaType(ManaType.BLACK);
pool.addDoNotEmptyManaType(ManaType.COLORLESS);
}
}
}
return true;
}
return false;
return false;
}
@Override