From 6a73a2be86ab6865483b85e74f435a0551c78fa8 Mon Sep 17 00:00:00 2001 From: kjbranch <61815121+kjbranch@users.noreply.github.com> Date: Sun, 28 Jun 2026 16:48:20 +0000 Subject: [PATCH] Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter --- region/brinstar/blue/Morph Ball Room.json | 5 ++++- region/brinstar/green/Early Supers Room.json | 7 ++++--- region/brinstar/green/Green Hill Zone.json | 6 +++--- region/brinstar/green/Noob Bridge.json | 3 ++- .../green/Spore Spawn Kihunter Room.json | 3 ++- .../west/Gauntlet Energy Tank Room.json | 5 ++++- region/crateria/west/Terminator Room.json | 3 ++- region/lowernorfair/east/Mickey Mouse Room.json | 3 ++- region/maridia/inner-pink/Aqueduct.json | 17 ++++++++++++----- region/maridia/inner-pink/West Sand Pit.json | 4 +++- region/maridia/outer/Mt. Everest.json | 3 ++- region/norfair/crocomire/Crocomire's Room.json | 4 +++- .../crocomire/Post Crocomire Farming Room.json | 8 ++++++-- region/norfair/east/Double Chamber.json | 4 +++- region/norfair/west/Crocomire Speedway.json | 8 +++++--- region/norfair/west/Ice Beam Gate Room.json | 3 ++- region/norfair/west/Ice Beam Tutorial Room.json | 3 ++- 17 files changed, 61 insertions(+), 28 deletions(-) diff --git a/region/brinstar/blue/Morph Ball Room.json b/region/brinstar/blue/Morph Ball Room.json index de594c209..54be92c2d 100644 --- a/region/brinstar/blue/Morph Ball Room.json +++ b/region/brinstar/blue/Morph Ball Room.json @@ -737,6 +737,7 @@ "note": "Unmorph and quickly kill the hoppers on entry." }, { + "id": 92, "link": [1, 1], "name": "Blue Speed Entry", "entranceCondition": { @@ -775,6 +776,7 @@ ] }, { + "id": 93, "link": [1, 1], "name": "Come In Blue Spinning", "entranceCondition": { @@ -1232,6 +1234,7 @@ ] }, { + "id": 94, "link": [1, 5], "name": "Come In Blue Spinning, Speedball", "entranceCondition": { @@ -2035,6 +2038,6 @@ } ], "notables": [], - "nextStratId": 92, + "nextStratId": 95, "nextNotableId": 1 } \ No newline at end of file diff --git a/region/brinstar/green/Early Supers Room.json b/region/brinstar/green/Early Supers Room.json index 667065157..c99e3bf87 100644 --- a/region/brinstar/green/Early Supers Room.json +++ b/region/brinstar/green/Early Supers Room.json @@ -430,6 +430,7 @@ "devNote": ["This strat avoids the need to dash."] }, { + "id": 61, "link": [1, 2], "name": "Wall Ice Clip X-Ray Climb Gate Clip", "requires": [ @@ -449,10 +450,10 @@ "Freeze a Zeb inside the pillar below the gate. The Zeb's face should stick out slightly if it's frozen in the correct position.", "Run or walk into the pillar to clip into it. Press Down to crouch, then X-Ray climb to clip into the gate and walk through it." ], - "detailNote": [ + "detailNote": [ "Walking into the pillar is possible but is more precise and may require several tries." ], - "devNote": ["This strat avoids the need to dash."] + "devNote": ["This strat avoids the need to dash."] }, { "id": 13, @@ -1422,6 +1423,6 @@ ] } ], - "nextStratId": 61, + "nextStratId": 62, "nextNotableId": 4 } \ No newline at end of file diff --git a/region/brinstar/green/Green Hill Zone.json b/region/brinstar/green/Green Hill Zone.json index 92f939827..ce8a33186 100644 --- a/region/brinstar/green/Green Hill Zone.json +++ b/region/brinstar/green/Green Hill Zone.json @@ -324,6 +324,7 @@ ] }, { + "id": 99, "link": [1, 1], "name": "Gain Flash Suit (Geegas R-Mode Knockback Spark)", "entranceCondition": { @@ -333,8 +334,7 @@ {"or": [ {"disableEquipment": "ETank"}, "canBeVeryPatient" - ] - }, + ]}, {"canShineCharge": {"usedTiles": 18, "openEnd": 1}}, "h_RModeKnockbackSpark" ], @@ -2073,6 +2073,6 @@ ] } ], - "nextStratId": 99, + "nextStratId": 100, "nextNotableId": 7 } \ No newline at end of file diff --git a/region/brinstar/green/Noob Bridge.json b/region/brinstar/green/Noob Bridge.json index d1e0d9788..c78b27a44 100644 --- a/region/brinstar/green/Noob Bridge.json +++ b/region/brinstar/green/Noob Bridge.json @@ -737,6 +737,7 @@ "blueSuitChecked": true }, { + "id": 41, "link": [2, 2], "name": "Leave With Temporary Blue", "requires": [ @@ -805,6 +806,6 @@ ] } ], - "nextStratId": 41, + "nextStratId": 42, "nextNotableId": 2 } \ No newline at end of file diff --git a/region/brinstar/green/Spore Spawn Kihunter Room.json b/region/brinstar/green/Spore Spawn Kihunter Room.json index a49cbf9f9..09c35da3c 100644 --- a/region/brinstar/green/Spore Spawn Kihunter Room.json +++ b/region/brinstar/green/Spore Spawn Kihunter Room.json @@ -482,6 +482,7 @@ "blueSuitChecked": true }, { + "id": 27, "link": [2, 2], "name": "Leave With Temporary Blue", "requires": [ @@ -620,6 +621,6 @@ ] } ], - "nextStratId": 27, + "nextStratId": 28, "nextNotableId": 2 } \ No newline at end of file diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 691034208..605175fe7 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -743,6 +743,7 @@ "blueSuitChecked": true }, { + "id": 70, "link": [1, 4], "name": "Come In Getting Blue Speed, Blue Space Jump, Kill Zebo on Entry", "entranceCondition": { @@ -767,6 +768,7 @@ "blueSuitChecked": true }, { + "id": 71, "link": [1, 4], "name": "Blue Space Jump, In-Room Runway", "requires": [ @@ -795,6 +797,7 @@ "blueSuitChecked": true }, { + "id": 72, "link": [1, 4], "name": "Come In Blue Spinning, Blue Space Jump", "entranceCondition": { @@ -1617,7 +1620,7 @@ ] } ], - "nextStratId": 70, + "nextStratId": 73, "nextNotableId": 3, "devNote": ["FIXME: Add canLongChainTemporaryBlue left-to-right strats."] } \ No newline at end of file diff --git a/region/crateria/west/Terminator Room.json b/region/crateria/west/Terminator Room.json index 53241a42c..6d57356a7 100644 --- a/region/crateria/west/Terminator Room.json +++ b/region/crateria/west/Terminator Room.json @@ -443,6 +443,7 @@ ] }, { + "id": 25, "link": [2, 2], "name": "Gain Blue Suit (Slope X-Mode)", "requires": [ @@ -481,6 +482,6 @@ } ], "notables": [], - "nextStratId": 25, + "nextStratId": 26, "nextNotableId": 1 } \ No newline at end of file diff --git a/region/lowernorfair/east/Mickey Mouse Room.json b/region/lowernorfair/east/Mickey Mouse Room.json index 752582bfe..45ed7d25d 100644 --- a/region/lowernorfair/east/Mickey Mouse Room.json +++ b/region/lowernorfair/east/Mickey Mouse Room.json @@ -2995,6 +2995,7 @@ "detailNote": "This variant is only useful if Samus needs to break some of the Bomb blocks to go up after collecting the item." }, { + "id": 107, "link": [9, 4], "name": "Multiviola Clip, Flash Suit the Blocks", "requires": [ @@ -3071,6 +3072,6 @@ ] } ], - "nextStratId": 107, + "nextStratId": 108, "nextNotableId": 5 } \ No newline at end of file diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json index 853b580b1..6f65f71ff 100644 --- a/region/maridia/inner-pink/Aqueduct.json +++ b/region/maridia/inner-pink/Aqueduct.json @@ -268,6 +268,7 @@ "blueSuitChecked": true }, { + "id": 199, "link": [1, 1], "name": "R-Mode Entry", "entranceCondition": { @@ -550,14 +551,15 @@ "blueSuitChecked": true }, { + "id": 200, "link": [2, 1], "name": "Gravity Jump", "requires": [ "canGravityJump" ], + "wallJumpAvoid": true, "flashSuitChecked": true, - "blueSuitChecked": true, - "wallJumpAvoid": true + "blueSuitChecked": true }, { "id": 13, @@ -1355,6 +1357,7 @@ ] }, { + "id": 201, "link": [2, 2], "name": "R-Mode Entry", "entranceCondition": { @@ -1792,6 +1795,7 @@ "note": "Watch out for snails coming from above, or aggressive snails from below, who will either block or attack Samus." }, { + "id": 202, "link": [2, 9], "name": "Gravity Jump", "requires": [ @@ -1804,9 +1808,9 @@ ]} ]} ], + "wallJumpAvoid": true, "flashSuitChecked": true, "blueSuitChecked": true, - "wallJumpAvoid": true, "note": [ "Gravity Jump up to the top with HiJump.", "It is possible to jump up without HiJump with a precise jump and equipping Spring Ball and Gravity at the peak of the jump." @@ -2418,6 +2422,7 @@ "blueSuitChecked": true }, { + "id": 203, "link": [5, 5], "name": "R-Mode Entry", "entranceCondition": { @@ -2995,6 +3000,7 @@ ] }, { + "id": 204, "link": [6, 6], "name": "R-Mode Entry", "entranceCondition": { @@ -3133,6 +3139,7 @@ ] }, { + "id": 205, "link": [6, 6], "name": "R-Mode Forced Standup clip", "requires": [ @@ -3154,9 +3161,9 @@ ]}, {"autoReserveTrigger": {}} ], + "bypassesDoorShell": "yes", "flashSuitChecked": true, "blueSuitChecked": true, - "bypassesDoorShell": "yes", "note": [ "Gain Reserve Energy with a Crystal Flash or farm Yards with Bombs or Speed Booster.", "Shoot a Yard with a beam shot to anger it, then Morph on top of another against the door.", @@ -4131,7 +4138,7 @@ ] } ], - "nextStratId": 199, + "nextStratId": 206, "nextNotableId": 10, "devNote": [ "FIXME: An obstacle or two could be added to represent the bomb blocks and crumble blocks, and simple 1->9 strats could be added;", diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json index 91945605a..d8d9a4f3e 100644 --- a/region/maridia/inner-pink/West Sand Pit.json +++ b/region/maridia/inner-pink/West Sand Pit.json @@ -715,6 +715,7 @@ ] }, { + "id": 42, "link": [7, 5], "name": "Spring Ball into IBJ", "requires": [ @@ -733,6 +734,7 @@ ] }, { + "id": 43, "link": [7, 5], "name": "Gravity, Spring Ball, Power Bomb Boost", "requires": [ @@ -827,6 +829,6 @@ ] } ], - "nextStratId": 42, + "nextStratId": 44, "nextNotableId": 4 } \ No newline at end of file diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index 29eca73f0..958fbe336 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1404,6 +1404,7 @@ ] }, { + "id": 294, "link": [2, 6], "name": "Leave Shinecharged", "requires": [ @@ -6818,7 +6819,7 @@ ] } ], - "nextStratId": 294, + "nextStratId": 295, "nextNotableId": 14, "devNote": [ "FIXME: A 4->6 grapple teleport is possible, but the wrong-side transition will usually put Samus out-of-bounds. " diff --git a/region/norfair/crocomire/Crocomire's Room.json b/region/norfair/crocomire/Crocomire's Room.json index 281ff394c..cb6b03ef2 100644 --- a/region/norfair/crocomire/Crocomire's Room.json +++ b/region/norfair/crocomire/Crocomire's Room.json @@ -473,6 +473,7 @@ "blueSuitChecked": true }, { + "id": 73, "link": [2, 2], "name": "Leave With Temporary Blue", "requires": [ @@ -496,6 +497,7 @@ "blueSuitChecked": true }, { + "id": 74, "link": [2, 2], "name": "Leave With Temporary Blue - Crocomire Alive", "requires": [ @@ -1456,6 +1458,6 @@ ] } ], - "nextStratId": 73, + "nextStratId": 75, "nextNotableId": 2 } \ No newline at end of file diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index ba5f8da3c..f87b83e3f 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -1333,6 +1333,7 @@ ] }, { + "id": 100, "link": [3, 4], "name": "Leave Shinecharged (Wall Jump)", "requires": [ @@ -1703,6 +1704,7 @@ "blueSuitChecked": true }, { + "id": 101, "link": [4, 1], "name": "Insane, Damageless, Continuous Wall Jump", "requires": [ @@ -1714,7 +1716,9 @@ "canInsaneWallJump", "canBeVeryPatient", {"or": [ - {"enemyKill": {"enemies": [["Ripper 2 (green)"]]}}, + {"enemyKill": { + "enemies": [["Ripper 2 (green)"]] + }}, {"and": [ "h_enemyDrops", {"or": [ @@ -2097,6 +2101,6 @@ "note": "Use the moving platform (Kamer) to elevate the Gamets." } ], - "nextStratId": 100, + "nextStratId": 102, "nextNotableId": 3 } \ No newline at end of file diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json index c6c5b5002..f2e8e6234 100644 --- a/region/norfair/east/Double Chamber.json +++ b/region/norfair/east/Double Chamber.json @@ -3380,6 +3380,7 @@ ] }, { + "id": 182, "link": [3, 4], "name": "Speedy Jump over the Spikes", "entranceCondition": { @@ -3399,6 +3400,7 @@ "devNote": "This becomes easier with a very long runway, but probably not easy enough to remove the canTrickyJump, since a missed jump likely means death." }, { + "id": 183, "link": [3, 4], "name": "Speedy Jump over the Spikes, With Assist", "entranceCondition": { @@ -5068,7 +5070,7 @@ ] } ], - "nextStratId": 182, + "nextStratId": 184, "nextNotableId": 5, "devNote": [ "FIXME: Heat frames could be tightened by adding 5->1 strats:", diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index ecff89907..2e450e30c 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -3532,6 +3532,7 @@ "note": "Jump over the Cacatacs. Their projectiles remain inside of them and their hitbox is a bit smaller than it appears." }, { + "id": 147, "link": [7, 1], "name": "G-Mode Overload PLMs, Speed Block X-Ray Climb", "requires": [ @@ -3541,9 +3542,9 @@ "canGModeXRayClimb", "canLongXRayClimb" ], + "bypassesDoorShell": "yes", "flashSuitChecked": true, "blueSuitChecked": true, - "bypassesDoorShell": "yes", "note": [ "Enter the right-most speed block, to where Samus is fully within it and between 0 and 5 pixels from the left edge of the block.", "Exit G-mode while inside the speed blocks then X-Ray climb up. The camera will move up slightly once Samus is high enough, as she is pushed up from a slope below the door.", @@ -3717,6 +3718,7 @@ ] }, { + "id": 148, "link": [8, 1], "name": "G-Mode Overload PLMs, Blind Speed Block X-Ray Climb", "requires": [ @@ -3727,9 +3729,9 @@ "canGModeXRayClimb", "canLongXRayClimb" ], + "bypassesDoorShell": "yes", "flashSuitChecked": true, "blueSuitChecked": true, - "bypassesDoorShell": "yes", "note": [ "Enter the right-most speed block, to where Samus is fully within it and between 0 and 5 pixels from the left edge of the block.", "This is when Samus enters the screen again and then moves right so there is just over one full tile gap between her and the left edge of the screen.", @@ -4196,7 +4198,7 @@ ] } ], - "nextStratId": 147, + "nextStratId": 149, "nextNotableId": 5, "devNote": [ "FIXME: A moonfall using Multiviolas might be possible to bypass the door shell below." diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json index dd995a81c..087b9c586 100644 --- a/region/norfair/west/Ice Beam Gate Room.json +++ b/region/norfair/west/Ice Beam Gate Room.json @@ -768,6 +768,7 @@ ] }, { + "id": 104, "link": [2, 5], "name": "Temporary Blue Chain (Come in With Temporary Blue)", "entranceCondition": { @@ -2131,6 +2132,6 @@ ] } ], - "nextStratId": 104, + "nextStratId": 105, "nextNotableId": 7 } \ No newline at end of file diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json index b786f1f07..0496ee118 100644 --- a/region/norfair/west/Ice Beam Tutorial Room.json +++ b/region/norfair/west/Ice Beam Tutorial Room.json @@ -343,6 +343,7 @@ "blueSuitChecked": true }, { + "id": 31, "link": [1, 2], "name": "G-Mode", "entranceCondition": { @@ -807,6 +808,6 @@ "note": "Unmorph with the right timing to damage boost using the Boyon who is closest to the Morph tunnel in order to avoid taking any lava damage." } ], - "nextStratId": 31, + "nextStratId": 32, "nextNotableId": 2 } \ No newline at end of file