Skip to content

Commit db834e7

Browse files
committed
Add resetRoom, notes
1 parent 7580eed commit db834e7

7 files changed

Lines changed: 33 additions & 12 deletions

File tree

region/crateria/east/Crab Maze.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@
108108
"nodes": [1]
109109
}},
110110
"Morph",
111-
{"refill": ["Energy", "PowerBomb"]}
111+
{"or": [
112+
"Wave",
113+
"Plasma",
114+
"Spazer",
115+
"canUseGrapple"
116+
]},
117+
{"partialRefill": {"type": "PowerBomb", "limit": 5}},
118+
{"partialRefill": {"type": "Energy", "limit": 200}}
112119
]
113120
},
114121
{

region/maridia/inner-pink/Botwoon Energy Tank Room.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@
173173
"link": [1, 1],
174174
"name": "Puyo Farm",
175175
"requires": [
176+
{"resetRoom": {
177+
"nodes": [1]
178+
}},
176179
{"or": [
177180
"Spazer",
178181
"Wave",

region/maridia/outer/Crab Tunnel.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,14 @@
173173
}},
174174
{"partialRefill": {
175175
"type": "Energy",
176-
"limit": 200
176+
"limit": 100
177177
}},
178178
{"partialRefill": {
179179
"type": "PowerBomb",
180-
"limit": 4
180+
"limit": 3
181181
}}
182-
]
182+
],
183+
"devNote": "Farm cycle: 6seconds."
183184
},
184185
{
185186
"id": 6,
@@ -452,13 +453,14 @@
452453
}},
453454
{"partialRefill": {
454455
"type": "Energy",
455-
"limit": 200
456+
"limit": 100
456457
}},
457458
{"partialRefill": {
458459
"type": "PowerBomb",
459-
"limit": 4
460+
"limit": 3
460461
}}
461-
]
462+
],
463+
"devNote": "Farm cycle: 6seconds."
462464
},
463465
{
464466
"id": 23,

region/norfair/east/Frog Speedway.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@
107107
]}
108108
]},
109109
{"refill": ["PowerBomb"]}
110+
],
111+
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
112+
"devNote": [
113+
"Health Bomb ends at 50 energy.",
114+
"One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."
110115
]
111116
},
112117
{

region/norfair/east/Speed Booster Hall.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
"name": "Geruta Farm",
106106
"requires": [
107107
"h_heatProof",
108+
{"resetRoom": {
109+
"nodes": [1]
110+
}},
108111
{"or": [
109112
"ScrewAttack",
110113
"Ice",

region/norfair/west/Crumble Shaft.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -469,15 +469,13 @@
469469
"name": "Sova Farm",
470470
"requires": [
471471
"h_heatProof",
472+
"canDodgeWhileShooting",
472473
{"or": [
473474
{"and": [
474475
"canCrumbleJump",
475476
"canConsecutiveWalljump"
476477
]},
477-
{"and": [
478-
"h_canUseSpringBall",
479-
"canDodgeWhileShooting"
480-
]}
478+
"h_canUseSpringBall"
481479
]},
482480
{"resetRoom": {
483481
"nodes": [1, 2]

region/norfair/west/Ice Beam Gate Room.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,11 @@
618618
{
619619
"id": 28,
620620
"link": [3, 3],
621-
"name": "Mella, and Sm. Dessgeega Farm",
621+
"name": "Mella and Sm. Dessgeega Farm",
622622
"requires": [
623+
{"resetRoom": {
624+
"nodes": [3]
625+
}},
623626
{"or": [
624627
"ScrewAttack",
625628
"Wave",

0 commit comments

Comments
 (0)