From 0444fdc379aab5d41e4052686e55b896f96f3de6 Mon Sep 17 00:00:00 2001 From: lordlou <87331798+lordlou@users.noreply.github.com> Date: Wed, 31 Aug 2022 20:20:30 -0400 Subject: [PATCH] SM: wasteland ap (#983) --- .../variaRandomizer/graph/vanilla/graph_access.py | 13 ++++++++++++- .../graph/vanilla/graph_locations.py | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/worlds/sm/variaRandomizer/graph/vanilla/graph_access.py b/worlds/sm/variaRandomizer/graph/vanilla/graph_access.py index eebff84c52c3..b74b69026eae 100644 --- a/worlds/sm/variaRandomizer/graph/vanilla/graph_access.py +++ b/worlds/sm/variaRandomizer/graph/vanilla/graph_access.py @@ -294,7 +294,18 @@ sm.canGetBackFromRidleyZone(), sm.canPassWastelandDessgeegas(), sm.canPassRedKiHunters())), - 'RidleyRoomOut': Cache.ldeco(lambda sm: sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main'])) + 'RidleyRoomOut': Cache.ldeco(lambda sm: sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main'])), + 'Wasteland': Cache.ldeco(lambda sm: sm.wand(sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']), + sm.canGetBackFromRidleyZone(), + sm.canPassWastelandDessgeegas())) + }, internal=True), + AccessPoint('Wasteland', 'LowerNorfair', { + # no transition to firefleas to exlude pb of shame location when starting at firefleas top + 'Ridley Zone': Cache.ldeco(lambda sm: sm.wand(sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']), + sm.traverse('WastelandLeft'), + sm.canGetBackFromRidleyZone(), + sm.canPassWastelandDessgeegas(), + sm.canPassNinjaPirates())) }, internal=True), AccessPoint('Three Muskateers Room Left', 'LowerNorfair', { 'Firefleas': Cache.ldeco(lambda sm: sm.wand(sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']), diff --git a/worlds/sm/variaRandomizer/graph/vanilla/graph_locations.py b/worlds/sm/variaRandomizer/graph/vanilla/graph_locations.py index b8a1d3f44e49..671368e83175 100644 --- a/worlds/sm/variaRandomizer/graph/vanilla/graph_locations.py +++ b/worlds/sm/variaRandomizer/graph/vanilla/graph_locations.py @@ -797,10 +797,10 @@ lambda sm: SMBool(True) ) locationsDict["Power Bomb (Power Bombs of shame)"].AccessFrom = { - 'Ridley Zone': lambda sm: sm.canUsePowerBombs() + 'Wasteland': lambda sm: sm.canUsePowerBombs() } locationsDict["Power Bomb (Power Bombs of shame)"].Available = ( - lambda sm: sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']) + lambda sm: SMBool(True) ) locationsDict["Missile (lower Norfair near Wave Beam)"].AccessFrom = { 'Firefleas': lambda sm: SMBool(True)