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

optimized dash and del for text suffix

Browse source
This commit is contained in:
ReznoRMichael 2021-02-24 15:24:00 +01:00
parent fe562f00a7
commit 647a20e1f5
3 changed files with 12 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
build/app.js
View file

@ -188,13 +188,13 @@ function PrepareHTMLString(divId) {
if (divId === "hints") { if (divId === "hints") {
span[0] = "<span>"; span[0] = "<span>";
icon = ""; icon = "";
} } // let dash = "";
var dash = "";
if (textSuffix.length && textPrefix.length) dash = "— ";
if (textPrefix.includes("<del>")) dash = "<del>— </del>"; // return divStart + icon + b[0] + textPrefix + b[1] + span[0] + pSpan + spoilerSpan[0] + dash + textSuffix + spoilerSpan[1] + span[1] + divEnd;
return "\n ".concat(divStart, "\n ").concat(icon).concat(b[0]).concat(textPrefix).concat(b[1]).concat(span[0]).concat(pSpan).concat(spoilerSpan[0]).concat(dash).concat(textSuffix).concat(spoilerSpan[1]).concat(span[1], "\n ").concat(divEnd, "\n "); if (textSuffix.length && textPrefix.length) textSuffix = "— " + textSuffix;
if (textPrefix.includes("<del>")) textSuffix = "<del>".concat(textSuffix, "</del>"); // return divStart + icon + b[0] + textPrefix + b[1] + span[0] + pSpan + spoilerSpan[0] + dash + textSuffix + spoilerSpan[1] + span[1] + divEnd;
return "\n ".concat(divStart, "\n ").concat(icon).concat(b[0]).concat(textPrefix).concat(b[1]).concat(span[0]).concat(pSpan).concat(spoilerSpan[0]).concat(textSuffix).concat(spoilerSpan[1]).concat(span[1], "\n ").concat(divEnd, "\n ");
} }
/** /**
* 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.
@ -431,7 +431,6 @@ function CheckIfDataTrue(divId, dataObject, playerData) {
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
@ -533,7 +532,7 @@ function CheckGodmasterDoors(divId, dataObject, playerData) {
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty("bossDoorStateTier" + (i + 1)) === false) { if (playerData.hasOwnProperty("bossDoorStateTier" + (i + 1)) === false) {
CurrentDataBlank(); CurrentDataBlank();
sFillText += PrepareHTMLString(divId, "<del>".concat(dataObject[pantheon[i]].name, "</del>"), "<del>".concat(dataObject[pantheon[i]].spoiler, "</del>"), dataObject[pantheon[i]].wiki); sFillText += PrepareHTMLString(divId, "<del>".concat(dataObject[pantheon[i]].name, "</del>"), dataObject[pantheon[i]].spoiler, dataObject[pantheon[i]].wiki);
} else { } else {
playerData["bossDoorStateTier" + (i + 1)].completed === true ? CurrentDataTrue(divId) : CurrentDataFalse(); playerData["bossDoorStateTier" + (i + 1)].completed === true ? CurrentDataTrue(divId) : CurrentDataFalse();
sFillText += PrepareHTMLString(divId, dataObject[pantheon[i]].name, dataObject[pantheon[i]].spoiler, dataObject[pantheon[i]].wiki); sFillText += PrepareHTMLString(divId, dataObject[pantheon[i]].name, dataObject[pantheon[i]].spoiler, dataObject[pantheon[i]].wiki);
@ -691,11 +690,9 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(dataObject[i].name, "</del>"); textPrefix = "<del>".concat(dataObject[i].name, "</del>");
textSuffix = "<del>".concat(textSuffix, "</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) {
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
} }
} }
@ -704,7 +701,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(dataObject[i].name, "</del>"); textPrefix = "<del>".concat(dataObject[i].name, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
} }
@ -724,7 +720,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
} }
@ -776,7 +771,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
@ -823,7 +817,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
} else { } else {
playerData[i].completed === true ? CurrentDataTrue() : CurrentDataFalse(); playerData[i].completed === true ? CurrentDataTrue() : CurrentDataFalse();
} }
@ -834,7 +827,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
@ -845,7 +837,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
@ -857,7 +848,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
@ -869,7 +859,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
break; break;
} }
@ -881,11 +870,9 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</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) {
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
} }
playerData[i] === true ? CurrentDataTrue() : CurrentDataBlank(); playerData[i] === true ? CurrentDataTrue() : CurrentDataBlank();
@ -954,7 +941,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(textPrefix, "</del>");
textSuffix = "<del>".concat(textSuffix, "</del>");
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(); CurrentDataTrue();
} else { } else {

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

24
src/js/HKCheckCompletion.js
View file

@ -265,14 +265,14 @@ function PrepareHTMLString(divId, textPrefix = "Unknown Completion Element: ", t
icon = ""; icon = "";
} }
let dash = ""; // let dash = "";
if (textSuffix.length && textPrefix.length) dash = "— "; if (textSuffix.length && textPrefix.length) textSuffix = "— " + textSuffix;
if (textPrefix.includes("<del>")) dash = "<del>— </del>" if (textPrefix.includes("<del>")) textSuffix = `<del>${textSuffix}</del>`;
// return divStart + icon + b[0] + textPrefix + b[1] + span[0] + pSpan + spoilerSpan[0] + dash + textSuffix + spoilerSpan[1] + span[1] + divEnd; // return divStart + icon + b[0] + textPrefix + b[1] + span[0] + pSpan + spoilerSpan[0] + dash + textSuffix + spoilerSpan[1] + span[1] + divEnd;
return ` return `
${divStart} ${divStart}
${icon}${b[0]}${textPrefix}${b[1]}${span[0]}${pSpan}${spoilerSpan[0]}${dash}${textSuffix}${spoilerSpan[1]}${span[1]} ${icon}${b[0]}${textPrefix}${b[1]}${span[0]}${pSpan}${spoilerSpan[0]}${textSuffix}${spoilerSpan[1]}${span[1]}
${divEnd} ${divEnd}
`; `;
} }
@ -514,7 +514,6 @@ function CheckIfDataTrue(divId, dataObject, playerData, worldData = []) {
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
if (i === "grimmChildLevel") { if (i === "grimmChildLevel") {
@ -611,7 +610,7 @@ function CheckGodmasterDoors(divId, dataObject, playerData) {
sFillText += PrepareHTMLString( sFillText += PrepareHTMLString(
divId, divId,
`<del>${dataObject[pantheon[i]].name}</del>`, `<del>${dataObject[pantheon[i]].name}</del>`,
`<del>${dataObject[pantheon[i]].spoiler}</del>`, dataObject[pantheon[i]].spoiler,
dataObject[pantheon[i]].wiki dataObject[pantheon[i]].wiki
); );
} else { } else {
@ -774,11 +773,9 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${dataObject[i].name}</del>`; textPrefix = `<del>${dataObject[i].name}</del>`;
textSuffix = `<del>${textSuffix}</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)) {
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
} }
} }
@ -787,7 +784,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${dataObject[i].name}</del>`; textPrefix = `<del>${dataObject[i].name}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
} }
@ -805,7 +801,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
} }
@ -855,7 +850,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
@ -888,7 +882,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
} else { } else {
(playerData[i].completed === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i].completed === true) ? CurrentDataTrue(): CurrentDataFalse();
} }
@ -897,7 +890,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
(playerData[i] == 0) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i] == 0) ? CurrentDataTrue(): CurrentDataFalse();
@ -906,7 +898,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
@ -916,7 +907,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
@ -926,7 +916,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
break; break;
} }
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
@ -936,11 +925,9 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</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)) {
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
} }
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataBlank(); (playerData[i] === true) ? CurrentDataTrue(): CurrentDataBlank();
if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) CurrentDataFalse(); if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) CurrentDataFalse();
@ -1001,7 +988,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`; textPrefix = `<del>${textPrefix}</del>`;
textSuffix = `<del>${textSuffix}</del>`;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(); CurrentDataTrue();
} else { } else {