Skip to content

Commit de5d382

Browse files
authored
Merge pull request #2668 from kjbranch/bowling-flag
Add f_UsedBowlingStatue flag
2 parents 43f1df0 + dff6793 commit de5d382

4 files changed

Lines changed: 17 additions & 2 deletions

File tree

items.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,12 @@
8080
"f_ShaktoolDoneDigging",
8181
"f_TourianOpen",
8282
"f_UsedAcidChozoStatue",
83+
"f_UsedBowlingStatue",
8384
"f_ZebesAwake",
8485
"f_ZebesSetAblaze",
8586
"f_MotherBrainGlassBroken"
87+
],
88+
"devNote": [
89+
"The f_UsedBowlingStatue is not a vanilla flag, but is included as a possible randomizer objective."
8690
]
8791
}

region/wreckedship/main/Bowling Alley.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,9 @@
935935
{"types": ["super"], "requires": []},
936936
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
937937
],
938-
"flashSuitChecked": true
938+
"setsFlags": ["f_UsedBowlingStatue"],
939+
"flashSuitChecked": true,
940+
"note": "Samus's shinecharge frames are paused while riding the Bowling Chozo."
939941
},
940942
{
941943
"id": 83,
@@ -961,7 +963,9 @@
961963
{"types": ["super"], "requires": []},
962964
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
963965
],
964-
"flashSuitChecked": true
966+
"setsFlags": ["f_UsedBowlingStatue"],
967+
"flashSuitChecked": true,
968+
"note": "Samus's shinecharge frames are paused while riding the Bowling Chozo."
965969
},
966970
{
967971
"id": 24,
@@ -2186,6 +2190,7 @@
21862190
"Morph"
21872191
],
21882192
"clearsObstacles": ["C"],
2193+
"setsFlags": ["f_UsedBowlingStatue"],
21892194
"flashSuitChecked": true
21902195
},
21912196
{
@@ -2203,6 +2208,7 @@
22032208
{"spikeHits": 1}
22042209
]}
22052210
],
2211+
"setsFlags": ["f_UsedBowlingStatue"],
22062212
"flashSuitChecked": true,
22072213
"note": [
22082214
"Quickly unmorph and jump to the left edge to take as few spike hits as possible.",
@@ -2228,6 +2234,7 @@
22282234
"exitCondition": {
22292235
"leaveNormally": {}
22302236
},
2237+
"setsFlags": ["f_UsedBowlingStatue"],
22312238
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
22322239
"flashSuitChecked": true,
22332240
"note": [

schema/m3-items.schema.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@
168168
"description": "The name of a game flag, as it will appear in requirements and in the `yields` property of nodes",
169169
"pattern": "^(.*)$"
170170
}
171+
},
172+
"devNote": {
173+
"$ref" : "m3-note.schema.json#/definitions/devNote"
171174
}
172175
}
173176
}

schema/m3-string-requirements.schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"f_ShaktoolDoneDigging",
5555
"f_TourianOpen",
5656
"f_UsedAcidChozoStatue",
57+
"f_UsedBowlingStatue",
5758
"f_ZebesAwake",
5859
"f_ZebesSetAblaze",
5960
"f_MotherBrainGlassBroken",

0 commit comments

Comments
 (0)