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

SM: rename death_link_survive and update docstring

This commit is contained in:
Fabian Dill 2021-12-03 22:11:25 +01:00
parent c1a73e7839
commit 84e76eadd9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/sm/Options.py
View File

@ -1,5 +1,5 @@
import typing import typing
from Options import Choice, Range, OptionDict, OptionList, Option, Toggle, DefaultOnToggle, DeathLink from Options import Choice, Range, OptionDict, OptionList, Option, Toggle, DefaultOnToggle
class StartItemsRemovesFromPool(Toggle): class StartItemsRemovesFromPool(Toggle):
displayname = "StartItems Removes From Item Pool" displayname = "StartItems Removes From Item Pool"
@ -40,8 +40,8 @@ class StartLocation(Choice):
option_Golden_Four = 14 option_Golden_Four = 14
default = 1 default = 1
class DeathLinkSurvive(Choice): class DeathLink(Choice):
"""When DeathLink is enabled and someone dies, you can survive with (enable_survive) if you have non-empty reserve tank.""" """When DeathLink is enabled and someone dies, you will die. With survive reserve tanks can save you."""
displayname = "Death Link Survive" displayname = "Death Link Survive"
option_disable = 0 option_disable = 0
option_enable = 1 option_enable = 1
@ -196,7 +196,7 @@ sm_options: typing.Dict[str, type(Option)] = {
"start_inventory_removes_from_pool": StartItemsRemovesFromPool, "start_inventory_removes_from_pool": StartItemsRemovesFromPool,
"preset": Preset, "preset": Preset,
"start_location": StartLocation, "start_location": StartLocation,
"death_link_survive": DeathLinkSurvive, "death_link": DeathLink,
#"majors_split": "Full", #"majors_split": "Full",
#"scav_num_locs": "10", #"scav_num_locs": "10",
#"scav_randomized": "off", #"scav_randomized": "off",

2
worlds/sm/__init__.py
View File

@ -282,7 +282,7 @@ class SMWorld(World):
openTourianGreyDoors = {0x07C823 + 5: [0x0C], 0x07C831 + 5: [0x0C]} openTourianGreyDoors = {0x07C823 + 5: [0x0C], 0x07C831 + 5: [0x0C]}
deathLink = {0x277f04: [self.world.death_link_survive[self.player].value]} deathLink = {0x277f04: [self.world.death_link[self.player].value]}
playerNames = {} playerNames = {}
playerNameIDMap = {} playerNameIDMap = {}