monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Rewrite start inventory from pool code (#3778) 

* Rewrite start inventory from pool code

* I think this is nicer?

* lol

* I just made it even shorter and nicer

* comments :D

* I think this makes more logical sense

* final change I promise

* HOLD UP THIS IS SO SHORT NOW

* ???????? Vi pls

* ???????? Vi pls????????????????

* this was probably important idk

* Lmao this just did not work correctly at all
This commit is contained in:
NewSoupVi 2024-11-29 22:43:01 +01:00 committed by GitHub
parent 8444ffa0c7
commit c97e4866dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Main.py
View File

@ -153,45 +153,38 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
# remove starting inventory from pool items. # remove starting inventory from pool items.
# Because some worlds don't actually create items during create_items this has to be as late as possible. # Because some worlds don't actually create items during create_items this has to be as late as possible.
if any(getattr(multiworld.worlds[player].options, "start_inventory_from_pool", None) for player in multiworld.player_ids): fallback_inventory = StartInventoryPool({})
new_items: List[Item] = [] depletion_pool: Dict[int, Dict[str, int]] = {
old_items: List[Item] = [] player: getattr(multiworld.worlds[player].options, "start_inventory_from_pool", fallback_inventory).value.copy()
depletion_pool: Dict[int, Dict[str, int]] = { for player in multiworld.player_ids
player: getattr(multiworld.worlds[player].options, }
"start_inventory_from_pool", target_per_player = {
StartInventoryPool({})).value.copy() player: sum(target_items.values()) for player, target_items in depletion_pool.items() if target_items
for player in multiworld.player_ids }
}
for player, items in depletion_pool.items():
player_world: AutoWorld.World = multiworld.worlds[player]
for count in items.values():
for _ in range(count):
new_items.append(player_world.create_filler())
target: int = sum(sum(items.values()) for items in depletion_pool.values())
for i, item in enumerate(multiworld.itempool):
if depletion_pool[item.player].get(item.name, 0):
target -= 1
depletion_pool[item.player][item.name] -= 1
# quick abort if we have found all items
if not target:
old_items.extend(multiworld.itempool[i+1:])
break
else:
old_items.append(item)
# leftovers? if target_per_player:
if target: new_itempool: List[Item] = []
for player, remaining_items in depletion_pool.items():
remaining_items = {name: count for name, count in remaining_items.items() if count} # Make new itempool with start_inventory_from_pool items removed
if remaining_items: for item in multiworld.itempool:
logger.warning(f"{multiworld.get_player_name(player)}" if depletion_pool[item.player].get(item.name, 0):
f" is trying to remove items from their pool that don't exist: {remaining_items}") depletion_pool[item.player][item.name] -= 1
# find all filler we generated for the current player and remove until it matches else:
removables = [item for item in new_items if item.player == player] new_itempool.append(item)
for _ in range(sum(remaining_items.values())):
new_items.remove(removables.pop()) # Create filler in place of the removed items, warn if any items couldn't be found in the multiworld itempool
assert len(multiworld.itempool) == len(new_items + old_items), "Item Pool amounts should not change." for player, target in target_per_player.items():
multiworld.itempool[:] = new_items + old_items unfound_items = {item: count for item, count in depletion_pool[player].items() if count}
if unfound_items:
player_name = multiworld.get_player_name(player)
logger.warning(f"{player_name} tried to remove items from their pool that don't exist: {unfound_items}")
needed_items = target_per_player[player] - sum(unfound_items.values())
new_itempool += [multiworld.worlds[player].create_filler() for _ in range(needed_items)]
assert len(multiworld.itempool) == len(new_itempool), "Item Pool amounts should not change."
multiworld.itempool[:] = new_itempool
multiworld.link_items() multiworld.link_items()