From b029de3ec9dbd2af034aa5aaf8a8393f27e47644 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 26 Jul 2015 10:17:04 +0200 Subject: [PATCH] * Added id and colored font to shown related object names of stack abilities. --- Mage.Common/src/mage/view/CardsView.java | 5 +-- .../src/mage/view/StackAbilityView.java | 3 +- Mage/src/mage/util/GameLog.java | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Mage.Common/src/mage/view/CardsView.java b/Mage.Common/src/mage/view/CardsView.java index a4400c5faad..0107ee0ee03 100644 --- a/Mage.Common/src/mage/view/CardsView.java +++ b/Mage.Common/src/mage/view/CardsView.java @@ -49,6 +49,7 @@ import mage.game.GameState; import mage.game.command.Emblem; import mage.game.permanent.Permanent; import mage.target.targetpointer.TargetPointer; +import mage.util.GameLog; /** * @@ -145,11 +146,11 @@ public class CardsView extends LinkedHashMap { for (UUID uuid : abilityTargets) { MageObject mageObject = game.getObject(uuid); if (mageObject != null) { - names.add(mageObject.getName()); + names.add(GameLog.getColoredObjectIdNameForTooltip(mageObject)); } } if (!names.isEmpty()) { - abilityView.getRules().add("Related to: " + names.toString() + ""); + abilityView.getRules().add("Related objects: " + names.toString() + ""); } } } diff --git a/Mage.Common/src/mage/view/StackAbilityView.java b/Mage.Common/src/mage/view/StackAbilityView.java index a55b78c9c8f..6fb4d3c4863 100644 --- a/Mage.Common/src/mage/view/StackAbilityView.java +++ b/Mage.Common/src/mage/view/StackAbilityView.java @@ -41,6 +41,7 @@ import mage.game.Game; import mage.game.stack.StackAbility; import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.TargetPointer; +import mage.util.GameLog; /** * @@ -118,7 +119,7 @@ public class StackAbilityView extends CardView { if ((mageObject instanceof Card) && ((Card) mageObject).isFaceDown(game)) { continue; } - names.add(mageObject.getName()); + names.add(GameLog.getColoredObjectIdNameForTooltip(mageObject)); } } diff --git a/Mage/src/mage/util/GameLog.java b/Mage/src/mage/util/GameLog.java index 544b0a2d359..b6a59464e67 100644 --- a/Mage/src/mage/util/GameLog.java +++ b/Mage/src/mage/util/GameLog.java @@ -39,6 +39,7 @@ public class GameLog { static final String LOG_COLOR_PLAYER = "#20B2AA"; // LightSeaGreen static final String LOG_COLOR_PLAYER_REQUEST = "#D2691E"; // Chocolate static final String LOG_COLOR_PLAYER_CONFIRM = "#D2691E"; // Chocolate + // colors for more dark background static final String LOG_COLOR_GREEN = "#90EE90"; // LightGreen static final String LOG_COLOR_RED = "#FF6347"; // Tomato static final String LOG_COLOR_BLUE = "#87CEFA"; // LightSkyBlue @@ -46,6 +47,14 @@ public class GameLog { static final String LOG_COLOR_WHITE = "#F0E68C"; // Khaki static final String LOG_COLOR_MULTI = "#DAA520"; // GoldenRod static final String LOG_COLOR_COLORLESS = "#B0C4DE"; // LightSteelBlue + // colors for tooltip (light background) + static final String LOG_TT_COLOR_RED = "Red"; // Tomato + static final String LOG_TT_COLOR_GREEN = "Green"; // LightGreen + static final String LOG_TT_COLOR_BLUE = "Blue"; + static final String LOG_TT_COLOR_BLACK = "Black"; + static final String LOG_TT_COLOR_WHITE = "#CCDB00"; + static final String LOG_TT_COLOR_MULTI = "#FFAC40"; + static final String LOG_TT_COLOR_COLORLESS = "#94A4BA"; static final String LOG_COLOR_NEUTRAL = "#F0F8FF"; // AliceBlue public static String replaceNameByColoredName(MageObject mageObject, String text) { @@ -60,6 +69,10 @@ public class GameLog { return "" + mageObject.getName() + " [" + mageObject.getId().toString().substring(0, 3) + "]"; } + public static String getColoredObjectIdNameForTooltip(MageObject mageObject) { + return "" + mageObject.getName() + " [" + mageObject.getId().toString().substring(0, 3) + "]"; + } + public static String getNeutralColoredText(String text) { return "" + text + ""; } @@ -97,4 +110,22 @@ public class GameLog { return LOG_COLOR_BLACK; } } + + private static String getTooltipColorName(ObjectColor objectColor) { + if (objectColor.isMulticolored()) { + return LOG_TT_COLOR_MULTI; + } else if (objectColor.isColorless()) { + return LOG_TT_COLOR_COLORLESS; + } else if (objectColor.isRed()) { + return LOG_TT_COLOR_RED; + } else if (objectColor.isGreen()) { + return LOG_TT_COLOR_GREEN; + } else if (objectColor.isBlue()) { + return LOG_TT_COLOR_BLUE; + } else if (objectColor.isWhite()) { + return LOG_TT_COLOR_WHITE; + } else { + return LOG_TT_COLOR_BLACK; + } + } }