Merged in DR v1.2.0.14 (2nd)

This commit is contained in:
codemann8
2023-04-07 12:04:12 -05:00
parent c2b3d8ce6c
commit 793f3b30b0
28 changed files with 633 additions and 618 deletions

View File

@@ -3,11 +3,11 @@ 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_inverted_entrances
from EntranceShuffle import link_entrances
from ItemList import generate_itempool, difficulties
from Items import ItemFactory
from OverworldGlitchRules import create_owg_connections
from Regions import create_regions, mark_light_world_regions, create_dungeon_regions, create_shops
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 test.TestBase import TestBase
@@ -27,7 +27,7 @@ class TestInvertedOWG(TestBase):
create_dungeons(self.world, 1)
link_overworld(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']
@@ -37,5 +37,5 @@ class TestInvertedOWG(TestBase):
self.world.get_location('Agahnim 2', 1).item = None
self.world.precollected_items.clear()
self.world.itempool.append(ItemFactory('Pegasus Boots', 1))
mark_light_world_regions(self.world, 1)
mark_light_dark_world_regions(self.world, 1)
set_rules(self.world, 1)