github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve grammar and written clarity on Commander zone replacement effect. Still works with Oathbreaker

Browse source
This commit is contained in:
PurpleCrowbar 2023-03-15 03:49:26 +00:00
parent 03b82ff7ee
commit bd2678242d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java
View file

@ -144,10 +144,10 @@ public class CommanderReplacementEffect extends ReplacementEffectImpl {
Permanent permanent = zEvent.getTarget(); Permanent permanent = zEvent.getTarget();
if (permanent != null) { if (permanent != null) {
Player player = game.getPlayer(permanent.getOwnerId()); Player player = game.getPlayer(permanent.getOwnerId());
if (player != null && (forceToMove || player.chooseUse(Outcome.Benefit, "Move " + commanderTypeName + " to command zone instead " + originToZone + "?", source, game))) { if (player != null && (forceToMove || player.chooseUse(Outcome.Benefit, "Move " + permanent.getLogName() + " to command zone instead of your " + originToZone + "?", source, game))) {
zEvent.setToZone(Zone.COMMAND); zEvent.setToZone(Zone.COMMAND);
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(player.getLogName() + " has moved their " + commanderTypeName + " to the command zone instead " + originToZone); game.informPlayers(player.getLogName() + " has moved " + permanent.getLogName() + " to the command zone instead of their " + originToZone);
} }
} }
} }
@ -164,10 +164,10 @@ public class CommanderReplacementEffect extends ReplacementEffectImpl {
} }
if (card != null) { if (card != null) {
Player player = game.getPlayer(card.getOwnerId()); Player player = game.getPlayer(card.getOwnerId());
if (player != null && (forceToMove || player.chooseUse(Outcome.Benefit, "Move " + commanderTypeName + " to command zone instead " + originToZone + "?", source, game))) { if (player != null && (forceToMove || player.chooseUse(Outcome.Benefit, "Move " + card.getLogName() + " to command zone instead of your " + originToZone + "?", source, game))) {
((ZoneChangeEvent) event).setToZone(Zone.COMMAND); ((ZoneChangeEvent) event).setToZone(Zone.COMMAND);
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(player.getLogName() + " has moved their " + commanderTypeName + " to the command zone instead " + originToZone); game.informPlayers(player.getLogName() + " has moved " + card.getLogName() + " to the command zone instead of their " + originToZone);
} }
} }
} }

2
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -2147,7 +2147,7 @@ public abstract class GameImpl implements Game {
for (Card card : commanders) { for (Card card : commanders) {
Zone currentZone = this.getState().getZone(card.getId()); Zone currentZone = this.getState().getZone(card.getId());
String currentZoneInfo = (currentZone == null ? "(error)" : "(" + currentZone.name() + ")"); String currentZoneInfo = (currentZone == null ? "(error)" : "(" + currentZone.name() + ")");
if (player.chooseUse(Outcome.Benefit, "Move " + card.getIdName() if (player.chooseUse(Outcome.Benefit, "Move " + card.getLogName()
+ " to the command zone or leave it in current zone " + currentZoneInfo + "?", "You can only make this choice once per object", + " to the command zone or leave it in current zone " + currentZoneInfo + "?", "You can only make this choice once per object",
"Move to command", "Leave in current zone " + currentZoneInfo, null, this)) { "Move to command", "Leave in current zone " + currentZoneInfo, null, this)) {
toMove.add(card); toMove.add(card);