Fix: Item_Calyx should not have ETA

This commit is contained in:
LmeSzinc 2024-06-22 23:13:25 +08:00
parent b4f75165b1
commit c2ec4beea6

View File

@ -293,7 +293,7 @@ class StoredPlannerProxy(BaseModelWithFallback):
""" """
Estimate remaining days to farm Estimate remaining days to farm
""" """
if not self.need_farm(): if not self.can_daily_farm():
return 0. return 0.
if self.item.dungeon is None: if self.item.dungeon is None:
return 0. return 0.
@ -304,12 +304,11 @@ class StoredPlannerProxy(BaseModelWithFallback):
cost = self.combat_cost cost = self.combat_cost
drop = self.drop_equivalent_green drop = self.drop_equivalent_green
if self.item.is_ItemWeekly: # if self.item.is_ItemWeekly:
weeks = math.ceil(remain / drop / 3) # weeks = math.ceil(remain / drop / 3)
return weeks * 7 # return weeks * 7
else: stamina = math.ceil(remain / drop) * cost
stamina = math.ceil(remain / drop) * cost return round(stamina / 240, 1)
return round(stamina / 240, 1)
def update(self, time=False): def update(self, time=False):
for attr in SET_ROW_EXCLUDE: for attr in SET_ROW_EXCLUDE:
@ -534,6 +533,7 @@ class PlannerProgressParser:
name = f'Item_{row.item.name}' name = f'Item_{row.item.name}'
dic = row.model_dump(exclude=SET_ROW_EXCLUDE) dic = row.model_dump(exclude=SET_ROW_EXCLUDE)
dic['item'] = row.item.name dic['item'] = row.item.name
dic['time'] = str(row.time)
data[name] = dic data[name] = dic
return data return data