From 456b1007992e60d73c06d355c2df22c8302e1db3 Mon Sep 17 00:00:00 2001 From: dtookey Date: Fri, 18 Sep 2020 02:30:02 -0400 Subject: [PATCH] Added a patch to enable the final act. cleaned up some formatting in ConstructDraftPatch.java --- .../patches/CArenaEnableLastActPatch.java | 25 +++++++++++++++++++ .../patches/ConstructDraftPatch.java | 5 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 constructTheArena/src/main/java/constructTheArena/patches/CArenaEnableLastActPatch.java diff --git a/constructTheArena/src/main/java/constructTheArena/patches/CArenaEnableLastActPatch.java b/constructTheArena/src/main/java/constructTheArena/patches/CArenaEnableLastActPatch.java new file mode 100644 index 0000000..2a6c0d8 --- /dev/null +++ b/constructTheArena/src/main/java/constructTheArena/patches/CArenaEnableLastActPatch.java @@ -0,0 +1,25 @@ +package constructTheArena.patches; + +import com.evacipated.cardcrawl.modthespire.lib.SpirePatch; +import com.evacipated.cardcrawl.modthespire.lib.SpirePrefixPatch; +import com.megacrit.cardcrawl.core.Settings; +import com.megacrit.cardcrawl.dungeons.AbstractDungeon; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + + +//generateMap in AbstractDungeon.java +@SpirePatch( + clz = AbstractDungeon.class, + method = "generateMap" +) +public class CArenaEnableLastActPatch { + private final static Logger logger = LogManager.getLogger(CArenaEnableLastActPatch.class.getName()); + + @SpirePrefixPatch + public static void Prefix() { + if (CArenaPatch.isEnabled()) { + Settings.isFinalActAvailable = true; + } + } +} \ No newline at end of file diff --git a/constructTheArena/src/main/java/constructTheArena/patches/ConstructDraftPatch.java b/constructTheArena/src/main/java/constructTheArena/patches/ConstructDraftPatch.java index 9d6e961..11266c3 100644 --- a/constructTheArena/src/main/java/constructTheArena/patches/ConstructDraftPatch.java +++ b/constructTheArena/src/main/java/constructTheArena/patches/ConstructDraftPatch.java @@ -34,7 +34,6 @@ public class ConstructDraftPatch { @SpirePrefixPatch public static void Prefix() { if (CArenaPatch.isEnabled()) { - ArrayList mods = ModHelper.getEnabledModIDs(); mods.remove("SealedDeck"); ModHelper.setMods(mods); @@ -73,8 +72,10 @@ public class ConstructDraftPatch { UnlockTracker.markCardAsSeen(c.cardID); } - AbstractDungeon.gridSelectScreen.open(constructGroup, 40, true, uiStrings.TEXT[0]+CardLimit+uiStrings.TEXT[1]); + AbstractDungeon.gridSelectScreen.open(constructGroup, 40, true, uiStrings.TEXT[0] + CardLimit + uiStrings.TEXT[1]); + AbstractDungeon.getCurrRoom().spawnRelicAndObtain(Settings.WIDTH / 2.0F, Settings.HEIGHT / 2.0F, new ConstructorsBurden()); + CArenaPatch.setEnabled(false); //turne off deck skipping and whatnot } }