Skip to content

Commit 6be3c0f

Browse files
fenhlfenhl
committed
Change some location names for consistency with region names
1 parent b1285ac commit 6be3c0f

76 files changed

Lines changed: 920 additions & 920 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
@@ -138,8 +138,8 @@ def build_one_way_targets(world: World, types_to_include: Iterable[str], exclude
138138
('KF House of Twins -> Kokiri Forest', { 'index': 0x033C })),
139139
('Interior', ('Kokiri Forest -> KF Know It All House', { 'index': 0x00C9 }),
140140
('KF Know It All House -> Kokiri Forest', { 'index': 0x026A })),
141-
('Interior', ('Kokiri Forest -> KF Kokiri Shop', { 'index': 0x00C1 }),
142-
('KF Kokiri Shop -> Kokiri Forest', { 'index': 0x0266 })),
141+
('Interior', ('Kokiri Forest -> KF Shop', { 'index': 0x00C1 }),
142+
('KF Shop -> Kokiri Forest', { 'index': 0x0266 })),
143143
('Interior', ('Lake Hylia -> LH Lab', { 'index': 0x0043 }),
144144
('LH Lab -> Lake Hylia', { 'index': 0x03CC })),
145145
('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
@@ -873,7 +873,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
873873
world.state.collect(ItemFactory('Small Key (Fire Temple)', world))
874874

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

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

‎LocationList.py‎

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

‎Patches.py‎

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

19771977
# kokiri shop
1978-
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
1978+
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
19791979
shop_objs = place_shop_items(rom, world, shop_items, messages, shop_locations, True)
19801980
shop_objs |= {0x00FC, 0x00B2, 0x0101, 0x0102, 0x00FD, 0x00C5} # Shop objects
19811981
rom.write_byte(0x2587029, len(shop_objs))
@@ -2061,9 +2061,9 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
20612061
return message
20622062

20632063
single_item_scrubs = {
2064-
0x3E: world.get_location("HF Deku Scrub Grotto"),
2064+
0x3E: world.get_location("HF Inside Fence Grotto Deku Scrub"),
20652065
0x77: world.get_location("LW Deku Scrub Near Bridge"),
2066-
0x79: world.get_location("LW Deku Scrub Grotto Front"),
2066+
0x79: world.get_location("LW Scrubs Grotto Deku Scrub Front"),
20672067
}
20682068

20692069
scrub_message_dict = {}
@@ -2175,7 +2175,7 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
21752175
if 'unique_merchants' not in world.settings.misc_hints:
21762176
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")
21772177
else:
2178-
location = world.get_location("Kak Granny Buy Blue Potion")
2178+
location = world.get_location("Kak Odd Medicine Building Buy Blue Potion")
21792179
item_text = get_hint(get_item_generic_name(location.item), True).text
21802180
wrapped_item_text = line_wrap(item_text, False, False, False)
21812181
if wrapped_item_text != item_text:

‎World.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def __missing__(self, dungeon_name: str) -> EmptyDungeonInfo:
258258
max_tokens = max(max_tokens, self.settings.ganon_bosskey_tokens)
259259
tokens = [50, 40, 30, 20, 10]
260260
for t in tokens:
261-
if f'Kak {t} Gold Skulltula Reward' not in self.settings.disabled_locations:
261+
if f'Kak House of Skulltula {t} Gold Skulltula Reward' not in self.settings.disabled_locations:
262262
max_tokens = max(max_tokens, t)
263263
break
264264
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
{
@@ -392,7 +392,7 @@
392392
{
393393
"region_name": "Colossus Great Fairy Fountain",
394394
"locations": {
395-
"Colossus Great Fairy Reward": "can_play(Zeldas_Lullaby)"
395+
"Colossus Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
396396
}
397397
},
398398
{
@@ -429,7 +429,7 @@
429429
"Temple of Time Access": "True"
430430
},
431431
"locations": {
432-
"ToT Light Arrows Cutscene": "is_adult and can_trigger_lacs",
432+
"Temple of Time Light Arrow Cutscene": "is_adult and can_trigger_lacs",
433433
"ToT Child Altar Hint": "is_child",
434434
"ToT Adult Altar Hint": "is_adult"
435435
},
@@ -488,7 +488,7 @@
488488
{
489489
"region_name": "HC Great Fairy Fountain",
490490
"locations": {
491-
"HC Great Fairy Reward": "can_play(Zeldas_Lullaby)"
491+
"HC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
492492
}
493493
},
494494
{
@@ -506,7 +506,7 @@
506506
{
507507
"region_name": "OGC Great Fairy Fountain",
508508
"locations": {
509-
"OGC Great Fairy Reward": "can_play(Zeldas_Lullaby)"
509+
"OGC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
510510
}
511511
},
512512
{
@@ -515,10 +515,10 @@
515515
"Sell Big Poe": "is_adult and Bottle_with_Big_Poe"
516516
},
517517
"locations": {
518-
"Market 10 Big Poes": "
518+
"Market Guard House 10 Big Poes": "
519519
is_adult and
520520
(Big_Poe or (Bottle_with_Big_Poe, big_poe_count))",
521-
"Market GS Guard House": "is_child"
521+
"Market Guard House GS": "is_child"
522522
}
523523
},
524524
{
@@ -700,11 +700,11 @@
700700
{
701701
"region_name": "Kak House of Skulltula",
702702
"locations": {
703-
"Kak 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)",
704-
"Kak 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)",
705-
"Kak 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)",
706-
"Kak 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)",
707-
"Kak 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)",
703+
"Kak House of Skulltula 10 Gold Skulltula Reward": "(Gold_Skulltula_Token, 10)",
704+
"Kak House of Skulltula 20 Gold Skulltula Reward": "(Gold_Skulltula_Token, 20)",
705+
"Kak House of Skulltula 30 Gold Skulltula Reward": "(Gold_Skulltula_Token, 30)",
706+
"Kak House of Skulltula 40 Gold Skulltula Reward": "(Gold_Skulltula_Token, 40)",
707+
"Kak House of Skulltula 50 Gold Skulltula Reward": "(Gold_Skulltula_Token, 50)",
708708
"10 Skulltulas Reward Hint": "True",
709709
"20 Skulltulas Reward Hint": "True",
710710
"30 Skulltulas Reward Hint": "True",
@@ -772,12 +772,12 @@
772772
{
773773
"region_name": "Kak Odd Medicine Building",
774774
"locations": {
775-
"Kak Granny Trade Odd Mushroom": "is_adult and Odd_Mushroom",
775+
"Kak Odd Medicine Building Trade Odd Mushroom": "is_adult and Odd_Mushroom",
776776
# Granny will not sell her item without turning in odd mushroom
777777
# If the adult trade item(s) in the world are all after odd mushroom,
778778
# allow any of the later sequence items to satisfy logic. The patcher
779779
# sets the flag needed for her to sell stuff if odd mushroom can't be obtained.
780-
"Kak Granny Buy Blue Potion": "Progressive_Wallet and is_adult and
780+
"Kak Odd Medicine Building Buy Blue Potion": "Progressive_Wallet and is_adult and
781781
(Odd_Mushroom or ((Odd_Potion or Poachers_Saw or Broken_Sword or
782782
Prescription or Eyeball_Frog or Eyedrops or Claim_Check) and not adult_trade_shuffle))"
783783
}
@@ -829,8 +829,8 @@
829829
"region_name": "Graveyard Dampes Grave",
830830
"hint": "GRAVEYARD",
831831
"locations": {
832-
"Graveyard Dampe Race Hookshot Chest": "True",
833-
"Graveyard Dampe Race Freestanding PoH": "True",
832+
"Graveyard Dampes Grave Hookshot Chest": "True",
833+
"Graveyard Dampes Grave Freestanding PoH": "True",
834834
"Nut Pot": "True"
835835
}
836836
},
@@ -1053,13 +1053,13 @@
10531053
{
10541054
"region_name": "DMC Great Fairy Fountain",
10551055
"locations": {
1056-
"DMC Great Fairy Reward": "can_play(Zeldas_Lullaby)"
1056+
"DMC Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
10571057
}
10581058
},
10591059
{
10601060
"region_name": "DMT Great Fairy Fountain",
10611061
"locations": {
1062-
"DMT Great Fairy Reward": "can_play(Zeldas_Lullaby)"
1062+
"DMT Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
10631063
}
10641064
},
10651065
{
@@ -1174,7 +1174,7 @@
11741174
{
11751175
"region_name": "ZF Great Fairy Fountain",
11761176
"locations": {
1177-
"ZF Great Fairy Reward": "can_play(Zeldas_Lullaby)"
1177+
"ZF Great Fairy Fountain Reward": "can_play(Zeldas_Lullaby)"
11781178
}
11791179
},
11801180
{
@@ -1202,7 +1202,7 @@
12021202
{
12031203
"region_name": "LLR Talons House",
12041204
"locations": {
1205-
"LLR Talons Chickens": "is_child and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))"
1205+
"LLR Talons House Chickens": "is_child and (skip_child_zelda or at('Hyrule Castle Grounds', is_child and (Weird_Egg or Chicken)))"
12061206
}
12071207
},
12081208
{
@@ -1215,7 +1215,7 @@
12151215
{
12161216
"region_name": "LLR Tower",
12171217
"locations": {
1218-
"LLR Freestanding PoH": "True",
1218+
"LLR Tower Freestanding PoH": "True",
12191219
"LLR Tower Left Cow": "can_play(Eponas_Song)",
12201220
"LLR Tower Right Cow": "can_play(Eponas_Song)"
12211221
}
@@ -1253,8 +1253,8 @@
12531253
{
12541254
"region_name": "LW Scrubs Grotto",
12551255
"locations": {
1256-
"LW Deku Scrub Grotto Rear": "True",
1257-
"LW Deku Scrub Grotto Front": "True"
1256+
"LW Scrubs Grotto Deku Scrub Rear": "True",
1257+
"LW Scrubs Grotto Deku Scrub Front": "True"
12581258
}
12591259
},
12601260
{
@@ -1266,8 +1266,8 @@
12661266
{
12671267
"region_name": "SFM Storms Grotto",
12681268
"locations": {
1269-
"SFM Deku Scrub Grotto Rear": "True",
1270-
"SFM Deku Scrub Grotto Front": "True"
1269+
"SFM Storms Grotto Deku Scrub Rear": "True",
1270+
"SFM Storms Grotto Deku Scrub Front": "True"
12711271
}
12721272
},
12731273
{
@@ -1279,9 +1279,9 @@
12791279
{
12801280
"region_name": "LLR Grotto",
12811281
"locations": {
1282-
"LLR Deku Scrub Grotto Left": "True",
1283-
"LLR Deku Scrub Grotto Right": "True",
1284-
"LLR Deku Scrub Grotto Center": "True"
1282+
"LLR Grotto Deku Scrub Left": "True",
1283+
"LLR Grotto Deku Scrub Right": "True",
1284+
"LLR Grotto Deku Scrub Center": "True"
12851285
}
12861286
},
12871287
{
@@ -1301,13 +1301,13 @@
13011301
{
13021302
"region_name": "HF Inside Fence Grotto",
13031303
"locations": {
1304-
"HF Deku Scrub Grotto": "can_stun_deku"
1304+
"HF Inside Fence Grotto Deku Scrub": "can_stun_deku"
13051305
}
13061306
},
13071307
{
13081308
"region_name": "HF Cow Grotto",
13091309
"locations": {
1310-
"HF GS Cow Grotto": "
1310+
"HF Cow Grotto GS": "
13111311
has_fire_source and (can_use(Hookshot) or can_use(Boomerang))",
13121312
"HF Cow Grotto Cow": "has_fire_source and can_play(Eponas_Song)",
13131313
"HF Cow Grotto Gossip Stone": "has_fire_source"
@@ -1326,7 +1326,7 @@
13261326
{
13271327
"region_name": "HF Near Kak Grotto",
13281328
"locations": {
1329-
"HF GS Near Kak Grotto": "can_use(Boomerang) or can_use(Hookshot)"
1329+
"HF Near Kak Grotto GS": "can_use(Boomerang) or can_use(Hookshot)"
13301330
}
13311331
},
13321332
{
@@ -1339,7 +1339,7 @@
13391339
{
13401340
"region_name": "HC Storms Grotto",
13411341
"locations": {
1342-
"HC GS Storms Grotto": "(can_use(Boomerang) or can_isg) and (has_explosives or Blue_Fire)",
1342+
"HC Storms Grotto GS": "(can_use(Boomerang) or can_isg) and (has_explosives or Blue_Fire)",
13431343
"HC Storms Grotto Gossip Stone": "has_explosives or Blue_Fire"
13441344
}
13451345
},
@@ -1372,9 +1372,9 @@
13721372
{
13731373
"region_name": "GC Grotto",
13741374
"locations": {
1375-
"GC Deku Scrub Grotto Left": "True",
1376-
"GC Deku Scrub Grotto Right": "True",
1377-
"GC Deku Scrub Grotto Center": "True"
1375+
"GC Grotto Deku Scrub Left": "True",
1376+
"GC Grotto Deku Scrub Right": "True",
1377+
"GC Grotto Deku Scrub Center": "True"
13781378
}
13791379
},
13801380
{
@@ -1387,9 +1387,9 @@
13871387
{
13881388
"region_name": "DMC Hammer Grotto",
13891389
"locations": {
1390-
"DMC Deku Scrub Grotto Left": "True",
1391-
"DMC Deku Scrub Grotto Right": "True",
1392-
"DMC Deku Scrub Grotto Center": "True"
1390+
"DMC Hammer Grotto Deku Scrub Left": "True",
1391+
"DMC Hammer Grotto Deku Scrub Right": "True",
1392+
"DMC Hammer Grotto Deku Scrub Center": "True"
13931393
}
13941394
},
13951395
{
@@ -1405,30 +1405,30 @@
14051405
{
14061406
"region_name": "ZR Storms Grotto",
14071407
"locations": {
1408-
"ZR Deku Scrub Grotto Rear": "True",
1409-
"ZR Deku Scrub Grotto Front": "True"
1408+
"ZR Storms Grotto Deku Scrub Rear": "True",
1409+
"ZR Storms Grotto Deku Scrub Front": "True"
14101410
}
14111411
},
14121412
{
14131413
"region_name": "LH Grotto",
14141414
"locations": {
1415-
"LH Deku Scrub Grotto Left": "True",
1416-
"LH Deku Scrub Grotto Right": "True",
1417-
"LH Deku Scrub Grotto Center": "True"
1415+
"LH Grotto Deku Scrub Left": "True",
1416+
"LH Grotto Deku Scrub Right": "True",
1417+
"LH Grotto Deku Scrub Center": "True"
14181418
}
14191419
},
14201420
{
14211421
"region_name": "Colossus Grotto",
14221422
"locations": {
1423-
"Colossus Deku Scrub Grotto Rear": "True",
1424-
"Colossus Deku Scrub Grotto Front": "True"
1423+
"Colossus Grotto Deku Scrub Rear": "True",
1424+
"Colossus Grotto Deku Scrub Front": "True"
14251425
}
14261426
},
14271427
{
14281428
"region_name": "GV Storms Grotto",
14291429
"locations": {
1430-
"GV Deku Scrub Grotto Rear": "True",
1431-
"GV Deku Scrub Grotto Front": "True"
1430+
"GV Storms Grotto Deku Scrub Rear": "True",
1431+
"GV Storms Grotto Deku Scrub Front": "True"
14321432
}
14331433
}
14341434
]

0 commit comments

Comments
 (0)