Merge branch 'main' into breaking_changes

# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py

WebHostLib/autolauncher.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 import logging
 import multiprocessing
 from datetime import timedelta, datetime
+import concurrent.futures
 import sys
 import typing
 import time
@@ -135,6 +136,7 @@ def autohost(config: dict):
 
 multiworlds = {}
 
+guardians = concurrent.futures.ThreadPoolExecutor(2, thread_name_prefix="Guardian")
 
 class MultiworldInstance():
     def __init__(self, room: Room, config: dict):
@@ -152,12 +154,18 @@ class MultiworldInstance():
                                                args=(self.room_id, self.ponyconfig),
                                                name="MultiHost")
         self.process.start()
+        self.guardian = guardians.submit(self._collect)
 
     def stop(self):
         if self.process:
             self.process.terminate()
             self.process = None
 
+    def _collect(self):
+        self.process.join() # wait for process to finish
+        self.process = None
+        self.guardian = None
+
 
 from .models import Room, Generation, STATE_QUEUED, STATE_STARTED, STATE_ERROR, db, Seed
 from .customserver import run_server_process

WebHostLib/static/assets/tracker.js

@@ -55,7 +55,7 @@ window.addEventListener('load', () => {
 
     window.addEventListener('resize', () => {
         adjustTableHeight();
-        tables.draw()
+        tables.draw();
     });
 
     $(".table-wrapper").scrollsync({

WebHostLib/static/static/weightedSettings.json

@@ -1602,6 +1602,26 @@
         }
       }
     },
+    "reduceflashing": {
+      "keyString": "rom.reduceflashing",
+      "friendlyName": "Full-Screen Flashing Effects",
+      "description": "Enable or disable full-screen flashing effects in game.",
+      "inputType": "range",
+      "subOptions": {
+        "on": {
+          "keyString": "rom.reduceflashing.on",
+          "friendlyName": "Disabled",
+          "description": "Disables flashing.",
+          "defaultValue": 50
+        },
+        "off": {
+          "keyString": "rom.reduceflashing.off",
+          "friendlyName": "Enabled",
+          "description": "Enables flashing.",
+          "defaultValue": 0
+        }
+      }
+    },
     "quickswap": {
       "keyString": "rom.quickswap",
       "friendlyName": "Item Quick-Swap",
@@ -1797,7 +1817,7 @@
           "defaultValue": 0
         },
 		"puke": {
-          "keyString": "rom.ow_palettes.Puke",
+          "keyString": "rom.ow_palettes.puke",
           "friendlyName": "Puke",
           "description": "No logic at all.",
           "defaultValue": 0
@@ -1859,7 +1879,7 @@
           "defaultValue": 0
         },
 		"puke": {
-          "keyString": "rom.uw_palettes.Puke",
+          "keyString": "rom.uw_palettes.puke",
           "friendlyName": "Puke",
           "description": "No logic at all.",
           "defaultValue": 0
@@ -1921,7 +1941,7 @@
           "defaultValue": 0
         },
 		"puke": {
-          "keyString": "rom.hud_palettes.Puke",
+          "keyString": "rom.hud_palettes.puke",
           "friendlyName": "Puke",
           "description": "No logic at all.",
           "defaultValue": 0
@@ -1983,7 +2003,7 @@
           "defaultValue": 0
         },
 		"puke": {
-          "keyString": "rom.shield_palettes.Puke",
+          "keyString": "rom.shield_palettes.puke",
           "friendlyName": "Puke",
           "description": "No logic at all.",
           "defaultValue": 0
@@ -2045,7 +2065,7 @@
           "defaultValue": 0
         },
 		"puke": {
-          "keyString": "rom.sword_palettes.Puke",
+          "keyString": "rom.sword_palettes.puke",
           "friendlyName": "Puke",
           "description": "No logic at all.",
           "defaultValue": 0

WebHostLib/static/static/weightedSettings.yaml

@@ -20,7 +20,7 @@
 # For use with the weighted-settings page on the website. Changing this value will cause all users to be prompted
 # to update their settings. The version number should match the current released version number, and the revision
 # should be updated manually by whoever edits this file.
-ws_version: 4.0.1 rev0
+ws_version: 4.0.1 rev1
 
 description: Template Name # Used to describe your yaml. Useful if you have multiple files
 name: YourName # Your name in-game. Spaces will be replaced with underscores and there is a 16 character limit
@@ -363,6 +363,9 @@ rom:
   quickswap: # Enable switching items by pressing the L+R shoulder buttons
     on: 50
     off: 0
+  reduceflashing: # Reduces instances of flashing such as lightning attacks, weather, ether and more.
+    on: 50
+    off: 0
   menuspeed: # Controls how fast the item menu opens and closes
     normal: 50
     instant: 0

WebHostLib/templates/tracker.html

@@ -1,7 +1,7 @@
 {% extends 'tablepage.html' %}
 {% block head %}
     {{ super() }}
-    <title>Multiworld Tracker for Room {{ room.id }}</title>
+    <title>Multiworld Tracker</title>
     <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tracker.css") }}"/>
     <script type="application/ecmascript" src="{{ static_autoversion("assets/jquery.scrollsync.js") }}"></script>
     <script type="application/ecmascript" src="{{ static_autoversion("assets/tracker.js") }}"></script>
@@ -151,7 +151,7 @@
             {% endfor %}
             {% for team, hints in hints.items() %}
                 <div class="table-wrapper">
-                    <table class="table non-unique-item-table">
+                    <table class="table non-unique-item-table" data-order='[[5, "asc"], [0, "asc"]]'>
                         <thead>
                         <tr>
                             <th>Finder</th>