Merge branch 'OverworldShuffleDev' into OverworldShuffle

CHANGELOG.md

@@ -1,10 +1,13 @@
 # Changelog
 
 ### 0.1.6.7
-- Fixed issue with Pyramid Exit exiting to wrong location in ER
 - Mountain Entry and West Death Mountain are now Swapped independently (Old Man rescue is always in your starting world)
 - Fixed issue with AT/GT access logic
 - Improved spoiler log playthru accuracy
+- Fixed Boss Music when boss room is entered thru straight stairs
+- Suppressed in-dungeon music changes when DR is enabled
+- Fixed issue with Pyramid Exit exiting to wrong location in ER
+- Removed sortedcontainers dependency
 - ~~Merged DR v0.4.0.11 - Various DR changes~~
 
 ### 0.1.6.6

OverworldShuffle.py

@@ -1,10 +1,6 @@
 import random, logging, copy
 from BaseClasses import OWEdge, WorldType, RegionType, Direction, Terrain, PolSlot
 from OWEdges import OWTileRegions, OWTileGroups, OWEdgeGroups, OpenStd, parallel_links, IsParallel
-try:
-    from sortedcontainers import SortedList
-except ImportError:
-    raise Exception('Could not load sortedcontainers module')
 
 __version__ = '0.1.6.7-u'
 
@@ -161,16 +157,16 @@ def link_overworld(world, player):
         connect_flutes(default_flute_connections)
     else:
         flute_pool = list(flute_data.keys())
-        new_spots = SortedList()
+        new_spots = list()
 
         # guarantee desert/mire access
         flute_pool.remove(0x38)
-        new_spots.add(0x38)
+        new_spots.append(0x38)
         # guarantee mountain access
         mountainIds = [0x0b, 0x0e, 0x07]
         owslot = mountainIds[random.randint(0, 2)]
         flute_pool.remove(owslot)
-        new_spots.add(owslot)
+        new_spots.append(owslot)
 
         random.shuffle(flute_pool)
         f = 0
@@ -190,8 +186,9 @@ def link_overworld(world, player):
                     f += 1
                     continue
             if flute_pool[f] not in new_spots:
-                new_spots.add(flute_pool[f])
+                new_spots.append(flute_pool[f])
             f += 1
+        new_spots.sort()
         world.owflutespots[player] = new_spots
         connect_flutes(new_spots)
 

README.md

@@ -36,7 +36,7 @@ Download the source code from the repository directly and put it in a folder of
 
 You must have Python installed (version 3.6 - 3.9 supported)
 
-This program requires all python dependencies that are necessary to run Aerinon's Door Randomizer plus an additional 'sortedcontainers' package. Try running ```pip install sortedcontainers``` or ```python -m pip install sortedcontainers``` on the command line to install the dependency.
+This program requires all python dependencies that are necessary to run Aerinon's Door Randomizer. Try running ```pip install missingdependency``` or ```python -m pip install missingdependency``` on the command line (replace ```missingdependency``` with the specific package that is missing) to install the dependency.
 
 Alternatively, run ```resources/ci/common/local_install.py``` to install all the missing dependencies as well.
 

resources/app/meta/manifests/pip_requirements.txt

@@ -1,7 +1,6 @@
 aenum
 fast-enum
 python-bps-continued
-sortedcontainers
 colorama
 aioconsole
 websockets