Core: write playthrough is disabled, rather than an empty section

* Docs: python 3.11 works now

* change to py 3.12 unsupported

BaseClasses.py

@@ -1087,14 +1087,16 @@ class Spoiler:
     playthrough: Dict[str, Union[List[str], Dict[str, str]]]  # sphere "0" is list, others are dict
     unreachables: Set[Location]
     paths: Dict[str, List[Union[Tuple[str, str], Tuple[str, None]]]]  # last step takes no further exits
+    level: int
 
-    def __init__(self, multiworld: MultiWorld) -> None:
+    def __init__(self, multiworld: MultiWorld, level: int = 0) -> None:
         self.multiworld = multiworld
         self.hashes = {}
         self.entrances = {}
         self.playthrough = {}
         self.unreachables = set()
         self.paths = {}
+        self.level = level
 
     def set_entrance(self, entrance: str, exit_: str, direction: str, player: int) -> None:
         if self.multiworld.players == 1:
@@ -1296,11 +1298,13 @@ class Spoiler:
             outfile.write('\n\nLocations:\n\n')
             outfile.write('\n'.join(
                 ['%s: %s' % (location, item) for location, item in locations]))
-
-            outfile.write('\n\nPlaythrough:\n\n')
-            outfile.write('\n'.join(['%s: {\n%s\n}' % (sphere_nr, '\n'.join(
-                [f"  {location}: {item}" for (location, item) in sphere.items()] if isinstance(sphere, dict) else
-                [f"  {item}" for item in sphere])) for (sphere_nr, sphere) in self.playthrough.items()]))
+            if self.level > 1:
+                outfile.write('\n\nPlaythrough:\n\n')
+                outfile.write('\n'.join(['%s: {\n%s\n}' % (sphere_nr, '\n'.join(
+                    [f"  {location}: {item}" for (location, item) in sphere.items()] if isinstance(sphere, dict) else
+                    [f"  {item}" for item in sphere])) for (sphere_nr, sphere) in self.playthrough.items()]))
+            else:
+                outfile.write('\n\nPlaythrough is disabled.\n\n')
             if self.unreachables:
                 outfile.write('\n\nUnreachable Items:\n\n')
                 outfile.write(

Main.py

@@ -36,7 +36,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     logger = logging.getLogger()
     world.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
     world.plando_options = args.plando_options
-
+    world.spoiler.level = args.spoiler
     world.shuffle = args.shuffle.copy()
     world.logic = args.logic.copy()
     world.mode = args.mode.copy()

WebHostLib/static/assets/supportedGames.js

@@ -1,5 +1,4 @@
 window.addEventListener('load', () => {
-  document.getElementById('js-enabled').style.display = 'block';
   const gameHeaders = document.getElementsByClassName('collapse-toggle');
   Array.from(gameHeaders).forEach((header) => {
     const gameName = header.getAttribute('data-game');

WebHostLib/static/styles/supportedGames.css

@@ -24,10 +24,6 @@
     cursor: pointer;
 }
 
-#games h2 .game-name{
-    cursor: pointer;
-}
-
 #games p.collapsed{
     display: none;
 }
@@ -55,7 +51,3 @@
 #games #page-controls button{
     margin-left: 0.5rem;
 }
-
-#games #js-enabled{
-    display: none;
-}

WebHostLib/templates/supportedGames.html

@@ -12,25 +12,17 @@
     <div id="games" class="markdown">
         <h1>Currently Supported Games</h1>
         <div>
-            <label for="game-search">
-                Search for your game below!&nbsp;
-                <noscript>(You need to enable Javascript for this to work.)</noscript>
-            </label><br />
+            <label for="game-search">Search for your game below!</label><br />
             <div id="page-controls">
                 <input id="game-search" placeholder="Search by title..." autofocus />
                 <button id="expand-all">Expand All</button>
                 <button id="collapse-all">Collapse All</button>
             </div>
         </div>
-
-        <!-- This is always written to the page, but is hidden by default. If the user has JS enabled,
-            it will be un-hidden immediately when the page is ready. -->
-        <div id="js-enabled">
         {% for game_name in worlds | title_sorted %}
         {% set world = worlds[game_name] %}
         <h2 class="collapse-toggle" data-game="{{ game_name }}">
-            <span id="{{ game_name }}-arrow" class="collapse-arrow">▶</span>&nbsp;
-            <span class="game-name">{{ game_name }}</span>
+            <span id="{{ game_name }}-arrow" class="collapse-arrow">▶</span>&nbsp;{{ game_name }}
         </h2>
         <p id="{{ game_name }}" class="collapsed">
             {{ world.__doc__ | default("No description provided.", true) }}<br />
@@ -52,34 +44,5 @@
             {% endif %}
         </p>
         {% endfor %}
-        </div>
-
-        <!-- This is only printed when the user has JS disabled, allowing them to see all the information for
-            each game in a noscript-friendly way. -->
-        <noscript>
-        {% for game_name in worlds | title_sorted %}
-        {% set world = worlds[game_name] %}
-        <h2 class="collapse-toggle">{{ game_name }}</h2>
-        <p id="{{ game_name }}">
-            {{ world.__doc__ | default("No description provided.", true) }}<br />
-            <a href="{{ url_for("game_info", game=game_name, lang="en") }}">Game Page</a>
-            {% if world.web.tutorials %}
-            <span class="link-spacer">|</span>
-            <a href="{{ url_for("tutorial_landing") }}#{{ game_name }}">Setup Guides</a>
-            {% endif %}
-            {% if world.web.settings_page is string %}
-            <span class="link-spacer">|</span>
-            <a href="{{ world.web.settings_page }}">Settings Page</a>
-            {% elif world.web.settings_page %}
-            <span class="link-spacer">|</span>
-            <a href="{{ url_for("player_settings", game=game_name) }}">Settings Page</a>
-            {% endif %}
-            {% if world.web.bug_report_page %}
-            <span class="link-spacer">|</span>
-            <a href="{{ world.web.bug_report_page }}">Report a Bug</a>
-            {% endif %}
-        </p>
-        {% endfor %}
-        </noscript>
     </div>
 {% endblock %}

docs/running from source.md

@@ -8,7 +8,7 @@ use that version. These steps are for developers or platforms without compiled r
 
 What you'll need:
  * [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version
-   * **Python 3.11 does not work currently**
+   * **Python 3.12 is currently unsupported**
  * pip: included in downloads from python.org, separate in many Linux distributions
  * Matching C compiler
    * possibly optional, read operating system specific sections
@@ -30,7 +30,7 @@ After this, you should be able to run the programs.
 
 Recommended steps
  * Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads)
-   * **Python 3.11 does not work currently**
+   * **Python 3.12 is currently unsupported**
 
  * **Optional**: Download and install Visual Studio Build Tools from
    [Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).

test/__init__.py

@@ -13,5 +13,6 @@ ModuleUpdate.update_ran = True  # don't upgrade
 
 import Utils
 
-Utils.local_path.cached_path = pathlib.Path(__file__).parent.parent
+file_path = pathlib.Path(__file__).parent.parent
+Utils.local_path.cached_path = file_path
 Utils.user_path()  # initialize cached_path

test/worlds/__init__.py

@@ -1,7 +1,7 @@
 def load_tests(loader, standard_tests, pattern):
     import os
     import unittest
-    from ..TestBase import file_path
+    from .. import file_path
     from worlds.AutoWorld import AutoWorldRegister
 
     suite = unittest.TestSuite()