add moonwalk boomerang option, update notes

Author: blkerby

region/maridia/inner-pink/Aqueduct.json

@@ -1028,6 +1028,7 @@
       "requires": [
         "canPreciseStutterWaterShineCharge",
         "canShinechargeMovementTricky",
+        "canInsaneJump",
         {"shineChargeFrames": 130}
       ],
       "exitCondition": {
@@ -1056,6 +1057,7 @@
       "requires": [
         "canPreciseStutterWaterShineCharge",
         "canShinechargeMovementTricky",
+        "canInsaneJump",
         {"shineChargeFrames": 140}
       ],
       "exitCondition": {
@@ -1085,7 +1087,12 @@
       "requires": [
         "canPreciseStutterWaterShineCharge",
         "canShinechargeMovementTricky",
-        {"shineChargeFrames": 150}
+        "canInsaneJump",
+        {"shineChargeFrames": 145},
+        {"or": [
+          "canBeVeryPatient",
+          {"shineChargeFrames": 5}
+        ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
@@ -1099,7 +1106,11 @@
         "the ideal timing for the stutter is to release forward for 3 or 4 frames, and repress forward on the last possible frame before the transition.",
         "Other timings can work, but will gain the shinecharge further from the door, leaving fewer shinecharge frames remaining.",
         "After gaining the shinecharge, continue holding forward in order to make Samus stand.",
-        "Then turnaround spin jump back toward the door, and continue spin jumping to reach the transition with a shinecharge."
+        "Then turnaround spin jump back toward the door, and continue spin jumping to reach the transition with a shinecharge.",
+        "Alternatively, with greater difficulty but saving some shinecharge frames,",
+        "after performing the turnaround spin jump, briefly moonwalk back, then retain momentum by boomeranging forward",
+        "(switching from pressing backward to pressing forward on the next frame),",
+        "and arm pump to reach the door quickly."
       ],
       "devNote": [
         "The same shinecharge frames could be achieved with a closed end runway (effective length of 2.4375),",
@@ -1117,7 +1128,12 @@
       "requires": [
         "canPreciseStutterWaterShineCharge",
         "canShinechargeMovementTricky",
-        {"shineChargeFrames": 160}
+        "canInsaneJump",
+        {"shineChargeFrames": 150},
+        {"or": [
+          "canBeVeryPatient",
+          {"shineChargeFrames": 10}
+        ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
@@ -1131,7 +1147,16 @@
         "the ideal timing for the stutter is to release forward for 3 frames, and repress forward on the last possible frame before the transition.",
         "Other timings can work, but will gain the shinecharge further from the door, leaving fewer shinecharge frames remaining.",
         "After gaining the shinecharge, continue holding forward in order to make Samus stand.",
-        "Then turnaround spin jump back toward the door, and continue spin jumping to reach the transition with a shinecharge."
+        "Then turnaround spin jump back toward the door, and continue spin jumping to reach the transition with a shinecharge.",
+        "Alternatively, with greater difficulty but saving some shinecharge frames,",
+        "after performing the turnaround spin jump, briefly moonwalk back, then retain momentum by boomeranging forward",
+        "(switching from pressing backward to pressing forward on the next frame),",
+        "and arm pump to reach the door quickly."
+      ],
+      "devNote": [
+        "FIXME: The canBeVeryPatient requirement is for difficulty placement of the boomerang method;",
+        "but the boomerang (or maybe specifically the moonwalk boomerang) should possibly be its own tech,",
+        "and the same with rapid arm pumping."
       ]
     },
     {
@@ -1147,7 +1172,7 @@
         "canInsaneJump",
         "canBeVeryPatient",
         "canShinechargeMovementTricky",
-        {"shineChargeFrames": 175}
+        {"shineChargeFrames": 160}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
@@ -1157,18 +1182,24 @@
         {"types": ["missiles", "powerbomb"], "requires": ["never"]}
       ],
       "note": [
-        "With only 1 tile of runway in the other room, this requires subpixel-precise positioning and a double frame-perfect stutter:",
-        "At the start of the run, Samus must be on the last pixel of runway with X subpixels of $3FFF or less.",
+        "With only 1 tile of runway in the other room, Samus should ideally start on the last pixel of runway with X subpixels of $3FFF or less.",
         "Run toward the door, releasing forward for exactly 1 frame and pressing it again on the last possible frame before the transition.",
+        "Starting with X subpixels of $7FFF can also work (e.g., by simply backing against the door ledge, then jumping and turning around mid-air);",
+        "in this case, Samus must advance 1 or 2 pixels with an arm pump before the transition (e.g., firing a shot or pressing and/or releasing an angle button),",
+        "and the shinecharge will be gained slightly further away from the door.",
         "After gaining the shinecharge, continue holding forward in order to make Samus stand.",
-        "Then turnaround spin jump back toward the door, and continue spin jumping to reach the transition with a shinecharge."
+        "Then turnaround spin jump back toward the door, and continue spin jumping to reach the transition with a shinecharge.",
+        "Alternatively, with greater difficulty but saving some shinecharge frames,",
+        "after performing the turnaround spin jump, briefly moonwalk back, then retain momentum by boomeranging forward",
+        "(switching from pressing backward to pressing forward on the next frame),",
+        "and arm pump to reach the door quickly."
       ],
       "detailNote": [
-        "Correct subpixels can be achieved using one of several methods:",
-        "1) press against the door ledge (or a wall aligned with it);",
+        "Ideal subpixels ($3FFF) can be achieved using one of several methods:",
+        "1) press forward against the door ledge (or a wall aligned with it);",
         "jump, and while mid-air, tap forward for exactly 1 frame to land with subpixels $BFFF,",
         "moonwalk back for exactly 1 frame to end with subpixels $3FFF.",
-        "2) press against the door ledge (from a platform below, assuming one exists)",
+        "2) press forward against the door ledge (from a platform below, assuming one exists)",
         "turn around (while on the ground), and moonwalk back two pixels,",
         "then jump and mid-air turnaround onto the ledge;",
         "if Samus jumped from the correct pixel but does not land on the ledge, then it was needed to moonwalk back 1 more frame;",