Minor logic and terrain GFX changes to Spiral/Mimic Ledge in Inverted

- Also updated GFX routine to handle and correct GFX issues when exceeding the max number of GFX
This commit is contained in:
codemann8
2023-06-15 12:42:33 -05:00
parent a842939e92
commit 1cbee3f190
5 changed files with 3 additions and 5 deletions

View File

@@ -1454,7 +1454,6 @@ OWExitTypes = {
'EDM To Mimic Ledge Drop', 'EDM To Mimic Ledge Drop',
'EDM Ledge Drop', 'EDM Ledge Drop',
'Spiral Ledge Drop', 'Spiral Ledge Drop',
'Mimic Ledge Drop',
'Spiral Mimic Ledge Drop', 'Spiral Mimic Ledge Drop',
'Fairy Ascension Ledge Drop', 'Fairy Ascension Ledge Drop',
'Fairy Ascension Plateau Ledge Drop', 'Fairy Ascension Plateau Ledge Drop',

View File

@@ -1270,7 +1270,6 @@ mandatory_connections = [
('DM Hammer Bridge (West)', 'East Death Mountain (Top East)'), #hammer ('DM Hammer Bridge (West)', 'East Death Mountain (Top East)'), #hammer
('DM Hammer Bridge (East)', 'East Death Mountain (Top West)'), #hammer ('DM Hammer Bridge (East)', 'East Death Mountain (Top West)'), #hammer
('EDM To Spiral Ledge Drop', 'Spiral Cave Ledge'), ('EDM To Spiral Ledge Drop', 'Spiral Cave Ledge'),
('EDM To Fairy Ledge Drop', 'Fairy Ascension Ledge'),
('EDM Ledge Drop', 'East Death Mountain (Bottom)'), ('EDM Ledge Drop', 'East Death Mountain (Bottom)'),
('Spiral Ledge Drop', 'East Death Mountain (Bottom)'), ('Spiral Ledge Drop', 'East Death Mountain (Bottom)'),
('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'), ('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'),
@@ -1480,12 +1479,12 @@ ow_connections = {
('Dark Death Mountain Teleporter (West)', 'West Death Mountain (Bottom)') ('Dark Death Mountain Teleporter (West)', 'West Death Mountain (Bottom)')
]), ]),
0x05: ([ 0x05: ([
('EDM To Fairy Ledge Drop', 'Fairy Ascension Ledge'),
('East Death Mountain Teleporter', 'East Dark Death Mountain (Bottom)') ('East Death Mountain Teleporter', 'East Dark Death Mountain (Bottom)')
], [ ], [
('Floating Island Bridge (West)', 'East Death Mountain (Top East)'), ('Floating Island Bridge (West)', 'East Death Mountain (Top East)'),
('Floating Island Bridge (East)', 'Death Mountain Floating Island'), ('Floating Island Bridge (East)', 'Death Mountain Floating Island'),
('EDM To Mimic Ledge Drop', 'Mimic Cave Ledge'), ('EDM To Mimic Ledge Drop', 'Mimic Cave Ledge'),
('Mimic Ledge Drop', 'East Death Mountain (Bottom)'),
('Spiral Mimic Bridge (West)', 'Spiral Mimic Ledge Extend'), ('Spiral Mimic Bridge (West)', 'Spiral Mimic Ledge Extend'),
('Spiral Mimic Bridge (East)', 'Spiral Mimic Ledge Extend'), ('Spiral Mimic Bridge (East)', 'Spiral Mimic Ledge Extend'),
('Spiral Ledge Approach', 'Spiral Cave Ledge'), ('Spiral Ledge Approach', 'Spiral Cave Ledge'),

View File

@@ -25,7 +25,7 @@ def create_regions(world, player):
'EDM To Spiral Ledge Drop', 'EDM To Fairy Ledge Drop', 'EDM To Mimic Ledge Drop', 'EDM Ledge Drop', 'East Death Mountain EN']), 'EDM To Spiral Ledge Drop', 'EDM To Fairy Ledge Drop', 'EDM To Mimic Ledge Drop', 'EDM Ledge Drop', 'East Death Mountain EN']),
create_lw_region(player, 'Death Mountain Floating Island', ['Floating Island'], ['Floating Island Bridge (West)']), create_lw_region(player, 'Death Mountain Floating Island', ['Floating Island'], ['Floating Island Bridge (West)']),
create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Ledge Drop', 'Spiral Mimic Bridge (West)']), create_lw_region(player, 'Spiral Cave Ledge', None, ['Spiral Cave', 'Spiral Ledge Drop', 'Spiral Mimic Bridge (West)']),
create_lw_region(player, 'Mimic Cave Ledge', None, ['Mimic Cave', 'Mimic Ledge Drop', 'Spiral Mimic Bridge (East)']), create_lw_region(player, 'Mimic Cave Ledge', None, ['Mimic Cave', 'Spiral Mimic Bridge (East)']),
create_lw_region(player, 'Spiral Mimic Ledge Extend', None, ['Spiral Ledge Approach', 'Mimic Ledge Approach', 'Spiral Mimic Ledge Drop']), create_lw_region(player, 'Spiral Mimic Ledge Extend', None, ['Spiral Ledge Approach', 'Mimic Ledge Approach', 'Spiral Mimic Ledge Drop']),
create_lw_region(player, 'Fairy Ascension Ledge', None, ['Fairy Ascension Cave (Top)', 'Fairy Ascension Ledge Drop']), create_lw_region(player, 'Fairy Ascension Ledge', None, ['Fairy Ascension Cave (Top)', 'Fairy Ascension Ledge Drop']),
create_lw_region(player, 'Fairy Ascension Plateau', None, ['Fairy Ascension Cave (Bottom)', 'Fairy Ascension Rocks (Inner)', 'Fairy Ascension Plateau Ledge Drop']), create_lw_region(player, 'Fairy Ascension Plateau', None, ['Fairy Ascension Cave (Bottom)', 'Fairy Ascension Rocks (Inner)', 'Fairy Ascension Plateau Ledge Drop']),

2
Rom.py
View File

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '37055215524a94f346e892b7a716c2ef' RANDOMIZERBASEHASH = '5dc49b073decbc3b66635157ddedf05c'
class JsonRom(object): class JsonRom(object):

Binary file not shown.