shards/fragments fixed order

HKCheckCompletion.js

@@ -129,26 +129,42 @@ const HK_EQUIPMENT = {
 };
 
 const HK_MASKSHARDS = {
-    slyShellFrag1: "Mask Shard (Sly - 150 Geo)",
+    slyShellFrag1: "Mask Shard #1 (Sly - 150 Geo)",
-    slyShellFrag2: "Mask Shard (Sly - 500 Geo)",
+    slyShellFrag2: "Mask Shard #2 (Sly - 500 Geo)",
-    slyShellFrag3: "Mask Shard (Sly - 800 Geo)",
+    slyShellFrag3: "Mask Shard #3 (Sly - 800 Geo)",
-    slyShellFrag4: "Mask Shard (Sly - 1500 Geo)",
+    slyShellFrag4: "Mask Shard #4 (Sly - 1500 Geo)",
-    dreamReward7: "Mask Shard (Seer - 1500 Essence)"
+    dreamReward7: "Mask Shard #5 (Seer - 1500 Essence)"
 };
 
 // "Heart Piece" sceneData.persistentBoolItems[n].id
 const HK_MASKSHARDS_WORLD = {
-    Crossroads_13: "Mask Shard (Forgotten Crossroads - below Hot Springs)",
+    Crossroads_13: "Mask Shard #6 (Forgotten Crossroads - below Hot Springs)",
-    Fungus2_01: "Mask Shard (Queen's Station)",
+    Crossroads_09: "Mask Shard #7 (Forgotten Crossroads - Brooding Mawlek)",
-    Crossroads_38: "Mask Shard (Grubfather - rescue 5 Grubs)",
+    Crossroads_38: "Mask Shard #8 (Grubfather - rescue 5 Grubs)",
-    Waterways_04b: "Mask Shard (Royal Waterways)",
+    Room_Bretta: "Mask Shard #9 (Dirtmouth - Bretta's Room)",
-    Fungus1_36: "Mask Shard (Greenpath - Stone Sanctuary)",
+    Fungus2_01: "Mask Shard #10 (Queen's Station)",
-    Crossroads_09: "Mask Shard (Forgotten Crossroads - Brooding Mawlek)",
+    Waterways_04b: "Mask Shard #11 (Royal Waterways)",
-    Mines_32: "Mask Shard (Crystal Peak - Enraged Guardian)",
+    Fungus1_36: "Mask Shard #12 (Greenpath - Stone Sanctuary)",
-    Fungus2_25: "Mask Shard (Deepnest - entrance from Fungal Wastes)",
+    Mines_32: "Mask Shard #13 (Crystal Peak - Enraged Guardian)",
-    Room_Bretta: "Mask Shard (Dirtmouth - Bretta's Room)",
+    Fungus2_25: "Mask Shard #14 (Deepnest - entrance from Fungal Wastes)",
-    Hive_04: "Mask Shard (The Hive)",
+    Hive_04: "Mask Shard #15 (The Hive)",
-    Room_Mansion: "Mask Shard (Resting Grounds - Delicate Flower)"
+    Room_Mansion: "Mask Shard #16 (Resting Grounds - Delicate Flower)"
+};
+
+const HK_VESSELFRAGMENTS = {
+    slyVesselFrag1: "Vessel Fragment #1 (Sly - 550 Geo)",
+    slyVesselFrag2: "Vessel Fragment #2 (Sly - 900 Geo)",
+    dreamReward5: "Vessel Fragment #3 (Seer - 700 Essence)",
+    vesselFragStagNest: "Vessel Fragment #4 (Stag Nest)"
+};
+
+// "Vessel Fragment" sceneData.persistentBoolItems[n].id
+const HK_VESSELFRAGMENTS_WORLD = {
+    Fungus1_13: "Vessel Fragment #5 (Greenpath - near Queen's Gardens exit)",
+    Crossroads_37: "Vessel Fragment #6 (Forgotten Crossroads - unlock lift in City of Tears)",
+    Ruins2_09: "Vessel Fragment #7 (Above King's Station)",
+    Deepnest_38: "Vessel Fragment #8 (Deepnest - Goam platforming challenge)",
+    Abyss_04: "Vessel Fragment #9 (Ancient Basin Fountain - 3000 Geo)"
 };
 
 const HK_NAILARTS = {
@@ -181,22 +197,6 @@ const HK_SPELLS = {
     }
 };
 
