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

update Options system #2

This commit is contained in:
Fabian Dill 2020-10-24 19:46:13 +02:00
parent 68a1070237
commit 4de64eab84
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Options.py
View File

@ -92,13 +92,19 @@ class Logic(Choice):
alias_owg = 2 alias_owg = 2
class Goal(Choice): class Objective(Choice):
option_ganon = 0 option_crystals = 0
option_fast_ganon = 1 #option_pendants = 1
option_all_dungeons = 2 option_triforce_pieces = 2
option_pedestal = 3 option_pedestal = 3
option_triforce_hunt = 4 option_bingo = 4
local_objective = Toggle # local triforce pieces, local dungeon prizes etc.
class Goal(Choice):
option_kill_ganon = 0
option_kill_ganon_and_gt_agahnim = 1
option_hand_in = 2
class Accessibility(Choice): class Accessibility(Choice):
option_locations = 0 option_locations = 0

2
worlds/alttp/Rom.py
View File

@ -1371,7 +1371,7 @@ def patch_rom(world, rom, player, team, enemized):
rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F]) rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F])
# allow smith into multi-entrance caves in appropriate shuffles # allow smith into multi-entrance caves in appropriate shuffles
if world.shuffle[player] in ['restricted', 'full', 'crossed', 'insanity'] or (world.shuffle[player] == 'simple' and world.mode[player] == 'inverted'): if world.shuffle[player] in ['restricted', 'full', 'crossed', 'insanity', 'madness'] or (world.shuffle[player] == 'simple' and world.mode[player] == 'inverted'):
rom.write_byte(0x18004C, 0x01) rom.write_byte(0x18004C, 0x01)
# set correct flag for hera basement item # set correct flag for hera basement item