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

change function names

Browse source
This commit is contained in:
ReznoRMichael 2021-07-29 22:55:43 +02:00
parent c2bb7cad7b
commit 82a47fe2f7
3 changed files with 167 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
build/app.js
View file

@ -268,7 +268,7 @@ function PrepareHTMLString(section) {
*/ */
function CurrentDataTrue() { function SetIconGreen() {
var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ""; var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
@ -294,7 +294,7 @@ function CurrentDataTrue() {
*/ */
function CurrentDataPartial() { function SetIconPartial() {
var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ""; var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
section.entries[entry].icon = "partial"; section.entries[entry].icon = "partial";
@ -304,7 +304,7 @@ function CurrentDataPartial() {
*/ */
function CurrentDataPartialJournal() { function SetIconPartialJournal() {
var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ""; var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
section.entries[entry].icon = "partialJournal"; section.entries[entry].icon = "partialJournal";
@ -314,7 +314,7 @@ function CurrentDataPartialJournal() {
*/ */
function CurrentDataFalse() { function SetIconRed() {
var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ""; var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
section.entries[entry].icon = "red"; section.entries[entry].icon = "red";
@ -332,7 +332,7 @@ function CurrentDataFalse() {
*/ */
function CurrentDataBlank() { function SetIconNone() {
var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var section = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ""; var entry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
section.entries[entry].icon = "none"; section.entries[entry].icon = "none";
@ -398,7 +398,7 @@ function CheckCompletionPercent(section, playerData) {
section.entries.gameCompletion.spoilerAfter = section.entries.gameCompletion.spoilerAfterBaseGame; section.entries.gameCompletion.spoilerAfter = section.entries.gameCompletion.spoilerAfterBaseGame;
} }
completionPercentage >= maxPercent ? CurrentDataTrue(section, "gameCompletion") : CurrentDataFalse(section, "gameCompletion"); completionPercentage >= maxPercent ? SetIconGreen(section, "gameCompletion") : SetIconRed(section, "gameCompletion");
/* let textFill = "Game Completion:" + pSpan + "<b>" + completionPercentage + " %</b>" + pSpan + "(out of " + section.maxPercent + " %)"; */ /* let textFill = "Game Completion:" + pSpan + "<b>" + completionPercentage + " %</b>" + pSpan + "(out of " + section.maxPercent + " %)"; */
// document.getElementById(section.id).innerHTML += divStart + completionSymbol + textFill + divEnd; // document.getElementById(section.id).innerHTML += divStart + completionSymbol + textFill + divEnd;
} }
@ -478,7 +478,7 @@ function CheckExtendedCompletion(db) {
function CheckSaveFileVersion(section) { function CheckSaveFileVersion(section) {
var saveVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro.entries.saveVersion.spoiler; var saveVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro.entries.saveVersion.spoiler;
CurrentDataBlank(section, section.entries.saveVersion.id); SetIconNone(section, section.entries.saveVersion.id);
section.entries.saveVersion.spoiler = "".concat(saveVersion); section.entries.saveVersion.spoiler = "".concat(saveVersion);
/* let textFill = `Save Version:${pSpan}<b>${saveVersion}</b>${pSpan}`; */ /* let textFill = `Save Version:${pSpan}<b>${saveVersion}</b>${pSpan}`; */
// document.getElementById(section.id).innerHTML += divStart + completionSymbol + textFill + divEnd; // document.getElementById(section.id).innerHTML += divStart + completionSymbol + textFill + divEnd;
@ -633,7 +633,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
switch (i) { switch (i) {
case "gotCharm_36": case "gotCharm_36":
// prevents green checkbox and adding 1% when only got one white fragment // prevents green checkbox and adding 1% when only got one white fragment
playerData.gotQueenFragment === true && playerData.gotKingFragment === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.gotQueenFragment === true && playerData.gotKingFragment === true ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "gotCharm_37": case "gotCharm_37":
@ -646,7 +646,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
case "hasGodfinder": case "hasGodfinder":
// fades out the entries if save file is from older game versions // fades out the entries if save file is from older game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
@ -655,7 +655,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
if (i === "grimmChildLevel") { if (i === "grimmChildLevel") {
// (playerData.grimmChildLevel >= 4) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); // (playerData.grimmChildLevel >= 4) ? SetIconGreen(section, i): SetIconRed(section, i);
/* Check if Nightmare King or Banishment by looking at grimmChildLevel */ /* Check if Nightmare King or Banishment by looking at grimmChildLevel */
switch (playerData[i]) { switch (playerData[i]) {
@ -663,18 +663,18 @@ function CheckIfDataTrue(section, dataObject, playerData) {
dataObject[i].name = dataObject[i].nameNightmareKing; dataObject[i].name = dataObject[i].nameNightmareKing;
dataObject[i].spoiler = dataObject[i].spoilerNightmareKing; dataObject[i].spoiler = dataObject[i].spoilerNightmareKing;
dataObject[i].wiki = dataObject[i].wikiNightmareKing; dataObject[i].wiki = dataObject[i].wikiNightmareKing;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 5: case 5:
dataObject[i].name = dataObject[i].nameBanishment; dataObject[i].name = dataObject[i].nameBanishment;
dataObject[i].spoiler = dataObject[i].spoilerBanishment; dataObject[i].spoiler = dataObject[i].spoilerBanishment;
dataObject[i].wiki = dataObject[i].wikiBanishment; dataObject[i].wiki = dataObject[i].wikiBanishment;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
default: default:
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
dataObject[i].wiki = dataObject[i].wikiDefault; dataObject[i].wiki = dataObject[i].wikiDefault;
@ -684,7 +684,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
} }
if (i === "gotCharm_40") { if (i === "gotCharm_40") {
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
dataObject[i].wiki = dataObject[i].wikiDefault; dataObject[i].wiki = dataObject[i].wikiDefault;
@ -695,7 +695,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
dataObject[i].name = dataObject[i].nameGrimmchildP1; dataObject[i].name = dataObject[i].nameGrimmchildP1;
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP1; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP1;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
} }
break; break;
@ -704,28 +704,28 @@ function CheckIfDataTrue(section, dataObject, playerData) {
dataObject[i].name = dataObject[i].nameGrimmchildP2; dataObject[i].name = dataObject[i].nameGrimmchildP2;
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP2; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP2;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 3: case 3:
dataObject[i].name = dataObject[i].nameGrimmchildP3; dataObject[i].name = dataObject[i].nameGrimmchildP3;
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP3; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP3;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 4: case 4:
dataObject[i].name = dataObject[i].nameGrimmchildP4; dataObject[i].name = dataObject[i].nameGrimmchildP4;
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP4; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP4;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 5: case 5:
dataObject[i].name = dataObject[i].nameCarefreeMelody; dataObject[i].name = dataObject[i].nameCarefreeMelody;
dataObject[i].spoiler = dataObject[i].spoilerCarefreeMelody; dataObject[i].spoiler = dataObject[i].spoilerCarefreeMelody;
dataObject[i].wiki = dataObject[i].wikiCarefreeMelody; dataObject[i].wiki = dataObject[i].wikiCarefreeMelody;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
default: default:
@ -737,7 +737,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
break; break;
} }
playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] === true ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "bossGruzMother": case "bossGruzMother":
@ -758,7 +758,7 @@ function CheckIfDataTrue(section, dataObject, playerData) {
case "vesselFragmentCityOfTears": case "vesselFragmentCityOfTears":
case "vesselFragmentDeepnest": case "vesselFragmentDeepnest":
case "vesselFragmentFountain": case "vesselFragmentFountain":
WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData) ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData) ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "pantheonMaster": case "pantheonMaster":
@ -768,22 +768,22 @@ function CheckIfDataTrue(section, dataObject, playerData) {
checkText = CheckGodmasterDoors(dataObject[i], playerData); checkText = CheckGodmasterDoors(dataObject[i], playerData);
if (checkText === "PropertyNotFound") { if (checkText === "PropertyNotFound") {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} else if (checkText === "PantheonCompleted") { } else if (checkText === "PantheonCompleted") {
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
} else { } else {
CurrentDataFalse(section, i); SetIconRed(section, i);
} }
break; break;
default: default:
playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] === true ? SetIconGreen(section, i) : SetIconRed(section, i);
} }
/* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */ /* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */
@ -805,19 +805,19 @@ function CheckSpellLevel(section, dataObject, playerData) {
switch (i) { switch (i) {
case "vengefulSpirit": case "vengefulSpirit":
case "shadeSoul": case "shadeSoul":
playerData.fireballLevel >= dataObject[i].fireballLevel ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.fireballLevel >= dataObject[i].fireballLevel ? SetIconGreen(section, i) : SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
break; break;
case "desolateDive": case "desolateDive":
case "descendingDark": case "descendingDark":
playerData.quakeLevel >= dataObject[i].quakeLevel ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.quakeLevel >= dataObject[i].quakeLevel ? SetIconGreen(section, i) : SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
break; break;
case "howlingWraiths": case "howlingWraiths":
case "abyssShriek": case "abyssShriek":
playerData.screamLevel >= dataObject[i].screamLevel ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.screamLevel >= dataObject[i].screamLevel ? SetIconGreen(section, i) : SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
break; break;
@ -839,7 +839,7 @@ function CheckWarriorDreams(section, dataObject, playerData) {
var sFillText = ""; var sFillText = "";
for (var i in dataObject) { for (var i in dataObject) {
playerData[i] >= 2 ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] >= 2 ? SetIconGreen(section, i) : SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
} // AppendHTML(section, sFillText); } // AppendHTML(section, sFillText);
@ -877,7 +877,7 @@ function CheckNailUpgrades(section, dataObject, playerData) {
var sFillText = ""; var sFillText = "";
for (var i = 0; i < 5; i++) { for (var i = 0; i < 5; i++) {
playerData.nailSmithUpgrades >= i ? CurrentDataTrue(section, nail[i]) : CurrentDataFalse(section, nail[i]); playerData.nailSmithUpgrades >= i ? SetIconGreen(section, nail[i]) : SetIconRed(section, nail[i]);
sFillText += PrepareHTMLString(section, dataObject[nail[i]].name, dataObject[nail[i]].spoiler, dataObject[nail[i]].wiki); sFillText += PrepareHTMLString(section, dataObject[nail[i]].name, dataObject[nail[i]].spoiler, dataObject[nail[i]].wiki);
} }
@ -933,8 +933,8 @@ function WorldDataActivated(idText, sceneNameText, worldData) {
// Display the items as they were initially ordered // Display the items as they were initially ordered
for (let i = 0; i < size; i++) { for (let i = 0; i < size; i++) {
CurrentDataFalse(); SetIconRed();
if (orderedArray[i][4] === true) CurrentDataTrue(section); if (orderedArray[i][4] === true) SetIconGreen(section);
sFillText += PrepareHTMLString(section, orderedArray[i][1], orderedArray[i][2], orderedArray[i][3]); sFillText += PrepareHTMLString(section, orderedArray[i][1], orderedArray[i][2], orderedArray[i][3]);
} }
@ -1048,7 +1048,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "greyPrinceDefeats") { if (i === "greyPrinceDefeats") {
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`; dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
@ -1060,7 +1060,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "whiteDefenderDefeats") { if (i === "whiteDefenderDefeats") {
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`; dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
@ -1068,11 +1068,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} }
if (amount >= dataObject[i].max) { if (amount >= dataObject[i].max) {
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (amount > 0) { } else if (amount > 0) {
CurrentDataPartial(section, i); SetIconPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); SetIconNone(section, i);
} }
break; break;
@ -1086,15 +1086,15 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].amount = amount; dataObject[i].amount = amount;
if (amount > 0 && i == "geoPool") { if (amount > 0 && i == "geoPool") {
CurrentDataPartial(section, i); SetIconPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); SetIconNone(section, i);
} }
if (i === "jinnEggsSold") { if (i === "jinnEggsSold") {
// fade out if not on Steel Soul // fade out if not on Steel Soul
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${textPrefix}</del>`; dataObject[i].disabled = true; // textPrefix = `<del>${textPrefix}</del>`;
break; break;
@ -1112,7 +1112,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].activated = activated; dataObject[i].activated = activated;
/* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */ /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataBlank(section, i); SetIconNone(section, i);
break; break;
case "itemsDiscovered": case "itemsDiscovered":
@ -1124,24 +1124,24 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].activated = activated; dataObject[i].activated = activated;
/* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */ /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataBlank(section, i); SetIconNone(section, i);
break; break;
case "shopkeeperKey": case "shopkeeperKey":
playerData.hasSlykey === true || playerData.gaveSlykey === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.hasSlykey === true || playerData.gaveSlykey === true ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "elegantKey": case "elegantKey":
playerData.hasWhiteKey === true || playerData.usedWhiteKey === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.hasWhiteKey === true || playerData.usedWhiteKey === true ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "loveKey": case "loveKey":
playerData.hasLoveKey === true || playerData.openedLoveDoor === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.hasLoveKey === true || playerData.openedLoveDoor === true ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "paleOreSeer": case "paleOreSeer":
// #2 // #2
playerData.dreamReward3 === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData.dreamReward3 === true ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
/* -------------------- Interactables ------------------------------- */ /* -------------------- Interactables ------------------------------- */
@ -1168,7 +1168,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "whiteLadyRoom": case "whiteLadyRoom":
case "arcaneEggLifebloodCoreRoom": case "arcaneEggLifebloodCoreRoom":
case "throneRoomLoreTablet": case "throneRoomLoreTablet":
FindWorldItem(dataObject[i].id, dataObject[i].sceneName) ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); FindWorldItem(dataObject[i].id, dataObject[i].sceneName) ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "relicsWandererJournal": case "relicsWandererJournal":
@ -1178,11 +1178,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold]; total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold];
if (total >= dataObject[i].max) { if (total >= dataObject[i].max) {
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (total > 0) { } else if (total > 0) {
CurrentDataPartial(section, i); SetIconPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); SetIconNone(section, i);
} }
dataObject[i].amount = total; dataObject[i].amount = total;
@ -1192,61 +1192,61 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "bossDoorStateTier5": case "bossDoorStateTier5":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
} else { } else {
playerData[i].completed === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i].completed === true ? SetIconGreen(section, i) : SetIconRed(section, i);
} }
break; break;
case "killsBindingSeal": case "killsBindingSeal":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
playerData[i] == 0 ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] == 0 ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "killsBigBuzzer": case "killsBigBuzzer":
playerData[i] == 0 ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] == 0 ? SetIconGreen(section, i) : SetIconRed(section, i);
break; break;
case "killedVoidIdol_1": case "killedVoidIdol_1":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] === true ? SetIconGreen(section, i) : SetIconRed(section, i);
if (playerData[i] === false && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) CurrentDataTrue(section, i); if (playerData[i] === false && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) SetIconGreen(section, i);
break; break;
case "killedVoidIdol_2": case "killedVoidIdol_2":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i] === true ? SetIconGreen(section, i) : SetIconRed(section, i);
if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue(section, i); if (playerData[i] === false && playerData.killedVoidIdol_3 === true) SetIconGreen(section, i);
break; break;
case "greyPrinceDefeated": case "greyPrinceDefeated":
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
@ -1256,12 +1256,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
} }
playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataBlank(section, i); playerData[i] === true ? SetIconGreen(section, i) : SetIconNone(section, i);
if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) CurrentDataFalse(section, i); if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) SetIconRed(section, i);
break; break;
case "zoteStatus": case "zoteStatus":
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
@ -1270,13 +1270,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
textSuffix = dataObject[i].spoilerNeglect; */ textSuffix = dataObject[i].spoilerNeglect; */
dataObject[i].name = dataObject[i].nameNeglect; dataObject[i].name = dataObject[i].nameNeglect;
dataObject[i].spoiler = dataObject[i].spoilerNeglect; dataObject[i].spoiler = dataObject[i].spoilerNeglect;
CurrentDataTrue(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; dataObject[i].name = dataObject[i].nameRivalry;
dataObject[i].spoiler = dataObject[i].spoilerRivalry; dataObject[i].spoiler = dataObject[i].spoilerRivalry;
CurrentDataTrue(section, i); 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;
@ -1308,7 +1308,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
break; break;
case "nailsmithStatus": case "nailsmithStatus":
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
@ -1317,13 +1317,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
textSuffix = dataObject[i].spoilerPurity; */ textSuffix = dataObject[i].spoilerPurity; */
dataObject[i].name = dataObject[i].namePurity; dataObject[i].name = dataObject[i].namePurity;
dataObject[i].spoiler = dataObject[i].spoilerPurity; dataObject[i].spoiler = dataObject[i].spoilerPurity;
CurrentDataTrue(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; dataObject[i].name = dataObject[i].nameHappyCouple;
dataObject[i].spoiler = dataObject[i].spoilerHappyCouple; dataObject[i].spoiler = dataObject[i].spoilerHappyCouple;
CurrentDataTrue(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; */
@ -1351,14 +1351,14 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
default: default:
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`; dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else { } else {
CurrentDataFalse(section, i); SetIconRed(section, i);
} }
} // end switch (i) } // end switch (i)
@ -1559,9 +1559,9 @@ function CheckMrMushroomState(section, entry) {
var mrMushroomState = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; var mrMushroomState = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
if (mrMushroomState >= entry.state) { if (mrMushroomState >= entry.state) {
CurrentDataTrue(section, "mrMushroomState".concat(entry.state)); SetIconGreen(section, "mrMushroomState".concat(entry.state));
} else { } else {
CurrentDataFalse(section, "mrMushroomState".concat(entry.state)); SetIconRed(section, "mrMushroomState".concat(entry.state));
} }
} }
/** /**
@ -1593,7 +1593,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
continue; continue;
} }
@ -1604,7 +1604,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
if (playerData.destroyedNightmareLantern === true && playerData.killedFlameBearerLarge === false) { if (playerData.destroyedNightmareLantern === true && playerData.killedFlameBearerLarge === false) {
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
continue; continue;
} }
@ -1615,7 +1615,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
if (playerData.destroyedNightmareLantern === true) { if (playerData.destroyedNightmareLantern === true) {
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
continue; continue;
} }
@ -1626,16 +1626,16 @@ function CheckHuntersJournal(db, sectionName, playerData) {
/* When killed at least 1, the entry has a gray symbol */ /* When killed at least 1, the entry has a gray symbol */
if (playerData["killed".concat(entry)] === true) { if (playerData["killed".concat(entry)] === true) {
CurrentDataPartialJournal(section, entry); SetIconPartialJournal(section, entry);
/* When not killed, the entry is undiscovered */ /* When not killed, the entry is undiscovered */
} else { } else {
CurrentDataFalse(section, entry); SetIconRed(section, entry);
} }
/* When the Hunter's Note is unlocked, the entry has a green symbol */ /* When the Hunter's Note is unlocked, the entry has a green symbol */
if (amountKillsLeft === 0) { if (amountKillsLeft === 0) {
CurrentDataTrue(section, entry); SetIconGreen(section, entry);
/* If not, show how many remain to defeat in the name */ /* If not, show how many remain to defeat in the name */
} else { } else {
name += " (".concat(amountKillsLeft, ")"); name += " (".concat(amountKillsLeft, ")");
@ -1646,7 +1646,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
if (entry === "VoidIdol_1") { if (entry === "VoidIdol_1") {
if (playerData.killedVoidIdol_1 === false && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) { if (playerData.killedVoidIdol_1 === false && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) {
CurrentDataTrue(section, entry); SetIconGreen(section, entry);
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
} }
} }
@ -1656,7 +1656,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
amountKillsLeft = 0; amountKillsLeft = 0;
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = name; entries[entry].name = name;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
} }
} }
} }

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

166
src/js/HKCheckCompletion.js
View file

@ -344,7 +344,7 @@ function PrepareHTMLString(section, textPrefix = "Unknown Completion Element: ",
/** /**
* Switches global variable to a "completed" symbol. Adds +1 or +2 to percent property. * Switches global variable to a "completed" symbol. Adds +1 or +2 to percent property.
*/ */
function CurrentDataTrue(section = {}, entry = "") { function SetIconGreen(section = {}, entry = "") {
/* Increase section percentage except the Game Status and Hints sections */ /* Increase section percentage except the Game Status and Hints sections */
switch (section.id) { switch (section.id) {
@ -369,7 +369,7 @@ function CurrentDataTrue(section = {}, entry = "") {
/** /**
* Switches global variable to a "partially completed" symbol (prevents blurring the textPrefix). * Switches global variable to a "partially completed" symbol (prevents blurring the textPrefix).
*/ */
function CurrentDataPartial(section = {}, entry = "") { function SetIconPartial(section = {}, entry = "") {
section.entries[entry].icon = "partial"; section.entries[entry].icon = "partial";
} }
@ -377,7 +377,7 @@ function CurrentDataPartial(section = {}, entry = "") {
/** /**
* Switches global variable to a "partially completed" symbol (prevents blurring whole entry). * Switches global variable to a "partially completed" symbol (prevents blurring whole entry).
*/ */
function CurrentDataPartialJournal(section = {}, entry = "") { function SetIconPartialJournal(section = {}, entry = "") {
section.entries[entry].icon = "partialJournal"; section.entries[entry].icon = "partialJournal";
} }
@ -385,7 +385,7 @@ function CurrentDataPartialJournal(section = {}, entry = "") {
/** /**
* Switches global variable to a "not completed" symbol * Switches global variable to a "not completed" symbol
*/ */
function CurrentDataFalse(section = {}, entry = "") { function SetIconRed(section = {}, entry = "") {
section.entries[entry].icon = "red"; section.entries[entry].icon = "red";
} }
@ -400,7 +400,7 @@ function CurrentDataFalse(section = {}, entry = "") {
/** /**
* Switches global variable to no symbol (span with left padding) * Switches global variable to no symbol (span with left padding)
*/ */
function CurrentDataBlank(section = {}, entry = "") { function SetIconNone(section = {}, entry = "") {
section.entries[entry].icon = "none"; section.entries[entry].icon = "none";
} }
@ -473,7 +473,7 @@ function CheckCompletionPercent(section, playerData) {
section.entries.gameCompletion.spoilerAfter = section.entries.gameCompletion.spoilerAfterBaseGame; section.entries.gameCompletion.spoilerAfter = section.entries.gameCompletion.spoilerAfterBaseGame;
} }
(completionPercentage >= maxPercent) ? CurrentDataTrue(section, "gameCompletion"): CurrentDataFalse(section, "gameCompletion"); (completionPercentage >= maxPercent) ? SetIconGreen(section, "gameCompletion"): SetIconRed(section, "gameCompletion");
/* let textFill = "Game Completion:" + pSpan + "<b>" + completionPercentage + " %</b>" + pSpan + "(out of " + section.maxPercent + " %)"; */ /* let textFill = "Game Completion:" + pSpan + "<b>" + completionPercentage + " %</b>" + pSpan + "(out of " + section.maxPercent + " %)"; */
// document.getElementById(section.id).innerHTML += divStart + completionSymbol + textFill + divEnd; // document.getElementById(section.id).innerHTML += divStart + completionSymbol + textFill + divEnd;
@ -562,7 +562,7 @@ function CheckExtendedCompletion(db) {
*/ */
function CheckSaveFileVersion(section, saveVersion = HK.sections.intro.entries.saveVersion.spoiler) { function CheckSaveFileVersion(section, saveVersion = HK.sections.intro.entries.saveVersion.spoiler) {
CurrentDataBlank(section, section.entries.saveVersion.id); SetIconNone(section, section.entries.saveVersion.id);
section.entries.saveVersion.spoiler = `${saveVersion}`; section.entries.saveVersion.spoiler = `${saveVersion}`;
@ -738,7 +738,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
switch (i) { switch (i) {
case "gotCharm_36": case "gotCharm_36":
// prevents green checkbox and adding 1% when only got one white fragment // prevents green checkbox and adding 1% when only got one white fragment
(playerData.gotQueenFragment === true && playerData.gotKingFragment === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.gotQueenFragment === true && playerData.gotKingFragment === true) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "gotCharm_37": case "gotCharm_37":
@ -752,7 +752,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
// fades out the entries if save file is from older game versions // fades out the entries if save file is from older game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
@ -761,7 +761,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
// Checks for Nightmare King (4) or Banishment (5) // Checks for Nightmare King (4) or Banishment (5)
if (i === "grimmChildLevel") { if (i === "grimmChildLevel") {
// (playerData.grimmChildLevel >= 4) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); // (playerData.grimmChildLevel >= 4) ? SetIconGreen(section, i): SetIconRed(section, i);
/* Check if Nightmare King or Banishment by looking at grimmChildLevel */ /* Check if Nightmare King or Banishment by looking at grimmChildLevel */
switch (playerData[i]) { switch (playerData[i]) {
@ -771,7 +771,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerNightmareKing; dataObject[i].spoiler = dataObject[i].spoilerNightmareKing;
dataObject[i].wiki = dataObject[i].wikiNightmareKing; dataObject[i].wiki = dataObject[i].wikiNightmareKing;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
@ -780,12 +780,12 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerBanishment; dataObject[i].spoiler = dataObject[i].spoilerBanishment;
dataObject[i].wiki = dataObject[i].wikiBanishment; dataObject[i].wiki = dataObject[i].wikiBanishment;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
default: default:
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
dataObject[i].wiki = dataObject[i].wikiDefault; dataObject[i].wiki = dataObject[i].wikiDefault;
@ -795,7 +795,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
} }
if (i === "gotCharm_40") { if (i === "gotCharm_40") {
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
dataObject[i].wiki = dataObject[i].wikiDefault; dataObject[i].wiki = dataObject[i].wikiDefault;
@ -808,7 +808,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP1; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP1;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
} }
break; break;
@ -817,7 +817,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP2; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP2;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 3: case 3:
@ -825,7 +825,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP3; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP3;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 4: case 4:
@ -833,7 +833,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP4; dataObject[i].spoiler = dataObject[i].spoilerGrimmchildP4;
dataObject[i].wiki = dataObject[i].wikiGrimmchild; dataObject[i].wiki = dataObject[i].wikiGrimmchild;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
case 5: case 5:
@ -841,7 +841,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
dataObject[i].spoiler = dataObject[i].spoilerCarefreeMelody; dataObject[i].spoiler = dataObject[i].spoilerCarefreeMelody;
dataObject[i].wiki = dataObject[i].wikiCarefreeMelody; dataObject[i].wiki = dataObject[i].wikiCarefreeMelody;
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
default: default:
@ -853,7 +853,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] === true) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
@ -875,7 +875,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
case "vesselFragmentCityOfTears": case "vesselFragmentCityOfTears":
case "vesselFragmentDeepnest": case "vesselFragmentDeepnest":
case "vesselFragmentFountain": case "vesselFragmentFountain":
(WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData)) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData)) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "pantheonMaster": case "pantheonMaster":
@ -885,22 +885,22 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
checkText = CheckGodmasterDoors(dataObject[i], playerData); checkText = CheckGodmasterDoors(dataObject[i], playerData);
if (checkText === "PropertyNotFound") { if (checkText === "PropertyNotFound") {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} else if (checkText === "PantheonCompleted") { } else if (checkText === "PantheonCompleted") {
CurrentDataTrue(section, i); SetIconGreen(section, i);
break; break;
} else { } else {
CurrentDataFalse(section, i); SetIconRed(section, i);
} }
break; break;
default: default:
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] === true) ? SetIconGreen(section, i): SetIconRed(section, i);
} }
/* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */ /* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */
@ -923,17 +923,17 @@ function CheckSpellLevel(section, dataObject, playerData) {
switch (i) { switch (i) {
case "vengefulSpirit": case "vengefulSpirit":
case "shadeSoul": case "shadeSoul":
(playerData.fireballLevel >= dataObject[i].fireballLevel) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.fireballLevel >= dataObject[i].fireballLevel) ? SetIconGreen(section, i): SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
break; break;
case "desolateDive": case "desolateDive":
case "descendingDark": case "descendingDark":
(playerData.quakeLevel >= dataObject[i].quakeLevel) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.quakeLevel >= dataObject[i].quakeLevel) ? SetIconGreen(section, i): SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
break; break;
case "howlingWraiths": case "howlingWraiths":
case "abyssShriek": case "abyssShriek":
(playerData.screamLevel >= dataObject[i].screamLevel) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.screamLevel >= dataObject[i].screamLevel) ? SetIconGreen(section, i): SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
break; break;
default: default:
@ -955,7 +955,7 @@ function CheckWarriorDreams(section, dataObject, playerData) {
let sFillText = ""; let sFillText = "";
for (let i in dataObject) { for (let i in dataObject) {
(playerData[i] >= 2) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] >= 2) ? SetIconGreen(section, i): SetIconRed(section, i);
sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki); sFillText += PrepareHTMLString(section, dataObject[i].name, dataObject[i].spoiler, dataObject[i].wiki);
} }
@ -993,7 +993,7 @@ function CheckNailUpgrades(section, dataObject, playerData) {
let sFillText = ""; let sFillText = "";
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
(playerData.nailSmithUpgrades >= i) ? CurrentDataTrue(section, nail[i]): CurrentDataFalse(section, nail[i]); (playerData.nailSmithUpgrades >= i) ? SetIconGreen(section, nail[i]): SetIconRed(section, nail[i]);
sFillText += PrepareHTMLString(section, dataObject[nail[i]].name, dataObject[nail[i]].spoiler, dataObject[nail[i]].wiki); sFillText += PrepareHTMLString(section, dataObject[nail[i]].name, dataObject[nail[i]].spoiler, dataObject[nail[i]].wiki);
} }
if (section.percent) section.percent--; // subject one for the Old Nail if (section.percent) section.percent--; // subject one for the Old Nail
@ -1048,8 +1048,8 @@ function WorldDataActivated(idText, sceneNameText, worldData) {
// Display the items as they were initially ordered // Display the items as they were initially ordered
for (let i = 0; i < size; i++) { for (let i = 0; i < size; i++) {
CurrentDataFalse(); SetIconRed();
if (orderedArray[i][4] === true) CurrentDataTrue(section); if (orderedArray[i][4] === true) SetIconGreen(section);
sFillText += PrepareHTMLString(section, orderedArray[i][1], orderedArray[i][2], orderedArray[i][3]); sFillText += PrepareHTMLString(section, orderedArray[i][1], orderedArray[i][2], orderedArray[i][3]);
} }
@ -1159,7 +1159,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "greyPrinceDefeats") { if (i === "greyPrinceDefeats") {
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
@ -1172,7 +1172,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "whiteDefenderDefeats") { if (i === "whiteDefenderDefeats") {
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
@ -1181,13 +1181,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (amount >= dataObject[i].max) { if (amount >= dataObject[i].max) {
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (amount > 0) { } else if (amount > 0) {
CurrentDataPartial(section, i); SetIconPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); SetIconNone(section, i);
} }
break; break;
@ -1201,16 +1201,16 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].amount = amount; dataObject[i].amount = amount;
if (amount > 0 && i == "geoPool") { if (amount > 0 && i == "geoPool") {
CurrentDataPartial(section, i); SetIconPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); SetIconNone(section, i);
} }
if (i === "jinnEggsSold") { if (i === "jinnEggsSold") {
// fade out if not on Steel Soul // fade out if not on Steel Soul
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
// textPrefix = `<del>${textPrefix}</del>`; // textPrefix = `<del>${textPrefix}</del>`;
break; break;
@ -1230,7 +1230,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].activated = activated; dataObject[i].activated = activated;
/* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */ /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataBlank(section, i); SetIconNone(section, i);
break; break;
case "itemsDiscovered": case "itemsDiscovered":
@ -1244,23 +1244,23 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].activated = activated; dataObject[i].activated = activated;
/* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */ /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataBlank(section, i); SetIconNone(section, i);
break; break;
case "shopkeeperKey": case "shopkeeperKey":
(playerData.hasSlykey === true || playerData.gaveSlykey === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.hasSlykey === true || playerData.gaveSlykey === true) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "elegantKey": case "elegantKey":
(playerData.hasWhiteKey === true || playerData.usedWhiteKey === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.hasWhiteKey === true || playerData.usedWhiteKey === true) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "loveKey": case "loveKey":
(playerData.hasLoveKey === true || playerData.openedLoveDoor === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.hasLoveKey === true || playerData.openedLoveDoor === true) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "paleOreSeer": // #2 case "paleOreSeer": // #2
(playerData.dreamReward3 === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData.dreamReward3 === true) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
/* -------------------- Interactables ------------------------------- */ /* -------------------- Interactables ------------------------------- */
@ -1279,7 +1279,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "whiteLadyRoom": case "whiteLadyRoom":
case "arcaneEggLifebloodCoreRoom": case "arcaneEggLifebloodCoreRoom":
case "throneRoomLoreTablet": case "throneRoomLoreTablet":
(FindWorldItem(dataObject[i].id, dataObject[i].sceneName)) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (FindWorldItem(dataObject[i].id, dataObject[i].sceneName)) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "relicsWandererJournal": case "relicsWandererJournal":
@ -1290,13 +1290,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (total >= dataObject[i].max) { if (total >= dataObject[i].max) {
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (total > 0) { } else if (total > 0) {
CurrentDataPartial(section, i); SetIconPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); SetIconNone(section, i);
} }
dataObject[i].amount = total; dataObject[i].amount = total;
@ -1306,54 +1306,54 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "bossDoorStateTier5": case "bossDoorStateTier5":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
} else { } else {
(playerData[i].completed === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i].completed === true) ? SetIconGreen(section, i): SetIconRed(section, i);
} }
break; break;
case "killsBindingSeal": case "killsBindingSeal":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
(playerData[i] == 0) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] == 0) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "killsBigBuzzer": case "killsBigBuzzer":
(playerData[i] == 0) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] == 0) ? SetIconGreen(section, i): SetIconRed(section, i);
break; break;
case "killedVoidIdol_1": case "killedVoidIdol_1":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] === true) ? SetIconGreen(section, i): SetIconRed(section, i);
if (playerData[i] === false && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) CurrentDataTrue(section, i); if (playerData[i] === false && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) SetIconGreen(section, i);
break; break;
case "killedVoidIdol_2": case "killedVoidIdol_2":
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i); (playerData[i] === true) ? SetIconGreen(section, i): SetIconRed(section, i);
if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue(section, i); if (playerData[i] === false && playerData.killedVoidIdol_3 === true) SetIconGreen(section, i);
break; break;
case "greyPrinceDefeated": case "greyPrinceDefeated":
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
@ -1361,12 +1361,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].disabled = true; dataObject[i].disabled = true;
/* textPrefix = `<del>${textPrefix}</del>`; */ /* textPrefix = `<del>${textPrefix}</del>`; */
} }
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataBlank(section, i); (playerData[i] === true) ? SetIconGreen(section, i): SetIconNone(section, i);
if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) CurrentDataFalse(section, i); if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) SetIconRed(section, i);
break; break;
case "zoteStatus": case "zoteStatus":
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
@ -1376,7 +1376,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].name = dataObject[i].nameNeglect; dataObject[i].name = dataObject[i].nameNeglect;
dataObject[i].spoiler = dataObject[i].spoilerNeglect; dataObject[i].spoiler = dataObject[i].spoilerNeglect;
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (playerData.killedZote === true) { } else if (playerData.killedZote === true) {
/* textPrefix = dataObject[i].nameRivalry; /* textPrefix = dataObject[i].nameRivalry;
@ -1384,7 +1384,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].name = dataObject[i].nameRivalry; dataObject[i].name = dataObject[i].nameRivalry;
dataObject[i].spoiler = dataObject[i].spoilerRivalry; dataObject[i].spoiler = dataObject[i].spoilerRivalry;
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (playerData.zoteRescuedBuzzer === false) { } else if (playerData.zoteRescuedBuzzer === false) {
if (playerData.hasWalljump === false) { if (playerData.hasWalljump === false) {
@ -1418,7 +1418,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
break; break;
case "nailsmithStatus": case "nailsmithStatus":
CurrentDataFalse(section, i); SetIconRed(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; dataObject[i].spoiler = dataObject[i].spoilerDefault;
@ -1428,7 +1428,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].name = dataObject[i].namePurity; dataObject[i].name = dataObject[i].namePurity;
dataObject[i].spoiler = dataObject[i].spoilerPurity; dataObject[i].spoiler = dataObject[i].spoilerPurity;
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (playerData.nailsmithConvoArt === true) { } else if (playerData.nailsmithConvoArt === true) {
/* textPrefix = dataObject[i].nameHappyCouple; /* textPrefix = dataObject[i].nameHappyCouple;
@ -1436,7 +1436,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].name = dataObject[i].nameHappyCouple; dataObject[i].name = dataObject[i].nameHappyCouple;
dataObject[i].spoiler = dataObject[i].spoilerHappyCouple; dataObject[i].spoiler = dataObject[i].spoilerHappyCouple;
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else if (playerData.nailsmithSpared === true) { } else if (playerData.nailsmithSpared === true) {
/* textPrefix = dataObject[i].nameSheoHutWaiting; /* textPrefix = dataObject[i].nameSheoHutWaiting;
@ -1467,17 +1467,17 @@ 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) {
CurrentDataBlank(section, i); SetIconNone(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(section, i); SetIconGreen(section, i);
} else { } else {
CurrentDataFalse(section, i); SetIconRed(section, i);
} }
} // end switch (i) } // end switch (i)
@ -1660,9 +1660,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
function CheckMrMushroomState(section, entry, mrMushroomState = 0) { function CheckMrMushroomState(section, entry, mrMushroomState = 0) {
if (mrMushroomState >= entry.state) { if (mrMushroomState >= entry.state) {
CurrentDataTrue(section, `mrMushroomState${entry.state}`); SetIconGreen(section, `mrMushroomState${entry.state}`);
} else { } else {
CurrentDataFalse(section, `mrMushroomState${entry.state}`); SetIconRed(section, `mrMushroomState${entry.state}`);
} }
} }
@ -1700,7 +1700,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
continue; continue;
} }
@ -1714,7 +1714,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
continue; continue;
} }
@ -1728,7 +1728,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
continue; continue;
} }
@ -1741,18 +1741,18 @@ function CheckHuntersJournal(db, sectionName, playerData) {
/* When killed at least 1, the entry has a gray symbol */ /* When killed at least 1, the entry has a gray symbol */
if (playerData[`killed${entry}`] === true) { if (playerData[`killed${entry}`] === true) {
CurrentDataPartialJournal(section, entry); SetIconPartialJournal(section, entry);
/* When not killed, the entry is undiscovered */ /* When not killed, the entry is undiscovered */
} else { } else {
CurrentDataFalse(section, entry); SetIconRed(section, entry);
} }
/* When the Hunter's Note is unlocked, the entry has a green symbol */ /* When the Hunter's Note is unlocked, the entry has a green symbol */
if (amountKillsLeft === 0) { if (amountKillsLeft === 0) {
CurrentDataTrue(section, entry); SetIconGreen(section, entry);
/* If not, show how many remain to defeat in the name */ /* If not, show how many remain to defeat in the name */
} else { } else {
@ -1766,7 +1766,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
if (playerData.killedVoidIdol_1 === false if (playerData.killedVoidIdol_1 === false
&& (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) { && (playerData.killedVoidIdol_2 === true || playerData.killedVoidIdol_3 === true)) {
CurrentDataTrue(section, entry); SetIconGreen(section, entry);
entries[entry].name = nameDefault; entries[entry].name = nameDefault;
} }
} }
@ -1777,7 +1777,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
amountKillsLeft = 0; amountKillsLeft = 0;
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = name; entries[entry].name = name;
CurrentDataBlank(section, entry); SetIconNone(section, entry);
} }
} }
} }