Skip to content

Commit c8c4c7e

Browse files
authored
Merge pull request #1532 from kjbranch/trivial-ice
Add and use canTrivialUseFrozenEnemies
2 parents d5ee132 + 31b910c commit c8c4c7e

14 files changed

Lines changed: 69 additions & 55 deletions

region/brinstar/kraid/Kraid Eye Door Room.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
"name": "G-Mode Setup - Get Hit By Zeb",
451451
"requires": [
452452
{"or":[
453-
"canUseFrozenEnemies",
453+
"canTrickyUseFrozenEnemies",
454454
"canTrickyJump"
455455
]}
456456
],
@@ -628,7 +628,7 @@
628628
"name": "G-Mode Setup - Get Hit By Zeb",
629629
"requires": [
630630
{"or":[
631-
"canUseFrozenEnemies",
631+
"canTrickyUseFrozenEnemies",
632632
"canTrickyJump"
633633
]}
634634
],

region/brinstar/red/Red Tower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,9 +2154,9 @@
21542154
},
21552155
{
21562156
"link": [7, 6],
2157-
"name": "Use Frozen Enemies",
2157+
"name": "Frozen Ripper Platforms",
21582158
"requires": [
2159-
"canUseFrozenEnemies",
2159+
"canTrivialUseFrozenEnemies",
21602160
{"or": [
21612161
"HiJump",
21622162
"canWalljump",
@@ -2293,9 +2293,9 @@
22932293
},
22942294
{
22952295
"link": [9, 5],
2296-
"name": "Use Frozen Enemies",
2296+
"name": "Frozen Ripper Platforms",
22972297
"requires": [
2298-
"canUseFrozenEnemies",
2298+
"canTrivialUseFrozenEnemies",
22992299
{"obstaclesNotCleared": ["B"]}
23002300
]
23012301
},

region/crateria/central/Crateria Super Room.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
"link": [2, 2],
773773
"name": "Leave with Runway, Frozen Boyon Bridge",
774774
"requires": [
775-
"canUseFrozenEnemies"
775+
"canTrivialUseFrozenEnemies"
776776
],
777777
"exitCondition": {
778778
"leaveWithRunway": {
@@ -819,7 +819,7 @@
819819
"link": [2, 3],
820820
"name": "Frozen Boyon Runway",
821821
"requires": [
822-
"canUseFrozenEnemies",
822+
"canTrivialUseFrozenEnemies",
823823
{"canShineCharge": {
824824
"usedTiles": 33,
825825
"openEnd": 2
@@ -831,7 +831,7 @@
831831
"link": [2, 3],
832832
"name": "Frozen Boyon Runway and Fast Walljumps",
833833
"requires": [
834-
"canUseFrozenEnemies",
834+
"canTrivialUseFrozenEnemies",
835835
"canShinechargeMovementComplex",
836836
"canFastWalljumpClimb",
837837
{"canShineCharge": {
@@ -848,7 +848,7 @@
848848
"link": [2, 3],
849849
"name": "Frozen Boyon Runway and HiJump",
850850
"requires": [
851-
"canUseFrozenEnemies",
851+
"canTrivialUseFrozenEnemies",
852852
"canShinechargeMovement",
853853
"HiJump",
854854
{"canShineCharge": {
@@ -929,7 +929,7 @@
929929
{"ammo": {"type": "PowerBomb", "count": 9}},
930930
"canBeVeryPatient",
931931
{"or": [
932-
"canUseFrozenEnemies",
932+
"canTrivialUseFrozenEnemies",
933933
"canTrickyJump",
934934
{"and": [
935935
"ScrewAttack",

region/maridia/inner-yellow/Maridia Elevator Room.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
},
259259
"requires": [
260260
{"or": [
261-
"canUseFrozenEnemies",
261+
"canTrivialUseFrozenEnemies",
262262
{"and": [
263263
"canPreciseWalljump",
264264
"canStaggeredWalljump"
@@ -445,7 +445,7 @@
445445
"link": [2, 3],
446446
"name": "Frozen Rippers",
447447
"requires": [
448-
"canUseFrozenEnemies"
448+
"canTrivialUseFrozenEnemies"
449449
]
450450
},
451451
{
@@ -559,7 +559,7 @@
559559
},
560560
"requires": [
561561
{"or": [
562-
"canUseFrozenEnemies",
562+
"canTrivialUseFrozenEnemies",
563563
{"and": [
564564
"canPreciseWalljump",
565565
"canStaggeredWalljump"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
"link": [2, 1],
328328
"name": "Frozen Wall Pirate Plasma Escape",
329329
"requires": [
330-
"canUseFrozenEnemies",
330+
"canTrickyUseFrozenEnemies",
331331
"canPreciseWalljump"
332332
],
333333
"note": [

region/norfair/crocomire/Grapple Tutorial Room 3.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
{"or": [
163163
"Gravity",
164164
"HiJump",
165-
"canUseFrozenEnemies",
165+
"canTrickyUseFrozenEnemies",
166166
"canTrickyJump"
167167
]}
168168
],
@@ -260,7 +260,7 @@
260260
"canPreciseGrapple",
261261
"canInsaneJump"
262262
]},
263-
"canUseFrozenEnemies"
263+
"canTrickyUseFrozenEnemies"
264264
]}
265265
],
266266
"exitCondition": {

region/norfair/crocomire/Post Crocomire Jump Room.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@
10171017
"link": [5, 1],
10181018
"name": "PCJR Frozen Mella Door",
10191019
"requires": [
1020-
"canUseFrozenEnemies",
1020+
"canTrickyUseFrozenEnemies",
10211021
"canManipulateMellas",
10221022
{"or": [
10231023
{"obstaclesCleared": ["B"]},
@@ -1044,7 +1044,7 @@
10441044
"canSpringBallJumpMidAir"
10451045
]},
10461046
{"and": [
1047-
"canUseFrozenEnemies",
1047+
"canTrickyUseFrozenEnemies",
10481048
{"and": [
10491049
"HiJump",
10501050
"canWalljump",
@@ -1121,7 +1121,7 @@
11211121
"link": [5, 3],
11221122
"name": "Indy Jones Short Mella",
11231123
"requires": [
1124-
"canUseFrozenEnemies",
1124+
"canTrickyUseFrozenEnemies",
11251125
"canManipulateMellas",
11261126
"HiJump",
11271127
{"or": [
@@ -1138,7 +1138,7 @@
11381138
"link": [5, 3],
11391139
"name": "Indy Jones Long Mella",
11401140
"requires": [
1141-
"canUseFrozenEnemies",
1141+
"canTrickyUseFrozenEnemies",
11421142
"canManipulateMellas",
11431143
{"or": [
11441144
{"and": [

region/norfair/east/Cathedral Entrance.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
"name": "Cathedral Entrance Left Door Frozen Sova Step",
373373
"notable": true,
374374
"requires": [
375-
"canUseFrozenEnemies",
375+
"canTrickyUseFrozenEnemies",
376376
"canTrickyJump",
377377
"canCameraManip",
378378
{"heatFrames": 1100}
@@ -390,7 +390,7 @@
390390
"link": [3, 2],
391391
"name": "Frozen Sova",
392392
"requires": [
393-
"canUseFrozenEnemies",
393+
"canTrickyUseFrozenEnemies",
394394
{"heatFrames": 950}
395395
]
396396
},

region/norfair/east/Norfair Reserve Tank Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
{"lavaFrames": 20}
448448
]},
449449
{"and": [
450-
"canUseFrozenEnemies",
450+
"canTrickyUseFrozenEnemies",
451451
{"obstaclesNotCleared": ["A"]},
452452
{"lavaFrames": 30}
453453
]},

region/norfair/east/Single Chamber.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@
673673
"link": [3, 4],
674674
"name": "Frozen Enemies",
675675
"requires": [
676-
"canUseFrozenEnemies",
676+
"canTrickyUseFrozenEnemies",
677677
{"heatFrames": 1300}
678678
],
679679
"note": [
@@ -857,7 +857,7 @@
857857
"link": [4, 6],
858858
"name": "Frozen Enemies",
859859
"requires": [
860-
"canUseFrozenEnemies",
860+
"canTrickyUseFrozenEnemies",
861861
{"heatFrames": 830}
862862
],
863863
"note": "Wait for the Alcoon to walk off the edge. Use it and the Multiviola as platforms."

0 commit comments

Comments
 (0)