Merge pull request #1611 from pbeierle22/clo-not-clo-fix

fix niche clo problem, added dev site failure advice
2dos · Sep 15, 2023 · 1c07a58 · 1c07a58
2 parents 09690ea + 8590f90
commit 1c07a58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/randomizer/Fill.py b/randomizer/Fill.py
@@ -2453,6 +2453,10 @@ def SetNewProgressionRequirementsUnordered(spoiler):
                     and ItemList[spoiler.LocationList[x].item].type in (Types.TrainingBarrel, Types.Shop, Types.Shockwave)
                 ]
                 ownedMoves[bossCompletedLevel] = accessibleMoves
+                # After unblocking this level's T&S, the next loop needs the logic variables to know new lobbies are accessible
+                # We've now made the key on this boss accessible, so this iteration should be identical plus 1 key
+                spoiler.Reset()
+                GetAccessibleLocations(spoiler, [], SearchMode.GetReachable)
 
     # For any boss location behind a T&S we didn't lower...
     bossLocations = [

diff --git a/static/js/initalize.js b/static/js/initalize.js
@@ -48,10 +48,12 @@ if (window.location.protocol != "https:") {
   }
 }
 
-// if the domain is not the main domain, hide spoiler_warning_2 and spoiler_warning_1
+// if the domain is not the main domain, hide dev site warnings
 if (location.hostname == "dk64randomizer.com") {
-  document.getElementById("spoiler_warning_2").style.display = "none";
   document.getElementById("spoiler_warning_1").style.display = "none";
+  document.getElementById("spoiler_warning_2").style.display = "none";
+  document.getElementById("spoiler_warning_3").style.background = "";
+  document.getElementById("spoiler_warning_4").style.display = "none";
 }
 
 run_python_file("ui/__init__.py");

diff --git a/templates/base.html.jinja2 b/templates/base.html.jinja2
@@ -307,11 +307,17 @@
                                          id="settings_errors"
                                          style="display: none;">
                                     </div>
-                                    <input id="generate_seed"
+                                    <div style="background:#ff5722; padding:8px;" id="spoiler_warning_3">
+                                        <div class="row" id="spoiler_warning_4">
+                                            <h2 class="title" >FREQUENTLY FAILING?</h2>
+                                            <b style="padding-bottom: 16px;">If you are consistently failing seed generation on any given combination of settings (3+ attempts), do not continue uselessly trying to generate a seed! You've likely found a bug on the dev site that needs to be reported! Consult the <a href="https://discord.dk64randomizer.com" target="_blank" style="text-decoration: underline;">DK64 Rando Discord</a> for assistance!</b>
+                                        </div>
+                                        <input id="generate_seed"
                                            class="btn btn-primary"
                                            style="width: 60%; height: 50px; text-align: center"
                                            type="button"
                                            value="Generate Seed"/>
+                                    </div>
                                 </div>
                             </div>
                         </div>