fix base value modifier upgrade preview (daviscook477#397)

CICSilver · Apr 19, 2023 · 8f00c12 · 8f00c12
1 parent e3a5756
commit 8f00c12
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/SmithPreview.java b/...src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/SmithPreview.java
@@ -20,6 +20,17 @@ public static void Postfix(AbstractCard __instance)
 	{
 		ForEachDynamicVariable(__instance, (card, dv) -> {
 			if (dv.upgraded(card)) {
+				switch (dv.key()) {
+					case "D":
+						card.damage = dv.modifiedBaseValue(card);
+						break;
+					case "B":
+						card.block = dv.modifiedBaseValue(card);
+						break;
+					case "M":
+						card.magicNumber = dv.modifiedBaseValue(card);
+						break;
+				}
 				dv.setIsModified(card, true);
 			}
 		});
@@ -28,10 +39,13 @@ public static void Postfix(AbstractCard __instance)
 	public static void ForEachDynamicVariable(AbstractCard card, BiConsumer<AbstractCard, DynamicVariable> callback)
 	{
 		Pattern pattern;
+		int keyIndex;
 		if (Settings.lineBreakViaCharacter) {
 			pattern = Pattern.compile("\\$(.+)\\$\\$");
+			keyIndex = 1;
 		} else {
-			pattern = Pattern.compile("!(.+)!.*");
+			pattern = DynamicVariable.variablePattern;
+			keyIndex = 2;
 		}
 
 		for (DescriptionLine line : card.description) {
@@ -44,7 +58,7 @@ public static void ForEachDynamicVariable(AbstractCard card, BiConsumer<Abstract
 			for (String word : tokenized) {
 				java.util.regex.Matcher matcher = pattern.matcher(word);
 				if (matcher.find()) {
-					word = matcher.group(1);
+					word = matcher.group(keyIndex);
 
 					DynamicVariable dv = BaseMod.cardDynamicVariableMap.get(word);
 					if (dv != null) {