Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KH2: Promise charm logic #2635

Merged
merged 6 commits into from
Jan 16, 2024
Merged

KH2: Promise charm logic #2635

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dae7f9
Update Rules.py
JaredWeakStrike Dec 27, 2023
14c9893
update to be cleaner
JaredWeakStrike Dec 27, 2023
4a8b5d0
Merge branch 'main' into kh2-promise-charm-logic
black-sliver Dec 28, 2023
2776ac7
actually checking if they have promise charm
JaredWeakStrike Dec 28, 2023
7cc768d
dont check if promise charm isnt on
JaredWeakStrike Dec 28, 2023
24bfb31
Merge branch 'main' into kh2-promise-charm-logic
JaredWeakStrike Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion worlds/kh2/Rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ def hundred_acre_unlocked(self, state: CollectionState, amount) -> bool:
return state.has(ItemName.TornPages, self.player, amount)

def level_locking_unlock(self, state: CollectionState, amount):
if self.world.options.Promise_Charm and state.has(ItemName.PromiseCharm, self.player):
return True
return amount <= sum([state.count(item_name, self.player) for item_name in visit_locking_dict["2VisitLocking"]])

def summon_levels_unlocked(self, state: CollectionState, amount) -> bool:
Expand Down Expand Up @@ -224,7 +226,7 @@ def __init__(self, kh2world: KH2World) -> None:
RegionName.Pl2: lambda state: self.pl_unlocked(state, 2),

RegionName.Ag: lambda state: self.ag_unlocked(state, 1),
RegionName.Ag2: lambda state: self.ag_unlocked(state, 2) and self.kh2_has_all([ItemName.FireElement,ItemName.BlizzardElement,ItemName.ThunderElement],state),
RegionName.Ag2: lambda state: self.ag_unlocked(state, 2) and self.kh2_has_all([ItemName.FireElement, ItemName.BlizzardElement, ItemName.ThunderElement], state),

RegionName.Bc: lambda state: self.bc_unlocked(state, 1),
RegionName.Bc2: lambda state: self.bc_unlocked(state, 2),
Expand Down
Loading