From c355834a4e6c7fa6b02adaa0813ebdd1e5409fb1 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Sun, 14 Nov 2021 14:13:31 -0500 Subject: [PATCH] Fix #8337, #8456 --- .../src/main/java/org/mage/card/arcane/CardRendererUtils.java | 2 +- .../main/java/org/mage/card/arcane/ModernCardRenderer.java | 2 +- Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardRendererUtils.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardRendererUtils.java index 043f501d69..16a0549acf 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardRendererUtils.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardRendererUtils.java @@ -244,7 +244,7 @@ public final class CardRendererUtils { // boost colorizing if (value != null) { int current = value.getValue(); - int origin = value.getBaseValue(); + int origin = value.getBaseValueModified(); if (origin != 0) { if (current < origin) { return textLight ? CARD_TEXT_COLOR_BAD_LIGHT : CARD_TEXT_COLOR_BAD_DARK; diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index f39cc96b46..da544debd8 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -1105,7 +1105,7 @@ public class ModernCardRenderer extends CardRenderer { g.setColor(defaultTextColor); g.drawString(ptText2, ptPosStart2, curY - ptTextOffset - 1); // center // t - g.setColor(CardRendererUtils.getCardTextColor(cardView.getOriginalCard().getPower(), CardRendererUtils.isCardWithDamage(cardView), defaultTextColor, defaultTextLight)); + g.setColor(CardRendererUtils.getCardTextColor(cardView.getOriginalCard().getToughness(), CardRendererUtils.isCardWithDamage(cardView), defaultTextColor, defaultTextLight)); g.drawString(ptText3, ptPosStart3, curY - ptTextOffset - 1); // right // g.setColor(defaultTextColor); diff --git a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java index 973849eea1..0b7805593a 100644 --- a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java +++ b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java @@ -139,8 +139,8 @@ class MetamorphicAlterationEffect extends ContinuousEffectImpl { for (Ability ability : copied.getAbilities()) { permanent.addAbility(ability, source.getSourceId(), game); } - permanent.getPower().setValue(copied.getPower().getBaseValue()); - permanent.getToughness().setValue(copied.getToughness().getBaseValue()); + permanent.getPower().setValue(copied.getPower().getBaseValueModified()); + permanent.getToughness().setValue(copied.getToughness().getBaseValueModified()); return true; }