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: Add a function to allow worlds to easily allow self-locking items (#1383)

Browse Source 
* implement function to allow self locking items for items accessibility

* swap some lttp locations to use new functionality

* lambda capture `item_name` and `location`

* don't lambda capture location

* Revert weird visual indent

* make location.always_allow additive

* fix always_allow rule for multiple items

* don't need to lambda capture item_names

* oop

* move player assignment to the beginning

* always_allow should only be for that player so prevent non_local_items

* messenger got merged so have it use this

* Core: fix doc string indentation for allow_self_locking_items

* Core: fix doc string indentation for allow_self_locking_items, number two

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
This commit is contained in:
alwaysintreble
2023-03-13 18:55:34 -05:00
committed by GitHub
parent 060ee926e7
commit 573a1a8402
4 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
worlds/messenger/Rules.py
View File

@@ -1,9 +1,9 @@
from typing import Dict, Callable, Optional, Tuple, Union, TYPE_CHECKING, List, Iterable
from typing import Dict, Callable, TYPE_CHECKING
from BaseClasses import CollectionState, MultiWorld, Location, Region, Entrance, Item
from BaseClasses import CollectionState, MultiWorld
from worlds.generic.Rules import set_rule, allow_self_locking_items
from .Options import MessengerAccessibility, Goal
from .Constants import NOTES, PHOBEKINS
from ..generic.Rules import add_rule, set_rule
if TYPE_CHECKING:
from . import MessengerWorld
@@ -113,39 +113,6 @@ class MessengerRules:
set_self_locking_items(multiworld, self.player)
def location_item_name(state: CollectionState, location_name: str, player: int) -> Optional[Tuple[str, int]]:
location = state.multiworld.get_location(location_name, player)
if location.item is None:
return None
return location.item.name, location.item.player
def allow_self_locking_items(spot: Union[Location, Region], *item_names: str) -> None:
"""
Sets rules on the supplied spot, such that the supplied item_name(s) can possibly be placed there.
:param spot: Location or Region that the item(s) are allowed to be placed in
:param item_names: item name or names that are allowed to be placed in the Location or Region
"""
player = spot.player
def set_always_allow(location: Location, rule: Callable[[CollectionState, Item], bool]) -> None:
location.always_allow = rule
def add_allowed_rules(area: Union[Location, Entrance], location: Location) -> None:
for item_name in item_names:
add_rule(area, lambda state, item_name=item_name:
location_item_name(state, location.name, player) == (item_name, player), "or")
set_always_allow(location, lambda state, item:
item.player == player and item.name in [item_name for item_name in item_names])
if isinstance(spot, Region):
for entrance in spot.entrances:
for location in spot.locations:
add_allowed_rules(entrance, location)
else:
add_allowed_rules(spot, spot)
def set_self_locking_items(multiworld: MultiWorld, player: int) -> None:
# do the ones for seal shuffle on and off first
allow_self_locking_items(multiworld.get_location("Key of Strength", player), "Power Thistle")