mirror of
https://github.com/LmeSzinc/StarRailCopilot.git
synced 2024-11-15 22:19:18 +00:00
Fix: Weekly items are calculated in PlannerOverall
This commit is contained in:
parent
b63bf68621
commit
e75a9a90a8
@ -405,6 +405,22 @@ class StoredPlannerProxy(BaseModelWithFallback):
|
|||||||
self.total += row.total
|
self.total += row.total
|
||||||
self.synthesize += row.synthesize
|
self.synthesize += row.synthesize
|
||||||
|
|
||||||
|
def can_daily_farm(self):
|
||||||
|
"""
|
||||||
|
Returns:
|
||||||
|
bool: True if item can be farmed in daily
|
||||||
|
False if item.is_ItemWeekly or Tracks_of_Destiny
|
||||||
|
"""
|
||||||
|
if self.item.is_ItemAscension:
|
||||||
|
return True
|
||||||
|
if self.item.is_ItemTrace:
|
||||||
|
return True
|
||||||
|
if self.item.is_ItemExp:
|
||||||
|
return True
|
||||||
|
if self.item.is_ItemCurrency:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
def need_farm(self):
|
def need_farm(self):
|
||||||
return self.progress < 100
|
return self.progress < 100
|
||||||
|
|
||||||
@ -532,6 +548,8 @@ class PlannerProgressParser:
|
|||||||
progress_current = 0.
|
progress_current = 0.
|
||||||
progress_total = 0.
|
progress_total = 0.
|
||||||
for row in self.rows.values():
|
for row in self.rows.values():
|
||||||
|
if not row.can_daily_farm():
|
||||||
|
continue
|
||||||
eta += row.eta
|
eta += row.eta
|
||||||
progress_current += row.progress_current
|
progress_current += row.progress_current
|
||||||
progress_total += row.progress_total
|
progress_total += row.progress_total
|
||||||
|
Loading…
Reference in New Issue
Block a user