fix sts v2.2 crash in death screens (fixes #587)

dbjorge · Dec 3, 2020 · 68be74c · 68be74c
1 parent 5b8ed66
commit 68be74c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Bug fixes
+
+* Compatibility with Slay the Spire v2.2 (fixes crash in death screens) (thanks A Cake Wearing A Hat and Celicath for reporting!)
+
 ## [v1.9.1] - 2020-11-01
 
 ### Bug fixes

diff --git a/pom.xml b/pom.xml
@@ -11,8 +11,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <SlayTheSpire.version>01-27-2020</SlayTheSpire.version>
-        <ModTheSpire.version>3.15.0</ModTheSpire.version>
+        <SlayTheSpire.version>11-29-2020</SlayTheSpire.version>
+        <ModTheSpire.version>3.18.0</ModTheSpire.version>
 
         <!--
             You need to set a STEAMAPPS_PATH environment variable to enable Maven to find the dependencies.

diff --git a/src/main/java/stsjorbsmod/patches/VoiceoverMasterPatch.java b/src/main/java/stsjorbsmod/patches/VoiceoverMasterPatch.java
@@ -15,6 +15,8 @@
 import com.megacrit.cardcrawl.monsters.MonsterGroup;
 import com.megacrit.cardcrawl.neow.NeowEvent;
 import com.megacrit.cardcrawl.screens.DeathScreen;
+import com.megacrit.cardcrawl.screens.GameOverScreen;
+import com.megacrit.cardcrawl.screens.VictoryScreen;
 import javassist.CannotCompileException;
 import javassist.expr.ExprEditor;
 import javassist.expr.FieldAccess;
@@ -40,7 +42,7 @@ public static MonsterGroup Postfix(MonsterGroup __originalRetVal, String key) {
     public static class DeathScreen_ctor {
         @SpirePostfixPatch
         public static void Postfix(DeathScreen __this) {
-            VoiceoverMaster.playAfterDelay(__this.isVictory ? "death_victory" : "death", 2.0F);
+            VoiceoverMaster.playAfterDelay(DeathScreen.isVictory ? "death_victory" : "death", 2.0F);
         }
     }