From 9df8a85262cef81023a1a76f920a4b06b544b0f9 Mon Sep 17 00:00:00 2001 From: nekosoffy <161766793+nekosoffy@users.noreply.github.com> Date: Sat, 30 Nov 2024 14:38:24 -0300 Subject: [PATCH] fix: make verbiage of "remaining items" consistent - Changes all instances of remaining items to " left", since not only that seems to be the standard choice, but it also conveys the meaning better. --- src/pages/bundles.tsx | 8 ++------ src/pages/cooking.tsx | 2 +- src/pages/crafting.tsx | 2 +- src/pages/fishing.tsx | 4 ++-- src/pages/museum.tsx | 4 ++-- src/pages/relationships.tsx | 26 +++++++++++++------------- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/pages/bundles.tsx b/src/pages/bundles.tsx index 6af38210..9109acf6 100644 --- a/src/pages/bundles.tsx +++ b/src/pages/bundles.tsx @@ -497,9 +497,7 @@ export default function Bundles() { }, 0); completed = completedCount >= 30; if (!completed) { - additionalDescription = ` - ${ - 30 - completedCount - } more bundles to complete the community center`; + additionalDescription = ` - ${30 - completedCount} bundles left`; } } @@ -509,9 +507,7 @@ export default function Bundles() { activePlayer?.general?.jojaMembership?.developmentProjects?.length; completed = completedCount >= 5; if (!completed) { - additionalDescription = ` - ${ - 5 - completedCount - } more Joja Community Development projects needed`; + additionalDescription = ` - ${5 - completedCount} projects left`; } } } diff --git a/src/pages/cooking.tsx b/src/pages/cooking.tsx index 74f0c881..89b27a22 100644 --- a/src/pages/cooking.tsx +++ b/src/pages/cooking.tsx @@ -92,7 +92,7 @@ export default function Cooking() { completed = cookedCount >= reqs[name]; if (!completed) { - additionalDescription = ` - ${reqs[name] - cookedCount} more`; + additionalDescription = ` - ${reqs[name] - cookedCount} left`; } return { completed, additionalDescription }; }; diff --git a/src/pages/crafting.tsx b/src/pages/crafting.tsx index e821bee3..c134d7fd 100644 --- a/src/pages/crafting.tsx +++ b/src/pages/crafting.tsx @@ -94,7 +94,7 @@ export default function Crafting() { completed = craftedCount >= reqs[name]; if (!completed) { - additionalDescription = ` - ${reqs[name] - craftedCount} more`; + additionalDescription = ` - ${reqs[name] - craftedCount} left`; } return { completed, additionalDescription }; diff --git a/src/pages/fishing.tsx b/src/pages/fishing.tsx index 82eadde4..8786b79f 100644 --- a/src/pages/fishing.tsx +++ b/src/pages/fishing.tsx @@ -116,12 +116,12 @@ export default function Fishing() { const totalCaught = activePlayer?.fishing?.totalCaught ?? 0; completed = totalCaught >= reqs[name]; if (!completed) { - additionalDescription = ` - ${reqs[name] - totalCaught} more`; + additionalDescription = ` - ${reqs[name] - totalCaught} left`; } } else { completed = fishCaught.size >= reqs[name]; if (!completed) { - additionalDescription = ` - ${reqs[name] - fishCaught.size} more`; + additionalDescription = ` - ${reqs[name] - fishCaught.size} left`; } } return { completed, additionalDescription }; diff --git a/src/pages/museum.tsx b/src/pages/museum.tsx index 1ab00875..d677e575 100644 --- a/src/pages/museum.tsx +++ b/src/pages/museum.tsx @@ -63,7 +63,7 @@ export default function Museum() { if (!completed) { additionalDescription = ` - ${ 40 - (museumArtifactCollected.size + museumMineralCollected.size) - } more`; + } left`; } } else { completed = @@ -71,7 +71,7 @@ export default function Museum() { if (!completed) { additionalDescription = ` - ${ 95 - (museumArtifactCollected.size + museumMineralCollected.size) - } more`; + } left`; } } diff --git a/src/pages/relationships.tsx b/src/pages/relationships.tsx index 2b0c18cc..a94dd1eb 100644 --- a/src/pages/relationships.tsx +++ b/src/pages/relationships.tsx @@ -55,7 +55,7 @@ export default function Relationships() { let fiveHeartCount = 0; for (const relationship of Object.values( - activePlayer.social.relationships + activePlayer.social.relationships, )) { if (relationship.points >= 250 * 5) fiveHeartCount++; } @@ -67,7 +67,7 @@ export default function Relationships() { let tenHeartCount = 0; for (const relationship of Object.values( - activePlayer.social.relationships + activePlayer.social.relationships, )) { if (relationship.points >= 250 * 10) tenHeartCount++; } @@ -89,19 +89,19 @@ export default function Relationships() { // use 5 heart count relationships completed = fiveHeartCount >= reqs[name]; if (!completed) { - additionalDescription = ` - ${reqs[name] - fiveHeartCount} more`; + additionalDescription = ` - ${reqs[name] - fiveHeartCount} left`; } } else if (ten.has(name)) { // use 10 heart count relationships completed = tenHeartCount >= reqs[name]; if (!completed) { - additionalDescription = ` - ${reqs[name] - tenHeartCount} more`; + additionalDescription = ` - ${reqs[name] - tenHeartCount} left`; } } else if (house.has(name)) { // house upgrades completed = (activePlayer.social.houseUpgradeLevel ?? 0) >= reqs[name]; if (!completed) { - additionalDescription = ` - ${activePlayer.social.houseUpgradeLevel}/${reqs[name]}`; + additionalDescription = ` - ${reqs[name] - (activePlayer.social.houseUpgradeLevel ?? 0)} left`; } } else { // get married and have two kids @@ -113,7 +113,7 @@ export default function Relationships() { completed = true; } if (!completed) { - additionalDescription = ` - ${activePlayer.social.childrenCount}/2 kids`; + additionalDescription = ` - ${2 - (activePlayer.social.childrenCount ?? 0)} left`; } } return { completed, additionalDescription }; @@ -155,9 +155,9 @@ export default function Relationships() { />
-
+

Social & Family Tracker

@@ -243,7 +243,7 @@ export default function Relationships() { .filter( (a) => a.description.includes("house") || - a.description.includes("married") + a.description.includes("married"), ) .map((a) => { const { completed, additionalDescription } = @@ -268,8 +268,8 @@ export default function Relationships() {

All Villagers

-
-
+
+
-
+
- + setSearch(v)} placeholder="Search Villagers"