Show progress for drops with non-zero current minutes
This commit is contained in:
1 parent
e0dc371824
commit
31f25c9a6d
1 file changed
+7
-5
@@ -1213,21 +1213,23 @@ class InventoryOverview:
|
|||||||
self._campaigns.clear()
|
self._campaigns.clear()
|
||||||
|
|
||||||
def get_progress(self, drop: TimedDrop) -> tuple[str, tk._Color]:
|
def get_progress(self, drop: TimedDrop) -> tuple[str, tk._Color]:
|
||||||
|
progress_text: str
|
||||||
progress_color: tk._Color = ''
|
progress_color: tk._Color = ''
|
||||||
progress_text: str = _("gui", "inventory", "minutes_progress").format(
|
|
||||||
minutes=drop.required_minutes
|
|
||||||
)
|
|
||||||
if drop.is_claimed:
|
if drop.is_claimed:
|
||||||
progress_color = "green"
|
progress_color = "green"
|
||||||
progress_text = _("gui", "inventory", "status", "claimed")
|
progress_text = _("gui", "inventory", "status", "claimed")
|
||||||
elif drop.can_claim:
|
elif drop.can_claim:
|
||||||
progress_color = "goldenrod"
|
progress_color = "goldenrod"
|
||||||
progress_text = _("gui", "inventory", "status", "ready")
|
progress_text = _("gui", "inventory", "status", "ready_to_claim")
|
||||||
elif drop.can_earn():
|
elif drop.current_minutes or drop.can_earn():
|
||||||
progress_text = _("gui", "inventory", "percent_progress").format(
|
progress_text = _("gui", "inventory", "percent_progress").format(
|
||||||
percent=f"{drop.progress:3.1%}",
|
percent=f"{drop.progress:3.1%}",
|
||||||
minutes=drop.required_minutes,
|
minutes=drop.required_minutes,
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
|
progress_text = _("gui", "inventory", "minutes_progress").format(
|
||||||
|
minutes=drop.required_minutes
|
||||||
|
)
|
||||||
return (progress_text, progress_color)
|
return (progress_text, progress_color)
|
||||||
|
|
||||||
def update_drop(self, drop: TimedDrop) -> None:
|
def update_drop(self, drop: TimedDrop) -> None:
|
||||||
|
|||||||
Reference in new issue
Block a user