From 8414a1ec63c679d9528e9c6bb0df95dc020fc00d Mon Sep 17 00:00:00 2001 From: kjbranch Date: Wed, 13 Aug 2025 16:03:51 -0600 Subject: [PATCH] Add canComplexGMode to West Maridia --- region/maridia/outer/Boyon Gate Hall.json | 6 +++-- region/maridia/outer/Crab Hole.json | 20 +++++++-------- region/maridia/outer/Fish Tank.json | 6 +++-- region/maridia/outer/Main Street.json | 31 +++++++++++++++-------- region/maridia/outer/Maridia Tube.json | 29 +++++++++++---------- region/maridia/outer/Mt. Everest.json | 9 ++++--- 6 files changed, 59 insertions(+), 42 deletions(-) diff --git a/region/maridia/outer/Boyon Gate Hall.json b/region/maridia/outer/Boyon Gate Hall.json index 3ee55a6c7c..b3131c4d25 100644 --- a/region/maridia/outer/Boyon Gate Hall.json +++ b/region/maridia/outer/Boyon Gate Hall.json @@ -440,7 +440,8 @@ "h_artificialMorphJumpIntoIBJ" ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "devNote": "After exiting G-mode, jump just above the vertical shaft in order to fix the camera." }, { "id": 66, @@ -793,7 +794,8 @@ "h_artificialMorphJumpIntoIBJ" ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "devNote": "After exiting G-mode, jump just above the vertical shaft in order to fix the camera." }, { "id": 34, diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json index ad21921ca2..4ae5cf286e 100644 --- a/region/maridia/outer/Crab Hole.json +++ b/region/maridia/outer/Crab Hole.json @@ -672,7 +672,7 @@ { "id": 15, "link": [1, 4], - "name": "Carry G-Mode Through Tube (Left to Right)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -690,7 +690,7 @@ { "id": 16, "link": [1, 4], - "name": "Carry G-Mode Morph Through Tube (Left to Right)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2212,7 +2212,7 @@ { "id": 60, "link": [2, 5], - "name": "G-Mode (Bottom to Top)", + "name": "G-Mode", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2255,7 +2255,7 @@ { "id": 61, "link": [2, 5], - "name": "G-Mode Morph IBJ (Bottom to Top)", + "name": "G-Mode Morph IBJ", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2279,7 +2279,7 @@ { "id": 62, "link": [2, 5], - "name": "G-Mode Morph Gravity Jump (Bottom to Top)", + "name": "G-Mode Morph Gravity Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3210,7 +3210,7 @@ { "id": 91, "link": [3, 5], - "name": "G-Mode (Bottom to Top)", + "name": "G-Mode", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3253,7 +3253,7 @@ { "id": 92, "link": [3, 5], - "name": "G-Mode Morph IBJ (Bottom to Top)", + "name": "G-Mode Morph IBJ", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3277,7 +3277,7 @@ { "id": 93, "link": [3, 5], - "name": "G-Mode Morph Gravity Jump (Bottom to Top)", + "name": "G-Mode Morph Gravity Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3493,7 +3493,7 @@ { "id": 98, "link": [4, 1], - "name": "Carry G-Mode Through Tube (Right to Left)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3511,7 +3511,7 @@ { "id": 99, "link": [4, 1], - "name": "Carry G-Mode Morph Through Tube (Right to Left)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json index 76634f8e74..82e3b93974 100644 --- a/region/maridia/outer/Fish Tank.json +++ b/region/maridia/outer/Fish Tank.json @@ -1307,6 +1307,7 @@ }, "requires": [ {"notable": "Artificial Morph, Double Spring Ball Jump onto Frozen Fish"}, + "canComplexGMode", "h_artificialMorphDoubleSpringBallJump", "canInsaneJump", "canTrickyUseFrozenEnemies", @@ -2408,6 +2409,7 @@ }, "requires": [ {"or": [ + "canGravityJump", {"and": [ "Gravity", {"or": [ @@ -2427,8 +2429,7 @@ {"and": [ "HiJump", "canSpringBallJumpMidAir" - ]}, - "canGravityJump" + ]} ]} ]}, {"and": [ @@ -2721,6 +2722,7 @@ }, "requires": [ {"notable": "Artificial Morph, Double Spring Ball Jump onto Frozen Fish"}, + "canComplexGMode", "h_artificialMorphDoubleSpringBallJump", "canInsaneJump", "canTrickyUseFrozenEnemies", diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json index c793cffe99..1ca20f554f 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -1164,6 +1164,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater", {"or": [ "canGravityJump", @@ -1217,6 +1218,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater", {"or": [ "canGravityJump", @@ -2202,6 +2204,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater", {"or": [ "canGravityJump", @@ -2254,6 +2257,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater", {"or": [ "canGravityJump", @@ -3426,7 +3430,8 @@ } }, "requires": [ - {"notable": "G-Mode Overload Speed Blocks then use Global Crab"} + {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode" ], "clearsObstacles": ["B"], "flashSuitChecked": true, @@ -3443,7 +3448,8 @@ } }, "requires": [ - {"notable": "G-Mode Overload Speed Blocks then use Global Crab"} + {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode" ], "flashSuitChecked": true, "devNote": "FIXME: Immobile strats may need canBeVeryPatient if they can't be done before the crab is in position" @@ -4077,6 +4083,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater" ], "clearsObstacles": ["B"], @@ -4095,6 +4102,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater", "h_artificialMorphBombs", {"or": [ @@ -4140,6 +4148,7 @@ }, "requires": [ {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, + "canComplexGMode", "h_navigateUnderwater", "h_artificialMorphBombs", {"or": [ @@ -4377,7 +4386,7 @@ "h_artificialMorphPowerBomb", "h_artificialMorphPowerBomb", {"or": [ - "canInsaneJump", + "canComplexGMode", {"itemCollectedAtNode": 6} ]} ], @@ -4458,7 +4467,7 @@ "link": [6, 9], "name": "Kill Frozen Crab with Wave", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "Wave", {"obstaclesCleared": ["C"]} @@ -4471,7 +4480,7 @@ "link": [6, 9], "name": "Kago Frozen Crab", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "canKago", {"or": [ @@ -5198,7 +5207,7 @@ "link": [11, 6], "name": "G-Mode Overload Speed Blocks, Stuck on Frozen Crab", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "canBePatient", "h_navigateUnderwater", @@ -5225,7 +5234,7 @@ "link": [11, 6], "name": "G-Mode Overload Speed Blocks, Bomb Frozen Crab", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "canBePatient", "h_navigateUnderwater", @@ -5258,7 +5267,7 @@ "link": [11, 6], "name": "Direct G-Mode CF Overload Speed Blocks, Reserve Trigger", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "canBePatient", "h_navigateUnderwater", @@ -5296,7 +5305,7 @@ "link": [11, 11], "name": "Indirect G-Mode Crystal Flash", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "h_artificialMorphCrystalFlash", {"obstaclesNotCleared": ["B"]} @@ -5365,7 +5374,7 @@ "link": [12, 11], "name": "G-Mode Overload Speed Blocks (Bombs)", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "h_useMorphBombs", "h_navigateUnderwater", @@ -5496,7 +5505,7 @@ "link": [13, 11], "name": "G-Mode Morph, Overload Speed Blocks (Bombs)", "requires": [ - "canEnterGMode", + "canComplexGMode", {"notable": "G-Mode Overload Speed Blocks then use Global Crab"}, "h_navigateUnderwater", "h_artificialMorphBombs", diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json index 15aa4487da..1cddb6b82b 100644 --- a/region/maridia/outer/Maridia Tube.json +++ b/region/maridia/outer/Maridia Tube.json @@ -585,7 +585,7 @@ { "id": 8, "link": [1, 3], - "name": "Carry G-Mode Through Tube (Left to Right)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -603,7 +603,7 @@ { "id": 9, "link": [1, 3], - "name": "Carry G-Mode Morph Through Tube (Left to Right)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1152,7 +1152,7 @@ { "id": 17, "link": [2, 1], - "name": "Carry G-Mode Through Tube (Bottom to Left)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1172,7 +1172,7 @@ { "id": 18, "link": [2, 1], - "name": "Carry G-Mode Morph Through Tube (Bottom to Left)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1401,6 +1401,7 @@ } }, "requires": [ + "canComplexGMode", "canXRayClimb" ], "flashSuitChecked": true, @@ -1591,7 +1592,7 @@ { "id": 29, "link": [2, 3], - "name": "Carry G-Mode Through Tube (Bottom to Right)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1611,7 +1612,7 @@ { "id": 30, "link": [2, 3], - "name": "Carry G-Mode Morph Through Tube (Bottom to Right)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2144,7 +2145,7 @@ { "id": 40, "link": [3, 1], - "name": "Carry G-Mode Through Tube (Right to Left)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2162,7 +2163,7 @@ { "id": 41, "link": [3, 1], - "name": "Carry G-Mode Morph Through Tube (Right to Left)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3017,7 +3018,7 @@ { "id": 62, "link": [4, 1], - "name": "Carry G-Mode Through Tube (Top to Left)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3045,7 +3046,7 @@ { "id": 161, "link": [4, 1], - "name": "G-Mode Morph, Carry G-Mode Through Tube (Top to Left)", + "name": "G-Mode Morph, Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3067,7 +3068,7 @@ { "id": 63, "link": [4, 1], - "name": "Carry G-Mode Morph Through Tube (Top to Left)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3139,7 +3140,7 @@ { "id": 64, "link": [4, 3], - "name": "Carry G-Mode Through Tube (Top to Right)", + "name": "Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3167,7 +3168,7 @@ { "id": 162, "link": [4, 3], - "name": "G-Mode Morph, Carry G-Mode Through Tube (Top to Right)", + "name": "G-Mode Morph, Carry G-Mode Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -3189,7 +3190,7 @@ { "id": 65, "link": [4, 3], - "name": "Carry G-Mode Morph Through Tube (Top to Right)", + "name": "Carry G-Mode Morph Through Tube", "entranceCondition": { "comeInWithGMode": { "mode": "any", diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index ea0dba4d7d..bd0bb2174f 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -928,7 +928,10 @@ {"or": [ "Morph", "h_artificialMorphSpringBall", - "h_artificialMorphPowerBomb", + {"and": [ + "canComplexGMode", + "h_artificialMorphPowerBomb" + ]}, {"and": [ "Gravity", "h_artificialMorphLongIBJ" @@ -960,8 +963,8 @@ } }, "requires": [ + "canComplexGMode", "canSuitlessMaridia", - "canTrickyJump", {"or": [ "h_EverestMorphTunnelExpanded", "h_artificialMorphPowerBomb", @@ -3649,7 +3652,7 @@ }, "requires": [ "canSuitlessMaridia", - "canTrickyJump", + "canComplexGMode", {"or": [ "h_artificialMorphPowerBomb", {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 2}},