From f4a26fa541c5f9acc0a91f7247ba02a1cd5b784c Mon Sep 17 00:00:00 2001
From: Brian Lai <brianlai30@outlook.com>
Date: Tue, 27 Jul 2021 19:27:34 -0700
Subject: [PATCH] Fix clearing 3-stage achievements

---
 src/components/Check.svelte         | 2 +-
 src/routes/achievement/index.svelte | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Check.svelte b/src/components/Check.svelte
index 00bf9097..55e08136 100644
--- a/src/components/Check.svelte
+++ b/src/components/Check.svelte
@@ -6,7 +6,7 @@
 </script>
 
 <label
-  class="checkbox-wrapper flex flex-1 pl-4 items-center rounded-2xl h-14 cursor-pointer {inverted
+  class="checkbox-wrapper flex flex-1 pl-4 items-center rounded-2xl h-14 {disabled ? 'cursor-not-allowed' : 'cursor-pointer'} {inverted
     ? 'bg-item'
     : 'bg-background'} {className}"
   style="--bg: {inverted ? '#202442' : '#2D325A'};"
diff --git a/src/routes/achievement/index.svelte b/src/routes/achievement/index.svelte
index b475f917..b9a7dd62 100644
--- a/src/routes/achievement/index.svelte
+++ b/src/routes/achievement/index.svelte
@@ -147,6 +147,13 @@
       val = !list[index][subindex].checked;
       list[index][subindex].checked = val;
       checkList[active][list[index][subindex].id] = val;
+
+      // If unchecked, recursively uncheck subsequent achievements
+      if (subindex < list[index].length - 1 &&
+          !list[index][subindex].checked &&
+          list[index][subindex + 1].checked) {
+        toggle({ index, subindex: subindex + 1, primogem: list[index][subindex + 1].reward});
+      }
     } else {
       val = !list[index].checked;
       list[index].checked = val;
@@ -284,6 +291,7 @@
                     checked={list[index][i].checked}
                     on:change={() => toggle({ index, subindex: i, primogem: it.reward })}
                     inverted
+                    disabled={i > 0 && !el[i - 1].checked}
                   />
                 </div>
               </div>