Skip to content

Commit 1f75f38

Browse files
osse101osse101
authored
Merge pull request #2739 from blkerby/starting-down-tiles
Split startingDownTile into steep/gentle and clarify its handling
2 parents 55faf98 + 5683ee3 commit 1f75f38

10 files changed

Lines changed: 104 additions & 72 deletions

File tree

‎region/crateria/east/East Ocean.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"usedTiles": 20,
146146
"steepUpTiles": 4,
147147
"steepDownTiles": 2,
148-
"startingDownTiles": 1,
148+
"startingSteepDownTiles": 1,
149149
"openEnd": 0
150150
}},
151151
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
@@ -182,7 +182,7 @@
182182
"usedTiles": 20,
183183
"steepUpTiles": 4,
184184
"steepDownTiles": 2,
185-
"startingDownTiles": 1,
185+
"startingSteepDownTiles": 1,
186186
"openEnd": 0
187187
}},
188188
"canShinechargeMovementTricky",
@@ -207,7 +207,7 @@
207207
"usedTiles": 20,
208208
"steepUpTiles": 4,
209209
"steepDownTiles": 2,
210-
"startingDownTiles": 1,
210+
"startingSteepDownTiles": 1,
211211
"openEnd": 0
212212
}},
213213
"canShinechargeMovementTricky",
@@ -352,7 +352,7 @@
352352
"usedTiles": 20,
353353
"steepUpTiles": 4,
354354
"steepDownTiles": 2,
355-
"startingDownTiles": 1,
355+
"startingSteepDownTiles": 1,
356356
"openEnd": 0
357357
}},
358358
"canLongChainTemporaryBlue",
@@ -823,7 +823,7 @@
823823
"usedTiles": 20,
824824
"steepUpTiles": 4,
825825
"steepDownTiles": 2,
826-
"startingDownTiles": 1,
826+
"startingSteepDownTiles": 1,
827827
"openEnd": 0
828828
}},
829829
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
@@ -892,7 +892,7 @@
892892
"openEnd": 1,
893893
"steepUpTiles": 3,
894894
"steepDownTiles": 2,
895-
"startingDownTiles": 1
895+
"startingSteepDownTiles": 1
896896
}
897897
}
898898
},
@@ -914,7 +914,7 @@
914914
"openEnd": 1,
915915
"steepUpTiles": 3,
916916
"steepDownTiles": 2,
917-
"startingDownTiles": 1
917+
"startingSteepDownTiles": 1
918918
},
919919
"landingRunway": {
920920
"length": 5,
@@ -941,7 +941,7 @@
941941
"openEnd": 1,
942942
"steepUpTiles": 3,
943943
"steepDownTiles": 2,
944-
"startingDownTiles": 1
944+
"startingSteepDownTiles": 1
945945
},
946946
"landingRunway": {
947947
"length": 5,
@@ -967,7 +967,7 @@
967967
"usedTiles": 21,
968968
"steepUpTiles": 3,
969969
"steepDownTiles": 3,
970-
"startingDownTiles": 1,
970+
"startingSteepDownTiles": 1,
971971
"openEnd": 0
972972
}},
973973
"canXRayTurnaround"
@@ -976,7 +976,7 @@
976976
"usedTiles": 18,
977977
"steepUpTiles": 2,
978978
"steepDownTiles": 3,
979-
"startingDownTiles": 1,
979+
"startingSteepDownTiles": 1,
980980
"openEnd": 0
981981
}}
982982
]},
@@ -1002,7 +1002,7 @@
10021002
"usedTiles": 21,
10031003
"steepUpTiles": 3,
10041004
"steepDownTiles": 3,
1005-
"startingDownTiles": 1,
1005+
"startingSteepDownTiles": 1,
10061006
"openEnd": 0
10071007
}},
10081008
"canXRayTurnaround"
@@ -1011,7 +1011,7 @@
10111011
"usedTiles": 15,
10121012
"steepUpTiles": 2,
10131013
"steepDownTiles": 3,
1014-
"startingDownTiles": 1,
1014+
"startingSteepDownTiles": 1,
10151015
"openEnd": 0
10161016
}}
10171017
]},
@@ -1034,7 +1034,7 @@
10341034
"usedTiles": 18,
10351035
"steepUpTiles": 2,
10361036
"steepDownTiles": 2,
1037-
"startingDownTiles": 1,
1037+
"startingSteepDownTiles": 1,
10381038
"openEnd": 0
10391039
}},
10401040
"canBlueSpaceJump",
@@ -1658,7 +1658,7 @@
16581658
"usedTiles": 22,
16591659
"steepUpTiles": 3,
16601660
"steepDownTiles": 3,
1661-
"startingDownTiles": 1,
1661+
"startingSteepDownTiles": 1,
16621662
"openEnd": 0
16631663
}},
16641664
{"shineChargeFrames": 135}
@@ -1682,7 +1682,7 @@
16821682
"usedTiles": 17,
16831683
"steepUpTiles": 2,
16841684
"steepDownTiles": 3,
1685-
"startingDownTiles": 1,
1685+
"startingSteepDownTiles": 1,
16861686
"openEnd": 0
16871687
}},
16881688
{"shineChargeFrames": 115}
@@ -1706,7 +1706,7 @@
17061706
"usedTiles": 17,
17071707
"steepUpTiles": 2,
17081708
"steepDownTiles": 3,
1709-
"startingDownTiles": 1,
1709+
"startingSteepDownTiles": 1,
17101710
"openEnd": 0
17111711
}},
17121712
{"shineChargeFrames": 135}
@@ -1730,7 +1730,7 @@
17301730
"usedTiles": 22,
17311731
"steepUpTiles": 3,
17321732
"steepDownTiles": 3,
1733-
"startingDownTiles": 1,
1733+
"startingSteepDownTiles": 1,
17341734
"openEnd": 0
17351735
}},
17361736
{"shinespark": {"frames": 6, "excessFrames": 0}}
@@ -1754,7 +1754,7 @@
17541754
"usedTiles": 22,
17551755
"steepUpTiles": 3,
17561756
"steepDownTiles": 3,
1757-
"startingDownTiles": 1,
1757+
"startingSteepDownTiles": 1,
17581758
"openEnd": 0
17591759
}},
17601760
{"shinespark": {"frames": 10, "excessFrames": 0}}
@@ -1778,7 +1778,7 @@
17781778
"usedTiles": 17,
17791779
"steepUpTiles": 2,
17801780
"steepDownTiles": 3,
1781-
"startingDownTiles": 1,
1781+
"startingSteepDownTiles": 1,
17821782
"openEnd": 0
17831783
}},
17841784
{"shineChargeFrames": 160}

