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

@@ -6,7 +6,7 @@ from OverworldShuffle import link_overworld
from EntranceShuffle import link_entrances
from ItemList import difficulties, generate_itempool
from Items import ItemFactory
from Regions import create_regions, create_dungeon_regions, create_shops, mark_dark_world_regions
from Regions import create_regions, create_dungeon_regions, create_shops, mark_light_dark_world_regions
from RoomData import create_rooms
from Rules import set_rules
from test.TestBase import TestBase
@@ -33,5 +33,5 @@ class TestVanilla(TestBase):
self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
self.world.get_location('Agahnim 1', 1).item = None
self.world.get_location('Agahnim 2', 1).item = None
mark_dark_world_regions(self.world, 1)
mark_light_dark_world_regions(self.world, 1)
set_rules(self.world, 1)