morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
93a283912ecde3a7d2d04fa41b2b43c23a5e340f
Grinch-AP/ItemList.py

681 lines
34 KiB
Python
Raw Normal View History

Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
from collections import namedtuple
Retry Logic for Dungeon Prizes Will help make avoid seed failure for custom pool seeds. This won't help with a seed that has a layout that is not compatible with the item pool though.
2018-01-27 16:21:32 -05:00
import logging
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
import random
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
from BaseClasses import Region, RegionType, Shop, ShopType, Location
Basic impl. of boss shuffle for VT site enemizer integration
2018-09-26 13:12:20 -04:00
from Bosses import place_bosses
VT28 update: Keysanity has dungeon items in normal item pool
2018-01-02 20:01:16 -05:00
from Dungeons import get_dungeon_item_pool
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
from EntranceShuffle import connect_entrance
from Fill import FillError, fill_restrictive
from Items import ItemFactory
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
#This file sets the item pools for various modes. Timed modes and triforce hunt are enforced first, and then extra items are specified per mode to fill in the remaining space.
#Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided.
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
alwaysitems = ['Bombos', 'Book of Mudora', 'Cane of Somaria', 'Ether', 'Fire Rod', 'Flippers', 'Ocarina', 'Hammer', 'Hookshot', 'Ice Rod', 'Lamp',
High difficulty updates Should implement the myriad changes v29 will have to Hard+. This assumes silvers do not exist in Expert which is ambiguous.
2018-03-14 13:30:11 -05:00
'Cape', 'Magic Powder', 'Mushroom', 'Pegasus Boots', 'Quake', 'Shovel', 'Bug Catching Net', 'Cane of Byrna', 'Blue Boomerang', 'Red Boomerang']
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
progressivegloves = ['Progressive Glove'] * 2
basicgloves = ['Power Glove', 'Titans Mitts']
Rename Bottles for better display in spoiler logs
2017-11-18 20:56:45 -05:00
normalbottles = ['Bottle', 'Bottle (Red Potion)', 'Bottle (Green Potion)', 'Bottle (Blue Potion)', 'Bottle (Fairy)', 'Bottle (Bee)', 'Bottle (Good Bee)']
hardbottles = ['Bottle', 'Bottle (Red Potion)', 'Bottle (Green Potion)', 'Bottle (Blue Potion)', 'Bottle (Bee)', 'Bottle (Good Bee)']
Refactor bottle randomization Bottle randomization refactored to be done on generation of itempool, not with the ItemFactory function. This allows difficulty settings to use different bottle pools more easily as well as allows the pedestal, credits, and spoiler logs to report bottle contents. Expert and insane difficulties deliberately set the same bottle content to all four bottles since the bottle limit is one in those modes so this only guarantees that all racers regardless of play sequence will get the same one free bottle content.
2017-11-11 20:22:44 -06:00
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
normalbaseitems = (['Magic Upgrade (1/2)', 'Single Arrow', 'Sanctuary Heart Container', 'Arrows (10)', 'Bombs (10)'] +
High difficulty updates Should implement the myriad changes v29 will have to Hard+. This assumes silvers do not exist in Expert which is ambiguous.
2018-03-14 13:30:11 -05:00
['Rupees (300)'] * 4 + ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 24)
v30 updates
2018-09-22 22:51:54 -04:00
normalfirst15extra = ['Rupees (100)', 'Rupees (300)', 'Rupees (50)'] + ['Arrows (10)'] * 6 + ['Bombs (3)'] * 6
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
normalsecond15extra = ['Bombs (3)'] * 10 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupee (1)']
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
normalthird10extra = ['Rupees (50)'] * 4 + ['Rupees (20)'] * 3 + ['Arrows (10)', 'Rupee (1)', 'Rupees (5)']
normalfourth5extra = ['Arrows (10)'] * 2 + ['Rupees (20)'] * 2 + ['Rupees (5)']
normalfinal25extra = ['Rupees (20)'] * 23 + ['Rupees (5)'] * 2
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Difficulty = namedtuple('Difficulty',
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
['baseitems', 'bottles', 'bottle_count', 'same_bottle', 'progressiveshield',
'basicshield', 'progressivearmor', 'basicarmor', 'swordless',
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
'progressivesword', 'basicsword', 'basicbow', 'timedohko', 'timedother',
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
'triforcehunt', 'triforce_pieces_required', 'retro',
Fix progressive requirements to respect overflow limits
2018-01-04 01:06:22 -05:00
'extras', 'progressive_sword_limit', 'progressive_shield_limit',
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
'progressive_armor_limit', 'progressive_bottle_limit',
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
'progressive_bow_limit', 'heart_piece_limit', 'boss_heart_container_limit'])
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
total_items_to_place = 153
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
difficulties = {
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
'normal': Difficulty(
baseitems = normalbaseitems,
bottles = normalbottles,
bottle_count = 4,
same_bottle = False,
progressiveshield = ['Progressive Shield'] * 3,
basicshield = ['Blue Shield', 'Red Shield', 'Mirror Shield'],
progressivearmor = ['Progressive Armor'] * 2,
basicarmor = ['Blue Mail', 'Red Mail'],
swordless = ['Rupees (20)'] * 4,
Implement --startinventory
2020-01-06 19:13:42 +01:00
progressivesword = ['Progressive Sword'] * 4,
basicsword = ['Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword'],
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
basicbow = ['Bow', 'Silver Arrows'],
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
timedohko = ['Green Clock'] * 25,
timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
triforcehunt = ['Triforce Piece'] * 30,
triforce_pieces_required = 20,
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
retro = ['Small Key (Universal)'] * 17 + ['Rupees (20)'] * 10,
Fix progressive requirements to respect overflow limits
2018-01-04 01:06:22 -05:00
extras = [normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
progressive_sword_limit = 4,
progressive_shield_limit = 3,
progressive_armor_limit = 2,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
progressive_bow_limit = 2,
Fix progressive requirements to respect overflow limits
2018-01-04 01:06:22 -05:00
progressive_bottle_limit = 4,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
boss_heart_container_limit = 255,
heart_piece_limit = 255,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
),
'hard': Difficulty(
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
baseitems = normalbaseitems,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
bottles = hardbottles,
bottle_count = 4,
same_bottle = False,
progressiveshield = ['Progressive Shield'] * 3,
basicshield = ['Blue Shield', 'Red Shield', 'Red Shield'],
progressivearmor = ['Progressive Armor'] * 2,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
basicarmor = ['Progressive Armor'] * 2, # neither will count
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
swordless = ['Rupees (20)'] * 4,
Implement --startinventory
2020-01-06 19:13:42 +01:00
progressivesword = ['Progressive Sword'] * 4,
basicsword = ['Fighter Sword', 'Master Sword', 'Master Sword', 'Tempered Sword'],
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
basicbow = ['Bow'] * 2,
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
timedohko = ['Green Clock'] * 25,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
Triforce Hunt always 20/30 This adjusts the item pools to account for the fact that in v29 Triforce Hunt will be 20/30 in all difficulty settings.
2018-01-29 15:40:19 -06:00
triforcehunt = ['Triforce Piece'] * 30,
triforce_pieces_required = 20,
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
retro = ['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 15,
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
extras = [normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
Fix progressive requirements to respect overflow limits
2018-01-04 01:06:22 -05:00
progressive_sword_limit = 3,
progressive_shield_limit = 2,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
progressive_armor_limit = 0,
progressive_bow_limit = 1,
High difficulty updates Should implement the myriad changes v29 will have to Hard+. This assumes silvers do not exist in Expert which is ambiguous.
2018-03-14 13:30:11 -05:00
progressive_bottle_limit = 4,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
boss_heart_container_limit = 6,
heart_piece_limit = 16,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
),
'expert': Difficulty(
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
baseitems = normalbaseitems,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
bottles = hardbottles,
bottle_count = 4,
High difficulty updates Should implement the myriad changes v29 will have to Hard+. This assumes silvers do not exist in Expert which is ambiguous.
2018-03-14 13:30:11 -05:00
same_bottle = False,
progressiveshield = ['Progressive Shield'] * 3,
basicshield = ['Progressive Shield'] * 3, #only the first one will upgrade, making this equivalent to two blue shields
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
progressivearmor = ['Progressive Armor'] * 2, # neither will count
basicarmor = ['Progressive Armor'] * 2, # neither will count
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
swordless = ['Rupees (20)'] * 4,
Implement --startinventory
2020-01-06 19:13:42 +01:00
progressivesword = ['Progressive Sword'] * 4,
basicsword = ['Fighter Sword', 'Fighter Sword', 'Master Sword', 'Master Sword'],
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
basicbow = ['Bow'] * 2,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
timedohko = ['Green Clock'] * 20 + ['Red Clock'] * 5,
timedother = ['Green Clock'] * 20 + ['Blue Clock'] * 10 + ['Red Clock'] * 10,
Triforce Hunt always 20/30 This adjusts the item pools to account for the fact that in v29 Triforce Hunt will be 20/30 in all difficulty settings.
2018-01-29 15:40:19 -06:00
triforcehunt = ['Triforce Piece'] * 30,
triforce_pieces_required = 20,
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
retro = ['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 15,
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
extras = [normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
Fix progressive requirements to respect overflow limits
2018-01-04 01:06:22 -05:00
progressive_sword_limit = 2,
High difficulty updates Should implement the myriad changes v29 will have to Hard+. This assumes silvers do not exist in Expert which is ambiguous.
2018-03-14 13:30:11 -05:00
progressive_shield_limit = 1,
Fix progressive requirements to respect overflow limits
2018-01-04 01:06:22 -05:00
progressive_armor_limit = 0,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
progressive_bow_limit = 1,
High difficulty updates Should implement the myriad changes v29 will have to Hard+. This assumes silvers do not exist in Expert which is ambiguous.
2018-03-14 13:30:11 -05:00
progressive_bottle_limit = 4,
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
boss_heart_container_limit = 2,
heart_piece_limit = 8,
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
),
}
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
def generate_itempool(world, player):
Individual settings: difficulty and item_functionality
2019-12-16 17:46:21 +01:00
if (world.difficulty[player] not in ['normal', 'hard', 'expert'] or world.goal[player] not in ['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals']
Individual settings: mode
2019-12-16 16:54:46 +01:00
or world.mode[player] not in ['open', 'standard', 'inverted'] or world.timer not in ['none', 'display', 'timed', 'timed-ohko', 'ohko', 'timed-countdown'] or world.progressive not in ['on', 'off', 'random']):
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
raise NotImplementedError('Not supported yet')
Partial vt28 logic update
2018-01-02 00:39:53 -05:00
if world.timer in ['ohko', 'timed-ohko']:
world.can_take_damage = False
Individual settings: goal
2019-12-16 15:27:20 +01:00
if world.goal[player] in ['pedestal', 'triforcehunt']:
New Item/Location accessibility options Replaces existing check_only_beatable, which became the "none" option. TR can run out of key placement options, with the 100% locations option, but I really don't care enough. It exists mostly for people who want to 100% a seed, or to point to if they ask about keys locked behind themselves.
2019-08-04 17:40:13 -04:00
world.push_item(world.get_location('Ganon', player), ItemFactory('Nothing', player), False)
else:
world.push_item(world.get_location('Ganon', player), ItemFactory('Triforce', player), False)
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Individual settings: goal
2019-12-16 15:27:20 +01:00
if world.goal[player] in ['triforcehunt']:
Murahdahla doesn't spawn in rain state so dont put him in logic
2019-12-16 16:44:48 +01:00
region = world.get_region('Light World',player)
Triforce Hunt turn-in logic
2019-08-28 21:12:44 -04:00
loc = Location(player, "Murahdahla", parent=region)
Fix triforce hunt icon showing for every player
2019-12-21 10:42:59 +01:00
loc.access_rule = lambda state: state.item_count('Triforce Piece', player) + state.item_count('Power Star', player) > state.world.treasure_hunt_count[player]
Triforce Hunt turn-in logic
2019-08-28 21:12:44 -04:00
region.locations.append(loc)
world.dynamic_locations.append(loc)
world.clear_location_cache()
world.push_item(loc, ItemFactory('Triforce', player), False)
loc.event = True
loc.locked = True
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.get_location('Ganon', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Ganon', player).locked = True
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location('Agahnim 1', player), ItemFactory('Beat Agahnim 1', player), False)
world.get_location('Agahnim 1', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Agahnim 1', player).locked = True
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location('Agahnim 2', player), ItemFactory('Beat Agahnim 2', player), False)
world.get_location('Agahnim 2', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Agahnim 2', player).locked = True
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location('Dark Blacksmith Ruins', player), ItemFactory('Pick Up Purple Chest', player), False)
world.get_location('Dark Blacksmith Ruins', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Dark Blacksmith Ruins', player).locked = True
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location('Frog', player), ItemFactory('Get Frog', player), False)
world.get_location('Frog', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Frog', player).locked = True
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location('Missing Smith', player), ItemFactory('Return Smith', player), False)
world.get_location('Missing Smith', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Missing Smith', player).locked = True
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location('Floodgate', player), ItemFactory('Open Floodgate', player), False)
world.get_location('Floodgate', player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location('Floodgate', player).locked = True
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
# set up item pool
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
if world.custom:
Individual settings: retro
2019-12-17 00:16:02 +01:00
(pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = make_custom_item_pool(world.progressive, world.shuffle[player], world.difficulty[player], world.timer, world.goal[player], world.mode[player], world.swords[player], world.retro[player], world.customitemarray)
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
world.rupoor_cost = min(world.customitemarray[69], 9999)
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
else:
Individual settings: retro
2019-12-17 00:16:02 +01:00
(pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = get_pool_core(world.progressive, world.shuffle[player], world.difficulty[player], world.timer, world.goal[player], world.mode[player], world.swords[player], world.retro[player])
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
for item in precollected_items:
world.push_precollected(ItemFactory(item, player))
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Escape assist: only get infinite bombs with enemizer or bombs/cane/bow start + high hp
2019-12-30 06:42:45 +01:00
if world.mode[player] == 'standard' and not world.state.has_blunt_weapon(player):
if "Link's Uncle" not in placed_items:
found_sword = False
found_bow = False
possible_weapons = []
for item in pool:
if item in ['Progressive Sword', 'Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword']:
if not found_sword and world.swords[player] != 'swordless':
found_sword = True
possible_weapons.append(item)
if item in ['Progressive Bow', 'Bow'] and not found_bow:
found_bow = True
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
possible_weapons.append(item)
Escape assist: only get infinite bombs with enemizer or bombs/cane/bow start + high hp
2019-12-30 06:42:45 +01:00
if item in ['Hammer', 'Bombs (10)', 'Fire Rod', 'Cane of Somaria', 'Cane of Byrna']:
if item not in possible_weapons:
possible_weapons.append(item)
starting_weapon = random.choice(possible_weapons)
placed_items["Link's Uncle"] = starting_weapon
pool.remove(starting_weapon)
if placed_items["Link's Uncle"] in ['Bow', 'Progressive Bow', 'Bombs (10)', 'Cane of Somaria', 'Cane of Byrna'] and world.enemy_health[player] not in ['default', 'easy']:
world.escape_assist[player].append('bombs')
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
for (location, item) in placed_items.items():
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(world.get_location(location, player), ItemFactory(item, player), False)
world.get_location(location, player).event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
world.get_location(location, player).locked = True
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Beemizer: fix potentially replacing all heart containers for progression
2019-12-30 20:28:33 +01:00
items = ItemFactory(pool, player)
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Easy mode lamp update You can find all 3 lamps before dark rooms for easy mode.
2018-02-24 16:16:50 -05:00
world.lamps_needed_for_dark_rooms = lamps_needed_for_dark_rooms
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
if clock_mode is not None:
world.clock_mode = clock_mode
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
if treasure_hunt_count is not None:
Fix triforce hunt icon showing for every player
2019-12-21 10:42:59 +01:00
world.treasure_hunt_count[player] = treasure_hunt_count
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
if treasure_hunt_icon is not None:
Fix triforce hunt icon showing for every player
2019-12-21 10:42:59 +01:00
world.treasure_hunt_icon[player] = treasure_hunt_icon
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
Replace keysanity with map/compass/key/bk shuffle
2019-12-13 22:37:52 +01:00
world.itempool.extend([item for item in get_dungeon_item_pool(world) if item.player == player
Individual settings: map/compass/key/bk shuffle
2019-12-16 21:46:47 +01:00
and ((item.smallkey and world.keyshuffle[player])
or (item.bigkey and world.bigkeyshuffle[player])
or (item.map and world.mapshuffle[player])
or (item.compass and world.compassshuffle[player]))])
VT28 update: Keysanity has dungeon items in normal item pool
2018-01-02 20:01:16 -05:00
Add new 4 heart logic for spike cave and misery mire
2018-01-06 13:39:22 -05:00
# logic has some branches where having 4 hearts is one possible requirement (of several alternatives)
# rather than making all hearts/heart pieces progression items (which slows down generation considerably)
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
# We mark one random heart container as an advancement item (or 4 heart pieces in expert mode)
Individual settings: difficulty and item_functionality
2019-12-16 17:46:21 +01:00
if world.difficulty[player] in ['normal', 'hard'] and not (world.custom and world.customitemarray[30] == 0):
Beemizer: fix potentially replacing all heart containers for progression
2019-12-30 20:28:33 +01:00
[item for item in items if item.name == 'Boss Heart Container'][0].advancement = True
Individual settings: difficulty and item_functionality
2019-12-16 17:46:21 +01:00
elif world.difficulty[player] in ['expert'] and not (world.custom and world.customitemarray[29] < 4):
Beemizer: fix potentially replacing all heart containers for progression
2019-12-30 20:28:33 +01:00
adv_heart_pieces = [item for item in items if item.name == 'Piece of Heart'][0:4]
Add new 4 heart logic for spike cave and misery mire
2018-01-06 13:39:22 -05:00
for hp in adv_heart_pieces:
hp.advancement = True
Beemizer: fix potentially replacing all heart containers for progression
2019-12-30 20:28:33 +01:00
beeweights = {0: {None: 100},
1: {None: 75, 'trap': 25},
2: {None: 40, 'trap': 40, 'bee': 20},
3: {'trap': 50, 'bee': 50},
4: {'trap': 100}}
def beemizer(item):
if world.beemizer[item.player] and not item.advancement and not item.priority and not item.type:
choice = random.choices(list(beeweights[world.beemizer[item.player]].keys()), weights=list(beeweights[world.beemizer[item.player]].values()))[0]
return item if not choice else ItemFactory("Bee Trap", player) if choice == 'trap' else ItemFactory("Bee", player)
return item
world.itempool += [beemizer(item) for item in items]
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
# shuffle medallions
mm_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
tr_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.required_medallions[player] = (mm_medallion, tr_medallion)
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
place_bosses(world, player)
set_up_shops(world, player)
Shop implementation Also a few retro mode fixes
2018-02-17 18:38:54 -05:00
Individual settings: retro
2019-12-17 00:16:02 +01:00
if world.retro[player]:
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
set_up_take_anys(world, player)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
create_dynamic_shop_locations(world, player)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
take_any_locations = [
'Snitch Lady (East)', 'Snitch Lady (West)', 'Bush Covered House', 'Light World Bomb Hut',
'Fortune Teller (Light)', 'Lake Hylia Fortune Teller', 'Lumberjack House', 'Bonk Fairy (Light)',
'Bonk Fairy (Dark)', 'Lake Hylia Healer Fairy', 'Swamp Healer Fairy', 'Desert Healer Fairy',
'Dark Lake Hylia Healer Fairy', 'Dark Lake Hylia Ledge Healer Fairy', 'Dark Desert Healer Fairy',
'Dark Death Mountain Healer Fairy', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave',
Small shops refactor, cleanup some inverted mess
2020-01-10 11:41:22 +01:00
'Kakariko Gamble Game', '50 Rupee Cave', 'Lost Woods Gamble', 'Hookshot Fairy',
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
'Palace of Darkness Hint', 'East Dark World Hint', 'Archery Game', 'Dark Lake Hylia Ledge Hint',
'Dark Lake Hylia Ledge Spike Cave', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint', 'Dark Desert Hint']
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
def set_up_take_anys(world, player):
Individual settings: mode
2019-12-16 16:54:46 +01:00
if world.mode[player] == 'inverted' and 'Dark Sanctuary Hint' in take_any_locations:
Fix inverted retro take anys Removed 'Dark Sanctuary Hint' from take any pool if mode is inverted
2019-09-11 12:25:46 -04:00
take_any_locations.remove('Dark Sanctuary Hint')
Reimplement random weapon standard start, the previous one did not make sense in a multiworld context and rework castle chests logic, bombs start is now possible
2019-12-11 11:41:05 +01:00
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
regions = random.sample(take_any_locations, 5)
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
old_man_take_any = Region("Old Man Sword Cave", RegionType.Cave, 'the sword cave', player)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
world.regions.append(old_man_take_any)
world.dynamic_regions.append(old_man_take_any)
reg = regions.pop()
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
entrance = world.get_region(reg, player).entrances[0]
connect_entrance(world, entrance, old_man_take_any, player)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
entrance.target = 0x58
Small shops refactor, cleanup some inverted mess
2020-01-10 11:41:22 +01:00
old_man_take_any.shop = Shop(old_man_take_any, 0x0112, ShopType.TakeAny, 0xE2, True, True)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
world.shops.append(old_man_take_any.shop)
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
swords = [item for item in world.itempool if item.type == 'Sword' and item.player == player]
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
if swords:
sword = random.choice(swords)
world.itempool.remove(sword)
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.itempool.append(ItemFactory('Rupees (20)', player))
Fix bugs from recent playtest
2018-03-26 19:32:19 -04:00
old_man_take_any.shop.add_inventory(0, sword.name, 0, 0, create_location=True)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
else:
Fix bugs from recent playtest
2018-03-26 19:32:19 -04:00
old_man_take_any.shop.add_inventory(0, 'Rupees (300)', 0, 0)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
for num in range(4):
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
take_any = Region("Take-Any #{}".format(num+1), RegionType.Cave, 'a cave of choice', player)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
world.regions.append(take_any)
world.dynamic_regions.append(take_any)
target, room_id = random.choice([(0x58, 0x0112), (0x60, 0x010F), (0x46, 0x011F)])
reg = regions.pop()
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
entrance = world.get_region(reg, player).entrances[0]
connect_entrance(world, entrance, take_any, player)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
entrance.target = target
Small shops refactor, cleanup some inverted mess
2020-01-10 11:41:22 +01:00
take_any.shop = Shop(take_any, room_id, ShopType.TakeAny, 0xE3, True, True)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
world.shops.append(take_any.shop)
Fix bugs from recent playtest
2018-03-26 19:32:19 -04:00
take_any.shop.add_inventory(0, 'Blue Potion', 0, 0)
take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
Initialize region cache in initialize_regions() and make it a 2d map for more efficient player filtering
2019-12-14 19:19:08 +01:00
world.initialize_regions()
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
def create_dynamic_shop_locations(world, player):
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
for shop in world.shops:
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
if shop.region.player == player:
for i, item in enumerate(shop.inventory):
if item is None:
continue
if item['create_location']:
loc = Location(player, "{} Item {}".format(shop.region.name, i+1), parent=shop.region)
shop.region.locations.append(loc)
world.dynamic_locations.append(loc)
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.clear_location_cache()
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
world.push_item(loc, ItemFactory(item['item'], player), False)
loc.event = True
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
loc.locked = True
Initial Take-Any implementation
2018-03-22 23:18:40 -04:00
Retry Logic for Dungeon Prizes Will help make avoid seed failure for custom pool seeds. This won't help with a seed that has a layout that is not compatible with the item pool though.
2018-01-27 16:21:32 -05:00
def fill_prizes(world, attempts=15):
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
all_state = world.get_all_state(keys=True)
for player in range(1, world.players + 1):
crystals = ItemFactory(['Red Pendant', 'Blue Pendant', 'Green Pendant', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 7', 'Crystal 5', 'Crystal 6'], player)
crystal_locations = [world.get_location('Turtle Rock - Prize', player), world.get_location('Eastern Palace - Prize', player), world.get_location('Desert Palace - Prize', player), world.get_location('Tower of Hera - Prize', player), world.get_location('Palace of Darkness - Prize', player),
world.get_location('Thieves\' Town - Prize', player), world.get_location('Skull Woods - Prize', player), world.get_location('Swamp Palace - Prize', player), world.get_location('Ice Palace - Prize', player),
world.get_location('Misery Mire - Prize', player)]
placed_prizes = [loc.item.name for loc in crystal_locations if loc.item is not None]
unplaced_prizes = [crystal for crystal in crystals if crystal.name not in placed_prizes]
empty_crystal_locations = [loc for loc in crystal_locations if loc.item is None]
for attempt in range(attempts):
try:
prizepool = list(unplaced_prizes)
prize_locs = list(empty_crystal_locations)
random.shuffle(prizepool)
random.shuffle(prize_locs)
Fix beatable-only prizes and dungeon items in multiworld
2019-12-11 11:37:05 +01:00
fill_restrictive(world, all_state, prize_locs, prizepool, True)
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
except FillError as e:
logging: fix retry attempts nr
2019-12-28 01:11:44 +01:00
logging.getLogger('').info("Failed to place dungeon prizes (%s). Will retry %s more times", e, attempts - attempt - 1)
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
for location in empty_crystal_locations:
location.item = None
continue
break
else:
raise FillError('Unable to place dungeon prizes')
Retry Logic for Dungeon Prizes Will help make avoid seed failure for custom pool seeds. This won't help with a seed that has a layout that is not compatible with the item pool though.
2018-01-27 16:21:32 -05:00
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
def set_up_shops(world, player):
Shop implementation Also a few retro mode fixes
2018-02-17 18:38:54 -05:00
# TODO: move hard+ mode changes for sheilds here, utilizing the new shops
Individual settings: retro
2019-12-17 00:16:02 +01:00
if world.retro[player]:
Multiworld core implementation By Bonta0 Does not include the server/client code or the rom writes specific to it. Indeed it cannot write multiworld roms at all right now, pending addition future updates to support the official ALTTPR Multiworld client. Includes some GUI changes by Alaszun Co-authored-by: Alaszun <koelze@google.com>
2019-04-18 11:23:24 +02:00
rss = world.get_region('Red Shield Shop', player).shop
Small shops refactor, cleanup some inverted mess
2020-01-10 11:41:22 +01:00
if not rss.locked:
rss.add_inventory(2, 'Single Arrow', 80)
for shop in random.sample([s for s in world.shops if s.custom and not s.locked and s.region.player == player], 5):
shop.locked = True
Shop implementation Also a few retro mode fixes
2018-02-17 18:38:54 -05:00
shop.add_inventory(0, 'Single Arrow', 80)
shop.add_inventory(1, 'Small Key (Universal)', 100)
Bomb price fixing - requested by the Hyrule explosives cartel
2018-03-23 23:01:55 -04:00
shop.add_inventory(2, 'Bombs (10)', 50)
Small shops refactor, cleanup some inverted mess
2020-01-10 11:41:22 +01:00
rss.locked = True
New File This file contains the definition for the item pool generation function. I'm not going to sugarcoat this; what I wrote is a total mess. This considers all possible combinations between timed modes (two distinct sets of timers), triforce hunt, progressives on/off/random, and all five of the difficulty settings from the vt randomizer. Maybe it would have been better to just hardcode every combination as its own array instead of build smaller arrays and use some semblance of logic to piece them together, but this is what I did. I'm not satisfied at all with the ugly, ugly form of this code and hope to revisit later, but for now, it adds significant improved functionality.
2017-11-10 04:15:45 -06:00
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
def get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, retro):
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
pool = []
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
placed_items = {}
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
precollected_items = []
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
clock_mode = None
treasure_hunt_count = None
treasure_hunt_icon = None
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
pool.extend(alwaysitems)
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
def place_item(loc, item):
assert loc not in placed_items
placed_items[loc] = item
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
def want_progressives():
return random.choice([True, False]) if progressive == 'random' else progressive == 'on'
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
if want_progressives():
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
pool.extend(progressivegloves)
else:
pool.extend(basicgloves)
Easy mode lamp update You can find all 3 lamps before dark rooms for easy mode.
2018-02-24 16:16:50 -05:00
lamps_needed_for_dark_rooms = 1
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
# insanity shuffle doesn't have fake LW/DW logic so for now guaranteed Mirror and Moon Pearl at the start
Add new insanity mode
2018-02-18 14:52:34 -05:00
if shuffle == 'insanity_legacy':
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Link\'s House', 'Magic Mirror')
place_item('Sanctuary', 'Moon Pearl')
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
else:
pool.extend(['Magic Mirror', 'Moon Pearl'])
if timer == 'display':
clock_mode = 'stopwatch'
Add untimed OHKO mode
2017-11-18 20:36:42 -05:00
elif timer == 'ohko':
clock_mode = 'ohko'
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
diff = difficulties[difficulty]
pool.extend(diff.baseitems)
# expert+ difficulties produce the same contents for
# all bottles, since only one bottle is available
if diff.same_bottle:
thisbottle = random.choice(diff.bottles)
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
for _ in range(diff.bottle_count):
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
if not diff.same_bottle:
thisbottle = random.choice(diff.bottles)
pool.append(thisbottle)
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
if want_progressives():
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
pool.extend(diff.progressiveshield)
else:
pool.extend(diff.basicshield)
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
if want_progressives():
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
pool.extend(diff.progressivearmor)
else:
pool.extend(diff.basicarmor)
Implement --startinventory
2020-01-06 19:13:42 +01:00
if want_progressives():
pool.extend(['Progressive Bow'] * 2)
elif swords != 'swordless':
pool.extend(diff.basicbow)
else:
pool.extend(['Bow', 'Silver Arrows'])
Add Item functionality setting and progressive bow Progressive bows still have issue for silvers hint
2019-08-10 19:37:26 -04:00
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
if swords == 'swordless':
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
pool.extend(diff.swordless)
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
elif swords == 'vanilla':
Implement --startinventory
2020-01-06 19:13:42 +01:00
swords_to_use = diff.progressivesword.copy() if want_progressives() else diff.basicsword.copy()
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
random.shuffle(swords_to_use)
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Link\'s Uncle', swords_to_use.pop())
place_item('Blacksmith', swords_to_use.pop())
place_item('Pyramid Fairy - Left', swords_to_use.pop())
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
if goal != 'pedestal':
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Master Sword Pedestal', swords_to_use.pop())
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
else:
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Master Sword Pedestal', 'Triforce')
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
else:
Implement --startinventory
2020-01-06 19:13:42 +01:00
pool.extend(diff.progressivesword if want_progressives() else diff.basicsword)
if swords == 'assured':
if want_progressives():
precollected_items.append('Progressive Sword')
pool.remove('Progressive Sword')
else:
precollected_items.append('Fighter Sword')
pool.remove('Fighter Sword')
pool.extend(['Rupees (50)'])
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
extraitems = total_items_to_place - len(pool) - len(placed_items)
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
if timer in ['timed', 'timed-countdown']:
pool.extend(diff.timedother)
extraitems -= len(diff.timedother)
clock_mode = 'stopwatch' if timer == 'timed' else 'countdown'
elif timer == 'timed-ohko':
pool.extend(diff.timedohko)
extraitems -= len(diff.timedohko)
Add untimed OHKO mode
2017-11-18 20:36:42 -05:00
clock_mode = 'countdown-ohko'
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
if goal == 'triforcehunt':
pool.extend(diff.triforcehunt)
extraitems -= len(diff.triforcehunt)
treasure_hunt_count = diff.triforce_pieces_required
treasure_hunt_icon = 'Triforce Piece'
for extra in diff.extras:
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
if extraitems > 0:
pool.extend(extra)
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
extraitems -= len(extra)
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
if goal == 'pedestal' and swords != 'vanilla':
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Master Sword Pedestal', 'Triforce')
More of Retro Mode Implement correct Retro Mode item pools. Set up most of the key logic to handle retro mode (still needs shop access) Set ROM flags appropriately. TODO: Support Retro Mode with custom item pools, deal with shops in general, deal with Bow paired with arrow requirements, correct Expert item pool for silvers, test older fill algorithms with retro mode, deal with the new Sahas/Bomb Shop reveal map info ROM flags.
2018-03-15 16:23:02 -05:00
if retro:
pool = [item.replace('Single Arrow','Rupees (5)') for item in pool]
pool = [item.replace('Arrows (10)','Rupees (5)') for item in pool]
pool = [item.replace('Arrow Upgrade (+5)','Rupees (5)') for item in pool]
pool = [item.replace('Arrow Upgrade (+10)','Rupees (5)') for item in pool]
pool.extend(diff.retro)
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
if mode == 'standard':
key_location = random.choice(['Secret Passage', 'Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross'])
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item(key_location, 'Small Key (Universal)')
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
else:
pool.extend(['Small Key (Universal)'])
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
return (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms)
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
def make_custom_item_pool(progressive, shuffle, difficulty, timer, goal, mode, swords, retro, customitemarray):
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
pool = []
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
placed_items = {}
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
precollected_items = []
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
clock_mode = None
treasure_hunt_count = None
treasure_hunt_icon = None
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
def place_item(loc, item):
assert loc not in placed_items
placed_items[loc] = item
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
# Correct for insanely oversized item counts and take initial steps to handle undersized pools.
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
for x in range(0, 66):
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
if customitemarray[x] > total_items_to_place:
customitemarray[x] = total_items_to_place
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
if customitemarray[68] > total_items_to_place:
customitemarray[68] = total_items_to_place
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
itemtotal = 0
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
for x in range(0, 66):
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
itemtotal = itemtotal + customitemarray[x]
Custom item pool support for retro mode Allows the placement of Universal Keys (which probably don't do much outside of retro mode) and handles total item counts properly.
2018-03-15 16:53:42 -05:00
itemtotal = itemtotal + customitemarray[68]
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
itemtotal = itemtotal + customitemarray[70]
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
pool.extend(['Bow'] * customitemarray[0])
pool.extend(['Silver Arrows']* customitemarray[1])
pool.extend(['Blue Boomerang'] * customitemarray[2])
pool.extend(['Red Boomerang'] * customitemarray[3])
pool.extend(['Hookshot'] * customitemarray[4])
pool.extend(['Mushroom'] * customitemarray[5])
pool.extend(['Magic Powder'] * customitemarray[6])
pool.extend(['Fire Rod'] * customitemarray[7])
pool.extend(['Ice Rod'] * customitemarray[8])
pool.extend(['Bombos'] * customitemarray[9])
pool.extend(['Ether'] * customitemarray[10])
pool.extend(['Quake'] * customitemarray[11])
pool.extend(['Lamp'] * customitemarray[12])
pool.extend(['Hammer'] * customitemarray[13])
pool.extend(['Shovel'] * customitemarray[14])
pool.extend(['Ocarina'] * customitemarray[15])
pool.extend(['Bug Catching Net'] * customitemarray[16])
pool.extend(['Book of Mudora'] * customitemarray[17])
pool.extend(['Cane of Somaria'] * customitemarray[19])
pool.extend(['Cane of Byrna'] * customitemarray[20])
pool.extend(['Cape'] * customitemarray[21])
pool.extend(['Pegasus Boots'] * customitemarray[23])
pool.extend(['Power Glove'] * customitemarray[24])
pool.extend(['Titans Mitts'] * customitemarray[25])
pool.extend(['Progressive Glove'] * customitemarray[26])
pool.extend(['Flippers'] * customitemarray[27])
pool.extend(['Piece of Heart'] * customitemarray[29])
pool.extend(['Boss Heart Container'] * customitemarray[30])
pool.extend(['Sanctuary Heart Container'] * customitemarray[31])
pool.extend(['Master Sword'] * customitemarray[33])
pool.extend(['Tempered Sword'] * customitemarray[34])
pool.extend(['Golden Sword'] * customitemarray[35])
pool.extend(['Blue Shield'] * customitemarray[37])
pool.extend(['Red Shield'] * customitemarray[38])
pool.extend(['Mirror Shield'] * customitemarray[39])
pool.extend(['Progressive Shield'] * customitemarray[40])
pool.extend(['Blue Mail'] * customitemarray[41])
pool.extend(['Red Mail'] * customitemarray[42])
pool.extend(['Progressive Armor'] * customitemarray[43])
pool.extend(['Magic Upgrade (1/2)'] * customitemarray[44])
pool.extend(['Magic Upgrade (1/4)'] * customitemarray[45])
pool.extend(['Bomb Upgrade (+5)'] * customitemarray[46])
pool.extend(['Bomb Upgrade (+10)'] * customitemarray[47])
pool.extend(['Arrow Upgrade (+5)'] * customitemarray[48])
pool.extend(['Arrow Upgrade (+10)'] * customitemarray[49])
pool.extend(['Single Arrow'] * customitemarray[50])
pool.extend(['Arrows (10)'] * customitemarray[51])
pool.extend(['Single Bomb'] * customitemarray[52])
pool.extend(['Bombs (3)'] * customitemarray[53])
pool.extend(['Rupee (1)'] * customitemarray[54])
pool.extend(['Rupees (5)'] * customitemarray[55])
pool.extend(['Rupees (20)'] * customitemarray[56])
pool.extend(['Rupees (50)'] * customitemarray[57])
pool.extend(['Rupees (100)'] * customitemarray[58])
pool.extend(['Rupees (300)'] * customitemarray[59])
pool.extend(['Rupoor'] * customitemarray[60])
pool.extend(['Blue Clock'] * customitemarray[61])
pool.extend(['Green Clock'] * customitemarray[62])
pool.extend(['Red Clock'] * customitemarray[63])
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
pool.extend(['Progressive Bow'] * customitemarray[64])
pool.extend(['Bombs (10)'] * customitemarray[65])
pool.extend(['Triforce Piece'] * customitemarray[66])
pool.extend(['Triforce'] * customitemarray[68])
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
diff = difficulties[difficulty]
Easy mode lamp update You can find all 3 lamps before dark rooms for easy mode.
2018-02-24 16:16:50 -05:00
lamps_needed_for_dark_rooms = 1
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
# expert+ difficulties produce the same contents for
# all bottles, since only one bottle is available
if diff.same_bottle:
thisbottle = random.choice(diff.bottles)
for _ in range(customitemarray[18]):
if not diff.same_bottle:
thisbottle = random.choice(diff.bottles)
pool.append(thisbottle)
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
if customitemarray[66] > 0 or customitemarray[67] > 0:
treasure_hunt_count = max(min(customitemarray[67], 99), 1) #To display, count must be between 1 and 99.
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
treasure_hunt_icon = 'Triforce Piece'
# Ensure game is always possible to complete here, force sufficient pieces if the player is unwilling.
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
if (customitemarray[66] < treasure_hunt_count) and (goal == 'triforcehunt') and (customitemarray[68] == 0):
extrapieces = treasure_hunt_count - customitemarray[66]
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
pool.extend(['Triforce Piece'] * extrapieces)
itemtotal = itemtotal + extrapieces
if timer in ['display', 'timed', 'timed-countdown']:
clock_mode = 'countdown' if timer == 'timed-countdown' else 'stopwatch'
elif timer == 'timed-ohko':
clock_mode = 'countdown-ohko'
elif timer == 'ohko':
clock_mode = 'ohko'
if goal == 'pedestal':
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Master Sword Pedestal', 'Triforce')
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
itemtotal = itemtotal + 1
if mode == 'standard':
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
if retro:
key_location = random.choice(['Secret Passage', 'Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest', 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross'])
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item(key_location, 'Small Key (Universal)')
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
pool.extend(['Small Key (Universal)'] * max((customitemarray[70] - 1), 0))
Final v29 tweaks -Makes Retro Mode and Standard Mode compatible. -Replaces a Bombs (3) with Bombs (10) in all modes. -Introduces Silver Arrows to Expert Mode.
2018-03-16 12:26:14 -05:00
else:
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
pool.extend(['Small Key (Universal)'] * customitemarray[70])
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
else:
Custom Item Pool Update This updates the custom item pool feature to support progressive bows and the 10 bomb item. Yes, the latter had existed for a long time and was just never put in properly. The default item pool with the custom item pool feature now matches v31's item distribution instead of whatever the last version with bomb/arrow capacity upgrades' default was. I'm unsure if anyone will actually use this feature even still, but it's now up to date!
2019-10-23 21:31:02 -05:00
pool.extend(['Small Key (Universal)'] * customitemarray[70])
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
Fix random weapons for Standard Mode Now works roughly like VT, except that swords are somwhat more common and bombs-only escape is not supported (because I don't want to make 'Bombs (10)' an advancement item) Swordless Standard Mode should also work now Assured and Vanilla weapons still need to be implemented.
2019-08-06 21:36:45 -04:00
pool.extend(['Fighter Sword'] * customitemarray[32])
pool.extend(['Progressive Sword'] * customitemarray[36])
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
Add new insanity mode
2018-02-18 14:52:34 -05:00
if shuffle == 'insanity_legacy':
ItemList: use a dict for placed_items
2019-12-10 21:21:38 +01:00
place_item('Link\'s House', 'Magic Mirror')
place_item('Sanctuary', 'Moon Pearl')
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
pool.extend(['Magic Mirror'] * max((customitemarray[22] -1 ), 0))
pool.extend(['Moon Pearl'] * max((customitemarray[28] - 1), 0))
else:
pool.extend(['Magic Mirror'] * customitemarray[22])
pool.extend(['Moon Pearl'] * customitemarray[28])
Custom item pool support for retro mode Allows the placement of Universal Keys (which probably don't do much outside of retro mode) and handles total item counts properly.
2018-03-15 16:53:42 -05:00
if retro:
itemtotal = itemtotal - 28 # Corrects for small keys not being in item pool in Retro Mode
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
if itemtotal < total_items_to_place:
pool.extend(['Nothing'] * (total_items_to_place - itemtotal))
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
return (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms)
Custom item pool feature This is the starting point for the new custom item pool feature that will let users specify the item pool. It is functional, perhaps due for some minor tweaking and definitely needs more testing. The command line side is bad, just two parameters that hopefully don't do anything under any circumstance if the user tries to use them (don't really intend to support a command line version of this feature); maybe there's a better way to let the command line ER work in general without having any opportunity to activate this feature. The GUI should probably show the user the sum of the current item pool out of 153 so the user knows how to size the item pool more easily, but that's a todo.
2018-01-21 20:43:44 -06:00
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
# A quick test to ensure all combinations generate the correct amount of items.
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
def test():
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
for difficulty in ['normal', 'hard', 'expert']:
Refactored ItemList It now has much less duplicated code, and a useful difficulty abstraction. No changes to pool results were made, and this was verified with automated testing.
2017-11-18 18:21:31 -05:00
for goal in ['ganon', 'triforcehunt', 'pedestal']:
Add untimed OHKO mode
2017-11-18 20:36:42 -05:00
for timer in ['none', 'display', 'timed', 'timed-ohko', 'ohko', 'timed-countdown']:
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
for mode in ['open', 'standard', 'inverted']:
for swords in ['random', 'assured', 'swordless', 'vanilla']:
for progressive in ['on', 'off']:
for shuffle in ['full', 'insanity_legacy']:
for retro in [True, False]:
out = get_pool_core(progressive, shuffle, difficulty, timer, goal, mode, swords, retro)
count = len(out[0]) + len(out[1])
correct_count = total_items_to_place
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
if goal == 'pedestal' and swords != 'vanilla':
Partial implementation of many V31 features Partial support for Progressive bow - Still needs to be added to item pool - Silver hint handling remains TBD even for VT Added weapons selection. - Vanilla needs to be implemented - Assured needs to be implemented - Inverted swordless is almost certainly messed up. - Swordless standard mode will likely softlock - Random weapon standard mode is currently treated as uncle assured Deleted removed difficulties - Remaining difficulties still need to be adjusted Added locked property to locations: - This is used for preplaced items etc so that multiworld balancing knows they cannot be moved. Made a few of the difficulty changes from V31, but not all. Added required text changes to handle crystals requirements - More changes will likely me made in future - Currently there is is no way to tell ganon requirement in Inverted mode
2019-08-04 12:32:35 -04:00
# pedestal goals generate one extra item
correct_count += 1
if retro:
correct_count += 28
Implement new weapons modes This also includes some partial additional cleanup of the item pool.
2019-08-10 15:30:14 -04:00
try:
assert count == correct_count, "expected {0} items but found {1} items for {2}".format(correct_count, count, (progressive, shuffle, difficulty, timer, goal, mode, swords, retro))
except AssertionError as e:
print(e)
Style fixes A bunch of style fixes. Mostly white space and style import order tweaks, but a few other stylistic changes are present too.
2017-12-17 00:25:46 -05:00
if __name__ == '__main__':
test()
Reference in New Issue Copy Permalink