‎region/crateria/west/Gauntlet Entrance.json‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"usedTiles": 18,
103103
"steepUpTiles": 2,
104104
"steepDownTiles": 1,
105-
"startingDownTiles": 0,
106105
"openEnd": 1
107106
}},
108107
{"and": [
@@ -114,7 +113,7 @@
114113
"usedTiles": 21,
115114
"steepUpTiles": 2,
116115
"steepDownTiles": 2,
117-
"startingDownTiles": 1,
116+
"startingSteepDownTiles": 1,
118117
"openEnd": 0
119118
}}
120119
]}
@@ -198,7 +197,6 @@
198197
"usedTiles": 18,
199198
"steepUpTiles": 2,
200199
"steepDownTiles": 1,
201-
"startingDownTiles": 0,
202200
"openEnd": 1
203201
}},
204202
{"shinespark": {"frames": 45, "excessFrames": 0}}
@@ -228,7 +226,7 @@
228226
"usedTiles": 21,
229227
"steepUpTiles": 2,
230228
"steepDownTiles": 2,
231-
"startingDownTiles": 1,
229+
"startingSteepDownTiles": 1,
232230
"openEnd": 0
233231
}},
234232
{"shinespark": {"frames": 45, "excessFrames": 0}}
@@ -252,7 +250,7 @@
252250
"usedTiles": 21,
253251
"steepUpTiles": 2,
254252
"steepDownTiles": 2,
255-
"startingDownTiles": 1,
253+
"startingSteepDownTiles": 1,
256254
"openEnd": 0
257255
}},
258256
{"shinespark": {"frames": 45, "excessFrames": 0}}
@@ -763,7 +761,6 @@
763761
"usedTiles": 18,
764762
"steepUpTiles": 2,
765763
"steepDownTiles": 1,
766-
"startingDownTiles": 0,
767764
"openEnd": 1
768765
}},
769766
{"and": [
@@ -775,7 +772,7 @@
775772
"usedTiles": 21,
776773
"steepUpTiles": 2,
777774
"steepDownTiles": 2,
778-
"startingDownTiles": 1,
775+
"startingSteepDownTiles": 1,
779776
"openEnd": 0
780777
}}
781778
]}
@@ -1235,7 +1232,7 @@
12351232
"usedTiles": 18,
12361233
"steepUpTiles": 1,
12371234
"steepDownTiles": 3,
1238-
"startingDownTiles": 2,
1235+
"startingSteepDownTiles": 2,
12391236
"openEnd": 1
12401237
}},
12411238
{"shinespark": {"frames": 45, "excessFrames": 0}}
@@ -1262,7 +1259,7 @@
12621259
"usedTiles": 22,
12631260
"steepUpTiles": 2,
12641261
"steepDownTiles": 3,
1265-
"startingDownTiles": 2,
1262+
"startingSteepDownTiles": 2,
12661263
"openEnd": 0
12671264
}},
12681265
{"shinespark": {"frames": 45, "excessFrames": 0}}
@@ -1288,7 +1285,7 @@
12881285
"usedTiles": 22,
12891286
"steepUpTiles": 2,
12901287
"steepDownTiles": 3,
1291-
"startingDownTiles": 2,
1288+
"startingSteepDownTiles": 2,
12921289
"openEnd": 0
12931290
}},
12941291
{"shinespark": {"frames": 45, "excessFrames": 0}}

