mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 18:58:00 +00:00
title added to InputBlock
update added to inputP
This commit is contained in:
@@ -60,19 +60,18 @@ public class InputBlock extends InputPassPriorityBase {
|
|||||||
|
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public final void showMessage() {
|
protected final void showMessage() {
|
||||||
// could add "Reset Blockers" button
|
// could add "Reset Blockers" button
|
||||||
ButtonUtil.enableOnlyOk();
|
ButtonUtil.enableOnlyOk();
|
||||||
|
final StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append(player.getName() + ", declare blockers.\n\n");
|
||||||
|
|
||||||
if (this.currentAttacker == null) {
|
if (this.currentAttacker == null) {
|
||||||
|
sb.append("To Block, click on your opponent's attacker first, then your blocker(s).\n");
|
||||||
final StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append("To Block, click on your Opponents attacker first, then your blocker(s). ");
|
|
||||||
sb.append("To cancel a block right-click on your blocker");
|
sb.append("To cancel a block right-click on your blocker");
|
||||||
showMessage(sb.toString());
|
showMessage(sb.toString());
|
||||||
} else {
|
} else {
|
||||||
final String attackerName = this.currentAttacker.isFaceDown() ? "Morph" : this.currentAttacker.getName();
|
final String attackerName = this.currentAttacker.isFaceDown() ? "Morph" : this.currentAttacker.getName();
|
||||||
final StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append("Select a creature to block ").append(attackerName).append(" (");
|
sb.append("Select a creature to block ").append(attackerName).append(" (");
|
||||||
sb.append(this.currentAttacker.getUniqueNumber()).append("). ");
|
sb.append(this.currentAttacker.getUniqueNumber()).append("). ");
|
||||||
sb.append("To cancel a block right-click on your blocker");
|
sb.append("To cancel a block right-click on your blocker");
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
|
|
||||||
import forge.Card;
|
import forge.Card;
|
||||||
import forge.CardUtil;
|
import forge.CardUtil;
|
||||||
|
import forge.FThreads;
|
||||||
import forge.card.ColorSet;
|
import forge.card.ColorSet;
|
||||||
import forge.card.MagicColor;
|
import forge.card.MagicColor;
|
||||||
import forge.card.ability.ApiType;
|
import forge.card.ability.ApiType;
|
||||||
@@ -184,10 +185,10 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
|
|||||||
public void run() {
|
public void run() {
|
||||||
HumanPlay.playSpellAbility(chosen.getActivatingPlayer(), chosen);
|
HumanPlay.playSpellAbility(chosen.getActivatingPlayer(), chosen);
|
||||||
onManaAbilityPlayed(chosen);
|
onManaAbilityPlayed(chosen);
|
||||||
|
FThreads.invokeInEdtLater(new Runnable() { @Override public void run() { showMessage(); } });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
game.getInputQueue().invokeGameAction(proc);
|
game.getInputQueue().invokeGameAction(proc);
|
||||||
// EDT that removes lockUI from input stack will call our showMessage() method
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user