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

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2015-05-11 13:49:04 +02:00
parent fdcc365926
commit 7d2883560c
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
View file

@ -45,15 +45,21 @@ public class PutIntoGraveFromBattlefieldAllTriggeredAbility extends TriggeredAbi
private final FilterPermanent filter;
private boolean setTargetPointer;
private boolean onlyToControllerGraveyard;
public PutIntoGraveFromBattlefieldAllTriggeredAbility(Effect effect, boolean optional, FilterPermanent filter, boolean setTargetPointer) {
this(effect, optional, filter, setTargetPointer, false);
}
public PutIntoGraveFromBattlefieldAllTriggeredAbility(Effect effect, boolean optional, FilterPermanent filter, boolean setTargetPointer, boolean onlyToControllerGraveyard) {
super(Zone.BATTLEFIELD, effect, optional);
this.filter = filter;
this.onlyToControllerGraveyard = onlyToControllerGraveyard;
}
public PutIntoGraveFromBattlefieldAllTriggeredAbility(final PutIntoGraveFromBattlefieldAllTriggeredAbility ability) {
super(ability);
this.filter = ability.filter;
this.onlyToControllerGraveyard = ability.onlyToControllerGraveyard;
}
@Override
@ -80,7 +86,8 @@ public class PutIntoGraveFromBattlefieldAllTriggeredAbility extends TriggeredAbi
@Override
public String getRule() {
return new StringBuilder("Whenever ").append(filter.getMessage()).append(" is put into a graveyard from the battlefield, ").append(super.getRule()).toString();
return "Whenever " + filter.getMessage() + " is put into " + (onlyToControllerGraveyard ? "your":"a") +
" graveyard from the battlefield, " + super.getRule();
}
@Override

3
Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
View file

@ -63,8 +63,9 @@ public class ChooseColorEffect extends OneShotEffect {
return false;
}
}
if (!game.isSimulation())
if (!game.isSimulation()) {
game.informPlayers(new StringBuilder(permanent.getLogName()).append(": ").append(controller.getLogName()).append(" has chosen ").append(choice.getChoice()).toString());
}
game.getState().setValue(source.getSourceId() + "_color", choice.getColor());
permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + choice.getColor().getDescription() + "</font>", game);
return true;

3
Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
View file

@ -96,8 +96,9 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
} else {
return false;
}
if (!game.isSimulation())
if (!game.isSimulation()) {
game.informPlayers(controller.getLogName() + " has chosen the color: " + objectColor.toString());
}
} else {
objectColor = this.setColor;
}

1
Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
View file

@ -38,7 +38,6 @@ import mage.MageObjectReference;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.stack.Spell;
import mage.watchers.Watcher;
/**