mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Stardew Valley 6.x.x: The Content Update (#3478)
Focus of the Update: Compatibility with Stardew Valley 1.6 Released on March 19th 2024 This includes randomization for pretty much all of the new content, including but not limited to - Raccoon Bundles - Booksanity - Skill Masteries - New Recipes, Craftables, Fish, Maps, Farm Type, Festivals and Quests This also includes a significant reorganisation of the code into "Content Packs", to allow for easier modularity of various game mechanics between the settings and the supported mods. This improves maintainability quite a bit. In addition to that, a few **very** requested new features have been introduced, although they weren't the focus of this update - Walnutsanity - Player Buffs - More customizability in settings, such as shorter special orders, ER without farmhouse - New Remixed Bundles
This commit is contained in:
@@ -5,10 +5,13 @@ from .base_logic import BaseLogic, BaseLogicMixin
|
||||
from .has_logic import HasLogicMixin
|
||||
from .received_logic import ReceivedLogicMixin
|
||||
from .region_logic import RegionLogicMixin
|
||||
from ..stardew_rule import StardewRule, True_, Or
|
||||
from .tool_logic import ToolLogicMixin
|
||||
from ..options import ToolProgression
|
||||
from ..stardew_rule import StardewRule, True_
|
||||
from ..strings.generic_names import Generic
|
||||
from ..strings.geode_names import Geode
|
||||
from ..strings.region_names import Region
|
||||
from ..strings.tool_names import Tool
|
||||
|
||||
|
||||
class ActionLogicMixin(BaseLogicMixin):
|
||||
@@ -17,7 +20,7 @@ class ActionLogicMixin(BaseLogicMixin):
|
||||
self.action = ActionLogic(*args, **kwargs)
|
||||
|
||||
|
||||
class ActionLogic(BaseLogic[Union[ActionLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin]]):
|
||||
class ActionLogic(BaseLogic[Union[ActionLogicMixin, RegionLogicMixin, ReceivedLogicMixin, HasLogicMixin, ToolLogicMixin]]):
|
||||
|
||||
def can_watch(self, channel: str = None):
|
||||
tv_rule = True_()
|
||||
@@ -25,16 +28,13 @@ class ActionLogic(BaseLogic[Union[ActionLogicMixin, RegionLogicMixin, ReceivedLo
|
||||
return tv_rule
|
||||
return self.logic.received(channel) & tv_rule
|
||||
|
||||
def can_pan(self) -> StardewRule:
|
||||
return self.logic.received("Glittering Boulder Removed") & self.logic.region.can_reach(Region.mountain)
|
||||
|
||||
def can_pan_at(self, region: str) -> StardewRule:
|
||||
return self.logic.region.can_reach(region) & self.logic.action.can_pan()
|
||||
def can_pan_at(self, region: str, material: str) -> StardewRule:
|
||||
return self.logic.region.can_reach(region) & self.logic.tool.has_tool(Tool.pan, material)
|
||||
|
||||
@cache_self1
|
||||
def can_open_geode(self, geode: str) -> StardewRule:
|
||||
blacksmith_access = self.logic.region.can_reach(Region.blacksmith)
|
||||
geodes = [Geode.geode, Geode.frozen, Geode.magma, Geode.omni]
|
||||
if geode == Generic.any:
|
||||
return blacksmith_access & Or(*(self.logic.has(geode_type) for geode_type in geodes))
|
||||
return blacksmith_access & self.logic.or_(*(self.logic.has(geode_type) for geode_type in geodes))
|
||||
return blacksmith_access & self.logic.has(geode)
|
||||
|
||||
Reference in New Issue
Block a user