Merge pull request #2225 from kjbranch/e-norfair-complex

Add canComplexGMode to Upper Norfair East

Author: osse101

region/norfair/east/Bubble Mountain.json

@@ -850,6 +850,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -1838,6 +1839,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -2309,6 +2311,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb",
         "canBePatient"
       ],
@@ -2330,6 +2333,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -2385,6 +2389,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -3135,6 +3140,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,

region/norfair/east/Double Chamber.json

@@ -751,6 +751,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canXRayClimb"
       ],
@@ -768,6 +769,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canXRayClimb"
       ],
@@ -1754,6 +1756,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphCeilingBombJump",
           {"and": [
@@ -1881,6 +1884,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphCeilingBombJump",
           {"and": [
@@ -2157,6 +2161,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "SpaceJump",
           "canPreciseGrapple",
@@ -2202,6 +2207,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "ScrewAttack",
           "h_usePowerBomb",
@@ -2227,6 +2233,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphLongCeilingBombJump",
           {"and": [
@@ -2702,6 +2709,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "SpaceJump",
           "canSpringBallJumpMidAir",
@@ -2749,6 +2757,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "ScrewAttack",
           "h_usePowerBomb",
@@ -2777,6 +2786,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphCeilingBombJump",
           {"and": [
@@ -3179,6 +3189,7 @@
       "link": [6, 1],
       "name": "Direct G-Mode, Remote Acquire Item",
       "requires": [
+        "canComplexGMode",
         "Morph",
         {"or": [
           "SpaceJump",
@@ -3212,6 +3223,7 @@
       "link": [6, 1],
       "name": "Direct G-Mode, Remote Acquire Item, Kago Farm",
       "requires": [
+        "canComplexGMode",
         "Morph",
         {"or": [
           "SpaceJump",
@@ -3255,6 +3267,7 @@
       "link": [6, 2],
       "name": "Direct G-Mode, Remote Acquire Item",
       "requires": [
+        "canComplexGMode",
         "Morph",
         "h_heatedGModeOpenDifferentDoor"
       ],
@@ -3266,6 +3279,7 @@
       "link": [6, 2],
       "name": "Direct G-Mode, Remote Acquire Item, Kago Farm",
       "requires": [
+        "canComplexGMode",
         "Morph",
         "Plasma",
         "h_heatedGModePauseAbuse"

region/norfair/east/Green Bubbles Tunnel.json

@@ -455,6 +455,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedDirectGModeLeaveSameDoor"
       ],
       "collectsItems": [3],

region/norfair/east/Lava Dive Room.json

@@ -536,6 +536,7 @@
       },
       "requires": [
         {"notable": "Artificial Morph, Triple Spring Ball Jump"},
+        "canTrickyGMode",
         "h_artificialMorphDoubleSpringBallJump",
         "canInsaneJump",
         {"gravitylessLavaFrames": 640},
@@ -559,6 +560,7 @@
       },
       "requires": [
         {"notable": "Artificial Morph, Triple Spring Ball Jump"},
+        "canTrickyGMode",
         {"tech": "canDoubleSpringBallJumpMidAir"},
         "h_artificialMorphSpringBall",
         "canInsaneJump",

region/norfair/east/Lava Farm Tunnel.json

@@ -261,6 +261,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_preciseIceClip",
           "h_highPixelIceClip"
@@ -720,6 +721,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_preciseIceClip",
           "h_highPixelIceClip"
@@ -948,6 +950,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_preciseIceClip",
           "h_highPixelIceClip"

region/norfair/east/Purple Shaft.json

@@ -855,6 +855,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canXRayClimb"
       ],

region/norfair/east/Volcano Room.json

@@ -467,6 +467,7 @@
       },
       "requires": [
         "h_heatedGMode",
+        "canComplexGMode",
         "canOffScreenMovement",
         {"or": [
           "h_artificialMorphMovement",
@@ -487,7 +488,11 @@
             ]}
           ]}
         ]},
-        {"heatFrames": 1000}
+        {"heatFrames": 1000},
+        {"or": [
+          "canTrickyGMode",
+          {"heatFrames": 500}
+        ]}
       ],
       "exitCondition": {
         "leaveNormally": {}