From 3f61ba71aedb83142256fe8d7e780c08e6f3e148 Mon Sep 17 00:00:00 2001 From: ReznoRMichael Date: Thu, 24 Sep 2020 17:27:51 +0200 Subject: [PATCH] CheckSoulOrbs() --- HKCheckCompletion.js | 37 ++++++++++++++++++++++++++++++++----- img/soul-orb.png | Bin 0 -> 6014 bytes loadJson.js | 2 +- style.css | 5 +++++ 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 img/soul-orb.png diff --git a/HKCheckCompletion.js b/HKCheckCompletion.js index cbc2591..cbb38d8 100644 --- a/HKCheckCompletion.js +++ b/HKCheckCompletion.js @@ -341,7 +341,7 @@ const HK_GODMASTER_DOORS = [ const HK_ESSENTIAL = { grubsCollected: ["Grubs Rescued", "out of 46 total", 46], - dreamOrbs: ["Essence Collected", "out of 2400", 2400], + dreamOrbs: ["Essence Collected", "Dream Nail: 2400 for completion", 2400], slyRescued: ["Sly Rescued", "Forgotten Crossroads"], brettaRescued: ["Bretta Rescued", "Fungal Wastes"], hasLantern: ["Lumafly Lantern", "Sly: 1800 Geo"], @@ -358,7 +358,7 @@ const HK_ESSENTIAL = { paleOreDeepnest: ["Pale Ore #4", "Deepnest"], paleOreGrubfather: ["Pale Ore #5", "Grubfather: 31 Grubs"], paleOreColosseum: ["Pale Ore #6", "Colosseum of Fools: Trial of the Conqueror"], - fountainGeo: ["Geo in Fountain", "Ancient Basin", 3000], + fountainGeo: ["Geo in Fountain", "Ancient Basin: 3000 Geo maximum", 3000], hasTramPass: ["Tram Pass", "Deepnest"], nightmareLanternLit: ["Nightmare Lantern Lit", "Howling Cliffs"] }; @@ -433,7 +433,11 @@ function HKCheckCompletion(jsonObject) { // ---------------- Health Masks ----------------- // - CheckHealthMasks(DIV_ID.intro, HKPlayerData.maxHealth, HKPlayerData.permadeathMode); + CheckHealthMasks(DIV_ID.intro, HKPlayerData.maxHealthBase, HKPlayerData.permadeathMode); + + // ---------------- Soul Orbs ----------------- // + + CheckSoulOrbs(DIV_ID.intro, HKPlayerData.maxMP + HKPlayerData.MPReserveMax); // ---------------- Geo Amount ----------------- // @@ -562,7 +566,7 @@ function PrefillHTML(jsObj) { h2id = "h2-" + jsObj[i].id; (i === "hints") ? cl = " class='hidden'": cl = ""; - mp = " (" + jsObj[i].maxPercent + "%)"; + mp = " = " + jsObj[i].maxPercent + "%"; if (!jsObj[i].hasOwnProperty("maxPercent") || i === "intro") mp = ""; document.getElementById("generated").innerHTML += "
" + "
"; @@ -600,7 +604,7 @@ function CompletionHTML(jsObj) { } if (jsObj[i].hasOwnProperty("percent")) cp += "/"; - mp = " (" + cp + jsObj[i].maxPercent + "%)"; + mp = " = " + cp + jsObj[i].maxPercent + "%"; } document.getElementById(h2id).innerHTML = h2 + mp; @@ -713,6 +717,26 @@ function CheckHealthMasks(divId, masks, permadeathMode) { document.getElementById(divId.id).innerHTML += "
" + icon + textFill + maskImages + divEnd; } +/** + * Fills HTML with appriopriate number of soul orbs images + * @param {object} divId ID of the HTML element for data appending + * @param {number} totalSoul Number of max Soul reserve from the save. 99 = full Soul Orb + */ +function CheckSoulOrbs(divId, totalSoul) { + + let icon = SYMBOL_EMPTY; + let textFill = "Soul:"; + let soulImages = ""; + let soulNormal = ""; + let soulImg = soulNormal; + + for (let i = 0, total = totalSoul / 33; i < total; i++) { + soulImages += soulImg; + } + + document.getElementById(divId.id).innerHTML += "
" + icon + textFill + soulImages + divEnd; +} + /** * Fills HTML with the Geo value of the save file * @param {object} divId ID of the HTML element for data appending @@ -1003,6 +1027,9 @@ function InitialHTMLPopulate(divIdObj) { // Health Masks CheckHealthMasks(divIdObj.intro, 5, 0); + // Soul Orbs + CheckSoulOrbs(divIdObj.intro, 99); + // Geo CheckGeo(divIdObj.intro, 0); diff --git a/img/soul-orb.png b/img/soul-orb.png new file mode 100644 index 0000000000000000000000000000000000000000..69fb56f802476945d0846ddfb8ee64a7ed4b3086 GIT binary patch literal 6014 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 literal 0 HcmV?d00001 diff --git a/loadJson.js b/loadJson.js index 468482c..c348dbb 100644 --- a/loadJson.js +++ b/loadJson.js @@ -44,7 +44,7 @@ function loadJSON(filename, callback) { xobj.send(null); } -loadJSON("save/" + fileName[5], +loadJSON("save/" + fileName[9], function JSONparse(response) { // Parse JSON string into object jsonObj = JSON.parse(response); diff --git a/style.css b/style.css index abba408..16fb348 100644 --- a/style.css +++ b/style.css @@ -206,6 +206,7 @@ a:hover { } .health-mask, +.soul-orb, .geo-symbol { display: flex; width: auto; @@ -213,6 +214,10 @@ a:hover { margin: 0 0 0 0.3rem; } +.soul-orb { + height: 1.3rem; +} + .geo-symbol { margin-right: 0.15rem; }