Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle

This commit is contained in:
2021-10-02 21:18:15 -07:00
17 changed files with 977 additions and 640 deletions

View File

@@ -10,6 +10,7 @@ import time
import zlib
from BaseClasses import World, CollectionState, Item, Region, Location, Shop, Entrance, Settings
from Bosses import place_bosses
from Items import ItemFactory
from KeyDoorShuffle import validate_key_placement
from OverworldGlitchRules import create_owg_connections
@@ -29,7 +30,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc
from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
from Utils import output_path, parse_player_names
__version__ = '0.5.1.1-u'
__version__ = '0.5.1.2-u'
from source.classes.BabelFish import BabelFish
@@ -178,6 +179,7 @@ def main(args, seed=None, fish=None):
create_rooms(world, player)
create_dungeons(world, player)
adjust_locations(world, player)
place_bosses(world, player)
if any(world.potshuffle.values()):
logger.info(world.fish.translate("cli", "cli", "shuffling.pots"))
@@ -524,10 +526,6 @@ def copy_world(world):
ret.state.stale = {player: True for player in range(1, world.players + 1)}
ret.owedges = world.owedges
for edge in ret.owedges:
transition = ret.check_for_owedge(edge.name, edge.player)
if transition is not None:
transition.dest = edge
ret.doors = world.doors
for door in ret.doors:
entrance = ret.check_for_entrance(door.name, door.player)