monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SM - Option to remove empty locations (#323)

This commit is contained in:
Alchav 2022-03-26 02:26:55 -04:00 committed by GitHub
parent fb1be7b003
commit 3b128c8512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/sm/Options.py
View File

@ -224,7 +224,6 @@ class VariaCustomPreset(OptionList):
display_name = "Varia Custom Preset" display_name = "Varia Custom Preset"
default = {} default = {}
sm_options: typing.Dict[str, type(Option)] = { sm_options: typing.Dict[str, type(Option)] = {
"start_inventory_removes_from_pool": StartItemsRemovesFromPool, "start_inventory_removes_from_pool": StartItemsRemovesFromPool,
"preset": Preset, "preset": Preset,
@ -275,5 +274,5 @@ sm_options: typing.Dict[str, type(Option)] = {
"no_music": NoMusic, "no_music": NoMusic,
"random_music": RandomMusic, "random_music": RandomMusic,
"custom_preset": CustomPreset, "custom_preset": CustomPreset,
"varia_custom_preset": VariaCustomPreset "varia_custom_preset": VariaCustomPreset,
} }

3
worlds/sm/__init__.py
View File

@ -69,7 +69,6 @@ class SMWorld(World):
itemManager: ItemManager itemManager: ItemManager
locations = {} locations = {}
hint_blacklist = {'Nothing', 'No Energy'}
Logic.factory('vanilla') Logic.factory('vanilla')
@ -531,6 +530,8 @@ class SMWorld(World):
for item in self.world.itempool: for item in self.world.itempool:
if item.player == self.player and item.advancement: if item.player == self.player and item.advancement:
progitempool.append(item) progitempool.append(item)
if item.location.player == self.player and item.game == "Super Metroid" and item.type == "Nothing":
item.location.address = None
for item in progitempool: for item in progitempool:
new_state.collect(item, True) new_state.collect(item, True)