Merge branch 'develop' into fix/shop-sync

runejs · Mar 24, 2021 · b3e1b94 · b3e1b94
2 parents 0f34584 + 5c551db
commit b3e1b94
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/game-engine/world/actor/player/player.ts b/src/game-engine/world/actor/player/player.ts
@@ -1002,9 +1002,17 @@ export class Player extends Actor {
         Object.keys(questMap).forEach(questKey => {
             const questData = questMap[questKey];
             const playerQuest = this.quests.find(quest => quest.questId === questData.id);
-            let color = colors.green;
-            if(playerQuest && !playerQuest.complete) {
-                color = playerQuest.progress === 0 ? colors.red : colors.yellow;
+            let color: number;
+
+            if (playerQuest?.complete) {
+                // Quest complete, regardless of progress
+                color = colors.green;
+            } else if (playerQuest?.progress > 0) {
+                // Quest in progress, not yet complete but progress is greater than 0
+                color = colors.yellow;
+            } else {
+                // Everything else failed, so quest hasn't been started yet
+                color = colors.red;
             }
 
             this.modifyWidget(widgets.questTab, { childId: questData.questTabId, textColor: color });