From 946ee95391b2b9a0dfa83aba0dca687bb330ce50 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 00:20:42 -0800 Subject: [PATCH 01/15] Create MummifiedHandFix.java --- .../cardcrawl/relics/MummifiedHandFix.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java new file mode 100644 index 00000000..9a5d56a1 --- /dev/null +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java @@ -0,0 +1,23 @@ +package basemod.patches.com.megacrit.cardcrawl.relics; + +import com.evacipated.cardcrawl.modthespire.lib.SpireInstrumentPatch; +import com.evacipated.cardcrawl.modthespire.lib.SpirePatch2; +import com.megacrit.cardcrawl.cards.AbstractCard; +import com.megacrit.cardcrawl.relics.MummifiedHand; +import javassist.CannotCompileException; +import javassist.expr.ExprEditor; +import javassist.expr.FieldAccess; + +@SpirePatch2(clz = MummifiedHand.class, method = "onUseCard") +public class MummifiedHandPatch { + @SpireInstrumentPatch + public static ExprEditor MummifiedHandCheck() { + return new ExprEditor() { + public void edit(FieldAccess f) throws CannotCompileException { + if (f.getClassName().equals(AbstractCard.class.getName()) && f.getFieldName().equals("cost")) { + f.replace("$_ = $0.costForTurn;"); + } + } + }; + } +} From 12c686f0f990b07877feb9e4d6fda0cc57cb1e73 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 00:25:30 -0800 Subject: [PATCH 02/15] Create MakeTempCardInDiscardAction --- .../cardcrawl/actions/common/MakeTempCardInDiscardAction | 1 + 1 file changed, 1 insertion(+) create mode 100644 mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction @@ -0,0 +1 @@ + From a15589311f518c7ca45b4212266735d6068d6218 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 00:25:46 -0800 Subject: [PATCH 03/15] Delete mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction --- .../cardcrawl/actions/common/MakeTempCardInDiscardAction | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction deleted file mode 100644 index 8b137891..00000000 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction +++ /dev/null @@ -1 +0,0 @@ - From df8899137e57b1006bfff919f5600322f5d2fa93 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 00:29:20 -0800 Subject: [PATCH 04/15] Create MakeTempCardInDiscardPatch.java --- .../MakeTempCardInDiscardPatch.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java new file mode 100644 index 00000000..43f9b469 --- /dev/null +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java @@ -0,0 +1,29 @@ +package basemod.patches.com.megacrit.cardcrawl.actions.common.MakeTempCardInDiscardAction; + +import com.badlogic.gdx.Gdx; +import com.evacipated.cardcrawl.modthespire.lib.ByRef; +import com.evacipated.cardcrawl.modthespire.lib.SpirePatch; +import com.megacrit.cardcrawl.actions.common.MakeTempCardInDiscardAction; +import com.megacrit.cardcrawl.cards.AbstractCard; +import com.megacrit.cardcrawl.dungeons.AbstractDungeon; +import com.megacrit.cardcrawl.vfx.cardManip.ShowCardAndAddToDiscardEffect; + +@SpirePatch( + clz = MakeTempCardInDiscardAction.class, + method = "update" +) +public class MakeTempCardInDiscardPatch { + public static void Prefix(MakeTempCardInDiscardAction __instance, int ___numCards, AbstractCard ___c, float ___startDuration, boolean ___sameUUID, @ByRef float[] ___duration) { + if (___numCards >= 6 && ___duration[0] == ___startDuration && BaseMod.fixesEnabled) { + for (int i = 0; i < ___numCards; i++) { + AbstractDungeon.effectList.add(new ShowCardAndAddToDiscardEffect(makeNewCard(___c,___sameUUID))); + } + ___duration[0] -= Gdx.graphics.getDeltaTime(); + } + } + + private static AbstractCard makeNewCard(AbstractCard card, boolean sameUUID) { + if(sameUUID) return card.makeSameInstanceOf(); + return card.makeStatEquivalentCopy(); + } +} From 4e49c5c7afe4b7166db0e3eb9a92f371ab272a50 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 00:36:36 -0800 Subject: [PATCH 05/15] Update RenderRelicOnCard.java --- .../cardcrawl/cards/AbstractCard/RenderRelicOnCard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java index 0050844b..93e120af 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java @@ -35,7 +35,7 @@ public static void Postfix(AbstractCard __instance, SpriteBatch sb, boolean hove for (Pair, AbstractRelic> info : BaseMod.getBottledRelicList()) { if (info.getKey().test(__instance)) { AbstractRelic r = info.getValue(); - r.scale = __instance.drawScale * Settings.scale; + r.scale = __instance.drawScale * Settings.scale * 1.5F; try { relicRotation.set(r, __instance.angle); } catch (IllegalAccessException e) { From 665dc6d9c576e7ed228a46fd0e52409465220f18 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 00:40:25 -0800 Subject: [PATCH 06/15] Update MummifiedHandFix.java --- .../com/megacrit/cardcrawl/relics/MummifiedHandFix.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java index 9a5d56a1..8cf10951 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/relics/MummifiedHandFix.java @@ -15,7 +15,11 @@ public static ExprEditor MummifiedHandCheck() { return new ExprEditor() { public void edit(FieldAccess f) throws CannotCompileException { if (f.getClassName().equals(AbstractCard.class.getName()) && f.getFieldName().equals("cost")) { - f.replace("$_ = $0.costForTurn;"); + f.replace("if (" + BaseMod.class.getName() + ".fixesEnabled) {" + + "$_ = $0.costForTurn;" + + "} else {" + + "$_ = $proceed($$);" + + "}"); } } }; From 77c0896f104e4866a3b88a05c1b8fa7b3c249418 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 12:30:41 -0800 Subject: [PATCH 07/15] Update CustomBottleRelic.java --- mod/src/main/java/basemod/abstracts/CustomBottleRelic.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java index 3098c32d..cdf91de9 100644 --- a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java +++ b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java @@ -7,4 +7,8 @@ public interface CustomBottleRelic { Predicate isOnCard(); + + default boolean showInCombat(AbstractCard card) { + return true; + } } From 69675672b7c55353b594bd844d97dbf82ffd190c Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 12:44:08 -0800 Subject: [PATCH 08/15] Update RenderRelicOnCard.java --- .../cardcrawl/cards/AbstractCard/RenderRelicOnCard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java index 93e120af..72218d3d 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java @@ -33,7 +33,7 @@ public static void Postfix(AbstractCard __instance, SpriteBatch sb, boolean hove { if (!Settings.hideCards /*&& !__instance.isOnScreen()*/ && !__instance.isFlipped) { for (Pair, AbstractRelic> info : BaseMod.getBottledRelicList()) { - if (info.getKey().test(__instance)) { + if (info.getKey().test(__instance) && (((CustomBottleRelic) info.getValue()).showInCombat(__instance) || !(AbstractDungeon.getCurrRoom()).phase == AbstractRoom.RoomPhase.COMBAT)) { AbstractRelic r = info.getValue(); r.scale = __instance.drawScale * Settings.scale * 1.5F; try { From 58d6f3ba02057a99484dd3aef14567dfe362daa1 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Thu, 2 Oct 2025 15:50:39 -0800 Subject: [PATCH 09/15] Update CustomBottleRelic.java --- mod/src/main/java/basemod/abstracts/CustomBottleRelic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java index cdf91de9..d00ff89c 100644 --- a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java +++ b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java @@ -6,8 +6,10 @@ public interface CustomBottleRelic { + // Utilized for making relics appear on the Top Right of cards. Does nothing else in terms of "Bottles" Predicate isOnCard(); + // Base game bottles do not show in combat. It is set to default true however. default boolean showInCombat(AbstractCard card) { return true; } From b265ecba42514737fc4d6d7bd26637e6ea10c492 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Sat, 4 Oct 2025 10:59:17 -0800 Subject: [PATCH 10/15] Update MakeTempCardInDiscardPatch.java --- .../MakeTempCardInDiscardPatch.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java index 43f9b469..f75d1774 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/actions/common/MakeTempCardInDiscardAction/MakeTempCardInDiscardPatch.java @@ -1,29 +1,36 @@ package basemod.patches.com.megacrit.cardcrawl.actions.common.MakeTempCardInDiscardAction; -import com.badlogic.gdx.Gdx; -import com.evacipated.cardcrawl.modthespire.lib.ByRef; -import com.evacipated.cardcrawl.modthespire.lib.SpirePatch; +import basemod.ReflectionHacks; +import com.badlogic.gdx.Graphics; +import com.evacipated.cardcrawl.modthespire.lib.*; +import com.evacipated.cardcrawl.modthespire.patcher.PatchingException; import com.megacrit.cardcrawl.actions.common.MakeTempCardInDiscardAction; import com.megacrit.cardcrawl.cards.AbstractCard; import com.megacrit.cardcrawl.dungeons.AbstractDungeon; import com.megacrit.cardcrawl.vfx.cardManip.ShowCardAndAddToDiscardEffect; +import javassist.CannotCompileException; +import javassist.CtBehavior; @SpirePatch( clz = MakeTempCardInDiscardAction.class, method = "update" ) public class MakeTempCardInDiscardPatch { - public static void Prefix(MakeTempCardInDiscardAction __instance, int ___numCards, AbstractCard ___c, float ___startDuration, boolean ___sameUUID, @ByRef float[] ___duration) { - if (___numCards >= 6 && ___duration[0] == ___startDuration && BaseMod.fixesEnabled) { - for (int i = 0; i < ___numCards; i++) { - AbstractDungeon.effectList.add(new ShowCardAndAddToDiscardEffect(makeNewCard(___c,___sameUUID))); - } - ___duration[0] -= Gdx.graphics.getDeltaTime(); + @SpireInsertPatch( + locator = Locator.class + ) + public static void Insert(MakeTempCardInDiscardAction __instance, int ___numCards) { + if(___numCards >= 6 && BaseMod.fixesEnabled) for (int i = 0; i < ___numCards; i++) { + AbstractCard card = ReflectionHacks.privateMethod(MakeTempCardInDiscardAction.class, "makeNewCard").invoke(__instance); + AbstractDungeon.effectList.add(new ShowCardAndAddToDiscardEffect(card)); } } - private static AbstractCard makeNewCard(AbstractCard card, boolean sameUUID) { - if(sameUUID) return card.makeSameInstanceOf(); - return card.makeStatEquivalentCopy(); + private static class Locator extends SpireInsertLocator { + public int[] Locate(CtBehavior ctMethodToPatch) throws CannotCompileException, PatchingException { + Matcher finalMatcher = new Matcher.MethodCallMatcher(Graphics.class,"getDeltaTime"); + return LineFinder.findInOrder(ctMethodToPatch, finalMatcher); + } } } + From 1323558cfcc361c0571aa30192fa268e468c49ab Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Sat, 4 Oct 2025 11:01:27 -0800 Subject: [PATCH 11/15] Update CustomBottleRelic.java --- mod/src/main/java/basemod/abstracts/CustomBottleRelic.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java index d00ff89c..110f9d8b 100644 --- a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java +++ b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java @@ -6,11 +6,16 @@ public interface CustomBottleRelic { - // Utilized for making relics appear on the Top Right of cards. Does nothing else in terms of "Bottles" + // Utilized for making relics appear on the Top Right of cards. Does nothing else in terms of "Bottle" coding. If you want help, ask #modding-technical in the StS Discord! Predicate isOnCard(); // Base game bottles do not show in combat. It is set to default true however. default boolean showInCombat(AbstractCard card) { return true; } + + // Scale of the relic when it's being rendered. + default float scale(float scale) { + return 1.5F; + } } From d8fd3ba20ae1d562002e9267a49a6c4c0716106a Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Sat, 4 Oct 2025 11:03:39 -0800 Subject: [PATCH 12/15] Update RenderRelicOnCard.java --- .../cardcrawl/cards/AbstractCard/RenderRelicOnCard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java index 72218d3d..55587989 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java @@ -35,7 +35,7 @@ public static void Postfix(AbstractCard __instance, SpriteBatch sb, boolean hove for (Pair, AbstractRelic> info : BaseMod.getBottledRelicList()) { if (info.getKey().test(__instance) && (((CustomBottleRelic) info.getValue()).showInCombat(__instance) || !(AbstractDungeon.getCurrRoom()).phase == AbstractRoom.RoomPhase.COMBAT)) { AbstractRelic r = info.getValue(); - r.scale = __instance.drawScale * Settings.scale * 1.5F; + r.scale = __instance.drawScale * Settings.scale * ((CustomBottleRelic) r).scale(__instance); try { relicRotation.set(r, __instance.angle); } catch (IllegalAccessException e) { From 557689802247760aac2023098a4b4bc7d5599e16 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Sat, 4 Oct 2025 11:03:56 -0800 Subject: [PATCH 13/15] Update CustomBottleRelic.java --- mod/src/main/java/basemod/abstracts/CustomBottleRelic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java index 110f9d8b..3c949fcf 100644 --- a/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java +++ b/mod/src/main/java/basemod/abstracts/CustomBottleRelic.java @@ -15,7 +15,7 @@ default boolean showInCombat(AbstractCard card) { } // Scale of the relic when it's being rendered. - default float scale(float scale) { - return 1.5F; - } + default float scale(AbstractCard card) { + return 1.5F; + } } From b6ed5bc982b0fb6f4ca3130428eae81952c82b14 Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Sat, 4 Oct 2025 11:37:18 -0800 Subject: [PATCH 14/15] Update RenderRelicOnCard.java --- .../cardcrawl/cards/AbstractCard/RenderRelicOnCard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java index 55587989..20739e20 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java @@ -33,7 +33,7 @@ public static void Postfix(AbstractCard __instance, SpriteBatch sb, boolean hove { if (!Settings.hideCards /*&& !__instance.isOnScreen()*/ && !__instance.isFlipped) { for (Pair, AbstractRelic> info : BaseMod.getBottledRelicList()) { - if (info.getKey().test(__instance) && (((CustomBottleRelic) info.getValue()).showInCombat(__instance) || !(AbstractDungeon.getCurrRoom()).phase == AbstractRoom.RoomPhase.COMBAT)) { + if (info.getKey().test(__instance) && (((CustomBottleRelic) info.getValue()).showInCombat(__instance) || (AbstractDungeon.getCurrRoom()).phase != AbstractRoom.RoomPhase.COMBAT)) { AbstractRelic r = info.getValue(); r.scale = __instance.drawScale * Settings.scale * ((CustomBottleRelic) r).scale(__instance); try { From 07c8238e61ef20547355bbe4238be448ef12012b Mon Sep 17 00:00:00 2001 From: SoytheProton Date: Sat, 4 Oct 2025 12:07:00 -0800 Subject: [PATCH 15/15] Update RenderRelicOnCard.java --- .../cardcrawl/cards/AbstractCard/RenderRelicOnCard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java index 20739e20..ddf41b69 100644 --- a/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java +++ b/mod/src/main/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/RenderRelicOnCard.java @@ -33,7 +33,7 @@ public static void Postfix(AbstractCard __instance, SpriteBatch sb, boolean hove { if (!Settings.hideCards /*&& !__instance.isOnScreen()*/ && !__instance.isFlipped) { for (Pair, AbstractRelic> info : BaseMod.getBottledRelicList()) { - if (info.getKey().test(__instance) && (((CustomBottleRelic) info.getValue()).showInCombat(__instance) || (AbstractDungeon.getCurrRoom()).phase != AbstractRoom.RoomPhase.COMBAT)) { + if (info.getKey().test(__instance) && (((CustomBottleRelic) info.getValue()).showInCombat(__instance) || (AbstractDungeon.getCurrRoom()).phase != AbstractRoom.RoomPhase.COMBAT || AbstractDungeon.screen == AbstractDungeon.CurrentScreen.MASTER_DECK_VIEW)) { AbstractRelic r = info.getValue(); r.scale = __instance.drawScale * Settings.scale * ((CustomBottleRelic) r).scale(__instance); try {