Finishing up interior doors for Eastern
This commit is contained in:
aerinon
@@ -1786,7 +1786,10 @@ interior_doors = [
|
||||
('Eastern West Wing WS', 'Eastern Stalfos Spawn ES'),
|
||||
('Eastern Stalfos Spawn NW', 'Eastern Compass Room SW'),
|
||||
('Eastern Compass Room EN', 'Eastern Hint Tile WN'),
|
||||
# ('', ''),
|
||||
('Eastern Dark Square EN', 'Eastern Dark Pots WN'),
|
||||
('Eastern Darkness NE', 'Eastern Rupees SE'),
|
||||
('Eastern False Switches WS', 'Eastern Cannonball Hell ES'),
|
||||
('Eastern Single Eyegore NE', 'Eastern Duo Eyegores SE'),
|
||||
('Desert East Lobby WS', 'Desert East Wing ES'),
|
||||
('Desert East Wing Key Door EN', 'Desert Compass Key Door WN'),
|
||||
('Desert North Hall NW', 'Desert Map SW'),
|
||||
@@ -1901,8 +1904,8 @@ default_door_connections = [
|
||||
('Eastern Courtyard EN', 'Eastern Map Valley WN'),
|
||||
('Eastern Courtyard N', 'Eastern Darkness S'),
|
||||
('Eastern Map Valley SW', 'Eastern Dark Square NW'),
|
||||
('Eastern Attic Start WS', 'Eastern Attic Switches ES'),
|
||||
('Eastern Attic Switches WS', 'Eastern Eyegores ES'),
|
||||
('Eastern Attic Start WS', 'Eastern False Switches ES'),
|
||||
('Eastern Cannonball Hell WS', 'Eastern Single Eyegore ES'),
|
||||
('Desert Compass NW', 'Desert Cannonball S'),
|
||||
('Desert Beamos Hall NE', 'Desert Tiles 2 SE'),
|
||||
('PoD Middle Cage N', 'PoD Pit Room S'),
|
||||
@@ -1939,7 +1942,7 @@ default_door_connections = [
|
||||
# ('', ''),
|
||||
default_one_way_connections = [
|
||||
('Sewers Pull Switch S', 'Sanctuary N'),
|
||||
('Eastern Eyegores NE', 'Eastern Boss SE'),
|
||||
('Eastern Duo Eyegores NE', 'Eastern Boss SE'),
|
||||
('Desert Wall Slide NW', 'Desert Boss SW'),
|
||||
('Tower Altar NW', 'Tower Agahnim 1 SW'),
|
||||
('PoD Harmless Hellway SE', 'PoD Arena Main NE'),
|
||||
|
||||
20
Doors.py
20
Doors.py
@@ -154,19 +154,27 @@ def create_doors(world, player):
|
||||
create_door(player, 'Eastern Fairies\' Warp', Warp),
|
||||
create_door(player, 'Eastern Map Valley WN', Nrml).dir(We, 0xaa, Top, Low).pos(1),
|
||||
create_door(player, 'Eastern Map Valley SW', Nrml).dir(So, 0xaa, Left, High).pos(5),
|
||||
create_door(player, 'Eastern Dark Square NW', Nrml).dir(No, 0xba, Left, High).pos(1),
|
||||
create_door(player, 'Eastern Dark Square NW', Nrml).dir(No, 0xba, Left, High).trap(0x2).pos(1),
|
||||
create_door(player, 'Eastern Dark Square Key Door WN', Nrml).dir(We, 0xba, Top, High).small_key().pos(0),
|
||||
create_door(player, 'Eastern Dark Square EN', Intr).dir(Ea, 0xba, Top, High).pos(2),
|
||||
create_door(player, 'Eastern Dark Pots WN', Intr).dir(We, 0xba, Top, High).pos(2),
|
||||
create_door(player, 'Eastern Big Key EN', Nrml).dir(Ea, 0xb8, Top, High).pos(1),
|
||||
create_door(player, 'Eastern Big Key NE', Nrml).dir(No, 0xb8, Right, High).big_key().pos(0),
|
||||
ugly_door(create_door(player, 'Eastern Darkness S', Nrml).dir(So, 0x99, Mid, High)).small_key().pos(1),
|
||||
create_door(player, 'Eastern Darkness S', Nrml).dir(So, 0x99, Mid, High).small_key().pos(1),
|
||||
create_door(player, 'Eastern Darkness NE', Intr).dir(No, 0x99, Right, High).pos(2),
|
||||
create_door(player, 'Eastern Rupees SE', Intr).dir(So, 0x99, Right, High).pos(2),
|
||||
# Up is a keydoor and down is not. Only the up stairs should be considered a key door for now.
|
||||
create_door(player, 'Eastern Darkness Up Stairs', Sprl).dir(Up, 0x99, 0, HTH).ss(Z, 0x1a, 0x6c, False, True).small_key().pos(0),
|
||||
create_door(player, 'Eastern Attic Start Down Stairs', Sprl).dir(Dn, 0xda, 0, HTH).ss(Z, 0x11, 0x80, True, True),
|
||||
create_door(player, 'Eastern Attic Start WS', Nrml).dir(We, 0xda, Bot, High).trap(0x4).pos(0),
|
||||
create_door(player, 'Eastern Attic Switches ES', Nrml).dir(Ea, 0xd9, Bot, High).trap(0x1).pos(2),
|
||||
create_door(player, 'Eastern Attic Switches WS', Nrml).dir(We, 0xd9, Bot, High).trap(0x4).pos(0),
|
||||
create_door(player, 'Eastern Eyegores ES', Nrml).dir(Ea, 0xd8, Bot, High).pos(2),
|
||||
create_door(player, 'Eastern Eyegores NE', Nrml).dir(No, 0xd8, Right, High).trap(0x4).pos(0),
|
||||
create_door(player, 'Eastern False Switches ES', Nrml).dir(Ea, 0xd9, Bot, High).trap(0x1).pos(2),
|
||||
create_door(player, 'Eastern False Switches WS', Intr).dir(We, 0xd9, Bot, High).pos(1),
|
||||
create_door(player, 'Eastern Cannonball Hell ES', Intr).dir(Ea, 0xd9, Bot, High).pos(1),
|
||||
create_door(player, 'Eastern Cannonball Hell WS', Nrml).dir(We, 0xd9, Bot, High).trap(0x4).pos(0),
|
||||
create_door(player, 'Eastern Single Eyegore ES', Intr).dir(Ea, 0xd8, Bot, High).pos(2),
|
||||
create_door(player, 'Eastern Single Eyegore NE', Intr).dir(No, 0xd8, Right, High).pos(1),
|
||||
create_door(player, 'Eastern Duo Eyegores SE', Intr).dir(So, 0xd8, Right, High).pos(1),
|
||||
create_door(player, 'Eastern Duo Eyegores NE', Intr).dir(No, 0xd8, Right, High).trap(0x4).pos(0),
|
||||
create_door(player, 'Eastern Boss SE', Nrml).dir(So, 0xc8, Right, High).no_exit().trap(0x4).pos(0),
|
||||
|
||||
# Desert Palace
|
||||
|
||||
@@ -181,8 +181,9 @@ eastern_regions = [
|
||||
'Eastern Cannonball', 'Eastern Cannonball Ledge', 'Eastern Courtyard Ledge', 'Eastern East Wing',
|
||||
'Eastern Pot Switch', 'Eastern Map Balcony', 'Eastern Map Room', 'Eastern West Wing', 'Eastern Stalfos Spawn',
|
||||
'Eastern Compass Room', 'Eastern Hint Tile', 'Eastern Hint Tile Blocked Path', 'Eastern Courtyard',
|
||||
'Eastern Fairies', 'Eastern Map Valley', 'Eastern Dark Square', 'Eastern Big Key', 'Eastern Darkness',
|
||||
'Eastern Attic Start', 'Eastern Attic Switches', 'Eastern Eyegores', 'Eastern Boss'
|
||||
'Eastern Fairies', 'Eastern Map Valley', 'Eastern Dark Square', 'Eastern Dark Pots', 'Eastern Big Key',
|
||||
'Eastern Darkness', 'Eastern Rupees', 'Eastern Attic Start', 'Eastern False Switches', 'Eastern Cannonball Hell',
|
||||
'Eastern Single Eyegore', 'Eastern Duo Eyegores', 'Eastern Boss'
|
||||
]
|
||||
|
||||
desert_regions = [
|
||||
|
||||
16
Regions.py
16
Regions.py
@@ -310,16 +310,16 @@ def create_regions(world, player):
|
||||
create_dungeon_region(player, 'Eastern Courtyard', 'Eastern Palace', ['Eastern Palace - Big Chest'], ['Eastern Courtyard WN', 'Eastern Courtyard EN', 'Eastern Courtyard N', 'Eastern Courtyard Potholes']),
|
||||
create_dungeon_region(player, 'Eastern Fairies', 'Eastern Palace', None, ['Eastern Fairies\' Warp']),
|
||||
create_dungeon_region(player, 'Eastern Map Valley', 'Eastern Palace', None, ['Eastern Map Valley WN', 'Eastern Map Valley SW']),
|
||||
create_dungeon_region(player, 'Eastern Dark Square', 'Eastern Palace', ['Eastern Palace - Dark Square Pot Key'], ['Eastern Dark Square NW', 'Eastern Dark Square Key Door WN']),
|
||||
# todo: dark pots
|
||||
create_dungeon_region(player, 'Eastern Dark Square', 'Eastern Palace', None, ['Eastern Dark Square NW', 'Eastern Dark Square Key Door WN', 'Eastern Dark Square EN']),
|
||||
create_dungeon_region(player, 'Eastern Dark Pots', 'Eastern Palace', ['Eastern Palace - Dark Square Pot Key'], ['Eastern Dark Pots WN']),
|
||||
create_dungeon_region(player, 'Eastern Big Key', 'Eastern Palace', ['Eastern Palace - Big Key Chest'], ['Eastern Big Key EN', 'Eastern Big Key NE']),
|
||||
create_dungeon_region(player, 'Eastern Darkness', 'Eastern Palace', ['Eastern Palace - Dark Eyegore Key Drop'], ['Eastern Darkness S', 'Eastern Darkness Up Stairs']),
|
||||
# todo: rupees
|
||||
create_dungeon_region(player, 'Eastern Darkness', 'Eastern Palace', ['Eastern Palace - Dark Eyegore Key Drop'], ['Eastern Darkness S', 'Eastern Darkness Up Stairs', 'Eastern Darkness NE']),
|
||||
create_dungeon_region(player, 'Eastern Rupees', 'Eastern Palace', None, ['Eastern Rupees SE']),
|
||||
create_dungeon_region(player, 'Eastern Attic Start', 'Eastern Palace', None, ['Eastern Attic Start Down Stairs', 'Eastern Attic Start WS']),
|
||||
create_dungeon_region(player, 'Eastern Attic Switches', 'Eastern Palace', None, ['Eastern Attic Switches ES', 'Eastern Attic Switches WS']),
|
||||
# todo: cannonball
|
||||
create_dungeon_region(player, 'Eastern Eyegores', 'Eastern Palace', None, ['Eastern Eyegores ES', 'Eastern Eyegores NE']),
|
||||
# todo: eyegores 2
|
||||
create_dungeon_region(player, 'Eastern False Switches', 'Eastern Palace', None, ['Eastern False Switches ES', 'Eastern False Switches WS']),
|
||||
create_dungeon_region(player, 'Eastern Cannonball Hell', 'Eastern Palace', None, ['Eastern Cannonball Hell ES', 'Eastern Cannonball Hell WS']),
|
||||
create_dungeon_region(player, 'Eastern Single Eyegore', 'Eastern Palace', None, ['Eastern Single Eyegore ES', 'Eastern Single Eyegore NE']),
|
||||
create_dungeon_region(player, 'Eastern Duo Eyegores', 'Eastern Palace', None, ['Eastern Duo Eyegores SE', 'Eastern Duo Eyegores NE']),
|
||||
create_dungeon_region(player, 'Eastern Boss', 'Eastern Palace', ['Eastern Palace - Boss', 'Eastern Palace - Prize'], ['Eastern Boss SE']),
|
||||
|
||||
# Desert Palace
|
||||
|
||||
7
Rules.py
7
Rules.py
@@ -265,7 +265,8 @@ def global_rules(world, player):
|
||||
|
||||
# Eastern Palace
|
||||
# Eyegore room needs a bow
|
||||
set_rule(world.get_entrance('Eastern Eyegores NE', player), lambda state: state.can_shoot_arrows(player))
|
||||
set_rule(world.get_entrance('Eastern Duo Eyegores NE', player), lambda state: state.can_shoot_arrows(player))
|
||||
set_rule(world.get_entrance('Eastern Single Eyegore NE', player), lambda state: state.can_shoot_arrows(player))
|
||||
set_rule(world.get_entrance('Eastern Map Balcony Hook Path', player), lambda state: state.has('Hookshot', player))
|
||||
# Big key rules
|
||||
set_rule(world.get_location('Eastern Palace - Big Chest', player), lambda state: state.has('Big Key (Eastern Palace)', player))
|
||||
@@ -944,8 +945,12 @@ def no_glitches_rules(world, player):
|
||||
add_conditional_lamp('Palace of Darkness - Dark Maze - Bottom', 'PoD Dark Maze', 'Location')
|
||||
add_conditional_lamp('Eastern Dark Square NW', 'Eastern Dark Square', 'Entrance')
|
||||
add_conditional_lamp('Eastern Dark Square Key Door WN', 'Eastern Dark Square', 'Entrance')
|
||||
add_conditional_lamp('Eastern Dark Square EN', 'Eastern Dark Square', 'Entrance')
|
||||
add_conditional_lamp('Eastern Dark Pots WN', 'Eastern Dark Pots', 'Entrance')
|
||||
add_conditional_lamp('Eastern Darkness S', 'Eastern Darkness', 'Entrance')
|
||||
add_conditional_lamp('Eastern Darkness Up Stairs', 'Eastern Darkness', 'Entrance')
|
||||
add_conditional_lamp('Eastern Darkness NE', 'Eastern Darkness', 'Entrance')
|
||||
add_conditional_lamp('Eastern Rupees SE', 'Eastern Rupees', 'Entrance')
|
||||
add_conditional_lamp('Eastern Palace - Dark Square Pot Key', 'Eastern Dark Square', 'Location')
|
||||
add_conditional_lamp('Eastern Palace - Dark Eyegore Key Drop', 'Eastern Darkness', 'Location')
|
||||
if world.mode != 'inverted':
|
||||
|
||||
Reference in New Issue
Block a user