raidboss: fix edge case for Aloalo spring crystals 1/6

quisquous · Dec 15, 2023 · 71efa4f · 71efa4f
1 parent 2714999
commit 71efa4f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/ui/raidboss/data/06-ew/dungeon/another_aloalo_island-savage.ts b/ui/raidboss/data/06-ew/dungeon/another_aloalo_island-savage.ts
@@ -238,9 +238,16 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '8AA8', source: 'Ketuduke', capture: false },
       run: (data) => {
         data.ketuSpringCrystalCount++;
-        data.ketuCrystalAdd = [];
+        // Note: cannot clear `data.ketuCrystalAdd` here as there has been at least one case
+        // where AddCombatant (coming from memory, so racy) is partially before this cast.
       },
     },
+    {
+      id: 'AAIS Ketuduke Spring Crystals Saturate Cleanup',
+      type: 'StartsUsing',
+      netRegex: { id: ['8ADB', '8ADC'], capture: false },
+      run: (data) => data.ketuCrystalAdd = [],
+    },
     {
       id: 'AAIS Ketuduke Spring Crystal Collect',
       type: 'AddedCombatant',

diff --git a/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts b/ui/raidboss/data/06-ew/dungeon/another_aloalo_island.ts
@@ -233,9 +233,16 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '8AA8', source: 'Ketuduke', capture: false },
       run: (data) => {
         data.ketuSpringCrystalCount++;
-        data.ketuCrystalAdd = [];
+        // Note: cannot clear `data.ketuCrystalAdd` here as there has been at least one case
+        // where AddCombatant (coming from memory, so racy) is partially before this cast.
       },
     },
+    {
+      id: 'AAI Ketuduke Spring Crystals Saturate Cleanup',
+      type: 'StartsUsing',
+      netRegex: { id: ['8AAB', '8AAC'], capture: false },
+      run: (data) => data.ketuCrystalAdd = [],
+    },
     {
       id: 'AAI Ketuduke Spring Crystal Collect',
       type: 'AddedCombatant',