From b13a3861309ff4b5a1ba09b1770c5cdddcc4338e Mon Sep 17 00:00:00 2001
From: ReznoRMichael <mic3arena@gmail.com>
Date: Sat, 29 Aug 2020 01:56:37 +0200
Subject: [PATCH] add Mask Shards World

---
 HKCheckCompletion.js | 26 +++++++++++++++++++-------
 index.html           |  7 +------
 loadJson.js          |  2 +-
 style.css            |  8 +++++++-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/HKCheckCompletion.js b/HKCheckCompletion.js
index 69b7e1a..749fbce 100644
--- a/HKCheckCompletion.js
+++ b/HKCheckCompletion.js
@@ -128,20 +128,27 @@ const HK_EQUIPMENT = {
     hasShadowDash: "Shade Cloak"
 };
 
-// "Heart Piece" sceneData.persistentBoolItems[n].id
-// "Crossroads_13", "Crossroads_38", "Fungus2_01", "Room_Bretta", "Waterways_04b", "Crossroads_09", "Fungus1_36", "Mines_32", "Fungus2_25", "Hive_04"
-// "Reward X" sceneData.persistentBoolItems[n].id
 const HK_MASKSHARDS = {
     slyShellFrag1: "Mask Shard (Sly - 150 Geo)",
     slyShellFrag2: "Mask Shard (Sly - 500 Geo)",
     slyShellFrag3: "Mask Shard (Sly - 800 Geo)",
     slyShellFrag4: "Mask Shard (Sly - 1500 Geo)",
-    dreamReward7: "Mask Shard (Seer - 1500 Essence)",
-    xunRewardGiven: "Mask Shard (Delicate Flower)",
+    dreamReward7: "Mask Shard (Seer - 1500 Essence)"
 };
 
+// "Heart Piece" sceneData.persistentBoolItems[n].id
 const HK_MASKSHARDS_WORLD = {
-
+    Crossroads_13: "Mask Shard (Forgotten Crossroads - below Hot Springs)",
+    Fungus2_01: "Mask Shard (Queen's Station)",
+    Crossroads_38: "Mask Shard (Grubfather - rescue 5 Grubs)",
+    Waterways_04b: "Mask Shard (Royal Waterways)",
+    Fungus1_36: "Mask Shard (Greenpath - Stone Sanctuary)",
+    Crossroads_09: "Mask Shard (Forgotten Crossroads - Brooding Mawlek)",
+    Mines_32: "Mask Shard (Crystal Peak - Enraged Guardian)",
+    Fungus2_25: "Mask Shard (Deepnest - entrance from Fungal Wastes)",
+    Room_Bretta: "Mask Shard (Dirtmouth - Bretta's Room)",
+    Hive_04: "Mask Shard (The Hive)",
+    Room_Mansion: "Mask Shard (Resting Grounds - Delicate Flower)"
 };
 
 const HK_NAILARTS = {
@@ -224,6 +231,7 @@ function HKCheckCompletion(jsonObject) {
     let HK_DREAMNAIL_temp = Object.assign({}, HK_DREAMNAIL);
     let HK_EQUIPMENT_temp = Object.assign({}, HK_EQUIPMENT);
     let HK_MASKSHARDS_temp = Object.assign({}, HK_MASKSHARDS);
+    let HK_MASKSHARDS_WORLD_temp = Object.assign({}, HK_MASKSHARDS_WORLD);
     let HK_NAILARTS_temp = Object.assign({}, HK_NAILARTS);
     let HK_VESSELFRAGMENTS_temp = Object.assign({}, HK_VESSELFRAGMENTS);
     let HK_VESSELFRAGMENTS_WORLD_temp = Object.assign({}, HK_VESSELFRAGMENTS_WORLD);
@@ -350,6 +358,10 @@ function HKCheckCompletion(jsonObject) {
 
     }
 
+    // ---------------- Mask Shards (World Map) --------------------- //
+
+    CheckWorldDataTrue(DIV_ID.maskShards, "Heart Piece", HK_MASKSHARDS_WORLD_temp, HKWorldItems);
+
     // ---------------- Vessel Fragments (World Map) --------------------- //
 
     CheckWorldDataTrue(DIV_ID.vesselFragments, "Vessel Fragment", HK_VESSELFRAGMENTS_WORLD_temp, HKWorldItems);
@@ -423,8 +435,8 @@ function CheckWorldDataTrue(divId, idText, dataObject, worldData) {
         }
     }
     if (foundData < size) {
+        currentDataFalse();
         for (j in dataObject) {
-            currentDataFalse();
             fillHTML(divId, dataObject[j]);
             delete dataObject[j];
         }
diff --git a/index.html b/index.html
index 9e3dfd6..24ea0f0 100644
--- a/index.html
+++ b/index.html
@@ -54,13 +54,8 @@
         This is a very early version. Some data is WIP and some data may be incorrect.
     </p>
 
-    <div style="margin-bottom: 20px;"></div>
-
     <div>
         <textarea name="save-area" id="save-area"></textarea>
-    </div>
-
-    <div>
         <button id="save-area-read" onclick="HKReadTextArea();">Analyze</button>
     </div>
 
@@ -87,7 +82,7 @@
     <h2>Equipment</h2>
     <div id="hk-equipment"></div>
 
-    <h2>Mask Shards (WIP, 6/16)</h2>
+    <h2>Mask Shards</h2>
     <div id="hk-maskshards"></div>
     
     <h2>Nail Arts</h2>
diff --git a/loadJson.js b/loadJson.js
index e5169c9..6679e00 100644
--- a/loadJson.js
+++ b/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);
diff --git a/style.css b/style.css
index 5762532..9ff583b 100644
--- a/style.css
+++ b/style.css
@@ -3,9 +3,10 @@ html {
 }
 body {
     font-family: 'Heebo', sans-serif;
+    margin: 0;
 }
 #content {
-    width: max-content;
+    max-width: 530px; 
     margin: 0 auto;
 }
 h1 {
@@ -17,6 +18,11 @@ h1 {
 #save-area {
     width: 100%;
     height: calc(0.1 * 100vh);
+    margin: .5rem 0;
+}
+#save-area-read {
+    margin: 0 auto;
+    display: block;
 }
 h2 {
     margin: 0.6rem 0;