Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add small undo icon and use it in undo message, for #1177

master
melvinzhang 2017-07-14 16:08:27 +08:00
parent e470b5efe6
commit 5d5e8e57a9
5 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/magic/data/icons/undo2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

1
src/magic/data/MagicIcon.java
View File

@ -73,6 +73,7 @@ public enum MagicIcon {
START("start.png"),
STOP("stop.png"),
UNDO("undo.png"),
UNDO2("undo2.png"),
BUSY("busy.gif"),
BUSY16("busy16.gif"),
ALL("all.gif"),

1
src/magic/data/TextImages.java
View File

@ -13,6 +13,7 @@ public class TextImages {
static {
add("{f}", MagicIcon.FORWARD2);
add("{undo}", MagicIcon.UNDO2);
add("{O}", MagicIcon.TARGET);
add("{SS}", MagicIcon.CANNOTTAP);
add("{D}", MagicIcon.DAMAGE);

2
src/magic/model/choice/MagicPayManaCostChoice.java
View File

@ -26,7 +26,7 @@ public class MagicPayManaCostChoice extends MagicChoice {
private static final String _S_CHOOSE = "Choose a mana ability to pay %s.";
@StringContext(eg = "%s will be replaced with a mana cost icon.")
private static final String _S_NO_OPTIONS = "Unable to pay %s.|Please undo.";
private static final String _S_NO_OPTIONS = "Unable to pay %s.|Click {undo} to undo.";
private final MagicManaCost cost;

2
src/magic/model/choice/MagicTargetChoice.java
View File

@ -27,7 +27,7 @@ import magic.translate.MText;
public class MagicTargetChoice extends MagicChoice {
private static final String NO_OPTIONS = "Unable to %s|Please undo.";
private static final String NO_OPTIONS = "Unable to %s|Click {undo} to undo.";
public static final MagicTargetChoice NONE =
new MagicTargetChoice(MagicTargetFilterFactory.NONE,MagicTargetHint.None,"nothing") {