‎region/maridia/inner-yellow/Plasma Spark Room.json‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@
198198
"HiJump",
199199
{"canShineCharge": {
200200
"usedTiles": 42,
201-
"gentleDownTiles": 2,
202-
"steepUpTiles": 3,
203-
"startingDownTiles": 2,
201+
"gentleUpTiles": 2,
202+
"steepUpTiles": 1,
203+
"steepDownTiles": 3,
204204
"openEnd": 1
205205
}},
206206
"canXRayTurnaround",
@@ -706,7 +706,9 @@
706706
"openEnd": 1,
707707
"gentleDownTiles": 2,
708708
"steepUpTiles": 3,
709-
"startingDownTiles": 2
709+
"steepDownTiles": 1,
710+
"startingSteepDownTiles": 1,
711+
"startingGentleDownTiles": 2
710712
}
711713
},
712714
"flashSuitChecked": true
@@ -1358,7 +1360,8 @@
13581360
"gentleDownTiles": 2,
13591361
"steepUpTiles": 1,
13601362
"steepDownTiles": 1,
1361-
"startingDownTiles": 1,
1363+
"startingSteepDownTiles": 1,
1364+
"startingGentleDownTiles": 2,
13621365
"openEnd": 2
13631366
}},
13641367
{"shinespark": {"frames": 43, "excessFrames": 3}}
@@ -1572,7 +1575,8 @@
15721575
"gentleDownTiles": 2,
15731576
"steepUpTiles": 1,
15741577
"steepDownTiles": 1,
1575-
"startingDownTiles": 1,
1578+
"startingSteepDownTiles": 1,
1579+
"startingGentleDownTiles": 2,
15761580
"openEnd": 2
15771581
}},
15781582
{"shinespark": {"frames": 10}}
@@ -1603,7 +1607,8 @@
16031607
"gentleDownTiles": 2,
16041608
"steepUpTiles": 1,
16051609
"steepDownTiles": 1,
1606-
"startingDownTiles": 1,
1610+
"startingSteepDownTiles": 1,
1611+
"startingGentleDownTiles": 2,
16071612
"openEnd": 2
16081613
}},
16091614
"canChainTemporaryBlue",
@@ -1627,9 +1632,9 @@
16271632
"Gravity",
16281633
{"canShineCharge": {
16291634
"usedTiles": 42,
1630-
"gentleDownTiles": 2,
1631-
"steepUpTiles": 3,
1632-
"startingDownTiles": 2,
1635+
"gentleUpTiles": 2,
1636+
"steepUpTiles": 1,
1637+
"steepDownTiles": 3,
16331638
"openEnd": 1
16341639
}},
16351640
"canLongChainTemporaryBlue",

‎region/maridia/outer/Fish Tank.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
"gentleUpTiles": 1,
197197
"gentleDownTiles": 1,
198198
"steepDownTiles": 1,
199-
"startingDownTiles": 1
199+
"startingSteepDownTiles": 1
200200
},
201201
"obstruction": [1, 0]
202202
}

0 commit comments

Comments
 (0)