From 62fcd22a8b900b83daf70924b4daf28acb25ef2e Mon Sep 17 00:00:00 2001 From: lodici Date: Thu, 28 May 2015 13:26:12 +0100 Subject: [PATCH] closes #263 : Provide UI hint to user of "skip till end of turn" functionality in game enhancement UI. --- resources/magic/data/icons/forward2.png | Bin 877 -> 866 bytes src/magic/model/choice/MagicPlayChoice.java | 2 +- src/magic/ui/widget/TextLabel.java | 11 +++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/magic/data/icons/forward2.png b/resources/magic/data/icons/forward2.png index 4bc5aa93afa5065b11d26cd2fe3e480a87208b91..d8ae811cd0267d63aaeaa2f31626d5fe718d8d85 100644 GIT binary patch literal 866 zcmV-o1D*VdP)pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^4L^m3s900Q1gL_t(IPd$=*NRv?*#*g4O_s8<~nP4?aqgcfv=xU41X@3+6 zBIc!;1(lgpx@8xa8s*(+sfnRxhBhzRGy}_APF$J^y2?wLCYV}~MYrj^eBbwU)acBs6(r*nQYM?Jh5A6S}2_5>cFlkVp#IpB0Fh zlz{bq5Brh|M`7w^(f$E2zXO_kfhVtlax;gh>tEotr+!$tG(Ca{<3xnUTj3!uZr0u& zTL6r2f$BD(X9VaT21=WOq9&lw2pmfL3RiiV#coNmjELP+RX(bg>Do>Xh7O>ZHr=QP z`bRj}W`UOji|Y&nke~--L7l9?Jwr_#y>cs~uaBX$1<0%gk}H7tdq8>(i-A!V)@d5K z2S}ulhSq)Jf55@3ppiIjxYHYxKZTSBK%<48Gzz>QTbw_C=K(qU z`XS=FrMy2R+lJF6JYEfQnD{+!9uvQK{G6l|)yy1^x=tPenSflw!g*WGFmciaA`&=Bq9T_Gl9bq;abRVi5&^eke>*{*I?!RTCK;}p`&EYeEpbv*Ho>l)mt?i$(@ s^~$(5!ki!tGRhhMdIv|veF_os7x0JQBrAI5LI3~&07*qoM6N<$g3#QH7XSbN literal 877 zcmV-z1CsoSP)$#_1wW$uv^hq*QDhBO0|t zB)U+Pf-XciR>in+;lhQ8f*>d;NQ(-Bg;CH_B!*h3kfvHtHaI_C8)OrmopAN!=kT8(jS3qc}OpVCSbkM!Og^? zqlBkpr`x}cnJX~d2M-Q{lAvi|*%B!9z(0N1lcki z*=G|CZCQ>3jrM=7*K}xFkh~=*Ho@>1LTOTFDz)lh88`2rhLaa8q_!Ee-hzo?!PECE zEX(1&?=4QxOLPNFvx$aX(1diRR|*Asd%$sNq)Iw}Z|E$n=?wMjJb6Ij*bW~}Tl{!c z(%B{G4ufniV>{NYhM~uo63JDUYSG&bUBONC-3_ll0=jhge8%ETS`rQk!d(#XJFI0A zOQv#`b`qCkTF*!~EQJem{5lT&wQ9+{ndio2R@! zWmVBt^W;5%1+=etGojMV}pvw!o-6We@MY8 z29znD^>|%}J392J5Kt+%^OZ{DLc7^IxjHp|X)FI9mAyM570L;000000NkvXXu0mjf DtRb9W diff --git a/src/magic/model/choice/MagicPlayChoice.java b/src/magic/model/choice/MagicPlayChoice.java index dc16a64d7d..b00c06c1e2 100644 --- a/src/magic/model/choice/MagicPlayChoice.java +++ b/src/magic/model/choice/MagicPlayChoice.java @@ -21,7 +21,7 @@ public class MagicPlayChoice extends MagicChoice { private static final MagicChoice INSTANCE=new MagicPlayChoice(); - private static final String MESSAGE="Play a card or ability.|Press {f} to pass priority."; + private static final String MESSAGE="Play a card or ability.|Press {f} to pass priority.|[Shift+Right, Shift+Space or right click {f} to skip to end of turn.]"; private static final String CONTINUE_MESSAGE="Press {f} to pass priority."; private static final Collection PASS_OPTIONS=Collections.singleton(MagicPlayChoiceResult.SKIP); diff --git a/src/magic/ui/widget/TextLabel.java b/src/magic/ui/widget/TextLabel.java index 4f7af9edcf..e93246c960 100644 --- a/src/magic/ui/widget/TextLabel.java +++ b/src/magic/ui/widget/TextLabel.java @@ -38,6 +38,7 @@ public class TextLabel extends JPanel { private final boolean center; private Color textColor; private Color choiceColor; + private boolean isBlueInfo = true; static { @@ -80,7 +81,7 @@ public class TextLabel extends JPanel { if (textPart.charAt(0)=='{') { component = new IconComponent(IconImages.getIcon(TextImages.getIcon(textPart))); } else if (info) { - component=new TextComponent(textPart,this,FontsAndBorders.FONT0,true); + component=new TextComponent(textPart,this,FontsAndBorders.FONT0,isBlueInfo); } else { component=new TextComponent(textPart,this,FontsAndBorders.FONT1,false); } @@ -109,14 +110,16 @@ public class TextLabel extends JPanel { } else if (ch=='}') { addComponent(buildComponent(text.substring(startIndex,index+1),info)); startIndex=index+1; - } else if (ch=='(') { + } else if (ch=='(' || ch=='[') { addComponent(buildComponent(text.substring(startIndex,index),info)); startIndex=index; - info=true; - } else if (ch==')') { + info = true; + isBlueInfo = ch=='('; + } else if (ch==')'|| ch==']') { addComponent(buildComponent(text.substring(startIndex,index+1),info)); startIndex=index+1; info=false; + isBlueInfo = true; } } }