external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

added messages in auto-pass and ai inputs

Browse Source
This commit is contained in:
Maxmtg
2013-05-26 08:58:41 +00:00
parent fdaaf9d410
commit b2edf7ac90
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/card/ability/ai/ChangeZoneAi.java
View File

@@ -39,7 +39,6 @@ import forge.game.phase.Combat;
import forge.game.phase.PhaseType;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
import forge.util.Aggregates;
import forge.util.MyRandom;

1
src/main/java/forge/control/input/InputAutoPassPriority.java
View File

@@ -15,6 +15,7 @@ public class InputAutoPassPriority extends InputPassPriorityBase {
@Override
public void showMessage() {
showMessage(getTurnPhasePriorityMessage());
pass();
}

20
src/main/java/forge/control/input/InputPassPriority.java
View File

@@ -19,7 +19,6 @@ package forge.control.input;
import forge.Card;
import forge.card.spellability.SpellAbility;
import forge.game.phase.PhaseHandler;
import forge.game.player.HumanPlay;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
@@ -51,27 +50,10 @@ public class InputPassPriority extends InputPassPriorityBase {
for (Player p : player.getGame().getRegisteredPlayers()) {
p.getZone(ZoneType.Battlefield).updateObservers();
}
showMessage(getTurnPhasePriorityMessage());
ButtonUtil.enableOnlyOk();
final PhaseHandler ph = player.getGame().getPhaseHandler();
final StringBuilder sb = new StringBuilder();
sb.append("Priority: ").append(player).append("\n").append("\n");
sb.append("Turn : ").append(ph.getPlayerTurn()).append("\n");
sb.append("Phase: ").append(ph.getPhase().Name).append("\n");
sb.append("Stack: ");
if (!player.getGame().getStack().isEmpty()) {
sb.append(player.getGame().getStack().size()).append(" to Resolve.");
} else {
sb.append("Empty");
}
sb.append("\n");
showMessage(sb.toString());
}
/** {@inheritDoc} */
@Override
public final void selectButtonOK() {

20
src/main/java/forge/control/input/InputPassPriorityBase.java
View File

@@ -1,6 +1,7 @@
package forge.control.input;
import forge.FThreads;
import forge.game.phase.PhaseHandler;
import forge.game.player.Player;
public abstract class InputPassPriorityBase extends InputBase {
@@ -19,11 +20,28 @@ public abstract class InputPassPriorityBase extends InputBase {
protected final void pass() { // no futher overloads possible
setFinished();
if( FThreads.isEDT() )
FThreads.invokeInNewThread(passPriority);
else
passPriority.run();
}
protected String getTurnPhasePriorityMessage() {
final PhaseHandler ph = player.getGame().getPhaseHandler();
final StringBuilder sb = new StringBuilder();
sb.append("Priority: ").append(player).append("\n").append("\n");
sb.append("Turn : ").append(ph.getPlayerTurn()).append("\n");
sb.append("Phase: ").append(ph.getPhase().Name).append("\n");
sb.append("Stack: ");
if (!player.getGame().getStack().isEmpty()) {
sb.append(player.getGame().getStack().size()).append(" to Resolve.");
} else {
sb.append("Empty");
}
sb.append("\n");
String message = sb.toString();
return message;
}
}

2
src/main/java/forge/game/ai/AiInputCommon.java
View File

@@ -54,6 +54,8 @@ public class AiInputCommon extends InputPassPriorityBase implements AiInput {
return;
}
showMessage(getTurnPhasePriorityMessage());
/*
* //put this back in ButtonUtil.disableAll();
* AllZone.getDisplay().showMessage("Phase: " +