Fix: Weekly farming was skipped if immersifiers are preserved for ornament

This commit is contained in:
LmeSzinc 2024-07-15 18:50:05 +08:00
parent 407029dffa
commit 2621cb5d53

View File

@ -375,13 +375,7 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonRogueUI
# Expired, do rogue
pass
elif self.config.stored.SimulatedUniverse.is_full():
if self.config.RogueWorld_UseImmersifier and self.config.stored.Immersifier.value > 0:
logger.info(
'Reached weekly point limit but still have immersifiers left, continue to use them')
if ornament:
logger.info('Ornament enabled, skip farming rogue')
raise RogueReachedWeeklyPointLimit
elif self.config.RogueWorld_WeeklyFarming and not self.config.stored.SimulatedUniverseFarm.is_full():
if self.config.RogueWorld_WeeklyFarming and not self.config.stored.SimulatedUniverseFarm.is_full():
logger.info(
'Reached weekly point limit but still continue to farm materials')
logger.attr(
@ -389,6 +383,12 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonRogueUI
if self.config.is_cloud_game and not self.config.stored.CloudRemainSeasonPass.value:
logger.warning('Running WeeklyFarming on cloud game without season pass may cause fee, skip')
raise RogueReachedWeeklyPointLimit
elif self.config.RogueWorld_UseImmersifier and self.config.stored.Immersifier.value > 0:
logger.info(
'Reached weekly point limit but still have immersifiers left, continue to use them')
if ornament:
logger.info('Ornament enabled, skip farming rogue')
raise RogueReachedWeeklyPointLimit
else:
raise RogueReachedWeeklyPointLimit
else: