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

Core: World: MultiWorld and another deprecated option getter (#3254)

Browse Source 
* world: multiworld and deprecated options getting

* Oops

* Found two more
This commit is contained in:
Exempt-Medic
2024-05-12 12:51:20 -04:00
committed by GitHub
parent af83050b75
commit 701fbab837
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
worlds/generic/Rules.py
View File

@@ -14,16 +14,16 @@ else:
ItemRule = typing.Callable[[object], bool]
def locality_needed(world: MultiWorld) -> bool:
for player in world.player_ids:
if world.local_items[player].value:
def locality_needed(multiworld: MultiWorld) -> bool:
for player in multiworld.player_ids:
if multiworld.worlds[player].options.local_items.value:
return True
if world.non_local_items[player].value:
if multiworld.worlds[player].options.non_local_items.value:
return True
# Group
for group_id, group in world.groups.items():
if set(world.player_ids) == set(group["players"]):
for group_id, group in multiworld.groups.items():
if set(multiworld.player_ids) == set(group["players"]):
continue
if group["local_items"]:
return True
@@ -31,8 +31,8 @@ def locality_needed(world: MultiWorld) -> bool:
return True
def locality_rules(world: MultiWorld):
if locality_needed(world):
def locality_rules(multiworld: MultiWorld):
if locality_needed(multiworld):
forbid_data: typing.Dict[int, typing.Dict[int, typing.Set[str]]] = \
collections.defaultdict(lambda: collections.defaultdict(set))
@@ -40,32 +40,32 @@ def locality_rules(world: MultiWorld):
def forbid(sender: int, receiver: int, items: typing.Set[str]):
forbid_data[sender][receiver].update(items)
for receiving_player in world.player_ids:
local_items: typing.Set[str] = world.worlds[receiving_player].options.local_items.value
for receiving_player in multiworld.player_ids:
local_items: typing.Set[str] = multiworld.worlds[receiving_player].options.local_items.value
if local_items:
for sending_player in world.player_ids:
for sending_player in multiworld.player_ids:
if receiving_player != sending_player:
forbid(sending_player, receiving_player, local_items)
non_local_items: typing.Set[str] = world.worlds[receiving_player].options.non_local_items.value
non_local_items: typing.Set[str] = multiworld.worlds[receiving_player].options.non_local_items.value
if non_local_items:
forbid(receiving_player, receiving_player, non_local_items)
# Group
for receiving_group_id, receiving_group in world.groups.items():
if set(world.player_ids) == set(receiving_group["players"]):
for receiving_group_id, receiving_group in multiworld.groups.items():
if set(multiworld.player_ids) == set(receiving_group["players"]):
continue
if receiving_group["local_items"]:
for sending_player in world.player_ids:
for sending_player in multiworld.player_ids:
if sending_player not in receiving_group["players"]:
forbid(sending_player, receiving_group_id, receiving_group["local_items"])
if receiving_group["non_local_items"]:
for sending_player in world.player_ids:
for sending_player in multiworld.player_ids:
if sending_player in receiving_group["players"]:
forbid(sending_player, receiving_group_id, receiving_group["non_local_items"])
# create fewer lambda's to save memory and cache misses
func_cache = {}
for location in world.get_locations():
for location in multiworld.get_locations():
if (location.player, location.item_rule) in func_cache:
location.item_rule = func_cache[location.player, location.item_rule]
# empty rule that just returns True, overwrite