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

- Fix Stardew valley option that was accidentally renamed in 993 (#2336)

Browse Source
This commit is contained in:
agilbert1412
2023-10-21 17:28:07 -04:00
committed by GitHub
parent 1c4303cce6
commit a5022ccfc5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/stardew_valley/items.py
View File

@@ -368,8 +368,8 @@ def create_arcade_machine_items(item_factory: StardewItemFactory, options: Stard
def create_player_buffs(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]): def create_player_buffs(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
items.extend(item_factory(item) for item in [Buff.movement] * options.number_of_movement_buffs.value) items.extend(item_factory(item) for item in [Buff.movement] * options.movement_buff_number.value)
items.extend(item_factory(item) for item in [Buff.luck] * options.number_of_luck_buffs.value) items.extend(item_factory(item) for item in [Buff.luck] * options.luck_buff_number.value)
def create_traveling_merchant_items(item_factory: StardewItemFactory, items: List[Item]): def create_traveling_merchant_items(item_factory: StardewItemFactory, items: List[Item]):

4
worlds/stardew_valley/logic.py
View File

@@ -927,7 +927,7 @@ class StardewLogic:
return region_rule & ((tool_rule & foraging_rule) | magic_rule) return region_rule & ((tool_rule & foraging_rule) | magic_rule)
def has_max_buffs(self) -> StardewRule: def has_max_buffs(self) -> StardewRule:
return self.received(Buff.movement, self.options.number_of_movement_buffs.value) & self.received(Buff.luck, self.options.number_of_luck_buffs.value) return self.received(Buff.movement, self.options.movement_buff_number.value) & self.received(Buff.luck, self.options.luck_buff_number.value)
def get_weapon_rule_for_floor_tier(self, tier: int): def get_weapon_rule_for_floor_tier(self, tier: int):
if tier >= 4: if tier >= 4:
@@ -1376,7 +1376,7 @@ class StardewLogic:
return self.received(Wallet.rusty_key) return self.received(Wallet.rusty_key)
def can_win_egg_hunt(self) -> StardewRule: def can_win_egg_hunt(self) -> StardewRule:
number_of_movement_buffs = self.options.number_of_movement_buffs.value number_of_movement_buffs = self.options.movement_buff_number.value
if self.options.festival_locations == FestivalLocations.option_hard or number_of_movement_buffs < 2: if self.options.festival_locations == FestivalLocations.option_hard or number_of_movement_buffs < 2:
return True_() return True_()
return self.received(Buff.movement, number_of_movement_buffs // 2) return self.received(Buff.movement, number_of_movement_buffs // 2)

4
worlds/stardew_valley/options.py
View File

@@ -556,8 +556,8 @@ class StardewValleyOptions(PerGameCommonOptions):
museumsanity: Museumsanity museumsanity: Museumsanity
friendsanity: Friendsanity friendsanity: Friendsanity
friendsanity_heart_size: FriendsanityHeartSize friendsanity_heart_size: FriendsanityHeartSize
number_of_movement_buffs: NumberOfMovementBuffs movement_buff_number: NumberOfMovementBuffs
number_of_luck_buffs: NumberOfLuckBuffs luck_buff_number: NumberOfLuckBuffs
exclude_ginger_island: ExcludeGingerIsland exclude_ginger_island: ExcludeGingerIsland
trap_items: TrapItems trap_items: TrapItems
multiple_day_sleep_enabled: MultipleDaySleepEnabled multiple_day_sleep_enabled: MultipleDaySleepEnabled