Merge pull request #2654 from kjbranch/indiana-jones

Lenient Indiana Jones Grapple

Author: osse101

region/norfair/crocomire/Indiana Jones Room.json

@@ -361,18 +361,74 @@
         "Once near the acid platforms, Shinespark diagonally to reach the item location."
       ]
     },
+    {
+      "link": [1, 3],
+      "name": "Indiana Jones Grapple (With Retries)",
+      "requires": [
+        {"notable": "Indiana Jones Grapple (With Retries)"},
+        "canUseEnemies",
+        "canPreciseGrapple",
+        "h_midAirShootUp",
+        {"or": [
+          {"and": [
+            "canInsaneJump",
+            "h_trickyToCarryFlashSuit"
+          ]},
+          {"enemyDamage": {"enemy": "Ripper 2 (green)", "type": "contact", "hits": 4}}
+        ]},
+        {"or": [
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]},
+          {"and": [
+            "canSpeedyJump",
+            "HiJump",
+            "canTrickyWalljump"
+          ]},
+          "h_trickySpringwall"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": "Carefully swing between the Rippers at the top of the room to the item. The last two swings are the hardest",
+      "detailNote": [
+        "Morphing and unmorphing to reset Samus's fall speed can help give a bit more time to position the Rippers.",
+        "It can help to Grapple the same Ripper again to get it in a better position.",
+        "Position the third Ripper far to the right then fling to the fourth, which is far to the right and very close to the ceiling.",
+        "Moving the fourth Ripper to the right a bit can also help in order to make the last fling less precise.",
+        "Be careful not to fling directly into the ceiling, as it is easy to hit the uneven surface and fall.",
+        "If Samus falls, it may be helpful to reset the room."
+      ]
+    },
     {
       "id": 11,
       "link": [1, 3],
-      "name": "Indiana Jones Grapple",
+      "name": "Indiana Jones Grapple (First Try)",
       "requires": [
-        {"notable": "Indiana Jones Grapple"},
+        {"notable": "Indiana Jones Grapple (First Try)"},
         "canUseEnemies",
         "canPreciseGrapple",
-        "h_midAirShootUp"
+        "h_midAirShootUp",
+        {"or": [
+          {"and": [
+            "canInsaneJump",
+            "h_trickyToCarryFlashSuit"
+          ]},
+          {"and": [
+            "canResetFallSpeed",
+            {"enemyDamage": {"enemy": "Ripper 2 (green)", "type": "contact", "hits": 2}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
-      "note": "Grapple off several Ripper 2."
+      "note": "Carefully swing between the Rippers at the top of the room to the item. The last two swings are the hardest",
+      "detailNote": [
+        "Morphing and unmorphing to reset Samus's fall speed can help give a bit more time to position the Rippers.",
+        "It can help to Grapple the same Ripper again to get it in a better position.",
+        "Position the third Ripper far to the right then fling to the fourth, which is far to the right and very close to the ceiling.",
+        "Moving the fourth Ripper to the right a bit can also help in order to make the last fling less precise.",
+        "Be careful not to fling directly into the ceiling, as it is easy to hit the uneven surface and fall."
+      ]
     },
     {
       "id": 12,
@@ -1695,13 +1751,29 @@
       "link": [3, 1],
       "name": "Indiana Jones Grapple in Reverse",
       "requires": [
-        {"notable": "Indiana Jones Grapple"},
+        {"notable": "Indiana Jones Grapple (First Try)"},
         "canUseEnemies",
         "canPreciseGrapple",
-        "h_midAirShootUp"
+        "h_midAirShootUp",
+        {"or": [
+          {"and": [
+            "canInsaneJump",
+            "h_trickyToCarryFlashSuit"
+          ]},
+          {"and": [
+            "canResetFallSpeed",
+            {"enemyDamage": {"enemy": "Ripper 2 (green)", "type": "contact", "hits": 1}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
-      "note": "Involves grappling off several Ripper 2."
+      "note": [
+        "Involves Grappling off several Rippers, where falling may lead to a soft lock.",
+        "Morphing and unmorphing to reset Samus's fall speed can help give a bit more time to position the Rippers.",
+        "It can help to Grapple the same Ripper again to get it in a better position.",
+        "Positioning the first Ripper far to the left until the second is visible can help make this much easier."
+      ],
+      "devNote": "In general, the return route is easier, but is only useful after doing the left to right strat first."
     },
     {
       "id": 49,
@@ -2246,8 +2318,16 @@
   "notables": [
     {
       "id": 1,
-      "name": "Indiana Jones Grapple",
-      "note": "Involves grappling off several Rippers, where falling may lead to a soft lock."
+      "name": "Indiana Jones Grapple (First Try)",
+      "note": [
+        "Involves Grappling off several Rippers, where falling may lead to a soft lock.",
+        "Morphing and unmorphing to reset Samus's fall speed can help give a bit more time to position the Rippers.",
+        "It can help to Grapple the same Ripper again to get it in a better position.",
+        "Position the third Ripper far to the right then fling to the fourth, which is far to the right and very close to the ceiling.",
+        "Moving the fourth Ripper to the right a bit can also help in order to make the last fling less precise.",
+        "Be careful not to fling directly into the ceiling, as it is easy to hit the uneven surface and fall.",
+        "On the return route, positioning the first Ripper far to the left until the second is visible can help make this much easier."
+      ]
     },
     {
       "id": 2,
@@ -2302,8 +2382,20 @@
         "A spring fling can help add some lenience to the bomb placement and unmorph timing;",
         "it requires pausing early before jumping, in order to be able to initiate another pause immediately before placing a Power Bomb."
       ]
+    },
+    {
+      "id": 10,
+      "name": "Indiana Jones Grapple (With Retries)",
+      "note": [
+        "Involves Grappling off several Rippers, but Samus will have enough movement items to get back up and try again after a fall.",
+        "Morphing and unmorphing to reset Samus's fall speed can help give a bit more time to position the Rippers.",
+        "It can help to Grapple the same Ripper again to get it in a better position.",
+        "Position the third Ripper far to the right then fling to the fourth, which is far to the right and very close to the ceiling.",
+        "Moving the fourth Ripper to the right a bit can also help in order to make the last fling less precise.",
+        "Be careful not to fling directly into the ceiling, as it is easy to hit the uneven surface and fall."
+      ]
     }
   ],
   "nextStratId": 137,
-  "nextNotableId": 10
+  "nextNotableId": 11
 }