Merge pull request #2519 from 2dos/dev

Dev -> Master

Author: theballaam96

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 4.10.70
+current_version = 4.10.73
 
 [bumpversion:file:version.py]
 search = version = "{current_version}"

controller/app.py

@@ -9,7 +9,7 @@
 import time
 import sys
 import socket
-from datetime import UTC, datetime
+from datetime import timezone, datetime
 from os import environ, path, walk
 
 import requests
@@ -589,12 +589,12 @@ def get_total_info():
             last_generated_time = datetime.strptime(f.read().strip(), "%Y-%m-%d %H:%M:%S.%f%z")
     except ValueError:
         logging.error("Incorrect date format in last_generated_time.cfg, resetting to current time.")
-        last_generated_time = datetime.now(UTC)
+        last_generated_time = datetime.now(timezone.utc)
         with open("last_generated_time.cfg", "w") as f:
             f.write(last_generated_time.isoformat())
     except Exception:
         # If we can't read the file, just set it to the current time.
-        last_generated_time = datetime.now(UTC)
+        last_generated_time = datetime.now(timezone.utc)
         with open("last_generated_time.cfg", "w") as f:
             f.write(last_generated_time.isoformat())
     return current_total, last_generated_time

randomizer.html

@@ -255,7 +255,7 @@ <h2>Attempting to get Spoiler Log</h2>
                                                         Generate Spoiler Log
                                                     </label>
                                                 </div>
-                                                <div class="form-check form-switch item-switch" style="text-align: center">
+                                                <div class="form-check form-switch item-switch" style="text-align: center; display: none">
                                                     <label data-toggle="tooltip"
                                                         title="Locks entry into the file with a password. Used solely for races.">
                                                         <input class="form-check-input"

randomizer/Enums/Transitions.py

@@ -89,8 +89,8 @@ class Transitions(IntEnum):
     FactoryRaceToRandD = auto()
     FactoryChunkyRoomToPower = auto()
     FactoryPowerToChunkyRoom = auto()
-    FactoryBeyondHatchToInsideCore = auto()
-    FactoryInsideCoreToBeyondHatch = auto()
+    FactoryLowerCoreToInsideCore = auto()
+    FactoryInsideCoreToLowerCore = auto()
     FactoryMainToBBlast = auto()
 
     # Gloomy Galleon Exits

randomizer/Lists/ShufflableExit.py

