mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Ocarina of Time 7.0 (#1277)
## What is this fixing or adding? - Adds the majority of OoTR 7.0 features: - Pot shuffle, Freestanding item shuffle, Crate shuffle, Beehive shuffle - Key rings mode - Dungeon shortcuts to speed up dungeons - "Regional" shuffle for dungeon items - New options for shop pricing in shopsanity - Expanded Ganon's Boss Key shuffle options - Pre-planted beans - Improved Chest Appearance Matches Contents mode - Blue Fire Arrows - Bonk self-damage - Finer control over MQ dungeons and spawn position randomization - Several bugfixes as a result of the update: - Items recognized by the server and valid starting items are now in a 1-to-1 correspondence. In particular, starting with keys is now supported. - Entrance randomization success rate improved. Hopefully it is now at 100%. Co-authored-by: Zach Parks <zach@alliware.com>
This commit is contained in:
@@ -136,15 +136,15 @@ def create_dungeons(ootworld):
|
||||
|
||||
ootworld.load_regions_from_json(dungeon_json)
|
||||
|
||||
boss_keys = [ootworld.create_item(f'Boss Key ({name})') for i in range(dungeon_info['boss_key'])]
|
||||
if not ootworld.dungeon_mq[dungeon_info['name']]:
|
||||
small_keys = [ootworld.create_item(f'Small Key ({name})') for i in range(dungeon_info['small_key'])]
|
||||
else:
|
||||
small_keys = [ootworld.create_item(f'Small Key ({name})') for i in range(dungeon_info['small_key_mq'])]
|
||||
dungeon_items = [ootworld.create_item(f'Map ({name})'), ootworld.create_item(f'Compass ({name})')] * dungeon_info['dungeon_item']
|
||||
if ootworld.shuffle_mapcompass in ['any_dungeon', 'overworld']:
|
||||
for item in dungeon_items:
|
||||
item.priority = True
|
||||
# boss_keys = [ootworld.create_item(f'Boss Key ({name})') for i in range(dungeon_info['boss_key'])]
|
||||
# if not ootworld.dungeon_mq[dungeon_info['name']]:
|
||||
# small_keys = [ootworld.create_item(f'Small Key ({name})') for i in range(dungeon_info['small_key'])]
|
||||
# else:
|
||||
# small_keys = [ootworld.create_item(f'Small Key ({name})') for i in range(dungeon_info['small_key_mq'])]
|
||||
# dungeon_items = [ootworld.create_item(f'Map ({name})'), ootworld.create_item(f'Compass ({name})')] * dungeon_info['dungeon_item']
|
||||
# if ootworld.shuffle_mapcompass in ['any_dungeon', 'overworld']:
|
||||
# for item in dungeon_items:
|
||||
# item.priority = True
|
||||
|
||||
ootworld.dungeons.append(Dungeon(ootworld, name, hint, font_color, boss_keys, small_keys, dungeon_items))
|
||||
ootworld.dungeons.append(Dungeon(ootworld, name, hint, font_color))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user