Skip to content

Commit e1991f1

Browse files
committed
move Infested Cavern checks
1 parent 6f93fa4 commit e1991f1

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

worlds/crosscode/locations.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@
241241
LocationData(code=3235824232, name="Ba'kii: Bazaar House", area='heat-village', access=AccessInfo(region={'linear': '11', 'open': 'open5'}, cond=[ChestKeyCondition(default_level='Silver')])),
242242
LocationData(code=3235824233, name='Garden: Dripping Cave', area='jungle', access=AccessInfo(region={'linear': '23', 'open': 'open10'}, cond=[ItemCondition(item_name='Wave', amount=1), ChestKeyCondition(default_level='Silver')])),
243243
LocationData(code=3235824234, name='Garden: Tranquility Pond', area='jungle', access=AccessInfo(region={'linear': '23', 'open': 'open10'}, cond=[ItemCondition(item_name='Wave', amount=1), ChestKeyCondition(default_level='Gold')])),
244-
LocationData(code=3235824235, name='Garden: Infested Cavern Left', area='jungle', access=AccessInfo(region={'linear': '25', 'open': 'open10'}, cond=[ItemCondition(item_name='Wave', amount=1), ChestKeyCondition(default_level='Bronze')])),
245-
LocationData(code=3235824236, name='Garden: Infested Cavern Right', area='jungle', access=AccessInfo(region={'linear': '25', 'open': 'open10'}, cond=[ItemCondition(item_name='Wave', amount=1), ChestKeyCondition(default_level='Silver')])),
246244
LocationData(code=3235824237, name="Garden: V'rda Vil West Lower Left", area='jungle', access=AccessInfo(region={'linear': '23', 'open': 'open10'}, cond=[ChestKeyCondition(default_level='Gold')])),
247245
LocationData(code=3235824238, name="Garden: V'rda Vil West Upper", area='jungle', access=AccessInfo(region={'linear': '23', 'open': 'open10'}, cond=[ChestKeyCondition(default_level='Silver')])),
248246
LocationData(code=3235824239, name="Garden: V'rda Vil West Lower Right", area='jungle', access=AccessInfo(region={'linear': '23', 'open': 'open10'}, cond=[ChestKeyCondition(default_level='Bronze')])),
@@ -353,6 +351,8 @@
353351
LocationData(code=3235824344, name="So'najiz U1: Flaming Conveyance", area='wave-dng', access=AccessInfo(region={'linear': '26.5', 'open': 'open14.2'}, cond=[ChestKeyCondition(default_level='Default')])),
354352
LocationData(code=3235824077, name='Bergen: Omni Gilders Basement Left', area='bergen', metadata={'quest': True}, access=AccessInfo(region={'linear': '4', 'open': 'open4.1'}, cond=[OrCondition(subconditions=[ItemCondition(item_name='Heat', amount=1), ItemCondition(item_name='Mine Key', amount=1)]), QuestCondition(quest_name='The Legendary Bunny'), ChestKeyCondition(default_level='Bronze')])),
355353
LocationData(code=3235824522, name='Trail: Horncave', area='bergen-trails', metadata={'quest': True}, access=AccessInfo(region={'linear': '3', 'open': 'open3'}, cond=[QuestCondition(quest_name='The Goatfather'), ChestKeyCondition(default_level='Default')])),
354+
LocationData(code=3235824235, name='Garden: Infested Cavern Left', area='jungle', metadata={'quest': True}, access=AccessInfo(region={'linear': '25', 'open': 'open10'}, cond=[ItemCondition(item_name='Wave', amount=1), ChestKeyCondition(default_level='Bronze')])),
355+
LocationData(code=3235824236, name='Garden: Infested Cavern Right', area='jungle', metadata={'quest': True}, access=AccessInfo(region={'linear': '25', 'open': 'open10'}, cond=[ItemCondition(item_name='Wave', amount=1), ChestKeyCondition(default_level='Silver')])),
356356
LocationData(code=3235824523, name='Garden: Chilled Den', area='jungle', metadata={'quest': True}, access=AccessInfo(region={'linear': '10', 'open': 'open10'}, cond=[ItemCondition(item_name='Heat', amount=1), ItemCondition(item_name='Cold', amount=1), ChestKeyCondition(default_level='Silver')])),
357357
LocationData(code=3235824345, name='Talatu Introductions', area='autumn-area', access=AccessInfo(region={'linear': '3', 'open': 'open3'})),
358358
LocationData(code=3235824346, name='Schneider Guild Pass', area='autumn-area', access=AccessInfo(region={'linear': '3.1', 'open': 'open3.1'})),
@@ -1138,8 +1138,6 @@
11381138
3235824232,
11391139
3235824233,
11401140
3235824234,
1141-
3235824235,
1142-
3235824236,
11431141
3235824237,
11441142
3235824238,
11451143
3235824239,
@@ -1250,6 +1248,8 @@
12501248
3235824344,
12511249
3235824077,
12521250
3235824522,
1251+
3235824235,
1252+
3235824236,
12531253
3235824523,
12541254
}
12551255

