Stardew Valley: Fix magic altar logic (#3417)

* Fix magic altar logic

* Force a tuple (really?)

* Fix received and force progression on all spells

* Reversing the tuple change (?yllaer)
This commit is contained in:
Witchybun
2024-05-29 13:16:19 -05:00
committed by GitHub
parent 34f903e97a
commit 378af4b07c
3 changed files with 41 additions and 32 deletions

View File

@@ -8,7 +8,7 @@ from ...mods.mod_data import ModNames
from ...stardew_rule import StardewRule, False_
from ...strings.ap_names.skill_level_names import ModSkillLevel
from ...strings.region_names import MagicRegion
from ...strings.spells import MagicSpell
from ...strings.spells import MagicSpell, all_spells
class MagicLogicMixin(BaseLogicMixin):
@@ -27,7 +27,8 @@ class MagicLogic(BaseLogic[Union[RegionLogicMixin, ReceivedLogicMixin, HasLogicM
def can_use_altar(self) -> StardewRule:
if ModNames.magic not in self.options.mods:
return False_()
return self.logic.region.can_reach(MagicRegion.altar)
spell_rule = False_()
return self.logic.region.can_reach(MagicRegion.altar) & self.logic.received_any(*all_spells)
def has_any_spell(self) -> StardewRule:
if ModNames.magic not in self.options.mods: