Merged in DR v1.4.1.12

This commit is contained in:
codemann8
2024-05-23 21:49:24 -05:00
26 changed files with 557 additions and 3048 deletions

View File

@@ -554,7 +554,7 @@ def config_sort(world):
if world.item_pool_config.verify:
config_sort_helper(world, world.item_pool_config.verify)
elif world.item_pool_config.preferred:
config_sort_helper(world, world.item_pool_config.preferred)
config_sort_helper_random(world, world.item_pool_config.preferred)
def config_sort_helper(world, sort_dict):
@@ -564,6 +564,10 @@ def config_sort_helper(world, sort_dict):
if (i.name, i.player) in sort_dict else 0)
def config_sort_helper_random(world, sort_dict):
world.itempool.sort(key=lambda i: 1 if (i.name, i.player) in sort_dict else 0)
def calc_trash_locations(world, player):
total_count, gt_count = 0, 0
for loc in world.get_locations():