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

Stardew Valley 6.x.x: The Content Update (#3478)

Browse Source 
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:
agilbert1412
2024-07-07 16:04:25 +03:00
committed by GitHub
parent f99ee77325
commit 9b22458f44
210 changed files with 10298 additions and 4540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
worlds/stardew_valley/logic/bundle_logic.py
View File

@@ -2,17 +2,22 @@ from functools import cached_property
from typing import Union, List
from .base_logic import BaseLogicMixin, BaseLogic
from .farming_logic import FarmingLogicMixin
from .fishing_logic import FishingLogicMixin
from .has_logic import HasLogicMixin
from .money_logic import MoneyLogicMixin
from .quality_logic import QualityLogicMixin
from .quest_logic import QuestLogicMixin
from .received_logic import ReceivedLogicMixin
from .region_logic import RegionLogicMixin
from .skill_logic import SkillLogicMixin
from .time_logic import TimeLogicMixin
from ..bundles.bundle import Bundle
from ..stardew_rule import StardewRule, And, True_
from ..stardew_rule import StardewRule, True_
from ..strings.ap_names.community_upgrade_names import CommunityUpgrade
from ..strings.currency_names import Currency
from ..strings.machine_names import Machine
from ..strings.quality_names import CropQuality, ForageQuality, FishQuality, ArtisanQuality
from ..strings.quest_names import Quest
from ..strings.region_names import Region
@@ -22,21 +27,26 @@ class BundleLogicMixin(BaseLogicMixin):
self.bundle = BundleLogic(*args, **kwargs)
class BundleLogic(BaseLogic[Union[HasLogicMixin, RegionLogicMixin, MoneyLogicMixin, FarmingLogicMixin, FishingLogicMixin, SkillLogicMixin]]):
class BundleLogic(BaseLogic[Union[ReceivedLogicMixin, HasLogicMixin, TimeLogicMixin, RegionLogicMixin, MoneyLogicMixin, QualityLogicMixin, FishingLogicMixin, SkillLogicMixin,
QuestLogicMixin]]):
# Should be cached
def can_complete_bundle(self, bundle: Bundle) -> StardewRule:
item_rules = []
qualities = []
time_to_grind = 0
can_speak_junimo = self.logic.region.can_reach(Region.wizard_tower)
for bundle_item in bundle.items:
if Currency.is_currency(bundle_item.item_name):
return can_speak_junimo & self.logic.money.can_trade(bundle_item.item_name, bundle_item.amount)
if Currency.is_currency(bundle_item.get_item()):
return can_speak_junimo & self.logic.money.can_trade(bundle_item.get_item(), bundle_item.amount)
item_rules.append(bundle_item.item_name)
item_rules.append(bundle_item.get_item())
if bundle_item.amount > 50:
time_to_grind = bundle_item.amount // 50
qualities.append(bundle_item.quality)
quality_rules = self.get_quality_rules(qualities)
item_rules = self.logic.has_n(*item_rules, count=bundle.number_required)
return can_speak_junimo & item_rules & quality_rules
time_rule = True_() if time_to_grind <= 0 else self.logic.time.has_lived_months(time_to_grind)
return can_speak_junimo & item_rules & quality_rules & time_rule
def get_quality_rules(self, qualities: List[str]) -> StardewRule:
crop_quality = CropQuality.get_highest(qualities)
@@ -45,7 +55,7 @@ class BundleLogic(BaseLogic[Union[HasLogicMixin, RegionLogicMixin, MoneyLogicMix
artisan_quality = ArtisanQuality.get_highest(qualities)
quality_rules = []
if crop_quality != CropQuality.basic:
quality_rules.append(self.logic.farming.can_grow_crop_quality(crop_quality))
quality_rules.append(self.logic.quality.can_grow_crop_quality(crop_quality))
if fish_quality != FishQuality.basic:
quality_rules.append(self.logic.fishing.can_catch_quality_fish(fish_quality))
if forage_quality != ForageQuality.basic:
@@ -54,7 +64,7 @@ class BundleLogic(BaseLogic[Union[HasLogicMixin, RegionLogicMixin, MoneyLogicMix
quality_rules.append(self.logic.has(Machine.cask))
if not quality_rules:
return True_()
return And(*quality_rules)
return self.logic.and_(*quality_rules)
@cached_property
def can_complete_community_center(self) -> StardewRule:
@@ -64,3 +74,11 @@ class BundleLogic(BaseLogic[Union[HasLogicMixin, RegionLogicMixin, MoneyLogicMix
self.logic.region.can_reach_location("Complete Bulletin Board") &
self.logic.region.can_reach_location("Complete Vault") &
self.logic.region.can_reach_location("Complete Boiler Room"))
def can_access_raccoon_bundles(self) -> StardewRule:
if self.options.quest_locations < 0:
return self.logic.received(CommunityUpgrade.raccoon, 1) & self.logic.quest.can_complete_quest(Quest.giant_stump)
# 1 - Break the tree
# 2 - Build the house, which summons the bundle racoon. This one is done manually if quests are turned off
return self.logic.received(CommunityUpgrade.raccoon, 2)