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

- Ensure that (Targeting ERROR) is removed from the prompt window when showing the SA text when selecting targets.

Browse Source 
- Some code formatting.
This commit is contained in:
Agetian
2017-01-20 17:15:38 +00:00
parent 55e34867ff
commit bf98c77eb7
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui/src/main/java/forge/match/input/InputPayManaOfCostPayment.java
View File

@@ -52,11 +52,11 @@ public class InputPayManaOfCostPayment extends InputPayMana {
} }
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT)) { if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT)) {
// msg.append(saPaidFor.getStackDescription().replace("(Targeting ERROR)", "")); // msg.append(saPaidFor.getStackDescription().replace("(Targeting ERROR)", ""));
if ( saPaidFor.isSpell() ) { if (saPaidFor.isSpell()) {
msg.append(saPaidFor.getStackDescription().replace("(Targeting ERROR)", "")); msg.append(saPaidFor.getStackDescription().replace("(Targeting ERROR)", ""));
} else { } else {
msg.append(saPaidFor.getHostCard()).append(" - ").append(saPaidFor.toString()); msg.append(saPaidFor.getHostCard()).append(" - ").append(saPaidFor.toString());
} }
} }
msg.append("\n").append("Pay Mana Cost: ").append(displayMana); msg.append("\n").append("Pay Mana Cost: ").append(displayMana);
if (this.phyLifeToLose > 0) { if (this.phyLifeToLose > 0) {

12
forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
View File

@@ -50,13 +50,17 @@ public final class InputSelectTargets extends InputSyncronizedBase {
getController().getGui().setCard(CardView.get(sa.getHostCard())); getController().getGui().setCard(CardView.get(sa.getHostCard()));
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT)) { if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT)) {
// sb.append(sa.getStackDescription().replace("(Targeting ERROR)", "")).append("\n<b>").append(tgt.getVTSelection()).append("</b>\n"); // sb.append(sa.getStackDescription().replace("(Targeting ERROR)", "")).append("\n<b>").append(tgt.getVTSelection()).append("</b>\n");
if ( sa.isAbility() ) { sb.append(sa.getHostCard()).append(" - " ); } if (sa.isAbility()) {
sb.append(sa.toString()).append("\n<b>").append(tgt.getVTSelection()).append("</b>\n"); sb.append(sa.getHostCard()).append(" - ");
}
sb.append(sa.toString().replace("(Targeting ERROR)", "")).append("\n<b>").append(tgt.getVTSelection()).append("</b>\n");
} else { } else {
sb.append(sa.getHostCard()).append(" - ").append(tgt.getVTSelection()).append("\n"); sb.append(sa.getHostCard()).append(" - ").append(tgt.getVTSelection()).append("\n");
} }
if ( ! targetDepth.entrySet().isEmpty() ) { sb.append("Targeted:\n"); } if (!targetDepth.entrySet().isEmpty()) {
sb.append("Targeted:\n");
}
for (final Entry<GameEntity, Integer> o : targetDepth.entrySet()) { for (final Entry<GameEntity, Integer> o : targetDepth.entrySet()) {
sb.append(o.getKey()); sb.append(o.getKey());
if (o.getValue() > 1) { if (o.getValue() > 1) {