From 6d812a8eb6f4c7b530f78c3f3cf51a6d20dd5ea5 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sat, 3 Dec 2022 16:47:58 -0600
Subject: [PATCH] Show layer name instead of "Day complete" above progress bar
---
src/data/layers/coal.tsx | 2 +-
src/data/layers/elves.tsx | 2 +-
src/data/layers/trees.tsx | 2 +-
src/data/layers/workshop.tsx | 6 ++++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/data/layers/coal.tsx b/src/data/layers/coal.tsx
index 3ef694a..ebd64a3 100644
--- a/src/data/layers/coal.tsx
+++ b/src/data/layers/coal.tsx
@@ -574,7 +574,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
<div>
{main.day.value === day
? `Reach ${formatWhole(totalCoalGoal)} ${coal.displayName} to complete the day`
- : `Day Complete!`}{" "}
+ : `${name} Complete!`}{" "}
-{" "}
<button
class="button"
diff --git a/src/data/layers/elves.tsx b/src/data/layers/elves.tsx
index 0e27118..b9f7d81 100644
--- a/src/data/layers/elves.tsx
+++ b/src/data/layers/elves.tsx
@@ -300,7 +300,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
? `Reach ${formatWhole(6)} trained elves and ${formatWhole(coalGoal)} ${
coal.coal.displayName
} to complete the day`
- : `Day Complete!`}{" "}
+ : `${name} Complete!`}{" "}
-{" "}
<button
class="button"
diff --git a/src/data/layers/trees.tsx b/src/data/layers/trees.tsx
index c654df5..c0780a6 100644
--- a/src/data/layers/trees.tsx
+++ b/src/data/layers/trees.tsx
@@ -646,7 +646,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
<div>
{main.day.value === day
? `Reach ${formatWhole(1e4)} ${logs.displayName} to complete the day`
- : `Day Complete!`}{" "}
+ : `${name} Complete!`}{" "}
-{" "}
<button
class="button"
diff --git a/src/data/layers/workshop.tsx b/src/data/layers/workshop.tsx
index 321ad55..cd7b44a 100644
--- a/src/data/layers/workshop.tsx
+++ b/src/data/layers/workshop.tsx
@@ -179,12 +179,14 @@ const layer = createLayer(id, function (this: BaseLayer) {
<div>
{main.day.value === day
? `Complete the foundation to complete the day`
- : `Day Complete!`}
+ : `${name} Complete!`}
</div>
{render(dayProgress)}
<Spacer />
{render(buildFoundation)}
- <div>You have {formatWhole(foundationProgress.value)}% completed</div>
+ {Decimal.lt(foundationProgress.value, 100) ? (
+ <div>You have {formatWhole(foundationProgress.value)}% completed</div>
+ ) : null}
<Spacer />
{renderCol(...Object.values(milestones))}
</>