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

OoT: No Logic modifications 

NL now uses the glitchless world graph, which enables entrance randomizer
NL forces all logic tricks on, progression balancing off, minimal accessibility
This commit is contained in:
espeon65536 2022-04-26 15:16:02 -05:00
parent 0309fac592
commit d57bdf6dc3
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/oot/DungeonList.py
View File

@ -122,7 +122,7 @@ def create_dungeons(ootworld):
hint = dungeon_info['hint'] if 'hint' in dungeon_info else name hint = dungeon_info['hint'] if 'hint' in dungeon_info else name
font_color = dungeon_info['font_color'] if 'font_color' in dungeon_info else 'White' font_color = dungeon_info['font_color'] if 'font_color' in dungeon_info else 'White'
if ootworld.logic_rules == 'glitchless': if ootworld.logic_rules == 'glitchless' or ootworld.logic_rules == 'no_logic': # ER + NL
if not ootworld.dungeon_mq[name]: if not ootworld.dungeon_mq[name]:
dungeon_json = os.path.join(data_path('World'), name + '.json') dungeon_json = os.path.join(data_path('World'), name + '.json')
else: else:

28
worlds/oot/__init__.py
View File

@ -170,12 +170,20 @@ class OOTWorld(World):
self.dungeon_mq = {item['name']: (item in mq_dungeons) for item in dungeon_table} self.dungeon_mq = {item['name']: (item in mq_dungeons) for item in dungeon_table}
# Determine tricks in logic # Determine tricks in logic
for trick in self.logic_tricks: if self.logic_rules == 'glitchless':
normalized_name = trick.casefold() for trick in self.logic_tricks:
if normalized_name in normalized_name_tricks: normalized_name = trick.casefold()
setattr(self, normalized_name_tricks[normalized_name]['name'], True) if normalized_name in normalized_name_tricks:
else: setattr(self, normalized_name_tricks[normalized_name]['name'], True)
raise Exception(f'Unknown OOT logic trick for player {self.player}: {trick}') else:
raise Exception(f'Unknown OOT logic trick for player {self.player}: {trick}')
# No Logic forces all tricks on, prog balancing off and beatable-only
elif self.logic_rules == 'no_logic':
self.world.progression_balancing[self.player].value = False
self.world.accessibility[self.player] = self.world.accessibility[self.player].from_text("minimal")
for trick in normalized_name_tricks.values():
setattr(self, trick['name'], True)
# Not implemented for now, but needed to placate the generator. Remove as they are implemented # Not implemented for now, but needed to placate the generator. Remove as they are implemented
self.mq_dungeons_random = False # this will be a deprecated option later self.mq_dungeons_random = False # this will be a deprecated option later
@ -298,8 +306,7 @@ class OOTWorld(World):
continue continue
new_location.parent_region = new_region new_location.parent_region = new_region
new_location.rule_string = rule new_location.rule_string = rule
if self.world.logic_rules != 'none': self.parser.parse_spot_rule(new_location)
self.parser.parse_spot_rule(new_location)
if new_location.never: if new_location.never:
# We still need to fill the location even if ALR is off. # We still need to fill the location even if ALR is off.
logger.debug('Unreachable location: %s', new_location.name) logger.debug('Unreachable location: %s', new_location.name)
@ -311,8 +318,7 @@ class OOTWorld(World):
lname = '%s from %s' % (event, new_region.name) lname = '%s from %s' % (event, new_region.name)
new_location = OOTLocation(self.player, lname, type='Event', parent=new_region) new_location = OOTLocation(self.player, lname, type='Event', parent=new_region)
new_location.rule_string = rule new_location.rule_string = rule
if self.world.logic_rules != 'none': self.parser.parse_spot_rule(new_location)
self.parser.parse_spot_rule(new_location)
if new_location.never: if new_location.never:
logger.debug('Dropping unreachable event: %s', new_location.name) logger.debug('Dropping unreachable event: %s', new_location.name)
else: else:
@ -436,7 +442,7 @@ class OOTWorld(World):
return item return item
def create_regions(self): # create and link regions def create_regions(self): # create and link regions
if self.logic_rules == 'glitchless': if self.logic_rules == 'glitchless' or self.logic_rules == 'no_logic': # enables ER + NL
world_type = 'World' world_type = 'World'
else: else:
world_type = 'Glitched World' world_type = 'Glitched World'