mikl/hollow-knight-completion-check
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code refactoring CheckAdditionalThings()

Browse source
This commit is contained in:
ReznoRMichael 2022-02-20 13:25:58 +01:00
parent 27ce52cfec
commit 150b6c4dbb
3 changed files with 186 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

197
build/app.js
View file

@ -164,11 +164,11 @@ function HKCheckCompletion(jsonObject) {
CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"], "huntersJournal", HKPlayerData); CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"], "huntersJournal", HKPlayerData);
CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"], "huntersJournalOptional", HKPlayerData); // ------------------------- Essential Things --------------------------------------------------------------------------------- // CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"], "huntersJournalOptional", HKPlayerData); // ------------------------- Essential Things --------------------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.essential, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.essential.entries, HKPlayerData, HKWorldItems); // ------------------------- Achievements ------------------------------------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.essential, jsonObject); // ------------------------- Achievements ------------------------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.achievements, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.achievements.entries, HKPlayerData, HKWorldItems); // ------------------------- Collectibles -> Charm Notches ---------------------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.achievements, jsonObject); // ------------------------- Collectibles -> Charm Notches ---------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.charmNotches, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.charmNotches.entries, HKPlayerData, HKWorldItems); // ------------------------- Collectibles -> Grubs ---------------------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.charmNotches, jsonObject); // ------------------------- Collectibles -> Grubs ---------------------------------------------------------------------- //
saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.grubs); // ------------------------- Collectibles -> Whispering Roots ---------------------------------------------------------------------- // saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.grubs); // ------------------------- Collectibles -> Whispering Roots ---------------------------------------------------------------------- //
@ -184,21 +184,21 @@ function HKCheckCompletion(jsonObject) {
saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.rancidEggs); // ------------------------- Collectibles -> Items ---------------------------------------------------------------------- // saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.rancidEggs); // ------------------------- Collectibles -> Items ---------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.items, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.items.entries, HKPlayerData, HKWorldItems); // ------------------------- Geo Caches -> Geo Chests ----------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.items, jsonObject); // ------------------------- Geo Caches -> Geo Chests ----------------------------------------------------------- //
saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.geoChests); // ------------------------- Geo Caches -> Geo Rocks ----------------------------------------------------------- // saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.geoChests); // ------------------------- Geo Caches -> Geo Rocks ----------------------------------------------------------- //
saveDataChecker.checkGeoRocks(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.geoRocks); // ------------------------- Secrets -> World Interactions ---------------------------------------------------------------------- // saveDataChecker.checkGeoRocks(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.geoRocks); // ------------------------- Secrets -> World Interactions ---------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.worldInteractions, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.worldInteractions.entries, HKPlayerData, HKWorldItems); // ------------------------- Secrets -> Secret Rooms ---------------------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.worldInteractions, jsonObject); // ------------------------- Secrets -> Secret Rooms ---------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.secretRooms, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.secretRooms.entries, HKPlayerData, HKWorldItems); // ------------------------- Secrets -> Cornifer's Notes ----------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.secretRooms, jsonObject); // ------------------------- Secrets -> Cornifer's Notes ----------------------------------------------------------- //
saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.corniferNotes); // ------------------------- Game Statistics ---------------------------------------------------------------------------------- // saveDataChecker.checkItems(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.corniferNotes); // ------------------------- Game Statistics ---------------------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.statistics, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.statistics.entries, HKPlayerData, HKWorldItems, HKSceneData); // ------------------------- Godhome Statistics ------------------------------------------------------------------------------- // CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.statistics, jsonObject); // ------------------------- Godhome Statistics ------------------------------------------------------------------------------- //
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.godhomeStatistics, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.godhomeStatistics.entries, HKPlayerData, HKWorldItems, HKSceneData); CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"].sections.godhomeStatistics, jsonObject);
/* ------------------------- Pantheon Statistics ------------------------------------------------------------------------------ */ /* ------------------------- Pantheon Statistics ------------------------------------------------------------------------------ */
CheckPantheon(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"], "pantheonOfTheMaster", HKPlayerData); CheckPantheon(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__["default"], "pantheonOfTheMaster", HKPlayerData);
@ -998,27 +998,19 @@ function WorldDataActivated(idText, sceneNameText, worldData) {
} */ } */
/** /**
* Verifies if the data in a specific object are true or false, or checks what values they have, and appends HTML accordingly. * Verifies if the data in a specific section is true or false, or checks what values they have.
* @param {object} section ID of the HTML element for data appending * @param {object} section Reference/pointer to the specific section of the whole hk-database
* @param {object} dataObject Object containing data to be verified * @param {object} saveFile Reference/pointer to the whole Hollow Knight save file object (jsonObject)
* @param {object} playerData Reference/pointer to specific data where to search (playerData)
* @param {object} worldData Reference/pointer to specific data where to search (sceneData.persistentBoolItems)
* @param {object} sceneData Reference/pointer to specific data where to search (sceneData)
*/ */
function CheckAdditionalThings(section, dataObject, playerData, worldData, sceneData) { function CheckAdditionalThings(section, saveFile) {
/* let { var entries = section.entries;
textPrefix, var playerData = saveFile.playerData;
textSuffix, var sceneData = saveFile.sceneData;
wiki var worldData = saveFile.sceneData.persistentBoolItems; // Start main loop
} = "";
let sFillText = ""; */ for (var i in entries) {
// Start main loop
for (var i in dataObject) {
/* textPrefix = dataObject[i].name;
(dataObject[i].hasOwnProperty("spoiler")) ? textSuffix = dataObject[i].spoiler: textSuffix = "";
(dataObject[i].hasOwnProperty("wiki")) ? wiki = dataObject[i].wiki: wiki = ""; */
var _2 = 0, var _2 = 0,
amount = _2.amount, amount = _2.amount,
countTotal = _2.countTotal, countTotal = _2.countTotal,
@ -1046,34 +1038,34 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} }
countTotal = amount; countTotal = amount;
dataObject[i].amount = amount; entries[i].amount = amount;
if (i === "journalEntriesCompleted" || i === "journalNotesCompleted") { if (i === "journalEntriesCompleted" || i === "journalNotesCompleted") {
countTotal = "".concat(amount, " / ").concat(playerData.journalEntriesTotal); countTotal = "".concat(amount, " / ").concat(playerData.journalEntriesTotal);
dataObject[i].amountTotal = playerData.journalEntriesTotal; entries[i].amountTotal = playerData.journalEntriesTotal;
dataObject[i].spoiler = "".concat(dataObject[i].spoilerDefault, " (").concat(dataObject[i].max, " max)"); entries[i].spoiler = "".concat(entries[i].spoilerDefault, " (").concat(entries[i].max, " max)");
/* when Zote is dead, the max Journal entries will equal 4 less instead of 164. For the green tick */ /* when Zote is dead, the max Journal entries will equal 4 less instead of 164. For the green tick */
if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
if (playerData.hasOwnProperty("killedGreyPrince")) { if (playerData.hasOwnProperty("killedGreyPrince")) {
dataObject[i].max -= 4; // Subtract GPZ and 3 Zotelings from max entries[i].max -= 4; // Subtract GPZ and 3 Zotelings from max
} }
dataObject[i].spoiler = "".concat(dataObject[i].spoilerDefault, " (").concat(dataObject[i].max, " max)"); entries[i].spoiler = "".concat(entries[i].spoilerDefault, " (").concat(entries[i].max, " max)");
/* Change spoiler for less confusion */ /* Change spoiler for less confusion */
} }
/* when Grimm Troupe is banished, max Journal entries will be 1 or 2 less */ /* when Grimm Troupe is banished, max Journal entries will be 1 or 2 less */
if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) { if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) {
dataObject[i].max--; // Subtract Nightmare King from max entries[i].max--; // Subtract Nightmare King from max
/* if the player didn't defeat any Grimmkin Nightmare before banishing, subtract it from max */ /* if the player didn't defeat any Grimmkin Nightmare before banishing, subtract it from max */
if (playerData.killedFlameBearerLarge === false) { if (playerData.killedFlameBearerLarge === false) {
dataObject[i].max--; // Subtract Grimmkin Nightmare from max entries[i].max--; // Subtract Grimmkin Nightmare from max
dataObject[i].spoiler = "".concat(dataObject[i].spoilerDefault, " (").concat(dataObject[i].max, " max)"); entries[i].spoiler = "".concat(entries[i].spoilerDefault, " (").concat(entries[i].max, " max)");
/* Change spoiler for less confusion */ /* Change spoiler for less confusion */
} }
} }
@ -1086,7 +1078,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "grubRewards") { if (i === "grubRewards") {
dataObject[i].amountTotal = playerData.grubsCollected; entries[i].amountTotal = playerData.grubsCollected;
/* textPrefix += ` / ${playerData.grubsCollected}`; */ /* textPrefix += ` / ${playerData.grubsCollected}`; */
} }
@ -1094,11 +1086,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`; entries[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} else if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { } else if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
dataObject[i].disabled = true; // textPrefix = `<del>${textPrefix}</del>`; entries[i].disabled = true; // textPrefix = `<del>${textPrefix}</del>`;
} }
} }
@ -1106,13 +1098,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`; entries[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} }
} }
if (amount >= dataObject[i].max) { if (amount >= entries[i].max) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else if (amount > 0) { } else if (amount > 0) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconPartial)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconPartial)(section, i);
@ -1124,7 +1116,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "geoPool": case "geoPool":
amount = Math.abs(playerData[i]); amount = Math.abs(playerData[i]);
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0) { if (amount > 0) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconPartial)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconPartial)(section, i);
@ -1144,7 +1136,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "ore": case "ore":
case "simpleKeys": case "simpleKeys":
amount = Math.abs(playerData[i]); amount = Math.abs(playerData[i]);
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0) { if (amount > 0) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed"); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed");
@ -1156,7 +1148,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// fade out if not on Steel Soul // fade out if not on Steel Soul
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed"); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed");
} }
@ -1178,7 +1170,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// fade out if on Steel Soul // fade out if on Steel Soul
if (playerData.permadeathMode > 0) { if (playerData.permadeathMode > 0) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
continue; continue;
} }
@ -1189,10 +1181,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
amount = 0; amount = 0;
for (var _i = 1; _i <= 4; _i++) { for (var _i = 1; _i <= 4; _i++) {
amount += dataObject["soldTrinket".concat(_i)].amount * dataObject["soldTrinket".concat(_i)].geoValue; amount += entries["soldTrinket".concat(_i)].amount * entries["soldTrinket".concat(_i)].geoValue;
} }
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0) { if (amount > 0) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed"); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed");
@ -1210,7 +1202,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
amount = 0; amount = 0;
} }
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0 || playerData.bankerAccountPurchased === true) { if (amount > 0 || playerData.bankerAccountPurchased === true) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed"); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed");
@ -1251,9 +1243,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
discoveredTotal = sceneData.persistentBoolItems.length; discoveredTotal = sceneData.persistentBoolItems.length;
notActivated = CountItems(discoveredTotal, "notActivated"); notActivated = CountItems(discoveredTotal, "notActivated");
activated = CountItems(discoveredTotal, "active"); activated = CountItems(discoveredTotal, "active");
dataObject[i].discoveredTotal = discoveredTotal; entries[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated; entries[i].notActivated = notActivated;
dataObject[i].activated = activated; entries[i].activated = activated;
/* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */ /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed"); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIcon)(section, i, "revealed");
@ -1306,21 +1298,21 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "soulSanctumShortcut": case "soulSanctumShortcut":
case "colosseumHiddenHotSpring": case "colosseumHiddenHotSpring":
case "paleLurkersRetreat": case "paleLurkersRetreat":
FindWorldItem(dataObject[i].id, dataObject[i].sceneName) ? (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i) : (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); FindWorldItem(entries[i].id, entries[i].sceneName) ? (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i) : (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
break; break;
case "grimmTentSecretRoom": case "grimmTentSecretRoom":
/* Backwards compatibility with older save files */ /* Backwards compatibility with older save files */
if (playerData.hasOwnProperty("destroyedNightmareLantern") === false) { if (playerData.hasOwnProperty("destroyedNightmareLantern") === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else if (FindWorldItem(dataObject[i].id, dataObject[i].sceneName)) { } else if (FindWorldItem(entries[i].id, entries[i].sceneName)) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else { } else {
/* When the Ritual has been completed or Grimm Troupe has been Banished, the secret is no longer possible to discover */ /* When the Ritual has been completed or Grimm Troupe has been Banished, the secret is no longer possible to discover */
if (playerData.grimmChildLevel >= 4) { if (playerData.grimmChildLevel >= 4) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
} }
@ -1332,9 +1324,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "relicsHallownestSeal": case "relicsHallownestSeal":
case "relicsKingsIdol": case "relicsKingsIdol":
case "relicsArcaneEgg": case "relicsArcaneEgg":
total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold]; total = playerData[entries[i].nameHeld] + playerData[entries[i].nameSold];
if (total >= dataObject[i].max) { if (total >= entries[i].max) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else if (total > 0) { } else if (total > 0) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconPartial)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconPartial)(section, i);
@ -1342,19 +1334,19 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
} }
dataObject[i].amount = total; entries[i].amount = total;
/* textPrefix += ": " + total; */ /* textPrefix += ": " + total; */
break; break;
case "arcaneEggLifebloodCoreRoom": case "arcaneEggLifebloodCoreRoom":
FindWorldItem(dataObject[i].id, dataObject[i].sceneName) ? (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i) : (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); FindWorldItem(entries[i].id, entries[i].sceneName) ? (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i) : (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
break; break;
case "pantheonHallownest": case "pantheonHallownest":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
playerData.bossDoorStateTier5.completed === true ? (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i) : (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); playerData.bossDoorStateTier5.completed === true ? (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i) : (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
} }
@ -1364,7 +1356,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killsBindingSeal": case "killsBindingSeal":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
@ -1380,7 +1372,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killedVoidIdol_1": case "killedVoidIdol_1":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
@ -1393,7 +1385,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killedVoidIdol_2": case "killedVoidIdol_2":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
@ -1407,12 +1399,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} else if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { } else if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
} }
@ -1422,45 +1414,45 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "zoteStatus": case "zoteStatus":
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
dataObject[i].name = dataObject[i].nameDefault; entries[i].name = entries[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; entries[i].spoiler = entries[i].spoilerDefault;
if (playerData.zoteDead === true) { if (playerData.zoteDead === true) {
/* textPrefix = dataObject[i].nameNeglect; /* textPrefix = dataObject[i].nameNeglect;
textSuffix = dataObject[i].spoilerNeglect; */ textSuffix = dataObject[i].spoilerNeglect; */
dataObject[i].name = dataObject[i].nameNeglect; entries[i].name = entries[i].nameNeglect;
dataObject[i].spoiler = dataObject[i].spoilerNeglect; entries[i].spoiler = entries[i].spoilerNeglect;
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else if (playerData.killedZote === true) { } else if (playerData.killedZote === true) {
/* textPrefix = dataObject[i].nameRivalry; /* textPrefix = dataObject[i].nameRivalry;
textSuffix = dataObject[i].spoilerRivalry; */ textSuffix = dataObject[i].spoilerRivalry; */
dataObject[i].name = dataObject[i].nameRivalry; entries[i].name = entries[i].nameRivalry;
dataObject[i].spoiler = dataObject[i].spoilerRivalry; entries[i].spoiler = entries[i].spoilerRivalry;
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else if (playerData.zoteRescuedBuzzer === false) { } else if (playerData.zoteRescuedBuzzer === false) {
if (playerData.hasWalljump === false) { if (playerData.hasWalljump === false) {
/* textPrefix = dataObject[i].nameTrappedVengefly; /* textPrefix = dataObject[i].nameTrappedVengefly;
textSuffix = dataObject[i].spoilerTrappedVengefly; */ textSuffix = dataObject[i].spoilerTrappedVengefly; */
dataObject[i].name = dataObject[i].nameTrappedVengefly; entries[i].name = entries[i].nameTrappedVengefly;
dataObject[i].spoiler = dataObject[i].spoilerTrappedVengefly; entries[i].spoiler = entries[i].spoilerTrappedVengefly;
} else if (playerData.hasWalljump === true) { } else if (playerData.hasWalljump === true) {
/* textPrefix = dataObject[i].nameNotRescuedVengefly; /* textPrefix = dataObject[i].nameNotRescuedVengefly;
textSuffix = dataObject[i].spoilerNotRescuedVengefly; */ textSuffix = dataObject[i].spoilerNotRescuedVengefly; */
dataObject[i].name = dataObject[i].nameNotRescuedVengefly; entries[i].name = entries[i].nameNotRescuedVengefly;
dataObject[i].spoiler = dataObject[i].spoilerNotRescuedVengefly; entries[i].spoiler = entries[i].spoilerNotRescuedVengefly;
} }
} else if (playerData.zoteRescuedBuzzer === true) { } else if (playerData.zoteRescuedBuzzer === true) {
if (playerData.zoteRescuedDeepnest === false) { if (playerData.zoteRescuedDeepnest === false) {
/* textPrefix = dataObject[i].nameTrappedDeepnest; /* textPrefix = dataObject[i].nameTrappedDeepnest;
textSuffix = dataObject[i].spoilerTrappedDeepnest; */ textSuffix = dataObject[i].spoilerTrappedDeepnest; */
dataObject[i].name = dataObject[i].nameTrappedDeepnest; entries[i].name = entries[i].nameTrappedDeepnest;
dataObject[i].spoiler = dataObject[i].spoilerTrappedDeepnest; entries[i].spoiler = entries[i].spoilerTrappedDeepnest;
} else if (playerData.zoteRescuedDeepnest === true) { } else if (playerData.zoteRescuedDeepnest === true) {
if (playerData.killedZote === false) { if (playerData.killedZote === false) {
/* textPrefix = dataObject[i].nameColosseum; /* textPrefix = dataObject[i].nameColosseum;
textSuffix = dataObject[i].spoilerColosseum; */ textSuffix = dataObject[i].spoilerColosseum; */
dataObject[i].name = dataObject[i].nameColosseum; entries[i].name = entries[i].nameColosseum;
dataObject[i].spoiler = dataObject[i].spoilerColosseum; entries[i].spoiler = entries[i].spoilerColosseum;
} }
} }
} }
@ -1469,31 +1461,31 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "nailsmithStatus": case "nailsmithStatus":
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
dataObject[i].name = dataObject[i].nameDefault; entries[i].name = entries[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; entries[i].spoiler = entries[i].spoilerDefault;
if (playerData.nailsmithKilled === true) { if (playerData.nailsmithKilled === true) {
/* textPrefix = dataObject[i].namePurity; /* textPrefix = dataObject[i].namePurity;
textSuffix = dataObject[i].spoilerPurity; */ textSuffix = dataObject[i].spoilerPurity; */
dataObject[i].name = dataObject[i].namePurity; entries[i].name = entries[i].namePurity;
dataObject[i].spoiler = dataObject[i].spoilerPurity; entries[i].spoiler = entries[i].spoilerPurity;
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else if (playerData.nailsmithConvoArt === true) { } else if (playerData.nailsmithConvoArt === true) {
/* textPrefix = dataObject[i].nameHappyCouple; /* textPrefix = dataObject[i].nameHappyCouple;
textSuffix = dataObject[i].spoilerHappyCouple; */ textSuffix = dataObject[i].spoilerHappyCouple; */
dataObject[i].name = dataObject[i].nameHappyCouple; entries[i].name = entries[i].nameHappyCouple;
dataObject[i].spoiler = dataObject[i].spoilerHappyCouple; entries[i].spoiler = entries[i].spoilerHappyCouple;
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else if (playerData.nailsmithSpared === true) { } else if (playerData.nailsmithSpared === true) {
/* textPrefix = dataObject[i].nameSheoHutWaiting; /* textPrefix = dataObject[i].nameSheoHutWaiting;
textSuffix = dataObject[i].spoilerSheoHutWaiting; */ textSuffix = dataObject[i].spoilerSheoHutWaiting; */
dataObject[i].name = dataObject[i].nameSheoHutWaiting; entries[i].name = entries[i].nameSheoHutWaiting;
dataObject[i].spoiler = dataObject[i].spoilerSheoHutWaiting; entries[i].spoiler = entries[i].spoilerSheoHutWaiting;
} else { } else {
/* textPrefix = dataObject[i].nameUpgradeNail; /* textPrefix = dataObject[i].nameUpgradeNail;
textSuffix = dataObject[i].spoilerUpgradeNail; */ textSuffix = dataObject[i].spoilerUpgradeNail; */
dataObject[i].name = dataObject[i].nameUpgradeNail; entries[i].name = entries[i].nameUpgradeNail;
dataObject[i].spoiler = dataObject[i].spoilerUpgradeNail; entries[i].spoiler = entries[i].spoilerUpgradeNail;
} }
break; break;
@ -1505,7 +1497,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "mrMushroomState5": case "mrMushroomState5":
case "mrMushroomState6": case "mrMushroomState6":
case "mrMushroomState7": case "mrMushroomState7":
CheckMrMushroomState(section, dataObject[i], playerData["mrMushroomState"]); CheckMrMushroomState(section, entries[i], playerData["mrMushroomState"]);
break; break;
case "openedTownBuilding": case "openedTownBuilding":
@ -1522,19 +1514,19 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* backwards compatibility with earlier game versions */ /* backwards compatibility with earlier game versions */
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
break; break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
/* Create amount property before incrementing (avoids NaN) */ /* Create amount property before incrementing (avoids NaN) */
if (!dataObject.stagStationsOpened.hasOwnProperty("amount")) { if (!entries.stagStationsOpened.hasOwnProperty("amount")) {
dataObject.stagStationsOpened.amount = 0; entries.stagStationsOpened.amount = 0;
} }
/* increment the stag stations amount by one */ /* increment the stag stations amount by one */
dataObject.stagStationsOpened.amount++; entries.stagStationsOpened.amount++;
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
} }
@ -1545,10 +1537,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* backwards compatibility check */ /* backwards compatibility check */
if (!playerData.hasOwnProperty("openedHiddenStation")) { if (!playerData.hasOwnProperty("openedHiddenStation")) {
/* Subtract one from maximum for extended completion counting */ /* Subtract one from maximum for extended completion counting */
dataObject[i].max--; entries[i].max--;
} }
if (dataObject[i].amount >= dataObject[i].max) { if (entries[i].amount >= entries[i].max) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
@ -1573,13 +1565,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
/* Create amount property before incrementing (avoids NaN) */ /* Create amount property before incrementing (avoids NaN) */
if (!dataObject.areaMaps.hasOwnProperty("amount")) { if (!entries.areaMaps.hasOwnProperty("amount")) {
dataObject.areaMaps.amount = 0; entries.areaMaps.amount = 0;
} }
/* increment the area maps amount by one */ /* increment the area maps amount by one */
dataObject.areaMaps.amount++; entries.areaMaps.amount++;
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
} }
@ -1587,7 +1579,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
break; break;
case "areaMaps": case "areaMaps":
if (dataObject[i].amount >= dataObject[i].max) { if (entries[i].amount >= entries[i].max) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
@ -1603,14 +1595,14 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* backwards compatibility with earlier game versions */ /* backwards compatibility with earlier game versions */
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i);
} else { } else {
/* If player doesn't have an Unbreakable Charm, and they Banished the Grimm Troupe, the entry needs to be disabled */ /* If player doesn't have an Unbreakable Charm, and they Banished the Grimm Troupe, the entry needs to be disabled */
if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) { if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconRed)(section, i);
} }
@ -1622,7 +1614,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); (0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`; entries[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
@ -1633,10 +1625,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} // end switch (i) } // end switch (i)
/* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */
} // end for (let i in dataObject) } // end for (let i in dataObject)
// AppendHTML(section, sFillText);
// ========================================== // ==========================================
// -------------- Methods ---------------- // // -------------- Methods ---------------- //

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

196
src/js/HKCheckCompletion.js
View file

@ -217,15 +217,15 @@ function HKCheckCompletion(jsonObject, benchStart = performance.now()) {
// ------------------------- Essential Things --------------------------------------------------------------------------------- // // ------------------------- Essential Things --------------------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.essential, HK.sections.essential.entries, HKPlayerData, HKWorldItems); CheckAdditionalThings(HK.sections.essential, jsonObject);
// ------------------------- Achievements ------------------------------------------------------------------------------------- // // ------------------------- Achievements ------------------------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.achievements, HK.sections.achievements.entries, HKPlayerData, HKWorldItems); CheckAdditionalThings(HK.sections.achievements, jsonObject);
// ------------------------- Collectibles -> Charm Notches ---------------------------------------------------------------------- // // ------------------------- Collectibles -> Charm Notches ---------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.charmNotches, HK.sections.charmNotches.entries, HKPlayerData, HKWorldItems); CheckAdditionalThings(HK.sections.charmNotches, jsonObject);
// ------------------------- Collectibles -> Grubs ---------------------------------------------------------------------- // // ------------------------- Collectibles -> Grubs ---------------------------------------------------------------------- //
@ -257,7 +257,7 @@ function HKCheckCompletion(jsonObject, benchStart = performance.now()) {
// ------------------------- Collectibles -> Items ---------------------------------------------------------------------- // // ------------------------- Collectibles -> Items ---------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.items, HK.sections.items.entries, HKPlayerData, HKWorldItems); CheckAdditionalThings(HK.sections.items, jsonObject);
// ------------------------- Geo Caches -> Geo Chests ----------------------------------------------------------- // // ------------------------- Geo Caches -> Geo Chests ----------------------------------------------------------- //
@ -269,11 +269,11 @@ function HKCheckCompletion(jsonObject, benchStart = performance.now()) {
// ------------------------- Secrets -> World Interactions ---------------------------------------------------------------------- // // ------------------------- Secrets -> World Interactions ---------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.worldInteractions, HK.sections.worldInteractions.entries, HKPlayerData, HKWorldItems); CheckAdditionalThings(HK.sections.worldInteractions, jsonObject);
// ------------------------- Secrets -> Secret Rooms ---------------------------------------------------------------------- // // ------------------------- Secrets -> Secret Rooms ---------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.secretRooms, HK.sections.secretRooms.entries, HKPlayerData, HKWorldItems); CheckAdditionalThings(HK.sections.secretRooms, jsonObject);
// ------------------------- Secrets -> Cornifer's Notes ----------------------------------------------------------- // // ------------------------- Secrets -> Cornifer's Notes ----------------------------------------------------------- //
@ -281,11 +281,11 @@ function HKCheckCompletion(jsonObject, benchStart = performance.now()) {
// ------------------------- Game Statistics ---------------------------------------------------------------------------------- // // ------------------------- Game Statistics ---------------------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.statistics, HK.sections.statistics.entries, HKPlayerData, HKWorldItems, HKSceneData); CheckAdditionalThings(HK.sections.statistics, jsonObject);
// ------------------------- Godhome Statistics ------------------------------------------------------------------------------- // // ------------------------- Godhome Statistics ------------------------------------------------------------------------------- //
CheckAdditionalThings(HK.sections.godhomeStatistics, HK.sections.godhomeStatistics.entries, HKPlayerData, HKWorldItems, HKSceneData); CheckAdditionalThings(HK.sections.godhomeStatistics, jsonObject);
/* ------------------------- Pantheon Statistics ------------------------------------------------------------------------------ */ /* ------------------------- Pantheon Statistics ------------------------------------------------------------------------------ */
@ -1166,27 +1166,19 @@ function WorldDataActivated(idText, sceneNameText, worldData) {
} */ } */
/** /**
* Verifies if the data in a specific object are true or false, or checks what values they have, and appends HTML accordingly. * Verifies if the data in a specific section is true or false, or checks what values they have.
* @param {object} section ID of the HTML element for data appending * @param {object} section Reference/pointer to the specific section of the whole hk-database
* @param {object} dataObject Object containing data to be verified * @param {object} saveFile Reference/pointer to the whole Hollow Knight save file object (jsonObject)
* @param {object} playerData Reference/pointer to specific data where to search (playerData)
* @param {object} worldData Reference/pointer to specific data where to search (sceneData.persistentBoolItems)
* @param {object} sceneData Reference/pointer to specific data where to search (sceneData)
*/ */
function CheckAdditionalThings(section, dataObject, playerData, worldData, sceneData) { function CheckAdditionalThings(section, saveFile) {
/* let { let entries = section.entries;
textPrefix, let playerData = saveFile.playerData;
textSuffix, let sceneData = saveFile.sceneData;
wiki let worldData = saveFile.sceneData.persistentBoolItems;
} = "";
let sFillText = ""; */
// Start main loop // Start main loop
for (let i in dataObject) { for (let i in entries) {
/* textPrefix = dataObject[i].name;
(dataObject[i].hasOwnProperty("spoiler")) ? textSuffix = dataObject[i].spoiler: textSuffix = "";
(dataObject[i].hasOwnProperty("wiki")) ? wiki = dataObject[i].wiki: wiki = ""; */
let { let {
amount, amount,
@ -1216,32 +1208,32 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} }
countTotal = amount; countTotal = amount;
dataObject[i].amount = amount; entries[i].amount = amount;
if (i === "journalEntriesCompleted" || i === "journalNotesCompleted") { if (i === "journalEntriesCompleted" || i === "journalNotesCompleted") {
countTotal = `${amount} / ${playerData.journalEntriesTotal}`; countTotal = `${amount} / ${playerData.journalEntriesTotal}`;
dataObject[i].amountTotal = playerData.journalEntriesTotal; entries[i].amountTotal = playerData.journalEntriesTotal;
dataObject[i].spoiler = `${dataObject[i].spoilerDefault} (${dataObject[i].max} max)`; entries[i].spoiler = `${entries[i].spoilerDefault} (${entries[i].max} max)`;
/* when Zote is dead, the max Journal entries will equal 4 less instead of 164. For the green tick */ /* when Zote is dead, the max Journal entries will equal 4 less instead of 164. For the green tick */
if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
if (playerData.hasOwnProperty("killedGreyPrince")) { if (playerData.hasOwnProperty("killedGreyPrince")) {
dataObject[i].max -= 4; // Subtract GPZ and 3 Zotelings from max entries[i].max -= 4; // Subtract GPZ and 3 Zotelings from max
} }
dataObject[i].spoiler = `${dataObject[i].spoilerDefault} (${dataObject[i].max} max)`; /* Change spoiler for less confusion */ entries[i].spoiler = `${entries[i].spoilerDefault} (${entries[i].max} max)`; /* Change spoiler for less confusion */
} }
/* when Grimm Troupe is banished, max Journal entries will be 1 or 2 less */ /* when Grimm Troupe is banished, max Journal entries will be 1 or 2 less */
if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) { if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) {
dataObject[i].max--; // Subtract Nightmare King from max entries[i].max--; // Subtract Nightmare King from max
/* if the player didn't defeat any Grimmkin Nightmare before banishing, subtract it from max */ /* if the player didn't defeat any Grimmkin Nightmare before banishing, subtract it from max */
if (playerData.killedFlameBearerLarge === false) { if (playerData.killedFlameBearerLarge === false) {
dataObject[i].max--; // Subtract Grimmkin Nightmare from max entries[i].max--; // Subtract Grimmkin Nightmare from max
dataObject[i].spoiler = `${dataObject[i].spoilerDefault} (${dataObject[i].max} max)`; /* Change spoiler for less confusion */ entries[i].spoiler = `${entries[i].spoilerDefault} (${entries[i].max} max)`; /* Change spoiler for less confusion */
} }
} }
} }
@ -1253,7 +1245,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* textPrefix += `: ${countTotal}`; */ /* textPrefix += `: ${countTotal}`; */
if (i === "grubRewards") { if (i === "grubRewards") {
dataObject[i].amountTotal = playerData.grubsCollected; entries[i].amountTotal = playerData.grubsCollected;
/* textPrefix += ` / ${playerData.grubsCollected}`; */ /* textPrefix += ` / ${playerData.grubsCollected}`; */
} }
@ -1261,11 +1253,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) { } else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) {
dataObject[i].disabled = true; entries[i].disabled = true;
// textPrefix = `<del>${textPrefix}</del>`; // textPrefix = `<del>${textPrefix}</del>`;
} }
} }
@ -1274,13 +1266,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} }
} }
if (amount >= dataObject[i].max) { if (amount >= entries[i].max) {
SetIconGreen(section, i); SetIconGreen(section, i);
} else if (amount > 0) { } else if (amount > 0) {
@ -1295,7 +1287,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "geoPool": case "geoPool":
amount = Math.abs(playerData[i]); amount = Math.abs(playerData[i]);
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0) { if (amount > 0) {
SetIconPartial(section, i); SetIconPartial(section, i);
@ -1316,7 +1308,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "simpleKeys": case "simpleKeys":
amount = Math.abs(playerData[i]); amount = Math.abs(playerData[i]);
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0) { if (amount > 0) {
SetIcon(section, i, "revealed"); SetIcon(section, i, "revealed");
@ -1329,7 +1321,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
SetIcon(section, i, "revealed"); SetIcon(section, i, "revealed");
} }
@ -1353,7 +1345,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.permadeathMode > 0) { if (playerData.permadeathMode > 0) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
continue; continue;
} }
@ -1367,10 +1359,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
amount = 0; amount = 0;
for (let i = 1; i <= 4; i++) { for (let i = 1; i <= 4; i++) {
amount += (dataObject[`soldTrinket${i}`].amount * dataObject[`soldTrinket${i}`].geoValue); amount += (entries[`soldTrinket${i}`].amount * entries[`soldTrinket${i}`].geoValue);
} }
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0) { if (amount > 0) {
SetIcon(section, i, "revealed"); SetIcon(section, i, "revealed");
@ -1389,7 +1381,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
amount = 0; amount = 0;
} }
dataObject[i].amount = amount; entries[i].amount = amount;
if (amount > 0 || playerData.bankerAccountPurchased === true) { if (amount > 0 || playerData.bankerAccountPurchased === true) {
SetIcon(section, i, "revealed"); SetIcon(section, i, "revealed");
@ -1435,9 +1427,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
notActivated = CountItems(discoveredTotal, "notActivated"); notActivated = CountItems(discoveredTotal, "notActivated");
activated = CountItems(discoveredTotal, "active"); activated = CountItems(discoveredTotal, "active");
dataObject[i].discoveredTotal = discoveredTotal; entries[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated; entries[i].notActivated = notActivated;
dataObject[i].activated = activated; entries[i].activated = activated;
/* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */ /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
SetIcon(section, i, "revealed"); SetIcon(section, i, "revealed");
@ -1481,7 +1473,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "soulSanctumShortcut": case "soulSanctumShortcut":
case "colosseumHiddenHotSpring": case "colosseumHiddenHotSpring":
case "paleLurkersRetreat": case "paleLurkersRetreat":
(FindWorldItem(dataObject[i].id, dataObject[i].sceneName)) ? SetIconGreen(section, i): SetIconRed(section, i); (FindWorldItem(entries[i].id, entries[i].sceneName)) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "grimmTentSecretRoom": case "grimmTentSecretRoom":
@ -1489,15 +1481,15 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* Backwards compatibility with older save files */ /* Backwards compatibility with older save files */
if (playerData.hasOwnProperty("destroyedNightmareLantern") === false) { if (playerData.hasOwnProperty("destroyedNightmareLantern") === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else if (FindWorldItem(dataObject[i].id, dataObject[i].sceneName)) { } else if (FindWorldItem(entries[i].id, entries[i].sceneName)) {
SetIconGreen(section, i); SetIconGreen(section, i);
} else { } else {
/* When the Ritual has been completed or Grimm Troupe has been Banished, the secret is no longer possible to discover */ /* When the Ritual has been completed or Grimm Troupe has been Banished, the secret is no longer possible to discover */
if (playerData.grimmChildLevel >= 4) { if (playerData.grimmChildLevel >= 4) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
SetIconRed(section, i); SetIconRed(section, i);
} }
@ -1509,9 +1501,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "relicsHallownestSeal": case "relicsHallownestSeal":
case "relicsKingsIdol": case "relicsKingsIdol":
case "relicsArcaneEgg": case "relicsArcaneEgg":
total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold]; total = playerData[entries[i].nameHeld] + playerData[entries[i].nameSold];
if (total >= dataObject[i].max) { if (total >= entries[i].max) {
SetIconGreen(section, i); SetIconGreen(section, i);
} else if (total > 0) { } else if (total > 0) {
@ -1522,20 +1514,20 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
SetIconNone(section, i); SetIconNone(section, i);
} }
dataObject[i].amount = total; entries[i].amount = total;
/* textPrefix += ": " + total; */ /* textPrefix += ": " + total; */
break; break;
case "arcaneEggLifebloodCoreRoom": case "arcaneEggLifebloodCoreRoom":
(FindWorldItem(dataObject[i].id, dataObject[i].sceneName)) ? SetIconGreen(section, i): SetIconNone(section, i); (FindWorldItem(entries[i].id, entries[i].sceneName)) ? SetIconGreen(section, i): SetIconNone(section, i);
break; break;
case "pantheonHallownest": case "pantheonHallownest":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
(playerData.bossDoorStateTier5.completed === true) ? SetIconGreen(section, i): SetIconRed(section, i); (playerData.bossDoorStateTier5.completed === true) ? SetIconGreen(section, i): SetIconRed(section, i);
} }
@ -1544,7 +1536,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killsBindingSeal": case "killsBindingSeal":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
@ -1558,7 +1550,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killedVoidIdol_1": case "killedVoidIdol_1":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
@ -1569,7 +1561,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killedVoidIdol_2": case "killedVoidIdol_2":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
@ -1581,11 +1573,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) { } else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) {
dataObject[i].disabled = true; entries[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
} }
(playerData[i] === true) ? SetIconGreen(section, i): SetIconNone(section, i); (playerData[i] === true) ? SetIconGreen(section, i): SetIconNone(section, i);
@ -1594,22 +1586,22 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "zoteStatus": case "zoteStatus":
SetIconRed(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; entries[i].name = entries[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; entries[i].spoiler = entries[i].spoilerDefault;
if (playerData.zoteDead === true) { if (playerData.zoteDead === true) {
/* textPrefix = dataObject[i].nameNeglect; /* textPrefix = dataObject[i].nameNeglect;
textSuffix = dataObject[i].spoilerNeglect; */ textSuffix = dataObject[i].spoilerNeglect; */
dataObject[i].name = dataObject[i].nameNeglect; entries[i].name = entries[i].nameNeglect;
dataObject[i].spoiler = dataObject[i].spoilerNeglect; entries[i].spoiler = entries[i].spoilerNeglect;
SetIconGreen(section, i); SetIconGreen(section, i);
} else if (playerData.killedZote === true) { } else if (playerData.killedZote === true) {
/* textPrefix = dataObject[i].nameRivalry; /* textPrefix = dataObject[i].nameRivalry;
textSuffix = dataObject[i].spoilerRivalry; */ textSuffix = dataObject[i].spoilerRivalry; */
dataObject[i].name = dataObject[i].nameRivalry; entries[i].name = entries[i].nameRivalry;
dataObject[i].spoiler = dataObject[i].spoilerRivalry; entries[i].spoiler = entries[i].spoilerRivalry;
SetIconGreen(section, i); SetIconGreen(section, i);
@ -1617,28 +1609,28 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasWalljump === false) { if (playerData.hasWalljump === false) {
/* textPrefix = dataObject[i].nameTrappedVengefly; /* textPrefix = dataObject[i].nameTrappedVengefly;
textSuffix = dataObject[i].spoilerTrappedVengefly; */ textSuffix = dataObject[i].spoilerTrappedVengefly; */
dataObject[i].name = dataObject[i].nameTrappedVengefly; entries[i].name = entries[i].nameTrappedVengefly;
dataObject[i].spoiler = dataObject[i].spoilerTrappedVengefly; entries[i].spoiler = entries[i].spoilerTrappedVengefly;
} else if (playerData.hasWalljump === true) { } else if (playerData.hasWalljump === true) {
/* textPrefix = dataObject[i].nameNotRescuedVengefly; /* textPrefix = dataObject[i].nameNotRescuedVengefly;
textSuffix = dataObject[i].spoilerNotRescuedVengefly; */ textSuffix = dataObject[i].spoilerNotRescuedVengefly; */
dataObject[i].name = dataObject[i].nameNotRescuedVengefly; entries[i].name = entries[i].nameNotRescuedVengefly;
dataObject[i].spoiler = dataObject[i].spoilerNotRescuedVengefly; entries[i].spoiler = entries[i].spoilerNotRescuedVengefly;
} }
} else if (playerData.zoteRescuedBuzzer === true) { } else if (playerData.zoteRescuedBuzzer === true) {
if (playerData.zoteRescuedDeepnest === false) { if (playerData.zoteRescuedDeepnest === false) {
/* textPrefix = dataObject[i].nameTrappedDeepnest; /* textPrefix = dataObject[i].nameTrappedDeepnest;
textSuffix = dataObject[i].spoilerTrappedDeepnest; */ textSuffix = dataObject[i].spoilerTrappedDeepnest; */
dataObject[i].name = dataObject[i].nameTrappedDeepnest; entries[i].name = entries[i].nameTrappedDeepnest;
dataObject[i].spoiler = dataObject[i].spoilerTrappedDeepnest; entries[i].spoiler = entries[i].spoilerTrappedDeepnest;
} else if (playerData.zoteRescuedDeepnest === true) { } else if (playerData.zoteRescuedDeepnest === true) {
if (playerData.killedZote === false) { if (playerData.killedZote === false) {
/* textPrefix = dataObject[i].nameColosseum; /* textPrefix = dataObject[i].nameColosseum;
textSuffix = dataObject[i].spoilerColosseum; */ textSuffix = dataObject[i].spoilerColosseum; */
dataObject[i].name = dataObject[i].nameColosseum; entries[i].name = entries[i].nameColosseum;
dataObject[i].spoiler = dataObject[i].spoilerColosseum; entries[i].spoiler = entries[i].spoilerColosseum;
} }
} }
} }
@ -1646,36 +1638,36 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "nailsmithStatus": case "nailsmithStatus":
SetIconRed(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; entries[i].name = entries[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; entries[i].spoiler = entries[i].spoilerDefault;
if (playerData.nailsmithKilled === true) { if (playerData.nailsmithKilled === true) {
/* textPrefix = dataObject[i].namePurity; /* textPrefix = dataObject[i].namePurity;
textSuffix = dataObject[i].spoilerPurity; */ textSuffix = dataObject[i].spoilerPurity; */
dataObject[i].name = dataObject[i].namePurity; entries[i].name = entries[i].namePurity;
dataObject[i].spoiler = dataObject[i].spoilerPurity; entries[i].spoiler = entries[i].spoilerPurity;
SetIconGreen(section, i); SetIconGreen(section, i);
} else if (playerData.nailsmithConvoArt === true) { } else if (playerData.nailsmithConvoArt === true) {
/* textPrefix = dataObject[i].nameHappyCouple; /* textPrefix = dataObject[i].nameHappyCouple;
textSuffix = dataObject[i].spoilerHappyCouple; */ textSuffix = dataObject[i].spoilerHappyCouple; */
dataObject[i].name = dataObject[i].nameHappyCouple; entries[i].name = entries[i].nameHappyCouple;
dataObject[i].spoiler = dataObject[i].spoilerHappyCouple; entries[i].spoiler = entries[i].spoilerHappyCouple;
SetIconGreen(section, i); SetIconGreen(section, i);
} else if (playerData.nailsmithSpared === true) { } else if (playerData.nailsmithSpared === true) {
/* textPrefix = dataObject[i].nameSheoHutWaiting; /* textPrefix = dataObject[i].nameSheoHutWaiting;
textSuffix = dataObject[i].spoilerSheoHutWaiting; */ textSuffix = dataObject[i].spoilerSheoHutWaiting; */
dataObject[i].name = dataObject[i].nameSheoHutWaiting; entries[i].name = entries[i].nameSheoHutWaiting;
dataObject[i].spoiler = dataObject[i].spoilerSheoHutWaiting; entries[i].spoiler = entries[i].spoilerSheoHutWaiting;
} else { } else {
/* textPrefix = dataObject[i].nameUpgradeNail; /* textPrefix = dataObject[i].nameUpgradeNail;
textSuffix = dataObject[i].spoilerUpgradeNail; */ textSuffix = dataObject[i].spoilerUpgradeNail; */
dataObject[i].name = dataObject[i].nameUpgradeNail; entries[i].name = entries[i].nameUpgradeNail;
dataObject[i].spoiler = dataObject[i].spoilerUpgradeNail; entries[i].spoiler = entries[i].spoilerUpgradeNail;
} }
break; break;
@ -1686,7 +1678,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "mrMushroomState5": case "mrMushroomState5":
case "mrMushroomState6": case "mrMushroomState6":
case "mrMushroomState7": case "mrMushroomState7":
CheckMrMushroomState(section, dataObject[i], playerData["mrMushroomState"]); CheckMrMushroomState(section, entries[i], playerData["mrMushroomState"]);
break; break;
case "openedTownBuilding": case "openedTownBuilding":
@ -1705,7 +1697,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
break; break;
@ -1714,12 +1706,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
SetIconGreen(section, i); SetIconGreen(section, i);
/* Create amount property before incrementing (avoids NaN) */ /* Create amount property before incrementing (avoids NaN) */
if (!dataObject.stagStationsOpened.hasOwnProperty("amount")) { if (!entries.stagStationsOpened.hasOwnProperty("amount")) {
dataObject.stagStationsOpened.amount = 0; entries.stagStationsOpened.amount = 0;
} }
/* increment the stag stations amount by one */ /* increment the stag stations amount by one */
dataObject.stagStationsOpened.amount++; entries.stagStationsOpened.amount++;
} else { } else {
SetIconRed(section, i); SetIconRed(section, i);
@ -1733,10 +1725,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (!playerData.hasOwnProperty("openedHiddenStation")) { if (!playerData.hasOwnProperty("openedHiddenStation")) {
/* Subtract one from maximum for extended completion counting */ /* Subtract one from maximum for extended completion counting */
dataObject[i].max--; entries[i].max--;
} }
if (dataObject[i].amount >= dataObject[i].max) { if (entries[i].amount >= entries[i].max) {
SetIconGreen(section, i); SetIconGreen(section, i);
} else { } else {
SetIconRed(section, i); SetIconRed(section, i);
@ -1763,12 +1755,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
SetIconGreen(section, i); SetIconGreen(section, i);
/* Create amount property before incrementing (avoids NaN) */ /* Create amount property before incrementing (avoids NaN) */
if (!dataObject.areaMaps.hasOwnProperty("amount")) { if (!entries.areaMaps.hasOwnProperty("amount")) {
dataObject.areaMaps.amount = 0; entries.areaMaps.amount = 0;
} }
/* increment the area maps amount by one */ /* increment the area maps amount by one */
dataObject.areaMaps.amount++; entries.areaMaps.amount++;
} else { } else {
SetIconRed(section, i); SetIconRed(section, i);
@ -1778,7 +1770,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "areaMaps": case "areaMaps":
if (dataObject[i].amount >= dataObject[i].max) { if (entries[i].amount >= entries[i].max) {
SetIconGreen(section, i); SetIconGreen(section, i);
} else { } else {
SetIconRed(section, i); SetIconRed(section, i);
@ -1795,7 +1787,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
SetIconGreen(section, i); SetIconGreen(section, i);
@ -1804,7 +1796,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* If player doesn't have an Unbreakable Charm, and they Banished the Grimm Troupe, the entry needs to be disabled */ /* If player doesn't have an Unbreakable Charm, and they Banished the Grimm Troupe, the entry needs to be disabled */
if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) { if (playerData.hasOwnProperty("destroyedNightmareLantern") && playerData.destroyedNightmareLantern === true) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
} else { } else {
SetIconRed(section, i); SetIconRed(section, i);
} }
@ -1818,7 +1810,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
SetIconNone(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; entries[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
@ -1830,12 +1822,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
SetIconRed(section, i); SetIconRed(section, i);
} }
} // end switch (i) } // end switch (i)
/* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */
} // end for (let i in dataObject) } // end for (let i in dataObject)
// AppendHTML(section, sFillText);
// ========================================== // ==========================================
// -------------- Methods ---------------- // // -------------- Methods ---------------- //