From d4a7f1439e26545e95a4572eea2d0abbc5a58012 Mon Sep 17 00:00:00 2001 From: ReznoRMichael Date: Mon, 28 Sep 2020 17:55:13 +0200 Subject: [PATCH] Kingsoul/White Fragment fix --- HKCheckCompletion.js | 9 ++++++++- loadJson.js | 23 ++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/HKCheckCompletion.js b/HKCheckCompletion.js index a122c2e..695a9db 100644 --- a/HKCheckCompletion.js +++ b/HKCheckCompletion.js @@ -834,7 +834,14 @@ function CheckGeo(divId, geoValue) { */ function CheckIfDataTrue(divId, dataObject, playerData) { for (let i in dataObject) { - (playerData[i] === true) ? CurrentDataTrue(divId): CurrentDataFalse(); + switch (i) { + case "gotCharm_36": + // prevents green checkbox and adding 1% when only got one white fragment + (playerData.gotQueenFragment === true && playerData.gotKingFragment === true) ? CurrentDataTrue(divId): CurrentDataFalse(); + break; + default: + (playerData[i] === true) ? CurrentDataTrue(divId): CurrentDataFalse(); + } FillHTML(divId, dataObject[i][0], dataObject[i][1]); } } diff --git a/loadJson.js b/loadJson.js index dd70e48..a0eeab4 100644 --- a/loadJson.js +++ b/loadJson.js @@ -2,16 +2,17 @@ var jsonObj = ""; // save file names list in the save/ folder var fileName = [ - "reznor0.json", - "reznor1beforegruz.json", - "reznor2aftergruz.json", - "reznor5hornet.json", - "reznor29ss.json", - "ext48.json", - "reznor88banish.json", - "reznor100.json", - "reznor103ss.json", - "reznor112grimm.json", + "reznor0.json", // 0 + "reznor1beforegruz.json", // 1 + "reznor2aftergruz.json", // 2 + "reznor5hornet.json", // 3 + "reznor29ss.json", // 4 + "ext48.json", // 5 + "reznor88banish.json", // 6 + "reznor99whitefragment.json", // 7 + "reznor100.json", // 8 + "reznor103ss.json", // 9 + "reznor112grimm.json", // 10 ]; /** @@ -44,7 +45,7 @@ function loadJSON(filename, callback) { xobj.send(null); } -loadJSON("save/" + fileName[4], +loadJSON("save/" + fileName[7], function JSONparse(response) { // Parse JSON string into object jsonObj = JSON.parse(response);