From f341d35ecefd1e9816a445abf99eaf10e5c578ef Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 9 Feb 2019 12:00:24 +0400 Subject: [PATCH] Hints: disable card hints in m15 render mode; --- .../src/main/java/org/mage/card/arcane/CardRenderer.java | 9 ++++++++- Mage/src/main/java/mage/abilities/hint/HintUtils.java | 3 +++ Mage/src/main/java/mage/cards/CardImpl.java | 1 + .../src/main/java/mage/game/permanent/PermanentImpl.java | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java index a042e9665ce..69c91dce3de 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java @@ -5,6 +5,7 @@ */ package org.mage.card.arcane; +import mage.abilities.hint.HintUtils; import mage.cards.ArtRect; import mage.client.dialog.PreferencesDialog; import mage.constants.AbilityType; @@ -137,12 +138,18 @@ public abstract class CardRenderer { } protected void parseRules(List stringRules, ArrayList keywords, ArrayList rules) { - // Translate the textbox text + // Translate the textbox text and remove card hints for (String rule : stringRules) { + // remove all card hints + if (rule.equals(HintUtils.HINT_START_MARK)) { + break; + } + // Kill reminder text if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_RENDERING_REMINDER_TEXT, "false").equals("false")) { rule = CardRendererUtils.killReminderText(rule).trim(); } + if (!rule.isEmpty()) { TextboxRule tbRule = TextboxRuleParser.parse(cardView, rule); if (tbRule.type == TextboxRuleType.SIMPLE_KEYWORD) { diff --git a/Mage/src/main/java/mage/abilities/hint/HintUtils.java b/Mage/src/main/java/mage/abilities/hint/HintUtils.java index 796c1e591cc..62bf14cbf40 100644 --- a/Mage/src/main/java/mage/abilities/hint/HintUtils.java +++ b/Mage/src/main/java/mage/abilities/hint/HintUtils.java @@ -15,6 +15,9 @@ public class HintUtils { public static final String HINT_ICON_BAD = "ICON_BAD"; public static final String HINT_ICON_RESTRICT = "ICON_RESTRICT"; + // + public static final String HINT_START_MARK = "
"; // workaround to find hint text in rules list and shows it in html + public static String prepareText(String text, Color color) { return prepareText(text, color, null); } diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index e5e292a30c8..c8cdb0f0826 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -273,6 +273,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card { // total hints if (!abilityHints.isEmpty()) { + rules.add(HintUtils.HINT_START_MARK); rules.addAll(abilityHints); } } diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index fe92f6e6e8b..03745c65f2c 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -294,6 +294,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { // total hints if (!abilityHints.isEmpty() || !restrictHints.isEmpty()) { + rules.add(HintUtils.HINT_START_MARK); rules.addAll(abilityHints); rules.addAll(restrictHints); }