some of the annoying g-mode setups.

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -117,6 +117,11 @@
       "id": "R-Mode",
       "name": "Entered with R-Mode",
       "obstacleType": "abstract"
+    },
+    {
+      "id": "C",
+      "name":"Beetom above the crumbles",
+      "obstacleType": "abstract"
     }
   ],
   "enemies": [
@@ -308,6 +313,47 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Leave with Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canMoondance",
+        "canCount",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing."
+    },
+    {
+      "link": [1, 1],
+      "name": "Leave with Extended Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canExtendedMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
+        "h_extendedMoondanceBeetomLeniency"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.",
+        "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing."
+      ]
+    },
     {
       "id": 118,
       "link": [1, 1],
@@ -338,6 +384,21 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Beetom",
+        "requires":[
+          "canComplexGMode",
+          {"obstaclesCleared": ["C"]}
+        ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {
+          "knockback": false
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 8,
       "link": [1, 5],
@@ -549,6 +610,47 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+{
+      "link": [2, 2],
+      "name": "Leave with Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canMoondance",
+        "canCount",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing."
+    },
+    {
+      "link": [2, 2],
+      "name": "Leave with Extended Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canExtendedMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
+        "h_extendedMoondanceBeetomLeniency"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.",
+        "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing."
+      ]
+    },
     {
       "id": 15,
       "link": [2, 2],
@@ -588,6 +690,21 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By Beetom",
+        "requires":[
+          "canComplexGMode",
+          {"obstaclesCleared": ["C"]}
+        ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {
+          "knockback": false
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 16,
       "link": [2, 3],
@@ -953,10 +1070,46 @@
         "Two Beetom hits are assumed, but with failed attempts it could take more, possibly requiring leaving the Beetom and going back to the right to farm."
       ],
       "devNote": [
-        "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required.",
-        "FIXME: An ice clip would allow for Moondance strats at 1 and 2 using a second Beetom."
+        "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required."
       ]
     },
+    {
+      "link": [3, 2],
+      "name": "Bring a Beetom Through the Crumble Blocks",
+      "requires": [
+        {"obstaclesNotCleared": ["A"]},
+        {"notable": "Beetom Clip"},
+        {"noBlueSuit": {}},
+        {"or": [
+          "h_XRayMorphIceClip",
+          "h_preciseIceClip"
+        ]},
+        "Morph",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}},
+        {"or": [
+          "h_preciseIceClip",
+          "canWalljump",
+          "HiJump",
+          "SpaceJump",
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
+        ]},
+        {"or": [
+          "canCrumbleJump",
+          "canWalljump",
+          "HiJump",
+          "SpaceJump"
+        ]}
+      ],
+      "clearsObstacles": ["C"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Bring two Beetoms through the morph tunnel, damage can be limited by carefully manipulating the Beetoms.",
+        "Freeze both and allow one to unfreeze and refreeze it in position to clip. Allow the second Beetom to unfreeze and latch onto Samus.",
+        "Perform the crumble block clip with the Beetom attached to bring it up to the top two doors."
+      ],
+      "devNote": "This strat is for bringing a Beetom above the crumble blocks in order to be used for a Moondance or G-Mode setup from either of the top two doors."
+    },
     {
       "id": 29,
       "link": [3, 2],
@@ -1054,6 +1207,7 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+
     {
       "id": 121,
       "link": [3, 3],
@@ -1122,6 +1276,28 @@
         "Alternatively, bring two Beetoms and stand on one while freezing the other at chest height.",
         "Freezing the lower one may be made easier or damageless by scrolling the camera when the Beetom is in the correct position and freezing it with a hero shot from the right."
       ]
+    },
+         {
+      "link": [3, 3],
+      "name": "Leave With Runway - Two Frozen Beetoms",
+      "requires": [
+        {"noBlueSuit": {}},
+        "Morph",
+        "h_trickyFrozenEnemyRunway",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
+      ],
+      "exitCondition": {
+        "leaveWithRunway": {
+          "length": 9,
+          "openEnd": 0
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Bring two Beetoms from the right of the spiky tunnel to the bottom left door.",
+        "It is possible to lure first beetom through the tunnel to not take any damage."
+      ]
     },
     {
       "id": 107,
@@ -1386,7 +1562,7 @@
         ]}
       ],
       "clearsObstacles": ["A"],
-      "resetsObstacles": ["B", "R-Mode"],
+      "resetsObstacles": ["B", "R-Mode", "C"],
       "farmCycleDrops": [
         {"enemy": "Beetom", "count": 2},
         {"enemy": "Zebbo", "count": 1}
@@ -2134,7 +2310,7 @@
         ]}
       ],
       "clearsObstacles": ["A"],
-      "resetsObstacles": ["B", "R-Mode"],
+      "resetsObstacles": ["B", "R-Mode", "C"],
       "farmCycleDrops": [
         {"enemy": "Beetom", "count": 2},
         {"enemy": "Zebbo", "count": 2}

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -465,6 +465,24 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By KiHunter",
+      "requires": [
+        {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}},
+        "canComplexGMode"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Either run into the room or hold run during the transition. Quickly spinjump up into the tunnel to shoot the shotblocks before the KiHunter can swoop down.",
+        "Stand level with the tunnel and wait for the KiHunter to come down. Once it is in the tunnel, move to the wall to lure it down full.",
+        "Don't shoot the wings off it or it will spit projectiles at Samus. Instead take a contact hit when it is at the bottom and move towards to door to lure it along."
+      ]
+    },
     {
       "id": 48,
       "link": [2, 2],

region/tourian/main/Tourian Escape Room 2.json

@@ -209,6 +209,33 @@
       ],
       "devNote": "This is only for indirect G-Mode, because it is trivial while in direct, and would use a different strat."
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Space Pirate",
+      "requires": [
+        "canUpwardGModeSetup",
+        "canTrickyUseFrozenEnemies",
+        "canTrickyGMode"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Manipulate a Pirate to climb to the top of the room on the left side.",
+        "Freeze the pirate mid jump just below the doorframe.",
+        "Without Spring Ball, freeze the pirate low enough to where Samus can still spin jump onto it.",
+        "Land on the edge of it, X-Ray turnaround or crouch, then press forward when it is about to thaw to trigger the transition."
+      ],
+      "detailNote": [
+        "After jumping from right-to-left, Pirates will begin climbing up.",
+        "After jumping from left-to-right, Pirates will begin climbing down.",
+        "They will change direction when colliding with a block,",
+        "or at random (with 50% chance) after climbing a distance of about 5 tiles.",
+        "While climbing, they will fire a laser and jump across the room if the center vertical position of Samus and the Pirate differ by at most 32 pixels."
+      ]
+    },
     {
       "id": 6,
       "link": [1, 2],