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

Some fixes/changes to clash.

Browse source
This commit is contained in:
LevelX2 2014-08-25 21:33:44 +02:00
parent f15e2c5362
commit f004b1a28c
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/mage/abilities/effects/common/ClashEffect.java
View file

@ -97,10 +97,10 @@ public class ClashEffect extends OneShotEffect implements MageSingleton {
if (controller != null && !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.CLASH, controller.getId(), controller.getId()))) { if (controller != null && !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.CLASH, controller.getId(), controller.getId()))) {
// choose opponent // choose opponent
Target target = new TargetOpponent(true); Target target = new TargetOpponent(true);
target.setTargetName("an opponent to clash with");
if (controller.choose(Outcome.Benefit, target, source.getSourceId(), game)) { if (controller.choose(Outcome.Benefit, target, source.getSourceId(), game)) {
Player opponent = game.getPlayer(target.getFirstTarget()); Player opponent = game.getPlayer(target.getFirstTarget());
if (opponent != null) { if (opponent != null) {
game.informPlayers(controller.getName() + " clashes with " + opponent.getName());
int cmcController = Integer.MIN_VALUE; int cmcController = Integer.MIN_VALUE;
Card cardController = null; Card cardController = null;
boolean topController = true; boolean topController = true;
@ -108,51 +108,51 @@ public class ClashEffect extends OneShotEffect implements MageSingleton {
Card cardOpponent = null; Card cardOpponent = null;
boolean topOpponent = true; boolean topOpponent = true;
// Reveal top cards of involved players // Reveal top cards of involved players
StringBuilder message = new StringBuilder(); StringBuilder message = new StringBuilder("Clash: ");
message.append(controller.getName()).append(" reveals "); message.append(controller.getName());
if (controller.getLibrary().size() > 0) { if (controller.getLibrary().size() > 0) {
Cards cards = new CardsImpl(); Cards cards = new CardsImpl();
cardController = controller.getLibrary().getFromTop(game); cardController = controller.getLibrary().getFromTop(game);
cards.add(cardController); cards.add(cardController);
controller.revealCards("for clash by " + controller.getName(), cards, game); controller.revealCards("for clash by " + controller.getName(), cards, game);
cmcController = cardController.getManaCost().convertedManaCost(); cmcController = cardController.getManaCost().convertedManaCost();
message.append(cardController.getLogName()).append("(").append(cmcController).append(")"); message.append(" (").append(cmcController).append(")");
} else { } else {
message.append(" no card"); message.append(" no card");
} }
message.append(" - "); message.append(" vs. ").append(opponent.getName());
if (opponent.getLibrary().size() > 0) { if (opponent.getLibrary().size() > 0) {
Cards cards = new CardsImpl(); Cards cards = new CardsImpl();
cardOpponent = opponent.getLibrary().getFromTop(game); cardOpponent = opponent.getLibrary().getFromTop(game);
cards.add(cardOpponent); cards.add(cardOpponent);
opponent.revealCards("for clash by " + opponent.getName(), cards, game); opponent.revealCards("for clash by " + opponent.getName(), cards, game);
cmcOpponent = cardOpponent.getManaCost().convertedManaCost(); cmcOpponent = cardOpponent.getManaCost().convertedManaCost();
message.append(cardOpponent.getLogName()).append("(").append(cmcOpponent).append(")"); message.append(" (").append(cmcOpponent).append(")");
} else { } else {
message.append(" no card"); message.append(" no card");
} }
message.append(" - "); message.append(" - ");
if (cmcController > cmcOpponent) { if (cmcController > cmcOpponent) {
message.append(controller.getName()).append(" wins the clash"); message.append(controller.getName()).append(" won the clash");
game.informPlayer(controller, "You won the clash!");
} else if (cmcController < cmcOpponent) { } else if (cmcController < cmcOpponent) {
message.append(opponent.getName()).append(" wins the clash"); message.append(opponent.getName()).append(" won the clash");
game.informPlayer(controller, opponent.getName() + " won the clash!");
} else { } else {
message.append(" no winner "); message.append(" no winner ");
} }
game.informPlayers(message.toString()); game.informPlayers(message.toString());
// decide to pu the cards on top or on the buttom of library in turn order beginning with the active player in turn order // decide to put the cards on top or on the buttom of library in turn order beginning with the active player in turn order
PlayerList playerList = game.getPlayerList().copy(); PlayerList playerList = game.getPlayerList().copy();
playerList.setCurrent(game.getActivePlayerId()); playerList.setCurrent(game.getActivePlayerId());
do { do {
Player current = playerList.getCurrent(game); Player current = playerList.getCurrent(game);
if (cardController != null && current.getId().equals(controller.getId())) { if (cardController != null && current.getId().equals(controller.getId())) {
topController = current.chooseUse(Outcome.Detriment, "Put " + cardController.getLogName() + " on top of your library?" , game); topController = current.chooseUse(Outcome.Detriment, "Put " + cardController.getLogName() + " back on top of your library? (otherwise it goes to bottom)" , game);
game.informPlayers("Clash: " + controller.getName() + " decides to puts its card " + (topController ? "back on top": "on the buttom") + "of his or her library.");
} }
if (cardOpponent != null && current.getId().equals(opponent.getId())) { if (cardOpponent != null && current.getId().equals(opponent.getId())) {
topOpponent = current.chooseUse(Outcome.Detriment, "Put " + cardOpponent.getLogName() + " on top of your library?" , game); topOpponent = current.chooseUse(Outcome.Detriment, "Put " + cardOpponent.getLogName() + " back on top of your library? (otherwise it goes to bottom)" , game);
game.informPlayers("Clash: " + opponent.getName() + " decides to puts its card " + (topOpponent ? "back on top": "on the buttom") + "of his or her library.");
} }
} while (!playerList.getNext(game).getId().equals(game.getActivePlayerId())); } while (!playerList.getNext(game).getId().equals(game.getActivePlayerId()));
// put the cards back to library // put the cards back to library
@ -160,7 +160,7 @@ public class ClashEffect extends OneShotEffect implements MageSingleton {
controller.moveCardToLibraryWithInfo(cardController, source.getSourceId(), game, Zone.LIBRARY, topController, true); controller.moveCardToLibraryWithInfo(cardController, source.getSourceId(), game, Zone.LIBRARY, topController, true);
} }
if (cardOpponent != null) { if (cardOpponent != null) {
opponent.moveCardToLibraryWithInfo(cardController, source.getSourceId(), game, Zone.LIBRARY, topOpponent, true); opponent.moveCardToLibraryWithInfo(cardOpponent, source.getSourceId(), game, Zone.LIBRARY, topOpponent, true);
} }
game.fireEvent(new GameEvent(EventType.CLASHED, opponent.getId(), source.getSourceId(), controller.getId(), 0, cmcController > cmcOpponent)); game.fireEvent(new GameEvent(EventType.CLASHED, opponent.getId(), source.getSourceId(), controller.getId(), 0, cmcController > cmcOpponent));
// set opponent to DoIfClashWonEffect // set opponent to DoIfClashWonEffect

2
Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java
View file

@ -75,7 +75,7 @@ public class DoIfClashWonEffect extends OneShotEffect {
MageObject mageObject = game.getObject(source.getSourceId()); MageObject mageObject = game.getObject(source.getSourceId());
if (player != null && mageObject != null) { if (player != null && mageObject != null) {
String message = null; String message = null;
if (chooseUseText == null) { if (chooseUseText != null) {
message = chooseUseText; message = chooseUseText;
message = CardUtil.replaceSourceName(message, mageObject.getName()); message = CardUtil.replaceSourceName(message, mageObject.getName());
} }