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

- Pre-fill the macro sequence prompt with the last remembered sequence (to allow quick minor modifications if necessary).

Browse Source 
- Allow the user to "reset" the macro to step zero by initiating macro recording (Shift+R by default) and confirming the macro without any changes.
This commit is contained in:
Agetian
2017-02-04 05:28:20 +00:00
parent a845bd13dc
commit 5815a22d0c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -38,6 +38,7 @@ import forge.GuiBase;
import forge.LobbyPlayer; import forge.LobbyPlayer;
import forge.achievement.AchievementCollection; import forge.achievement.AchievementCollection;
import forge.ai.GameState; import forge.ai.GameState;
import forge.assets.FSkinProp;
import forge.card.CardDb; import forge.card.CardDb;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.ICardFace; import forge.card.ICardFace;
@@ -1974,6 +1975,7 @@ public class PlayerControllerHuman
// "Actions" are stored as a pair of the "action" recipient (the entity // "Actions" are stored as a pair of the "action" recipient (the entity
// to "click") and a boolean representing whether the entity is a player. // to "click") and a boolean representing whether the entity is a player.
private final List<Pair<GameEntityView, Boolean>> rememberedActions = new ArrayList<>(); private final List<Pair<GameEntityView, Boolean>> rememberedActions = new ArrayList<>();
private String rememberedSequenceText = "";
@Override @Override
public void setRememberedActions() { public void setRememberedActions() {
@@ -2004,10 +2006,12 @@ public class PlayerControllerHuman
// A more informative prompt would be useful, but the dialog seems to // A more informative prompt would be useful, but the dialog seems to
// like to clip text in long messages... // like to clip text in long messages...
final String prompt = "Enter a sequence (card IDs and/or \"opponent\"/\"me\"). (e.g. 7, opponent, 18)"; final String prompt = "Enter a sequence (card IDs and/or \"opponent\"/\"me\"). (e.g. 7, opponent, 18)";
String textSequence = getGui().showInputDialog(prompt, dialogTitle); String textSequence = getGui().showInputDialog(prompt, dialogTitle, FSkinProp.ICO_QUEST_NOTES, rememberedSequenceText);
if (textSequence == null || textSequence.trim().isEmpty()) { if (textSequence == null || textSequence.trim().isEmpty()) {
return; return;
} }
rememberedSequenceText = textSequence;
// Clean up input // Clean up input
textSequence = textSequence.trim().toLowerCase().replaceAll("[@%]", ""); textSequence = textSequence.trim().toLowerCase().replaceAll("[@%]", "");
// Replace "opponent" and "me" with symbols to ease following replacements // Replace "opponent" and "me" with symbols to ease following replacements