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

Minecraft: require bed for can_adventure if death link is on by default

This commit is contained in:
espeon65536 2022-02-20 12:34:25 -06:00 committed by Fabian Dill
parent 5fc1b760f4
commit 13a6c86077
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/minecraft/Rules.py
View File

@ -52,11 +52,13 @@ class MinecraftLogic(LogicMixin):
return self.world.combat_difficulty[player].current_key return self.world.combat_difficulty[player].current_key
def _mc_can_adventure(self, player: int): def _mc_can_adventure(self, player: int):
death_link_check = not self.world.death_link[player] or self.has('Bed', player)
if self._mc_combat_difficulty(player) == 'easy': if self._mc_combat_difficulty(player) == 'easy':
return self.has('Progressive Weapons', player, 2) and self._mc_has_iron_ingots(player) return self.has('Progressive Weapons', player, 2) and self._mc_has_iron_ingots(player) and death_link_check
elif self._mc_combat_difficulty(player) == 'hard': elif self._mc_combat_difficulty(player) == 'hard':
return True return True
return self.has('Progressive Weapons', player) and (self.has('Progressive Resource Crafting', player) or self.has('Campfire', player)) return (self.has('Progressive Weapons', player) and death_link_check and
(self.has('Progressive Resource Crafting', player) or self.has('Campfire', player)))
def _mc_basic_combat(self, player: int): def _mc_basic_combat(self, player: int):
if self._mc_combat_difficulty(player) == 'easy': if self._mc_combat_difficulty(player) == 'easy':