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

don't display amount for disabled entry

Browse source
This commit is contained in:
ReznoRMichael 2021-07-08 18:33:22 +02:00
commit 49bafb7fde
4 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/js/HKCheckCompletion.js
View file

@ -552,6 +552,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
// fades out the entries if save file is from older game versions
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
}
@ -590,6 +591,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
checkText = CheckGodmasterDoors(dataObject[i], playerData);
if (checkText === "PropertyNotFound") {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
} else if (checkText === "PantheonCompleted") {
@ -838,9 +840,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${dataObject[i].name}</del>`;
break;
} else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) {
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
}
}
@ -849,6 +853,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${dataObject[i].name}</del>`;
break;
}
@ -870,6 +875,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// fade out if not on Steel Soul
if (playerData.permadeathMode < 1) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
}
@ -954,6 +960,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "bossDoorStateTier5":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
} else {
(playerData[i].completed === true) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i);
@ -963,6 +970,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killsBindingSeal":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
}
@ -976,6 +984,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killedVoidIdol_1":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
}
@ -986,6 +995,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "killedVoidIdol_2":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
}
@ -997,9 +1007,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
break;
} else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) {
dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`;
}
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataBlank(section, i);
@ -1070,6 +1082,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
// backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i);
dataObject[i].disabled = true;
textPrefix = `<del>${dataObject[i].name}</del>`;
break;
}

14
src/js/page-functions.js
View file

@ -439,7 +439,13 @@ function SingleEntryFill(section, entry) {
spoiler = ["<span class='spoiler-text'>", "</span>"];
if (entry.hasOwnProperty("amount")) {
textPrefix += `: ${entry.amount}`;
if (entry.hasOwnProperty("disabled")) {
if (entry.disabled !== true) {
textPrefix += `: ${entry.amount}`;
}
} else {
textPrefix += `: ${entry.amount}`;
}
}
if (entry.hasOwnProperty("amountTotal")) {
@ -459,6 +465,12 @@ function SingleEntryFill(section, entry) {
default:
}
}
if (entry.hasOwnProperty("disabled")) {
if (entry.disabled === true) {
textPrefix = `<del>${textPrefix}</del>`;
}
}
if (textSuffix.length && textPrefix.length) textSuffix = `— ${textSuffix}`;
if (textPrefix.includes("<del>")) textSuffix = `<del>${textSuffix}</del>`;