fix: handle statue with no tiers

Clazex · Nov 9, 2021 · 66be0ed · 66be0ed
1 parent 2e99c74
commit 66be0ed
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/GodSeekerPlus/Modules/CompleteLowerDifficulty.cs b/GodSeekerPlus/Modules/CompleteLowerDifficulty.cs
@@ -18,18 +18,20 @@ private static void CompleteLower(
 			string descSheet,
 			string descKey) {
 
-			BossStatue.Completion completion = MiscUtil.GetStatueCompletion(statue);
+			if (!statue.hasNoTiers) {
+				BossStatue.Completion completion = MiscUtil.GetStatueCompletion(statue);
 
-			if ((completion.completedTier2 || completion.completedTier3) && !completion.completedTier1) {
-				completion.completedTier1 = true;
-				Logger.LogDebug($"Unlocked Tier 1 for {statue.name}");
-			}
-			if (completion.completedTier3 && !completion.completedTier2) {
-				completion.completedTier2 = true;
-				Logger.LogDebug($"Unlocked Tier 2 for {statue.name}");
-			}
+				if ((completion.completedTier2 || completion.completedTier3) && !completion.completedTier1) {
+					completion.completedTier1 = true;
+					Logger.LogDebug($"Unlocked Tier 1 for {statue.name}");
+				}
+				if (completion.completedTier3 && !completion.completedTier2) {
+					completion.completedTier2 = true;
+					Logger.LogDebug($"Unlocked Tier 2 for {statue.name}");
+				}
 
-			MiscUtil.SetStatueCompletion(statue, completion);
+				MiscUtil.SetStatueCompletion(statue, completion);
+			}
 
 			orig(self, statue, nameSheet, nameKey, descSheet, descKey);
 		}

diff --git a/GodSeekerPlus/Modules/UnlockRadiant.cs b/GodSeekerPlus/Modules/UnlockRadiant.cs
@@ -18,24 +18,29 @@ private static void UnlockTier3(
 			string descSheet,
 			string descKey
 		) {
-			BossStatue.Completion completion = MiscUtil.GetStatueCompletion(statue);
-
-			if (statue.hasNoTiers || completion.completedTier2) {
+			if (statue.hasNoTiers) {
 				orig(self, statue, nameSheet, nameKey, descSheet, descKey);
 			} else {
-				completion.completedTier2 = true;
-				completion.seenTier3Unlock = true;
-				MiscUtil.SetStatueCompletion(statue, completion);
+				BossStatue.Completion completion = MiscUtil.GetStatueCompletion(statue);
 
-				orig(self, statue, nameSheet, nameKey, descSheet, descKey);
+				if (completion.completedTier2) {
+					orig(self, statue, nameSheet, nameKey, descSheet, descKey);
+				} else {
+					completion.completedTier2 = true;
+					completion.seenTier3Unlock = true;
+					MiscUtil.SetStatueCompletion(statue, completion);
 
-				completion.completedTier2 = false;
-				MiscUtil.SetStatueCompletion(statue, completion);
+					orig(self, statue, nameSheet, nameKey, descSheet, descKey);
 
-				self.tier2Button.SetState(false);
+					completion.completedTier2 = false;
+					MiscUtil.SetStatueCompletion(statue, completion);
 
-				Logger.LogDebug($"Unlocked Radiant for {statue.name}");
+					self.tier2Button.SetState(false);
+
+					Logger.LogDebug($"Unlocked Radiant for {statue.name}");
+				}
 			}
+
 		}
 	}
 }