Skip to content

Commit 0b423ea

Browse files
fenhlfenhl
committed
Change some location names for consistency with region names
1 parent 03b7479 commit 0b423ea

76 files changed

Lines changed: 952 additions & 952 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎EntranceShuffle.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ def build_one_way_targets(world: World, types_to_include: Iterable[str], exclude
141141
('KF House of Twins -> Kokiri Forest', { 'index': 0x033C })),
142142
('Interior', ('Kokiri Forest -> KF Know It All House', { 'index': 0x00C9 }),
143143
('KF Know It All House -> Kokiri Forest', { 'index': 0x026A })),
144-
('Interior', ('Kokiri Forest -> KF Kokiri Shop', { 'index': 0x00C1 }),
145-
('KF Kokiri Shop -> Kokiri Forest', { 'index': 0x0266 })),
144+
('Interior', ('Kokiri Forest -> KF Shop', { 'index': 0x00C1 }),
145+
('KF Shop -> Kokiri Forest', { 'index': 0x0266 })),
146146
('Interior', ('Lake Hylia -> LH Lab', { 'index': 0x0043 }),
147147
('LH Lab -> Lake Hylia', { 'index': 0x03CC })),
148148
('Interior', ('LH Fishing Island -> LH Fishing Hole', { 'index': 0x045F }),

‎HintList.py‎

Lines changed: 76 additions & 76 deletions
Large diffs are not rendered by default.

‎ItemPool.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
943943
world.state.collect(ItemFactory('Small Key (Fire Temple)', world))
944944

945945
if world.settings.shuffle_ganon_bosskey == 'on_lacs':
946-
placed_items['ToT Light Arrows Cutscene'] = ItemFactory('Boss Key (Ganons Castle)', world)
946+
placed_items['Temple of Time Light Arrow Cutscene'] = ItemFactory('Boss Key (Ganons Castle)', world)
947947

948948
if world.settings.shuffle_ganon_bosskey in ('stones', 'medallions', 'dungeons', 'tokens', 'hearts', 'triforce'):
949949
placed_items['Gift from Sages'] = ItemFactory('Boss Key (Ganons Castle)', world)

‎LocationList.py‎

Lines changed: 84 additions & 84 deletions
Large diffs are not rendered by default.

‎Patches.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,7 @@ def calculate_traded_flags(world):
16101610
shuffle_messages.shop_item_messages = []
16111611

16121612
# kokiri shop
1613-
shop_locations = [location for location in world.get_region('KF Kokiri Shop').locations if location.type == 'Shop'] # Need to filter because of the freestanding item in KF Shop
1613+
shop_locations = [location for location in world.get_region('KF Shop').locations if location.type == 'Shop'] # Need to filter because of the freestanding item in KF Shop
16141614
shop_objs = place_shop_items(rom, world, shop_items, messages, shop_locations, True)
16151615
shop_objs |= {0x00FC, 0x00B2, 0x0101, 0x0102, 0x00FD, 0x00C5} # Shop objects
16161616
rom.write_byte(0x2587029, len(shop_objs))
@@ -1696,9 +1696,9 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
16961696
return message
16971697

16981698
single_item_scrubs = {
1699-
0x3E: world.get_location("HF Deku Scrub Grotto"),
1699+
0x3E: world.get_location("HF Inside Fence Grotto Deku Scrub"),
17001700
0x77: world.get_location("LW Deku Scrub Near Bridge"),
1701-
0x79: world.get_location("LW Deku Scrub Grotto Front"),
1701+
0x79: world.get_location("LW Scrubs Grotto Deku Scrub Front"),
17021702
}
17031703

17041704
scrub_message_dict = {}
@@ -1810,7 +1810,7 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
18101810
if 'unique_merchants' not in world.settings.misc_hints:
18111811
update_message_by_id(messages, 0x500C, "Mysterious item! How about\x01\x05\x41100 Rupees\x05\x40?\x01\x1B\x05\x42Buy\x01Don't buy\x05\x40\x02")
18121812
else:
1813-
location = world.get_location("Kak Granny Buy Blue Potion")
1813+
location = world.get_location("Kak Odd Medicine Building Buy Blue Potion")
18141814
item_text = get_hint(get_item_generic_name(location.item), True).text
18151815
wrapped_item_text = line_wrap(item_text, False, False, False)
18161816
if wrapped_item_text != item_text:

‎World.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def __init__(self, world_id: int, settings: Settings, resolve_randomized_setting
255255
max_tokens = max(max_tokens, self.settings.ganon_bosskey_tokens)
256256
tokens = [50, 40, 30, 20, 10]
257257
for t in tokens:
258-
if f'Kak {t} Gold Skulltula Reward' not in self.settings.disabled_locations:
258+
if f'Kak House of Skulltula {t} Gold Skulltula Reward' not in self.settings.disabled_locations:
259259
max_tokens = max(max_tokens, t)
260260
break
261261
self.max_progressions['Gold Skulltula Token'] = max_tokens

‎data/Glitched World/Overworld.json‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"KF Sarias House": "True",
5151
"KF House of Twins": "True",
5252
"KF Know It All House": "True",
53-
"KF Kokiri Shop": "True",
53+
"KF Shop": "True",
5454
"KF Outside Deku Tree": "'Showed Mido Sword & Shield' or Sticks or is_adult",
5555
"Lost Woods": "True",
5656
"LW Bridge": "can_leave_forest",
@@ -87,10 +87,10 @@
8787
{
8888
"region_name": "KF Midos House",
8989
"locations": {
90-
"KF Midos Top Left Chest": "True",
91-
"KF Midos Top Right Chest": "True",
92-
"KF Midos Bottom Left Chest": "True",
93-
"KF Midos Bottom Right Chest": "True"
90+
"KF Midos House Top Left Chest": "True",
91+
"KF Midos House Top Right Chest": "True",
92+
"KF Midos House Bottom Left Chest": "True",
93+
"KF Midos House Bottom Right Chest": "True"
9494
}
9595
},
9696
{
@@ -103,7 +103,7 @@
103103
"region_name": "KF Know It All House"
104104
},
105105
{
106-
"region_name": "KF Kokiri Shop",
106+
"region_name": "KF Shop",
107107
"locations": {
108108
"KF Shop Item 1": "True",
109109
"KF Shop Item 2": "True",
@@ -263,20 +263,20 @@
263263
{
264264
"region_name": "LH Lab",
265265
"locations": {
266-
"LH Trade Eyeball Frog": "is_adult and Eyeball_Frog",
266+
"LH Lab Trade Eyeball Frog": "is_adult and Eyeball_Frog",
267267
"LH Lab Dive": "
268268
(Progressive_Scale, 2) or
269269
(Iron_Boots and can_use(Hookshot)) or (has_bottle and can_use(Hover_Boots))",
270-
"LH GS Lab Crate": "Iron_Boots and can_use(Hookshot)"
270+
"LH Lab GS Crate": "Iron_Boots and can_use(Hookshot)"
271271
}
272272
},
273273
{
274274
"region_name": "LH Fishing Hole",
275275
"time_passes": true,
276276
"locations": {
277-
"LH Child Fishing": "is_child",
278-
"LH Adult Fishing": "is_adult",
279-
"LH Loach Fishing": "True"
277+
"LH Fishing Hole Child Reward": "is_child",
278+
"LH Fishing Hole Adult Reward": "is_adult",
279+
"LH Fishing Hole Loach Reward": "True"
280280
}
281281
},
282282
{
@@ -393,7 +393,7 @@
393393
{
394394
"region_name": "Colossus Great Fairy Fountain",
395395
"locations": {
396-
"Colossus Great Fairy Reward": "can_play(Zeldas_Lullaby)"
396+
"Colossus Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
397397
}
398398
},
399399
{
@@ -430,7 +430,7 @@
430430
"Temple of Time Access": "True"
431431
},
432432
"locations": {
433-
"ToT Light Arrows Cutscene": "is_adult and can_trigger_lacs",
433+
"Temple of Time Light Arrow Cutscene": "is_adult and can_trigger_lacs",
434434
"ToT Child Altar Hint": "is_child",
435435
"ToT Adult Altar Hint": "is_adult"
436436
},
@@ -498,7 +498,7 @@
498498
{
499499
"region_name": "HC Great Fairy Fountain",
500500
"locations": {
501-
"HC Great Fairy Reward": "can_play(Zeldas_Lullaby)"
501+
"HC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
502502
}
503503
},
504504
{
@@ -516,7 +516,7 @@
516516
{
517517
"region_name": "OGC Great Fairy Fountain",
518518
"locations": {
519-
"OGC Great Fairy Reward": "can_play(Zeldas_Lullaby)"
519+
"OGC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
520520
}
521521
},
522522
{
@@ -525,11 +525,11 @@
525525
"Sell Big Poe": "is_adult and Bottle_with_Big_Poe"
526526
},
527527
"locations": {
528-
"Market 10 Big Poes": "
528+
"Market Guard House 10 Big Poes": "
529529
is_adult and
530530
(Big_Poe or (Bottle_with_Big_Poe, big_poe_count))",
531531
"Market 10 Big Poes Hint": "is_adult",
532-
"Market GS Guard House": "is_child"
532+
"Market Guard House GS": "is_child"
533533
}
534534
},
535535
{
@@ -711,11 +711,11 @@
711711
{
712712
"region_name": "Kak House of Skulltula",
713713
"locations": {
714-
"Kak 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)",
715-
"Kak 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)",
716-
"Kak 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)",
717-
"Kak 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)",
718-
"Kak 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)",
714+
"Kak House of Skulltula 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)",
715+
"Kak House of Skulltula 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)",
716+
"Kak House of Skulltula 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)",
717+
"Kak House of Skulltula 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)",
718+
"Kak House of Skulltula 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)",
719719
"10 Skulltulas Reward Hint": "True",
720720
"20 Skulltulas Reward Hint": "True",
721721
"30 Skulltulas Reward Hint": "True",
@@ -783,12 +783,12 @@
783783
{
784784
"region_name": "Kak Odd Medicine Building",
785785
"locations": {
786-
"Kak Granny Trade Odd Mushroom": "is_adult and Odd_Mushroom",
786+
"Kak Odd Medicine Building Trade Odd Mushroom": "is_adult and Odd_Mushroom",
787787
# Granny will not sell her item without turning in odd mushroom
788788
# If the adult trade item(s) in the world are all after odd mushroom,
789789
# allow any of the later sequence items to satisfy logic. The patcher
790790
# sets the flag needed for her to sell stuff if odd mushroom can't be obtained.
791-
"Kak Granny Buy Blue Potion": "Progressive_Wallet and is_adult and
791+
"Kak Odd Medicine Building Buy Blue Potion": "Progressive_Wallet and is_adult and
792792
(Odd_Mushroom or ((Odd_Potion or Poachers_Saw or Broken_Sword or
793793
Prescription or Eyeball_Frog or Eyedrops or Claim_Check) and not adult_trade_shuffle))"
794794
}
@@ -840,8 +840,8 @@
840840
"region_name": "Graveyard Dampes Grave",
841841
"hint": "GRAVEYARD",
842842
"locations": {
843-
"Graveyard Dampe Race Hookshot Chest": "True",
844-
"Graveyard Dampe Race Freestanding PoH": "True",
843+
"Graveyard Dampes Grave Hookshot Chest": "True",
844+
"Graveyard Dampes Grave Freestanding PoH": "True",
845845
"Nut Pot": "True"
846846
}
847847
},
@@ -1064,13 +1064,13 @@
10641064
{
10651065
"region_name": "DMC Great Fairy Fountain",
10661066
"locations": {
1067-
"DMC Great Fairy Reward": "can_play(Zeldas_Lullaby)"
1067+
"DMC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
10681068
}
10691069
},
10701070
{
10711071
"region_name": "DMT Great Fairy Fountain",
10721072
"locations": {
1073-
"DMT Great Fairy Reward": "can_play(Zeldas_Lullaby)"
1073+
"DMT Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
10741074
}
10751075
},
10761076
{
@@ -1185,7 +1185,7 @@
11851185
{
11861186
"region_name": "ZF Great Fairy Fountain",
11871187
"locations": {
1188-
"ZF Great Fairy Reward": "can_play(Zeldas_Lullaby)"
1188+
"ZF Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
11891189
}
11901190
},
11911191
{
@@ -1213,7 +1213,7 @@
12131213
{
12141214
"region_name": "LLR Talons House",
12151215
"locations": {
1216-
"LLR Talons Chickens": "is_child and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))"
1216+
"LLR Talons House Chickens": "is_child and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))"
12171217
}
12181218
},
12191219
{
@@ -1226,7 +1226,7 @@
12261226
{
12271227
"region_name": "LLR Tower",
12281228
"locations": {
1229-
"LLR Freestanding PoH": "True",
1229+
"LLR Tower Freestanding PoH": "True",
12301230
"LLR Tower Left Cow": "can_play(Eponas_Song)",
12311231
"LLR Tower Right Cow": "can_play(Eponas_Song)"
12321232
}
@@ -1268,8 +1268,8 @@
12681268
{
12691269
"region_name": "LW Scrubs Grotto",
12701270
"locations": {
1271-
"LW Deku Scrub Grotto Rear": "True",
1272-
"LW Deku Scrub Grotto Front": "True"
1271+
"LW Scrubs Grotto Deku Scrub Rear": "True",
1272+
"LW Scrubs Grotto Deku Scrub Front": "True"
12731273
}
12741274
},
12751275
{
@@ -1281,8 +1281,8 @@
12811281
{
12821282
"region_name": "SFM Storms Grotto",
12831283
"locations": {
1284-
"SFM Deku Scrub Grotto Rear": "True",
1285-
"SFM Deku Scrub Grotto Front": "True"
1284+
"SFM Storms Grotto Deku Scrub Rear": "True",
1285+
"SFM Storms Grotto Deku Scrub Front": "True"
12861286
}
12871287
},
12881288
{
@@ -1294,9 +1294,9 @@
12941294
{
12951295
"region_name": "LLR Grotto",
12961296
"locations": {
1297-
"LLR Deku Scrub Grotto Left": "True",
1298-
"LLR Deku Scrub Grotto Right": "True",
1299-
"LLR Deku Scrub Grotto Center": "True"
1297+
"LLR Grotto Deku Scrub Left": "True",
1298+
"LLR Grotto Deku Scrub Right": "True",
1299+
"LLR Grotto Deku Scrub Center": "True"
13001300
}
13011301
},
13021302
{
@@ -1316,13 +1316,13 @@
13161316
{
13171317
"region_name": "HF Inside Fence Grotto",
13181318
"locations": {
1319-
"HF Deku Scrub Grotto": "can_stun_deku"
1319+
"HF Inside Fence Grotto Deku Scrub": "can_stun_deku"
13201320
}
13211321
},
13221322
{
13231323
"region_name": "HF Cow Grotto",
13241324
"locations": {
1325-
"HF GS Cow Grotto": "
1325+
"HF Cow Grotto GS": "
13261326
has_fire_source and (can_use(Hookshot) or can_use(Boomerang))",
13271327
"HF Cow Grotto Cow": "has_fire_source and can_play(Eponas_Song)",
13281328
"HF Cow Grotto Gossip Stone": "has_fire_source"
@@ -1341,7 +1341,7 @@
13411341
{
13421342
"region_name": "HF Near Kak Grotto",
13431343
"locations": {
1344-
"HF GS Near Kak Grotto": "can_use(Boomerang) or can_use(Hookshot)"
1344+
"HF Near Kak Grotto GS": "can_use(Boomerang) or can_use(Hookshot)"
13451345
}
13461346
},
13471347
{
@@ -1354,7 +1354,7 @@
13541354
{
13551355
"region_name": "HC Storms Grotto",
13561356
"locations": {
1357-
"HC GS Storms Grotto": "(can_use(Boomerang) or can_isg) and (has_explosives or Blue_Fire)",
1357+
"HC Storms Grotto GS": "(can_use(Boomerang) or can_isg) and (has_explosives or Blue_Fire)",
13581358
"HC Storms Grotto Gossip Stone": "has_explosives or Blue_Fire"
13591359
}
13601360
},
@@ -1387,9 +1387,9 @@
13871387
{
13881388
"region_name": "GC Grotto",
13891389
"locations": {
1390-
"GC Deku Scrub Grotto Left": "True",
1391-
"GC Deku Scrub Grotto Right": "True",
1392-
"GC Deku Scrub Grotto Center": "True"
1390+
"GC Grotto Deku Scrub Left": "True",
1391+
"GC Grotto Deku Scrub Right": "True",
1392+
"GC Grotto Deku Scrub Center": "True"
13931393
}
13941394
},
13951395
{
@@ -1402,9 +1402,9 @@
14021402
{
14031403
"region_name": "DMC Hammer Grotto",
14041404
"locations": {
1405-
"DMC Deku Scrub Grotto Left": "True",
1406-
"DMC Deku Scrub Grotto Right": "True",
1407-
"DMC Deku Scrub Grotto Center": "True"
1405+
"DMC Hammer Grotto Deku Scrub Left": "True",
1406+
"DMC Hammer Grotto Deku Scrub Right": "True",
1407+
"DMC Hammer Grotto Deku Scrub Center": "True"
14081408
}
14091409
},
14101410
{
@@ -1420,30 +1420,30 @@
14201420
{
14211421
"region_name": "ZR Storms Grotto",
14221422
"locations": {
1423-
"ZR Deku Scrub Grotto Rear": "True",
1424-
"ZR Deku Scrub Grotto Front": "True"
1423+
"ZR Storms Grotto Deku Scrub Rear": "True",
1424+
"ZR Storms Grotto Deku Scrub Front": "True"
14251425
}
14261426
},
14271427
{
14281428
"region_name": "LH Grotto",
14291429
"locations": {
1430-
"LH Deku Scrub Grotto Left": "True",
1431-
"LH Deku Scrub Grotto Right": "True",
1432-
"LH Deku Scrub Grotto Center": "True"
1430+
"LH Grotto Deku Scrub Left": "True",
1431+
"LH Grotto Deku Scrub Right": "True",
1432+
"LH Grotto Deku Scrub Center": "True"
14331433
}
14341434
},
14351435
{
14361436
"region_name": "Colossus Grotto",
14371437
"locations": {
1438-
"Colossus Deku Scrub Grotto Rear": "True",
1439-
"Colossus Deku Scrub Grotto Front": "True"
1438+
"Colossus Grotto Deku Scrub Rear": "True",
1439+
"Colossus Grotto Deku Scrub Front": "True"
14401440
}
14411441
},
14421442
{
14431443
"region_name": "GV Storms Grotto",
14441444
"locations": {
1445-
"GV Deku Scrub Grotto Rear": "True",
1446-
"GV Deku Scrub Grotto Front": "True"
1445+
"GV Storms Grotto Deku Scrub Rear": "True",
1446+
"GV Storms Grotto Deku Scrub Front": "True"
14471447
}
14481448
}
14491449
]

0 commit comments

Comments
 (0)