From 84e76eadd90a1aa7942c52c16f8c8744b3fe16ac Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 3 Dec 2021 22:11:25 +0100 Subject: [PATCH] SM: rename death_link_survive and update docstring --- worlds/sm/Options.py | 8 ++++---- worlds/sm/__init__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/worlds/sm/Options.py b/worlds/sm/Options.py index 4950b03a..25d53c49 100644 --- a/worlds/sm/Options.py +++ b/worlds/sm/Options.py @@ -1,5 +1,5 @@ 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): displayname = "StartItems Removes From Item Pool" @@ -40,8 +40,8 @@ class StartLocation(Choice): option_Golden_Four = 14 default = 1 -class DeathLinkSurvive(Choice): - """When DeathLink is enabled and someone dies, you can survive with (enable_survive) if you have non-empty reserve tank.""" +class DeathLink(Choice): + """When DeathLink is enabled and someone dies, you will die. With survive reserve tanks can save you.""" displayname = "Death Link Survive" option_disable = 0 option_enable = 1 @@ -196,7 +196,7 @@ sm_options: typing.Dict[str, type(Option)] = { "start_inventory_removes_from_pool": StartItemsRemovesFromPool, "preset": Preset, "start_location": StartLocation, - "death_link_survive": DeathLinkSurvive, + "death_link": DeathLink, #"majors_split": "Full", #"scav_num_locs": "10", #"scav_randomized": "off", diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py index 6eaa0f6e..6abcbfbe 100644 --- a/worlds/sm/__init__.py +++ b/worlds/sm/__init__.py @@ -282,7 +282,7 @@ class SMWorld(World): 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 = {} playerNameIDMap = {}