From da8f3caeee5b01c38db30ebb146b76dc41f9ca74 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sun, 21 Apr 2024 14:36:15 -0400 Subject: Expand sphere 1 in door shuffle + no ECH --- src/ap_state.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/ap_state.cpp') diff --git a/src/ap_state.cpp b/src/ap_state.cpp index aeed914..9aceef6 100644 --- a/src/ap_state.cpp +++ b/src/ap_state.cpp @@ -473,16 +473,27 @@ int AP_GetMasteryRequirement() { return GetState().mastery_requirement; } int AP_GetLevel2Requirement() { return GetState().level_2_requirement; } bool AP_IsLocationVisible(int classification) { + int world_state = 0; + switch (GetState().location_checks) { case kNORMAL_LOCATIONS: - return classification & kLOCATION_NORMAL; + world_state = kLOCATION_NORMAL; + break; case kREDUCED_LOCATIONS: - return classification & kLOCATION_REDUCED; + world_state = kLOCATION_REDUCED; + break; case kPANELSANITY: - return classification & kLOCATION_INSANITY; + world_state = kLOCATION_INSANITY; + break; default: return false; } + + if (GetState().door_shuffle_mode && !GetState().early_color_hallways) { + world_state |= kLOCATION_SMALL_SPHERE_ONE; + } + + return (world_state & classification); } VictoryCondition AP_GetVictoryCondition() { -- cgit 1.4.1