Skip to content

Run Scripts #2148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blkerby merged 1 commit into from
Jul 21, 2025
Merged

Run Scripts #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions region/brinstar/blue/Blue Brinstar Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,7 @@
"name": "Geemer, Skree, and Reo Farm",
"requires": [
"h_ZebesIsAwake",
{"resetRoom": {
"nodes": [1]
}},
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 400}
],
"resetsObstacles": ["A", "B", "C", "D"],
Expand Down Expand Up @@ -903,13 +901,11 @@
"canConsecutiveWalljump",
"SpaceJump"
]},
{"resetRoom": {
"nodes": [2]
}},
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 1350}
],
"resetsObstacles": ["C", "D"],
"clearsObstacles": ["A", "B"],
"resetsObstacles": ["C", "D"],
"farmCycleDrops": [
{"enemy": "Geemer (blue)", "count": 2},
{"enemy": "Skree", "count": 2},
Expand Down
8 changes: 2 additions & 6 deletions region/brinstar/blue/Construction Zone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,12 @@
"h_ZebesIsAwake",
{"or": [
{"and": [
{"resetRoom": {
"nodes": [1, 2]
}},
{"resetRoom": {"nodes": [1, 2]}},
{"cycleFrames": 150}
]},
{"and": [
"Morph",
{"resetRoom": {
"nodes": [3]
}},
{"resetRoom": {"nodes": [3]}},
{"or": [
{"cycleFrames": 510},
{"and": [
Expand Down
6 changes: 2 additions & 4 deletions region/brinstar/blue/Morph Ball Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,7 @@
"requires": [
"h_ZebesIsAwake",
"canPrepareForNextRoom",
{"resetRoom": {
"nodes": [1]
}},
{"resetRoom": {"nodes": [1]}},
{"or": [
{"and": [
"Plasma",
Expand Down Expand Up @@ -427,8 +425,8 @@
]}
]}
],
"resetsObstacles": ["A", "B", "D"],
"clearsObstacles": ["C"],
"resetsObstacles": ["A", "B", "D"],
"farmCycleDrops": [{"enemy": "Sidehopper", "count": 3}]
},
{
Expand Down
16 changes: 6 additions & 10 deletions region/brinstar/green/Brinstar Pre-Map Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,11 @@
"link": [1, 1],
"name": "Zeela Farm",
"requires": [
{"resetRoom": {
"nodes": [1]
}},
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 120}
],
"farmCycleDrops": [{"enemy": "Zeela", "count": 1}],
"resetsObstacles": ["A"]
"resetsObstacles": ["A"],
"farmCycleDrops": [{"enemy": "Zeela", "count": 1}]
},
{
"id": 2,
Expand Down Expand Up @@ -443,9 +441,7 @@
"link": [2, 2],
"name": "Zeela & Sidehopper Farm",
"requires": [
{"resetRoom": {
"nodes": [2]
}},
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 320},
{"or": [
"canDodgeWhileShooting",
Expand All @@ -465,11 +461,11 @@
]}
],
"resetsObstacles": ["A"],
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Zeela", "count": 2},
{"enemy": "Sm. Sidehopper", "count": 1}
]
],
"flashSuitChecked": true
},
{
"id": 24,
Expand Down
16 changes: 5 additions & 11 deletions region/brinstar/green/Early Supers Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,7 @@
"canSpringBallJumpMidAir",
"h_crouchJumpDownGrab"
]},
{"resetRoom": {
"nodes": [1]
}}
{"resetRoom": {"nodes": [1]}}
]
}
],
Expand Down Expand Up @@ -435,9 +433,7 @@
"canSpringBallJumpMidAir",
"h_crouchJumpDownGrab"
]},
{"resetRoom": {
"nodes": [1]
}}
{"resetRoom": {"nodes": [1]}}
]
}
],
Expand Down Expand Up @@ -809,9 +805,7 @@
"link": [2, 2],
"name": "Waver and Sidehopper Farm",
"requires": [
{"resetRoom": {
"nodes": [2]
}},
{"resetRoom": {"nodes": [2]}},
{"or": [
"canWalljump",
"canCrouchJump"
Expand All @@ -838,12 +832,12 @@
]}
]}
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"farmCycleDrops": [
{"enemy": "Waver", "count": 4},
{"enemy": "Sm. Sidehopper", "count": 3}
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"flashSuitChecked": true
},
{
Expand Down
20 changes: 8 additions & 12 deletions region/brinstar/green/Etecoon Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,9 +1047,7 @@
"name": "Zebbo and Beetom Farm",
"requires": [
"Morph",
{"resetRoom": {
"nodes": [3]
}},
{"resetRoom": {"nodes": [3]}},
{"cycleFrames": 630},
{"or": [
{"enemyKill": {
Expand All @@ -1068,11 +1066,11 @@
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Beetom", "count": 2},
{"enemy": "Zebbo", "count": 1}
]
],
"flashSuitChecked": true
},
{
"id": 75,
Expand Down Expand Up @@ -1580,9 +1578,7 @@
"link": [4, 4],
"name": "Zebbo and Beetom Farm",
"requires": [
{"resetRoom": {
"nodes": [4]
}},
{"resetRoom": {"nodes": [4]}},
{"cycleFrames": 530},
{"or": [
{"enemyKill": {
Expand All @@ -1600,11 +1596,11 @@
],
"clearsObstacles": ["A"],
"resetsObstacles": ["B"],
"flashSuitChecked": true,
"farmCycleDrops": [
{"enemy": "Beetom", "count": 2},
{"enemy": "Zebbo", "count": 2}
]
],
"flashSuitChecked": true
},
{
"id": 52,
Expand All @@ -1615,8 +1611,8 @@
{"simpleCycleFrames": 85},
{"cycleFrames": 30}
],
"flashSuitChecked": true,
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}],
"flashSuitChecked": true
},
{
"id": 80,
Expand Down
10 changes: 3 additions & 7 deletions region/brinstar/green/Green Brinstar Beetom Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,7 @@
"link": [1, 1],
"name": "Beetom Farm",
"requires": [
{"resetRoom": {
"nodes": [1, 2]
}},
{"resetRoom": {"nodes": [1, 2]}},
{"or": [
{"and": [
"ScrewAttack",
Expand All @@ -207,8 +205,8 @@
]}
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
"farmCycleDrops": [{"enemy": "Beetom", "count": 4}],
"flashSuitChecked": true,
"note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.",
"devNote": [
"Using an adjacent 2-tile runway doesn't seem workable since heat frames may be too much to maintain energy.",
Expand Down Expand Up @@ -312,9 +310,7 @@
"link": [1, 1],
"name": "10 Power Bomb Crystal Flash",
"requires": [
{"resetRoom": {
"nodes": [1, 2]
}},
{"resetRoom": {"nodes": [1, 2]}},
{"or": [
{"obstaclesCleared": ["A"]},
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
Expand Down
12 changes: 3 additions & 9 deletions region/brinstar/green/Green Brinstar Fireflea Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,11 @@
"requires": [
{"or": [
{"and": [
{"resetRoom": {
"nodes": [1]
}},
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 630}
]},
{"and": [
{"resetRoom": {
"nodes": [2]
}},
{"resetRoom": {"nodes": [2]}},
{"cycleFrames": 900}
]}
]}
Expand Down Expand Up @@ -275,9 +271,7 @@
{"thornHits": 1},
{"or": [
"h_spikeSuitThornHitLeniency",
{"resetRoom": {
"nodes": [1, 2]
}}
{"resetRoom": {"nodes": [1, 2]}}
]},
"canSpikeSuit",
{"shinespark": {"frames": 5, "excessFrames": 5}}
Expand Down
38 changes: 10 additions & 28 deletions region/brinstar/green/Green Brinstar Main Shaft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4845,8 +4845,8 @@
"name": "Cross-Room Spring Ball Bounce",
"entranceCondition": {
"comeInWithSpringBallBounce": {
"movementType": "any",
"speedBooster": true,
"movementType": "any",
"remoteAndLandingMinTiles": [[42, 0]]
}
},
Expand Down Expand Up @@ -5011,21 +5011,15 @@
"requires": [
{"or": [
{"and": [
{"resetRoom": {
"nodes": [2, 3, 4]
}},
{"resetRoom": {"nodes": [2, 3, 4]}},
{"cycleFrames": 660}
]},
{"and": [
{"resetRoom": {
"nodes": [5, 6]
}},
{"resetRoom": {"nodes": [5, 6]}},
{"cycleFrames": 760}
]},
{"and": [
{"resetRoom": {
"nodes": [1]
}},
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 1700}
]}
]},
Expand All @@ -5048,27 +5042,19 @@
"ScrewAttack",
{"or": [
{"and": [
{"resetRoom": {
"nodes": [2, 3]
}},
{"resetRoom": {"nodes": [2, 3]}},
{"cycleFrames": 375}
]},
{"and": [
{"resetRoom": {
"nodes": [4]
}},
{"resetRoom": {"nodes": [4]}},
{"cycleFrames": 445}
]},
{"and": [
{"resetRoom": {
"nodes": [5, 6]
}},
{"resetRoom": {"nodes": [5, 6]}},
{"cycleFrames": 600}
]},
{"and": [
{"resetRoom": {
"nodes": [1]
}},
{"resetRoom": {"nodes": [1]}},
{"cycleFrames": 1530}
]}
]}
Expand Down Expand Up @@ -5190,15 +5176,11 @@
"requires": [
{"or": [
{"and": [
{"resetRoom": {
"nodes": [7]
}},
{"resetRoom": {"nodes": [7]}},
{"cycleFrames": 270}
]},
{"and": [
{"resetRoom": {
"nodes": [8]
}},
{"resetRoom": {"nodes": [8]}},
{"cycleFrames": 620}
]}
]}
Expand Down
8 changes: 3 additions & 5 deletions region/brinstar/green/Green Hill Zone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,9 +1519,7 @@
"link": [3, 3],
"name": "Sidehopper Farm",
"requires": [
{"resetRoom": {
"nodes": [3]
}},
{"resetRoom": {"nodes": [3]}},
{"or": [
{"and": [
"Plasma",
Expand All @@ -1541,8 +1539,8 @@
]}
]}
],
"farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}],
"resetsObstacles": ["B"]
"resetsObstacles": ["B"],
"farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}]
},
{
"id": 65,
Expand Down
Loading