@@ -1488,8 +1488,6 @@
14881488
locations_dict["Ba'kii: Bazaar House"],
14891489
locations_dict['Garden: Dripping Cave'],
14901490
locations_dict['Garden: Tranquility Pond'],
1491-
locations_dict['Garden: Infested Cavern Left'],
1492-
locations_dict['Garden: Infested Cavern Right'],
14931491
locations_dict["Garden: V'rda Vil West Lower Left"],
14941492
locations_dict["Garden: V'rda Vil West Upper"],
14951493
locations_dict["Garden: V'rda Vil West Lower Right"],
@@ -1600,6 +1598,8 @@
16001598
locations_dict["So'najiz U1: Flaming Conveyance"],
16011599
locations_dict['Bergen: Omni Gilders Basement Left'],
16021600
locations_dict['Trail: Horncave'],
1601+
locations_dict['Garden: Infested Cavern Left'],
1602+
locations_dict['Garden: Infested Cavern Right'],
16031603
locations_dict['Garden: Chilled Den'],
16041604
locations_dict['Talatu Introductions'],
16051605
locations_dict['Schneider Guild Pass'],
@@ -2472,8 +2472,6 @@
24722472
"Gaia's Garden": {
24732473
locations_dict['Garden: Dripping Cave'],
24742474
locations_dict['Garden: Tranquility Pond'],
2475-
locations_dict['Garden: Infested Cavern Left'],
2476-
locations_dict['Garden: Infested Cavern Right'],
24772475
locations_dict["Garden: V'rda Vil West Lower Left"],
24782476
locations_dict["Garden: V'rda Vil West Upper"],
24792477
locations_dict["Garden: V'rda Vil West Lower Right"],
@@ -2535,6 +2533,8 @@
25352533
locations_dict['Garden: Ringing River Upper'],
25362534
locations_dict['Garden: Old Timber'],
25372535
locations_dict['Garden: Basin Keep Entrance'],
2536+
locations_dict['Garden: Infested Cavern Left'],
2537+
locations_dict['Garden: Infested Cavern Right'],
25382538
locations_dict['Garden: Chilled Den'],
25392539
locations_dict["Gaia's Garden Trailblazing"],
25402540
locations_dict["Gaia's Garden Collect"],
@@ -2547,8 +2547,6 @@
25472547
"Gaia's Garden Chests": {
25482548
locations_dict['Garden: Dripping Cave'],
25492549
locations_dict['Garden: Tranquility Pond'],
2550-
locations_dict['Garden: Infested Cavern Left'],
2551-
locations_dict['Garden: Infested Cavern Right'],
25522550
locations_dict["Garden: V'rda Vil West Lower Left"],
25532551
locations_dict["Garden: V'rda Vil West Upper"],
25542552
locations_dict["Garden: V'rda Vil West Lower Right"],
@@ -2610,6 +2608,8 @@
26102608
locations_dict['Garden: Ringing River Upper'],
26112609
locations_dict['Garden: Old Timber'],
26122610
locations_dict['Garden: Basin Keep Entrance'],
2611+
locations_dict['Garden: Infested Cavern Left'],
2612+
locations_dict['Garden: Infested Cavern Right'],
26132613
locations_dict['Garden: Chilled Den'],
26142614
},
26152615
"Basin Keep": {

0 commit comments

Comments
 (0)