Skip to content

Commit 05cac68

Browse files
committed
feedback update
1 parent a0a6457 commit 05cac68

3 files changed

Lines changed: 54 additions & 22 deletions

File tree

region/lowernorfair/east/Amphitheatre.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,53 @@
862862
"blueSuitChecked": true,
863863
"note": "Shinecharge on the flat portion before the third downward slope in order to fully avoid the pirate."
864864
},
865+
{
866+
"link": [2, 2],
867+
"name": "Crystal Spark",
868+
"requires": [
869+
{"or": [
870+
{"enemyKill": {
871+
"enemies": [["Yellow Space Pirate (standing)"]],
872+
"excludedWeapons": ["Bombs"]
873+
}},
874+
{"getBlueSpeed": {
875+
"usedTiles": 17,
876+
"gentleDownTiles": 6,
877+
"openEnd": 1
878+
}},
879+
{"and": [
880+
{"getBlueSpeed": {
881+
"usedTiles": 18,
882+
"gentleDownTiles": 6,
883+
"openEnd": 1
884+
}},
885+
{"doorUnlockedAtNode": 2}
886+
]}
887+
]},
888+
{"or": [
889+
{"canShineCharge": {
890+
"usedTiles": 19,
891+
"gentleDownTiles": 6,
892+
"openEnd": 0
893+
}},
894+
{"and": [
895+
{"canShineCharge": {
896+
"usedTiles": 20,
897+
"gentleDownTiles": 6,
898+
"openEnd": 0
899+
}},
900+
{"doorUnlockedAtNode": 2}
901+
]}
902+
]},
903+
"h_heatedCrystalSpark"
904+
],
905+
"unlocksDoors": [
906+
{"types": ["ammo"], "requires": []}
907+
],
908+
"flashSuitChecked": true,
909+
"blueSuitChecked": true,
910+
"devNote": "FIXME: The pirate could be an obstacle and more complex methods of killing it could be in logic."
911+
},
865912
{
866913
"id": 58,
867914
"link": [2, 2],

region/lowernorfair/east/Main Hall.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
]}
165165
]},
166166
{"heatFrames": 300},
167-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
167+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
168168
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
169169
"canRModeSparkInterrupt",
170170
{"heatFrames": 80}
@@ -190,7 +190,7 @@
190190
},
191191
"requires": [
192192
"h_CrystalFlashForReserveEnergy",
193-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
193+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
194194
{"or": [
195195
{"and": [
196196
"canReserveTriggerBufferXRay",
@@ -547,7 +547,7 @@
547547
]}
548548
]},
549549
{"heatFrames": 300},
550-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
550+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
551551
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
552552
"canRModeSparkInterrupt",
553553
{"heatFrames": 80}
@@ -572,7 +572,7 @@
572572
},
573573
"requires": [
574574
"h_CrystalFlashForReserveEnergy",
575-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
575+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
576576
{"or": [
577577
{"and": [
578578
"canReserveTriggerBufferXRay",
@@ -806,7 +806,7 @@
806806
"name": "Shinespark",
807807
"requires": [
808808
"canHorizontalMidairShinespark",
809-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
809+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
810810
{"shinespark": {"frames": 75, "excessFrames": 5}},
811811
{"heatFrames": 380}
812812
],
@@ -944,7 +944,7 @@
944944
"requires": [
945945
"canOffScreenMovement",
946946
"canHorizontalMidairShinespark",
947-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
947+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
948948
{"shinespark": {"frames": 75, "excessFrames": 5}},
949949
"h_heatedGModeOffCameraDoor"
950950
],
@@ -1091,7 +1091,7 @@
10911091
"link": [4, 4],
10921092
"name": "Leave Shinecharged - Full Runway",
10931093
"requires": [
1094-
{"canShineCharge": {"usedTiles": 24, "openEnd": 1}},
1094+
{"canShineCharge": {"usedTiles": 24.5, "openEnd": 1}},
10951095
"canShinechargeMovement",
10961096
"h_MainHallElevatorFrames",
10971097
{"heatFrames": 300},

region/lowernorfair/east/The Worst Room In The Game.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,21 +1833,6 @@
18331833
"flashSuitChecked": true,
18341834
"blueSuitChecked": true
18351835
},
1836-
{
1837-
"link": [3, 3],
1838-
"name": "Come in Shinecharging, Crystal Spark",
1839-
"entranceCondition": {
1840-
"comeInShinecharging": {
1841-
"length": 4,
1842-
"openEnd": 0
1843-
}
1844-
},
1845-
"requires": [
1846-
"h_heatedCrystalSpark"
1847-
],
1848-
"flashSuitChecked": true,
1849-
"blueSuitChecked": true
1850-
},
18511836
{
18521837
"id": 89,
18531838
"link": [3, 3],

0 commit comments

Comments
 (0)