Fixed a problem that cropped up in retro+vanilla with big key placement
This commit is contained in:
@@ -375,6 +375,13 @@ flexible_starts = {
|
|||||||
'Skull Woods': ['Skull Left Drop', 'Skull Pinball']
|
'Skull Woods': ['Skull Left Drop', 'Skull Pinball']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
default_key_counts = {
|
||||||
|
'Hyrule Castle': 1, 'Eastern Palace': 0, 'Desert Palace': 1,
|
||||||
|
'Tower of Hera': 1, 'Agahnims Tower': 2, 'Palace of Darkness': 6,
|
||||||
|
'Swamp Palace': 1, 'Skull Woods': 3, 'Thieves Town': 1,
|
||||||
|
'Ice Palace': 2, 'Misery Mire': 3, 'Turtle Rock': 4, 'Ganons Tower': 4
|
||||||
|
}
|
||||||
|
|
||||||
dungeon_keys = {
|
dungeon_keys = {
|
||||||
'Hyrule Castle': 'Small Key (Escape)',
|
'Hyrule Castle': 'Small Key (Escape)',
|
||||||
'Eastern Palace': 'Small Key (Eastern Palace)',
|
'Eastern Palace': 'Small Key (Eastern Palace)',
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from collections import defaultdict, deque
|
|||||||
|
|
||||||
from BaseClasses import DoorType
|
from BaseClasses import DoorType
|
||||||
from Regions import dungeon_events
|
from Regions import dungeon_events
|
||||||
from Dungeons import dungeon_keys, dungeon_bigs
|
from Dungeons import dungeon_keys, dungeon_bigs, default_key_counts
|
||||||
from DungeonGenerator import ExplorationState, special_big_key_doors
|
from DungeonGenerator import ExplorationState, special_big_key_doors
|
||||||
|
|
||||||
|
|
||||||
@@ -1384,9 +1384,10 @@ def create_key_counters(key_layout, world, player):
|
|||||||
flat_proposal = key_layout.flat_prop
|
flat_proposal = key_layout.flat_prop
|
||||||
state = ExplorationState(dungeon=key_layout.sector.name)
|
state = ExplorationState(dungeon=key_layout.sector.name)
|
||||||
if world.doorShuffle[player] == 'vanilla':
|
if world.doorShuffle[player] == 'vanilla':
|
||||||
state.key_locations = len(world.get_dungeon(key_layout.sector.name, player).small_keys)
|
state.key_locations = default_key_counts[key_layout.sector.name]
|
||||||
else:
|
else:
|
||||||
state.key_locations = world.dungeon_layouts[player][key_layout.sector.name].key_doors_num
|
builder = world.dungeon_layouts[player][key_layout.sector.name]
|
||||||
|
state.key_locations = builder.key_doors_num - builder.key_drop_cnt
|
||||||
state.big_key_special, special_region = False, None
|
state.big_key_special, special_region = False, None
|
||||||
for region in key_layout.sector.regions:
|
for region in key_layout.sector.regions:
|
||||||
for location in region.locations:
|
for location in region.locations:
|
||||||
|
|||||||
2
Main.py
2
Main.py
@@ -28,7 +28,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc
|
|||||||
from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
|
from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
|
||||||
from Utils import output_path, parse_player_names
|
from Utils import output_path, parse_player_names
|
||||||
|
|
||||||
__version__ = '0.5.0.2-u'
|
__version__ = '0.5.0.3-u'
|
||||||
|
|
||||||
from source.classes.BabelFish import BabelFish
|
from source.classes.BabelFish import BabelFish
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,10 @@ CLI: ```--bomblogic```
|
|||||||
|
|
||||||
# Bug Fixes and Notes.
|
# Bug Fixes and Notes.
|
||||||
|
|
||||||
|
* 0.5.0.3
|
||||||
|
* Fixed a bug in retro+vanilla and big key placement
|
||||||
|
* Fixed a problem with shops not registering in the Multiclient until you visit one
|
||||||
|
* Fixed a bug in the Mystery code with sfx
|
||||||
* 0.5.0.2
|
* 0.5.0.2
|
||||||
* --shuffle_sfx option added
|
* --shuffle_sfx option added
|
||||||
* 0.5.0.1
|
* 0.5.0.1
|
||||||
|
|||||||
Reference in New Issue
Block a user