feat: promote new entrance shuffle algorithm out of experimental

test/dungeons/TestDungeon.py

@@ -2,11 +2,11 @@ import unittest
 
 from BaseClasses import World, CollectionState
 from Dungeons import create_dungeons, get_dungeon_item_pool
-from EntranceShuffle import mandatory_connections, connect_simple
 from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
 from Regions import create_regions
 from Rules import set_rules
+from source.overworld.EntranceShuffle2 import mandatory_connections, connect_simple
 
 
 class TestDungeon(unittest.TestCase):

test/inverted/TestInverted.py

@@ -3,12 +3,13 @@ from DoorShuffle import link_doors
 from Doors import create_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
 from OverworldShuffle import link_overworld
-from EntranceShuffle import link_entrances
 from ItemList import generate_itempool, difficulties
 from Items import ItemFactory
 from Regions import create_regions, mark_light_dark_world_regions, create_dungeon_regions, create_shops
 from RoomData import create_rooms
 from Rules import set_rules
+
+from source.overworld.EntranceShuffle2 import link_entrances_new
 from test.TestBase import TestBase
 
 
@@ -25,7 +26,7 @@ class TestInverted(TestBase):
         create_rooms(self.world, 1)
         create_dungeons(self.world, 1)
         link_overworld(self.world, 1)
-        link_entrances(self.world, 1)
+        link_entrances_new(self.world, 1)
         link_doors(self.world, 1)
         generate_itempool(self.world, 1)
         self.world.required_medallions[1] = ['Ether', 'Quake']

test/inverted/TestInvertedBombRules.py

@@ -2,7 +2,8 @@ import unittest
 
 from BaseClasses import World
 from Dungeons import create_dungeons
-from EntranceShuffle import connect_entrance, Inverted_LW_Entrances, Inverted_LW_Dungeon_Entrances, Inverted_LW_Single_Cave_Doors, Inverted_Old_Man_Entrances, Inverted_DW_Entrances, Inverted_DW_Dungeon_Entrances, Inverted_DW_Single_Cave_Doors, \
+# todo: this test needs to be rewritten unfortunately
+from source.overworld.EntranceShuffle2 import connect_entrance, Inverted_LW_Entrances, Inverted_LW_Dungeon_Entrances, Inverted_LW_Single_Cave_Doors, Inverted_Old_Man_Entrances, Inverted_DW_Entrances, Inverted_DW_Dungeon_Entrances, Inverted_DW_Single_Cave_Doors, \
     Inverted_LW_Entrances_Must_Exit, Inverted_LW_Dungeon_Entrances_Must_Exit, Inverted_Bomb_Shop_Multi_Cave_Doors, Inverted_Bomb_Shop_Single_Cave_Doors, Inverted_Blacksmith_Single_Cave_Doors, Inverted_Blacksmith_Multi_Cave_Doors
 from Regions import create_regions
 from ItemList import difficulties

test/inverted_owg/TestInvertedOWG.py

@@ -3,7 +3,7 @@ from DoorShuffle import link_doors
 from Doors import create_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
 from OverworldShuffle import link_overworld
-from EntranceShuffle import link_entrances
+from source.overworld.EntranceShuffle2 import link_entrances_new
 from ItemList import generate_itempool, difficulties
 from Items import ItemFactory
 from OverworldGlitchRules import create_owg_connections
@@ -27,7 +27,7 @@ class TestInvertedOWG(TestBase):
         create_dungeons(self.world, 1)
         link_overworld(self.world, 1)
         create_owg_connections(self.world, 1)
-        link_entrances(self.world, 1)
+        link_entrances_new(self.world, 1)
         link_doors(self.world, 1)
         generate_itempool(self.world, 1)
         self.world.required_medallions[1] = ['Ether', 'Quake']

test/owg/TestVanillaOWG.py

@@ -3,7 +3,7 @@ from DoorShuffle import link_doors
 from Doors import create_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
 from OverworldShuffle import link_overworld
-from EntranceShuffle import link_entrances
+from source.overworld.EntranceShuffle2 import link_entrances_new
 from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
 from OverworldGlitchRules import create_owg_connections
@@ -26,7 +26,7 @@ class TestVanillaOWG(TestBase):
         create_rooms(self.world, 1)
         create_dungeons(self.world, 1)
         link_overworld(self.world, 1)
-        link_entrances(self.world, 1)
+        link_entrances_new(self.world, 1)
         link_doors(self.world, 1)
         create_owg_connections(self.world, 1)
         generate_itempool(self.world, 1)

test/stats/EntranceShuffleStats.py

@@ -7,11 +7,13 @@ import time
 from collections import Counter, defaultdict
 
 from source.overworld.EntranceShuffle2 import link_entrances_new
-from EntranceShuffle import link_entrances
+# from source.oEntranceShuffle import link_entrances_new
 from BaseClasses import World
 from Regions import create_regions, create_dungeon_regions
 
 
+# probably deprecated
+
 # tested: open + crossed (lh) Mar. 17 (made changes)
 # tested: open + simple (lh) Mar. 22
 

test/vanilla/TestVanilla.py

@@ -3,7 +3,7 @@ from DoorShuffle import link_doors
 from Doors import create_doors
 from Dungeons import create_dungeons, get_dungeon_item_pool
 from OverworldShuffle import link_overworld
-from EntranceShuffle import link_entrances
+from source.overworld.EntranceShuffle2 import link_entrances_new
 from ItemList import difficulties, generate_itempool
 from Items import ItemFactory
 from Regions import create_regions, create_dungeon_regions, create_shops, mark_light_dark_world_regions
@@ -25,7 +25,7 @@ class TestVanilla(TestBase):
         create_rooms(self.world, 1)
         create_dungeons(self.world, 1)
         link_overworld(self.world, 1)
-        link_entrances(self.world, 1)
+        link_entrances_new(self.world, 1)
         link_doors(self.world, 1)
         generate_itempool(self.world, 1)
         self.world.required_medallions[1] = ['Ether', 'Quake']