Merge pull request #1532 from kjbranch/trivial-ice

osse101 · web-flow · commit c8c4c7eddf35 · 2024-06-04T19:55:29.000-02:30
Add and use canTrivialUseFrozenEnemies
diff --git a/region/brinstar/kraid/Kraid Eye Door Room.json b/region/brinstar/kraid/Kraid Eye Door Room.json
@@ -450,7 +450,7 @@
       "name": "G-Mode Setup - Get Hit By Zeb",
       "requires": [
         {"or":[
-          "canUseFrozenEnemies",
+          "canTrickyUseFrozenEnemies",
           "canTrickyJump"
         ]}
       ],
@@ -628,7 +628,7 @@
       "name": "G-Mode Setup - Get Hit By Zeb",
       "requires": [
         {"or":[
-          "canUseFrozenEnemies",
+          "canTrickyUseFrozenEnemies",
           "canTrickyJump"
         ]}
       ],
diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json
@@ -2154,9 +2154,9 @@
     },
     {
       "link": [7, 6],
-      "name": "Use Frozen Enemies",
+      "name": "Frozen Ripper Platforms",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrivialUseFrozenEnemies",
         {"or": [
           "HiJump",
           "canWalljump",
@@ -2293,9 +2293,9 @@
     },
     {
       "link": [9, 5],
-      "name": "Use Frozen Enemies",
+      "name": "Frozen Ripper Platforms",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrivialUseFrozenEnemies",
         {"obstaclesNotCleared": ["B"]}
       ]
     },
diff --git a/region/crateria/central/Crateria Super Room.json b/region/crateria/central/Crateria Super Room.json
@@ -772,7 +772,7 @@
       "link": [2, 2],
       "name": "Leave with Runway, Frozen Boyon Bridge",
       "requires": [
-        "canUseFrozenEnemies"
+        "canTrivialUseFrozenEnemies"
       ],
       "exitCondition": {
         "leaveWithRunway": {
@@ -819,7 +819,7 @@
       "link": [2, 3],
       "name": "Frozen Boyon Runway",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrivialUseFrozenEnemies",
         {"canShineCharge": {
           "usedTiles": 33,
           "openEnd": 2
@@ -831,7 +831,7 @@
       "link": [2, 3],
       "name": "Frozen Boyon Runway and Fast Walljumps",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrivialUseFrozenEnemies",
         "canShinechargeMovementComplex",
         "canFastWalljumpClimb",
         {"canShineCharge": {
@@ -848,7 +848,7 @@
       "link": [2, 3],
       "name": "Frozen Boyon Runway and HiJump",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrivialUseFrozenEnemies",
         "canShinechargeMovement",
         "HiJump",
         {"canShineCharge": {
@@ -929,7 +929,7 @@
         {"ammo": {"type": "PowerBomb", "count": 9}},
         "canBeVeryPatient",
         {"or": [
-          "canUseFrozenEnemies",
+          "canTrivialUseFrozenEnemies",
           "canTrickyJump",
           {"and": [
             "ScrewAttack",
diff --git a/region/maridia/inner-yellow/Maridia Elevator Room.json b/region/maridia/inner-yellow/Maridia Elevator Room.json
@@ -258,7 +258,7 @@
       },
       "requires": [
         {"or": [
-          "canUseFrozenEnemies",
+          "canTrivialUseFrozenEnemies",
           {"and": [
             "canPreciseWalljump",
             "canStaggeredWalljump"
@@ -445,7 +445,7 @@
       "link": [2, 3],
       "name": "Frozen Rippers",
       "requires": [
-        "canUseFrozenEnemies"
+        "canTrivialUseFrozenEnemies"
       ]
     },
     {
@@ -559,7 +559,7 @@
       },
       "requires": [
         {"or": [
-          "canUseFrozenEnemies",
+          "canTrivialUseFrozenEnemies",
           {"and": [
             "canPreciseWalljump",
             "canStaggeredWalljump"
diff --git a/region/maridia/inner-yellow/Plasma Room.json b/region/maridia/inner-yellow/Plasma Room.json
@@ -327,7 +327,7 @@
       "link": [2, 1],
       "name": "Frozen Wall Pirate Plasma Escape",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canPreciseWalljump"
       ],
       "note": [
diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json
@@ -162,7 +162,7 @@
         {"or": [
           "Gravity",
           "HiJump",
-          "canUseFrozenEnemies",
+          "canTrickyUseFrozenEnemies",
           "canTrickyJump"
         ]}
       ],
@@ -260,7 +260,7 @@
             "canPreciseGrapple",
             "canInsaneJump"
           ]},
-          "canUseFrozenEnemies"
+          "canTrickyUseFrozenEnemies"
         ]}
       ],
       "exitCondition": {
diff --git a/region/norfair/crocomire/Post Crocomire Jump Room.json b/region/norfair/crocomire/Post Crocomire Jump Room.json
@@ -1017,7 +1017,7 @@
       "link": [5, 1],
       "name": "PCJR Frozen Mella Door",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canManipulateMellas",
         {"or": [
           {"obstaclesCleared": ["B"]},
@@ -1044,7 +1044,7 @@
             "canSpringBallJumpMidAir"
           ]},
           {"and": [
-            "canUseFrozenEnemies",
+            "canTrickyUseFrozenEnemies",
             {"and": [
               "HiJump",
               "canWalljump",
@@ -1121,7 +1121,7 @@
       "link": [5, 3],
       "name": "Indy Jones Short Mella",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canManipulateMellas",
         "HiJump",
         {"or": [
@@ -1138,7 +1138,7 @@
       "link": [5, 3],
       "name": "Indy Jones Long Mella",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canManipulateMellas",
         {"or": [
           {"and": [
diff --git a/region/norfair/east/Cathedral Entrance.json b/region/norfair/east/Cathedral Entrance.json
@@ -372,7 +372,7 @@
       "name": "Cathedral Entrance Left Door Frozen Sova Step",
       "notable": true,
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canTrickyJump",
         "canCameraManip",
         {"heatFrames": 1100}
@@ -390,7 +390,7 @@
       "link": [3, 2],
       "name": "Frozen Sova",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         {"heatFrames": 950}
       ]
     },
diff --git a/region/norfair/east/Norfair Reserve Tank Room.json b/region/norfair/east/Norfair Reserve Tank Room.json
@@ -447,7 +447,7 @@
             {"lavaFrames": 20}
           ]},
           {"and": [
-            "canUseFrozenEnemies",
+            "canTrickyUseFrozenEnemies",
             {"obstaclesNotCleared": ["A"]},
             {"lavaFrames": 30}
           ]},
diff --git a/region/norfair/east/Single Chamber.json b/region/norfair/east/Single Chamber.json
@@ -673,7 +673,7 @@
       "link": [3, 4],
       "name": "Frozen Enemies",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         {"heatFrames": 1300}
       ],
       "note": [
@@ -857,7 +857,7 @@
       "link": [4, 6],
       "name": "Frozen Enemies",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         {"heatFrames": 830}
       ],
       "note": "Wait for the Alcoon to walk off the edge. Use it and the Multiviola as platforms."
diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json
@@ -399,7 +399,7 @@
       "link": [2, 3],
       "name": "Croc Escape HiJump Freeze",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "HiJump",
         {"heatFrames": 1150}
       ],
diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json
@@ -175,7 +175,7 @@
       "name": "Crumble Shaft Top Item Frozen Sova",
       "notable": true,
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canCarefulJump",
         "canCameraManip",
         {"heatFrames": 350}
@@ -320,7 +320,7 @@
       "link": [2, 1],
       "name": "Crumble Shaft Frozen Climb",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         "canConsecutiveWalljump",
         {"heatFrames": 800}
       ],
@@ -516,7 +516,7 @@
       "link": [3, 1],
       "name": "Frozen Sova",
       "requires": [
-        "canUseFrozenEnemies",
+        "canTrickyUseFrozenEnemies",
         {"heatFrames": 400}
       ],
       "note": [
diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json
@@ -145,7 +145,7 @@
       "name": "Frozen Boyon",
       "requires": [
         "Morph",
-        "canUseFrozenEnemies",
+        "canTrivialUseFrozenEnemies",
         {"heatFrames": 350}
       ]
     },
diff --git a/tech.json b/tech.json
@@ -1154,44 +1154,58 @@
               ]
             },
             {
-              "name": "canUseFrozenEnemies",
+              "name": "canTrivialUseFrozenEnemies",
               "techRequires": ["canUseEnemies"],
               "otherRequires": ["Ice"],
-              "note": "Can use Ice Beam to freeze enemies to use as platforms or as wall jump supports, to reach higher areas",
+              "note": [
+                "Can use Ice Beam to freeze enemies to use as platforms.",
+                "This only includes the most basic examples, where enemies can be easily positioned and refrozen without risk of killing them."
+              ],
               "extensionTechs": [
                 {
-                  "name": "canMochtroidIceClimb",
-                  "techRequires": ["canUseFrozenEnemies"],
-                  "otherRequires": [],
-                  "note": "Using a frozen Mochtroid to climb upwards, by continually jumping as it thaws and refreezing it higher."
-                },
-                {
-                  "name": "canTrickyUseFrozenEnemies",
-                  "techRequires": ["canUseFrozenEnemies"],
+                  "name": "canUseFrozenEnemies",
+                  "techRequires": ["canTrivialUseFrozenEnemies"],
                   "otherRequires": [],
                   "note": [
-                    "The ability to use Ice Beam to freeze enemies in especially precise positionings.",
-                    "If supers are available, they can be used to knock wall crawlers off walls and freeze them mid air."
+                    "Can use Ice Beam to freeze enemies in nontrivial situations, such as to use as a platform or to wall jump off of.",
+                    "This may require removing Plasma Beam in order to prevent freezing and then killing the enemy with a single shot."
                   ],
                   "extensionTechs": [
                     {
-                      "name": "canWallIceClip",
-                      "techRequires": ["canTrickyUseFrozenEnemies"],
+                      "name": "canMochtroidIceClimb",
+                      "techRequires": ["canUseFrozenEnemies"],
                       "otherRequires": [],
-                      "note": [
-                        "Collision will prioritize frozen enemies before walls which allows Samus to clip 1 pixel into a wall if an enemy is there.",
-                        "This can be used to get Samus into position to X-Ray Climb.",
-                        "Additionally, enemies that fly through walls may be repeatedly frozen to advance 1 pixel at a time to eventually push Samus through a wall or touch a door transition."
-                      ]
+                      "note": "Using a frozen Mochtroid to climb upwards, by continually jumping as it thaws and refreezing it higher."
                     },
                     {
-                      "name": "canCrazyCrabClimb",
-                      "techRequires": ["canTrickyUseFrozenEnemies"],
+                      "name": "canTrickyUseFrozenEnemies",
+                      "techRequires": ["canUseFrozenEnemies"],
                       "otherRequires": [],
                       "note": [
-                        "Repeatedly freezing a crab to climb up an uneven wall, using no other support.",
-                        "These climbs often require high precision when jumping around ledges: too many pixels in any direction and Samus may fall off or clip through the crab.",
-                        "This includes only tricky versions of crab climbs and may include manipulating global and non-global crabs, multiple at a time, and freezing crabs in mid-air."
+                        "The ability to use Ice Beam to freeze enemies in especially precise positionings.",
+                        "If supers are available, they can be used to knock wall crawlers off walls and freeze them mid air."
+                      ],
+                      "extensionTechs": [
+                        {
+                          "name": "canWallIceClip",
+                          "techRequires": ["canTrickyUseFrozenEnemies"],
+                          "otherRequires": [],
+                          "note": [
+                            "Collision will prioritize frozen enemies before walls which allows Samus to clip 1 pixel into a wall if an enemy is there.",
+                            "This can be used to get Samus into position to X-Ray Climb.",
+                            "Additionally, enemies that fly through walls may be repeatedly frozen to advance 1 pixel at a time to eventually push Samus through a wall or touch a door transition."
+                          ]
+                        },
+                        {
+                          "name": "canCrazyCrabClimb",
+                          "techRequires": ["canTrickyUseFrozenEnemies"],
+                          "otherRequires": [],
+                          "note": [
+                            "Repeatedly freezing a crab to climb up an uneven wall, using no other support.",
+                            "These climbs often require high precision when jumping around ledges: too many pixels in any direction and Samus may fall off or clip through the crab.",
+                            "This includes only tricky versions of crab climbs and may include manipulating global and non-global crabs, multiple at a time, and freezing crabs in mid-air."
+                          ]
+                        }
                       ]
                     }
                   ]
