Merged Inverted/Open ER code and data

This commit is contained in:
codemann8
2022-12-07 22:05:48 -06:00
parent bd53400fec
commit 52edfcdddb
6 changed files with 732 additions and 1684 deletions

View File

@@ -2,7 +2,7 @@ from BaseClasses import World
from DoorShuffle import link_doors
from Doors import create_doors
from Dungeons import create_dungeons, get_dungeon_item_pool
from EntranceShuffle import link_inverted_entrances
from EntranceShuffle import link_entrances
from InvertedRegions import create_inverted_regions
from ItemList import generate_itempool, difficulties
from Items import ItemFactory
@@ -24,7 +24,7 @@ class TestInverted(TestBase):
create_doors(self.world, 1)
create_rooms(self.world, 1)
create_dungeons(self.world, 1)
link_inverted_entrances(self.world, 1)
link_entrances(self.world, 1)
link_doors(self.world, 1)
generate_itempool(self.world, 1)
self.world.required_medallions[1] = ['Ether', 'Quake']

View File

@@ -2,7 +2,7 @@ from BaseClasses import World
from DoorShuffle import link_doors
from Doors import create_doors
from Dungeons import create_dungeons, get_dungeon_item_pool
from EntranceShuffle import link_inverted_entrances
from EntranceShuffle import link_entrances
from InvertedRegions import create_inverted_regions
from ItemList import generate_itempool, difficulties
from Items import ItemFactory
@@ -26,7 +26,7 @@ class TestInvertedOWG(TestBase):
create_rooms(self.world, 1)
create_dungeons(self.world, 1)
create_owg_connections(self.world, 1)
link_inverted_entrances(self.world, 1)
link_entrances(self.world, 1)
link_doors(self.world, 1)
generate_itempool(self.world, 1)
self.world.required_medallions[1] = ['Ether', 'Quake']

View File

@@ -5,7 +5,7 @@ import time
from collections import Counter, defaultdict
from source.overworld.EntranceShuffle2 import link_entrances_new
from EntranceShuffle import link_entrances, link_inverted_entrances
from EntranceShuffle import link_entrances
from BaseClasses import World
from Regions import create_regions, create_dungeon_regions
from InvertedRegions import create_inverted_regions
@@ -30,10 +30,7 @@ def run_stats():
link_entrances_new(world, 1)
def runner_old(world):
if main_mode == 'inverted':
link_inverted_entrances(world, 1)
else:
link_entrances(world, 1)
link_entrances(world, 1)
compare_tests(tests, shuffle_mode, main_mode, ls, runner_old, runner_new)
@@ -68,10 +65,7 @@ def run_old_stats():
continue
def runner(world):
if main_mode == 'inverted':
link_inverted_entrances(world, 1)
else:
link_entrances(world, 1)
link_entrances(world, 1)
run_tests(tests, shuffle_mode, main_mode, ls, runner)