@@ -120,8 +120,8 @@ def __init__(self, name: str, region: Regions, back: TransitionBack, category: O
     Transitions.FactoryRaceToRandD: ShufflableExit("Frantic Factory Car Race to Research and Development", Regions.FactoryTinyRace, TransitionBack(Regions.FactoryTinyRaceLobby, "From Car Race", "Frantic Factory Main from Car Race", Transitions.FactoryRandDToRace)),
     Transitions.FactoryChunkyRoomToPower: ShufflableExit("Frantic Factory Main to Power Shed", Regions.ChunkyRoomPlatform, TransitionBack(Regions.PowerHut, "From Factory Main", "Frantic Factory Power Shed", Transitions.FactoryPowerToChunkyRoom), ExitCategories.FactoryExterior, entryKongs={Kongs.donkey}, regionKongs={Kongs.donkey}),
     Transitions.FactoryPowerToChunkyRoom: ShufflableExit("Frantic Factory Power Room to Chunky Room", Regions.PowerHut, TransitionBack(Regions.ChunkyRoomPlatform, "From Power Shed", "Frantic Factory Main from Power Shed", Transitions.FactoryChunkyRoomToPower)),
-    Transitions.FactoryBeyondHatchToInsideCore: ShufflableExit("Frantic Factory Main to Crusher Room", Regions.BeyondHatch, TransitionBack(Regions.InsideCore, "From Factory Main", "Frantic Factory Crusher Room", Transitions.FactoryInsideCoreToBeyondHatch), ExitCategories.FactoryExterior, regionKongs={Kongs.donkey, Kongs.lanky}),
-    Transitions.FactoryInsideCoreToBeyondHatch: ShufflableExit("Frantic Factory Crusher Room to Main", Regions.InsideCore, TransitionBack(Regions.BeyondHatch, "From Crusher Room", "Frantic Factory Main from Crusher Room", Transitions.FactoryBeyondHatchToInsideCore)),
+    Transitions.FactoryLowerCoreToInsideCore: ShufflableExit("Frantic Factory Main to Crusher Room", Regions.LowerCore, TransitionBack(Regions.InsideCore, "From Factory Main", "Frantic Factory Crusher Room", Transitions.FactoryInsideCoreToLowerCore), ExitCategories.FactoryExterior, regionKongs={Kongs.donkey, Kongs.lanky}),
+    Transitions.FactoryInsideCoreToLowerCore: ShufflableExit("Frantic Factory Crusher Room to Main", Regions.InsideCore, TransitionBack(Regions.LowerCore, "From Crusher Room", "Frantic Factory Main from Crusher Room", Transitions.FactoryLowerCoreToInsideCore)),
     # Transitions.FactoryMainToBBlast: ShufflableExit("Frantic Factory Main to BBlast", Regions.BeyondHatch, TransitionBack(Regions.FactoryBaboonBlast, "From Factory Main", "Frantic Factory Baboon Blast"), ExitCategories.FactoryExterior, entryKongs={Kongs.donkey}, regionKongs={Kongs.donkey}, move=True),
 
     # Gloomy Galleon Exits

randomizer/LogicFiles/AngryAztec.py

@@ -46,7 +46,7 @@
         Event(Events.AztecW1aTagged, lambda l: True),
     ], [
         TransitionFront(Regions.AngryAztecStart, lambda l: l.can_use_vines or (l.istiny and l.twirl) or l.CanPhase()),
-        TransitionFront(Regions.AngryAztecOasis, lambda l: l.assumeAztecEntry or l.can_use_vines or (l.istiny and l.twirl) or l.CanPhase()),
+        TransitionFront(Regions.AztecTunnelBeforeOasis, lambda l: l.assumeAztecEntry or l.can_use_vines or (l.istiny and l.twirl) or l.CanPhase()),
     ]),
 
     Regions.AztecTunnelBeforeOasis: Region("Angry Aztec Tunnel Before Oasis", HintRegion.AztecTunnels, Levels.AngryAztec, False, -1, [

randomizer/LogicFiles/FranticFactory.py

@@ -140,7 +140,6 @@
     ], [
         Event(Events.TestingGateOpened, lambda l: l.Slam),
         Event(Events.FactoryW1bTagged, lambda l: True),
-        Event(Events.FactoryW4aTagged, lambda l: True),
     ], [
         TransitionFront(Regions.FactoryArcadeTunnel, lambda l: l.climbing),
         TransitionFront(Regions.LowerCore, lambda l: True),
@@ -193,24 +192,25 @@
         Event(Events.LankyCoreSwitch, lambda l: l.CanSlamSwitch(Levels.FranticFactory, 1) and l.lanky),
         Event(Events.TinyCoreSwitch, lambda l: l.CanSlamSwitch(Levels.FranticFactory, 1) and l.tiny),
         Event(Events.ChunkyCoreSwitch, lambda l: l.CanSlamSwitch(Levels.FranticFactory, 1) and l.chunky),
+        Event(Events.FactoryW4aTagged, lambda l: True),
     ], [
         TransitionFront(Regions.BeyondHatch, lambda l: True),
         TransitionFront(Regions.AlcoveBeyondHatch, lambda l: Events.HatchOpened in l.Events and l.climbing),
         TransitionFront(Regions.FranticFactoryStart, lambda l: Events.HatchOpened in l.Events and l.climbing),
-        TransitionFront(Regions.InsideCore, lambda l: Events.MainCoreActivated in l.Events or l.CanPhase(), Transitions.FactoryBeyondHatchToInsideCore),
+        TransitionFront(Regions.InsideCore, lambda l: Events.MainCoreActivated in l.Events or l.CanPhase(), Transitions.FactoryLowerCoreToInsideCore),
         TransitionFront(Regions.MiddleCore, lambda l: Events.MainCoreActivated in l.Events),
     ]),
 
     Regions.InsideCore: Region("Inside Core", HintRegion.ProductionRoom, Levels.FranticFactory, False, -1, [
         LocationLogic(Locations.FactoryDonkeyCrusherRoom, lambda l: (l.strongKong and l.isdonkey) or l.generalclips or l.CanPhase()),
     ], [], [
-        TransitionFront(Regions.LowerCore, lambda l: True, Transitions.FactoryInsideCoreToBeyondHatch),
+        TransitionFront(Regions.LowerCore, lambda l: True, Transitions.FactoryInsideCoreToLowerCore),
     ]),
 
     Regions.MiddleCore: Region("Middle Core", HintRegion.ProductionRoom, Levels.FranticFactory, False, None, [], [], [
         TransitionFront(Regions.LowerCore, lambda l: True),
         TransitionFront(Regions.SpinningCore, lambda l: l.climbing),
-        TransitionFront(Regions.InsideCore, lambda l: l.ledgeclip, Transitions.FactoryBeyondHatchToInsideCore, isGlitchTransition=True),
+        TransitionFront(Regions.InsideCore, lambda l: l.ledgeclip, Transitions.FactoryLowerCoreToInsideCore, isGlitchTransition=True),
     ]),
 
     Regions.SpinningCore: Region("Spinning Core", HintRegion.ProductionRoom, Levels.FranticFactory, True, None, [

randomizer/Patching/ApplyLocal.py

@@ -9,7 +9,7 @@
 import time
 import string
 from datetime import datetime as Datetime
-from datetime import UTC
+from datetime import timezone
 import js
 from randomizer.Enums.Models import Model, ModelNames, HeadResizeImmune
 from randomizer.Enums.Settings import RandomModels, BigHeadMode
@@ -108,7 +108,7 @@ async def patching_response(data, from_patch_gen=False, lanky_from_history=False
             js.write_seed_history(seed_id, str(data), json.dumps(settings.seed_hash))
             js.load_old_seeds()
 
-    curr_time = Datetime.now(UTC)
+    curr_time = Datetime.now(timezone.utc)
     unix = time.mktime(curr_time.timetuple())
     random.seed(int(unix))
     split_version = version.split(".")

randomizer/Patching/ApplyRandomizer.py

@@ -3,7 +3,7 @@
 import json
 import os
 from datetime import datetime as Datetime
-from datetime import UTC
+from datetime import timezone
 import time
 from tempfile import mktemp
 from randomizer.Enums.Settings import (
@@ -146,7 +146,7 @@ def patching_response(spoiler):
 
     # Write date to ROM for debugging purposes
 
-    dt = Datetime.now(UTC).strftime("%Y-%m-%d %H:%M:%S")
+    dt = Datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
     temp_json = json.loads(spoiler.json)
     temp_json["Settings"]["Generation Timestamp"] = dt
     spoiler.json = json.dumps(temp_json, indent=4)

templates/overworld.html

@@ -101,7 +101,7 @@ <h2 class="title">GLOBAL SETTINGS</h2>
                                     class="form-select"
                                     aria-label="Logic"
                                     data-toggle="tooltip"
-                                    title="If this is checked, then locations and entrances will be shuffled without logic.&#10;WARNING: This can lead to unbeatable seeds, or seeds that require a high level of glitch knowledge to complete.">
+                                    title="Modifies the considerations logic makes when generating your seed:&#10;- Glitchless Logic: Seed is beatable without performing any glitches or complex movement tech.&#10;- Glitch Logic: Seed is beatable, but requires usage of glitches or movement tech to complete. To modify which glitches will be considered, use the cog icon to the right.&#10;- No logic: The seed does not verify that the seed is beatable at all, nor makes any logical considerations during the creation of the seed. This has a high potential to generate unbeatable seeds.">
                                 <option id="glitchless" selected value="glitchless">
                                     Glitchless Logic
                                 </option>