Merge pull request #2239 from kjbranch/ibj-hbj

Red Firefleas IBJ into HBJ, remove X-Ray Room references

Author: kjbranch

region/brinstar/red/Red Brinstar Fireflea Room.json

@@ -293,9 +293,9 @@
     {
       "id": 12,
       "link": [1, 2],
-      "name": "X-Ray Exit Damage Boost",
+      "name": "Damage Boost (Left to Right)",
       "requires": [
-        {"notable": "X-Ray Exit Damage Boost"},
+        {"notable": "Damage Boost (Left to Right)"},
         "canHorizontalDamageBoost",
         {"enemyDamage": {"enemy": "Waver", "type": "contact", "hits": 2}},
         {"or": [
@@ -315,7 +315,7 @@
     {
       "id": 13,
       "link": [1, 2],
-      "name": "X-Ray Exit Spike Floor",
+      "name": "Spike Floor Traversal",
       "requires": [
         {"spikeHits": 4},
         {"or": [
@@ -485,7 +485,7 @@
     {
       "id": 24,
       "link": [2, 1],
-      "name": "X-Ray Access Ice Bridge",
+      "name": "Ice Bridge",
       "requires": [
         "canTrickyUseFrozenEnemies",
         "canTrickyDodgeEnemies",
@@ -504,9 +504,9 @@
     {
       "id": 25,
       "link": [2, 1],
-      "name": "X-Ray Access Damage Boost",
+      "name": "Full Room Damage Boosts (Right to Left)",
       "requires": [
-        {"notable": "X-Ray Access Damage Boost"},
+        {"notable": "Full Room Damage Boosts (Right to Left)"},
         "canHorizontalDamageBoost",
         "canTrickyJump",
         "canUseIFrames",
@@ -533,7 +533,7 @@
     {
       "id": 68,
       "link": [2, 1],
-      "name": "X-Ray Access Damage Boost Speedy Jump",
+      "name": "Damage Boost Speedy Jump",
       "requires": [
         "canHorizontalDamageBoost",
         "canTrickyJump",
@@ -1151,7 +1151,7 @@
     {
       "id": 57,
       "link": [4, 1],
-      "name": "X-Ray Access Springwall",
+      "name": "Springwall",
       "requires": [
         "h_SpringwallOverSpikes",
         {"or": [
@@ -1163,9 +1163,9 @@
     {
       "id": 58,
       "link": [4, 1],
-      "name": "X-Ray Access Tricky SpringBall Jump",
+      "name": "Tricky Spring Ball Jump",
       "requires": [
-        {"notable": "X-Ray Access Tricky SpringBall Jump"},
+        {"notable": "Tricky Spring Ball Jump"},
         "canTrickyJump",
         "canTrickySpringBallJump",
         {"or": [
@@ -1229,12 +1229,24 @@
         ]}
       ]
     },
+    {
+      "link": [4, 1],
+      "name": "IBJ Into HBJ",
+      "requires": [
+        {"or": [
+          "canLongIBJ",
+          "canJumpIntoIBJ"
+        ]},
+        "canDiagonalBombJump"
+      ],
+      "note": "Perform an HBJ at the top of an IBJ. This is basically a very short diagonal bomb jump."
+    },
     {
       "id": 61,
       "link": [4, 1],
-      "name": "X-Ray Access SpikeJumps with HiJump",
+      "name": "Spike Jumps with HiJump",
       "requires": [
-        {"notable": "X-Ray Access SpikeJumps with HiJump"},
+        {"notable": "Spike Jumps with HiJump"},
         "HiJump",
         "canTrickyJump",
         {"or": [
@@ -1252,7 +1264,7 @@
         ]}
       ],
       "note": [
-        "Jump to the door leading to X-Ray either by jumping from spikes or with a very precise jump.",
+        "Jump up to the left door either by jumping from spikes or with a very precise jump.",
         "Cross the room by Jumping atop the spikes.",
         "Taking enemy damage can be used to reduce some spike damage.",
         "The final jump can either be made by jumping from the bottommost spike stair or from the safe stair.",
@@ -1269,7 +1281,7 @@
     },
     {
       "id": 2,
-      "name": "X-Ray Exit Damage Boost",
+      "name": "Damage Boost (Left to Right)",
       "note": [
         "If you wait long enough, a Waver will arrive. After it turns around to go back to the right, damage boost off of it, then follow it.",
         "Continue to hit it to get i-frames to avoid taking damage from any spikes.",
@@ -1278,15 +1290,15 @@
     },
     {
       "id": 4,
-      "name": "X-Ray Access Damage Boost",
+      "name": "Full Room Damage Boosts (Right to Left)",
       "note": [
-        "A precise strat that involves crossing both gaps by dboosting off Wavers.",
+        "A precise strat that involves crossing both gaps by damage boosting off Wavers.",
         "The Wavers are also used for iframes to avoid taking damage from any spikes."
       ]
     },
     {
       "id": 5,
-      "name": "X-Ray Access Tricky SpringBall Jump",
+      "name": "Tricky Spring Ball Jump",
       "note": [
         "Spring Ball jump from the safe spot on the spikey stairs. Moving over far enough left before the peak of the jump is the trickiest part of the jump.",
         "There are multiple things which can help get further left:",
@@ -1297,9 +1309,9 @@
     },
     {
       "id": 6,
-      "name": "X-Ray Access SpikeJumps with HiJump",
+      "name": "Spike Jumps with HiJump",
       "note": [
-        "Jump to the door leading to X-Ray either by jumping from spikes or with a very precise jump.",
+        "Jump up to the left door either by jumping from spikes or with a very precise jump.",
         "Cross the room by Jumping atop the spikes.",
         "Taking enemy damage can be used to reduce some spike damage.",
         "The final jump can either be made by jumping from the bottommost spike stair or from the safe stair.",

region/maridia/inner-pink/East Cactus Alley.json

@@ -471,6 +471,7 @@
           "h_artificialMorphLongIBJ",
           "h_artificialMorphJumpIntoIBJ"
         ]},
+        "h_artificialMorphDiagonalBombJump",
         "h_artificialMorphHBJ"
       ],
       "flashSuitChecked": true,
@@ -722,22 +723,23 @@
         {"or": [
           "SpaceJump",
           "canWalljump",
-          "h_IBJFromSpikes",
-          {"and": [
-            "canIBJ",
-            {"or": [
-              "canLongIBJ",
-              "canJumpIntoIBJ"
-            ]},
-            "canHBJ"
-          ]},
-          {"and": [
-            "canDiagonalBombJump",
-            "canLongIBJ"
-          ]}
+          "h_IBJFromSpikes"
         ]}
       ]
     },
+    {
+      "link": [2, 4],
+      "name": "IBJ Into HBJ",
+      "requires": [
+        "Gravity",
+        "canDiagonalBombJump",
+        {"or": [
+          "canLongIBJ",
+          "canJumpIntoIBJ"
+        ]}
+      ],
+      "note": "Perform an HBJ at the top of an IBJ. This is basically a very short diagonal bomb jump."
+    },
     {
       "id": 20,
       "link": [2, 4],

tech.json

@@ -1464,7 +1464,11 @@
                 "canIBJ"
               ],
               "otherRequires": [],
-              "note": "The ability to IBJ with backspin which results in an IBJ with diagonal movement."
+              "note": [
+                "The ability to IBJ with backspin which results in an IBJ with diagonal movement.",
+                "This also includes the ability to HBJ at the top of an IBJ."
+              ],
+              "devNote": "This does not include low incline diagonal bomb jumps, at less than around 45 degrees. Those are significantly harder."
             },
             {
               "id": 96,