-const HK_VESSELFRAGMENTS = {
-    slyVesselFrag1: "Vessel Fragment (Sly - 550 Geo)",
-    slyVesselFrag2: "Vessel Fragment (Sly - 900 Geo)",
-    dreamReward5: "Vessel Fragment (Seer - 700 Essence)",
-    vesselFragStagNest: "Vessel Fragment (Stag Nest)"
-};
-
-// "Vessel Fragment" sceneData.persistentBoolItems[n].id
-const HK_VESSELFRAGMENTS_WORLD = {
-    Fungus1_13: "Vessel Fragment (Greenpath - near Queen's Gardens exit)",
-    Crossroads_37: "Vessel Fragment (Forgotten Crossroads - unlock lift in City of Tears)",
-    Ruins2_09: "Vessel Fragment (Above King's Station)",
-    Deepnest_38: "Vessel Fragment (Deepnest - Goam platforming challenge)",
-    Abyss_04: "Vessel Fragment (Ancient Basin Fountain - 3000 Geo)"
-};
-
 const HK_WARRIORDREAMS = {
     galienDefeated: "Galien",
     mumCaterpillarDefeated: "Marmu",
@@ -438,25 +438,28 @@ function CheckWarriorDreams(divId, dataObject, playerData) {
 }
 
 function CheckWorldDataTrue(divId, idText, dataObject, worldData) {
-    let foundData = 0;
+    let orderedArray = [];
     let size = ObjectLength(dataObject);
 
+    // Order the items before displaying them
+    for (let i in dataObject) {
+        orderedArray.push([i, dataObject[i], false]);
+    }
+
+    // Search for completed items
     for (let i = 0; i < worldData.length; i++) {
-        for (let j in dataObject) {
+        for (let j = 0; j < size; j++) {
-            if (worldData[i].id === idText && worldData[i].sceneName === j && worldData[i].activated === true) {
+            if (worldData[i].id === idText && worldData[i].sceneName === orderedArray[j][0] && worldData[i].activated === true) {
-                CurrentDataTrue();
+                orderedArray[j][2] = true;
-                foundData++;
-                FillHTML(divId, dataObject[j]);
-                delete dataObject[j];
             }
         }
     }
-    if (foundData < size) {
+
+    // Display the items as they were initially ordered
+    for (let i = 0; i < size; i++) {
         CurrentDataFalse();
-        for (let j in dataObject) {
+        if (orderedArray[i][2] === true) CurrentDataTrue();
-            FillHTML(divId, dataObject[j]);
+        FillHTML(divId, orderedArray[i][1]);
-            delete dataObject[j];
-        }
     }
 }
 

index.html

@@ -39,9 +39,11 @@
 <body>
 
     <!-- To do:
-        - Single Pale Ore locations?
+        - Single Pale Ore locations? (required for completion)
-        - Single Keys/Pass locations?
+        - Single Keys/Pass locations? (required for completion)
         - Charms/Bosses locations
+        - Spoiler-free hints where to go next? (ala Elderbug)
+            1. (before False Knight) Explore Forgotten Crossroads.
     -->
 
 <div id="content">
@@ -70,33 +72,33 @@
     <h2>Charms</h2>
     <div id="hk-charms"></div>
 
-    <h2>Colosseum of Fools</h2>
-    <div id="hk-colosseum"></div>
-
-    <h2>Dreamers</h2>
-    <div id="hk-dreamers"></div>
-
-    <h2>Dream Nail and Essence</h2>
-    <div id="hk-dreamnail"></div>
-    
     <h2>Equipment</h2>
     <div id="hk-equipment"></div>
 
+    <h2>Spells</h2>
+    <div id="hk-spells"></div>
+
     <h2>Nail Arts</h2>
     <div id="hk-nailarts"></div>
 
     <h2>Nail Upgrades</h2>
     <div id="hk-nailupgrades"></div>
 
-    <h2>Spells</h2>
-    <div id="hk-spells"></div>
-
     <h2>Mask Shards</h2>
     <div id="hk-maskshards"></div>
 
     <h2>Vessel Fragments</h2>
     <div id="hk-vesselfragments"></div>
 
+    <h2>Dreamers</h2>
+    <div id="hk-dreamers"></div>
+
+    <h2>Colosseum of Fools</h2>
+    <div id="hk-colosseum"></div>
+
+    <h2>Dream Nail and Essence</h2>
+    <div id="hk-dreamnail"></div>
+
     <h2>Warrior Dreams</h2>
     <div id="hk-warriordreams"></div>
 

loadJson.js

@@ -31,7 +31,7 @@ function loadJSON(filename, callback) {
     xobj.send(null);
 }
 
-loadJSON(fileName[0],
+loadJSON(fileName[2],
     function JSONparse(response) {
         // Parse JSON string into object
         jsonObj = JSON.parse(response);