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

zote & nailsmith better handling

Browse source
This commit is contained in:
ReznoRMichael 2021-07-12 10:49:52 +02:00
parent b8a3330083
commit d43f2b87d9
5 changed files with 171 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

168
build/app.js
View file

@ -788,16 +788,17 @@ function WorldDataActivated(idText, sceneNameText, worldData) {
function CheckAdditionalThings(section, dataObject, playerData, worldData, sceneData) { function CheckAdditionalThings(section, dataObject, playerData, worldData, sceneData) {
var _ref = "", /* let {
textPrefix = _ref.textPrefix, textPrefix,
textSuffix = _ref.textSuffix, textSuffix,
wiki = _ref.wiki; wiki
var sFillText = ""; // Start main loop } = "";
let sFillText = ""; */
// Start main loop
for (var i in dataObject) { for (var i in dataObject) {
textPrefix = dataObject[i].name; /* textPrefix = dataObject[i].name;
dataObject[i].hasOwnProperty("spoiler") ? textSuffix = dataObject[i].spoiler : textSuffix = ""; (dataObject[i].hasOwnProperty("spoiler")) ? textSuffix = dataObject[i].spoiler: textSuffix = "";
dataObject[i].hasOwnProperty("wiki") ? wiki = dataObject[i].wiki : wiki = ""; (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,
@ -844,24 +845,23 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "grubsCollected") { if (i === "grubsCollected") {
LogMissingGrubs(); LogMissingGrubs();
} }
/* textPrefix += `: ${countTotal}`; */
textPrefix += ": ".concat(countTotal);
if (i === "grubRewards") { if (i === "grubRewards") {
dataObject[i].amountTotal = playerData.grubsCollected; dataObject[i].amountTotal = playerData.grubsCollected;
textPrefix += " / ".concat(playerData.grubsCollected); /* textPrefix += ` / ${playerData.grubsCollected}`; */
} }
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); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
textPrefix = "<del>".concat(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; dataObject[i].disabled = true; // textPrefix = `<del>${textPrefix}</del>`;
textPrefix = "<del>".concat(textPrefix, "</del>");
} }
} }
@ -869,8 +869,8 @@ 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); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
textPrefix = "<del>".concat(dataObject[i].name, "</del>");
break; break;
} }
} }
@ -882,7 +882,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "rancidEggs": case "rancidEggs":
case "jinnEggsSold": case "jinnEggsSold":
case "xunFlowerBrokeTimes": case "xunFlowerBrokeTimes":
textPrefix += ": " + Math.abs(playerData[i]); // textPrefix += ": " + Math.abs(playerData[i]);
dataObject[i].amount = Math.abs(playerData[i]); dataObject[i].amount = Math.abs(playerData[i]);
i === "geoPool" && playerData[i] > 0 ? CurrentDataBlank(section, i) : CurrentDataTrue(section, i); i === "geoPool" && playerData[i] > 0 ? CurrentDataBlank(section, i) : CurrentDataTrue(section, i);
@ -890,8 +890,8 @@ 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) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true; // textPrefix = `<del>${textPrefix}</del>`;
textPrefix = "<del>".concat(textPrefix, "</del>");
break; break;
} }
} }
@ -905,7 +905,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].discoveredTotal = discoveredTotal; dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated; dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated; dataObject[i].activated = activated;
textPrefix += ": ".concat(notActivated, " | ").concat(activated, " | ").concat(discoveredTotal); /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
break; break;
@ -916,7 +917,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].discoveredTotal = discoveredTotal; dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated; dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated; dataObject[i].activated = activated;
textPrefix += ": ".concat(notActivated, " | ").concat(activated, " | ").concat(discoveredTotal); /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
break; break;
@ -969,14 +971,15 @@ 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];
total >= dataObject[i].max ? CurrentDataTrue(section, i) : CurrentDataBlank(section, i); total >= dataObject[i].max ? CurrentDataTrue(section, i) : CurrentDataBlank(section, i);
dataObject[i].amount = total; dataObject[i].amount = total;
textPrefix += ": " + total; /* textPrefix += ": " + total; */
break; break;
case "bossDoorStateTier5": case "bossDoorStateTier5":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = "<del>".concat(textPrefix, "</del>"); /* textPrefix = `<del>${textPrefix}</del>`; */
} else { } else {
playerData[i].completed === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i); playerData[i].completed === true ? CurrentDataTrue(section, i) : CurrentDataFalse(section, i);
} }
@ -987,7 +990,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = "<del>".concat(textPrefix, "</del>"); /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
@ -1002,7 +1006,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = "<del>".concat(textPrefix, "</del>"); /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
@ -1014,7 +1019,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = "<del>".concat(textPrefix, "</del>"); /* textPrefix = `<del>${textPrefix}</del>`; */
break; break;
} }
@ -1027,11 +1033,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = "<del>".concat(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; dataObject[i].disabled = true;
textPrefix = "<del>".concat(textPrefix, "</del>"); /* textPrefix = `<del>${textPrefix}</del>`; */
} }
playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataBlank(section, i); playerData[i] === true ? CurrentDataTrue(section, i) : CurrentDataBlank(section, i);
@ -1040,43 +1047,45 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "zoteStatus": case "zoteStatus":
CurrentDataFalse(section, i); CurrentDataFalse(section, i);
dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[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].currentName = "nameNeglect"; dataObject[i].name = dataObject[i].nameNeglect;
dataObject[i].currentSpoiler = "spoilerNeglect"; dataObject[i].spoiler = dataObject[i].spoilerNeglect;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameRivalry"; dataObject[i].name = dataObject[i].nameRivalry;
dataObject[i].currentSpoiler = "spoilerRivalry"; dataObject[i].spoiler = dataObject[i].spoilerRivalry;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameTrappedVengefly"; dataObject[i].name = dataObject[i].nameTrappedVengefly;
dataObject[i].currentSpoiler = "spoilerTrappedVengefly"; dataObject[i].spoiler = dataObject[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].currentName = "nameNotRescuedVengefly"; dataObject[i].name = dataObject[i].nameNotRescuedVengefly;
dataObject[i].currentSpoiler = "spoilerNotRescuedVengefly"; dataObject[i].spoiler = dataObject[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].currentName = "nameTrappedDeepnest"; dataObject[i].name = dataObject[i].nameTrappedDeepnest;
dataObject[i].currentSpoiler = "spoilerTrappedDeepnest"; dataObject[i].spoiler = dataObject[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].currentName = "nameColosseum"; dataObject[i].name = dataObject[i].nameColosseum;
dataObject[i].currentSpoiler = "spoilerColosseum"; dataObject[i].spoiler = dataObject[i].spoilerColosseum;
} }
} }
} }
@ -1085,29 +1094,31 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "nailsmithStatus": case "nailsmithStatus":
CurrentDataFalse(section, i); CurrentDataFalse(section, i);
dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[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].currentName = "namePurity"; dataObject[i].name = dataObject[i].namePurity;
dataObject[i].currentSpoiler = "spoilerPurity"; dataObject[i].spoiler = dataObject[i].spoilerPurity;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameHappyCouple"; dataObject[i].name = dataObject[i].nameHappyCouple;
dataObject[i].currentSpoiler = "spoilerHappyCouple"; dataObject[i].spoiler = dataObject[i].spoilerHappyCouple;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameSheoHutWaiting"; dataObject[i].name = dataObject[i].nameSheoHutWaiting;
dataObject[i].currentSpoiler = "spoilerSheoHutWaiting"; dataObject[i].spoiler = dataObject[i].spoilerSheoHutWaiting;
} else { } else {
textPrefix = dataObject[i].nameUpgradeNail; /* textPrefix = dataObject[i].nameUpgradeNail;
textSuffix = dataObject[i].spoilerUpgradeNail; textSuffix = dataObject[i].spoilerUpgradeNail; */
dataObject[i].currentName = "nameUpgradeNail"; dataObject[i].name = dataObject[i].nameUpgradeNail;
dataObject[i].currentSpoiler = "spoilerUpgradeNail"; dataObject[i].spoiler = dataObject[i].spoilerUpgradeNail;
} }
break; break;
@ -1126,8 +1137,8 @@ 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); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true; // textPrefix = `<del>${dataObject[i].name}</del>`;
textPrefix = "<del>".concat(dataObject[i].name, "</del>");
break; break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
@ -1137,8 +1148,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} // end switch (i) } // end switch (i)
/* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */
sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki);
} // end for (let i in dataObject) } // end for (let i in dataObject)
// AppendHTML(section, sFillText); // AppendHTML(section, sFillText);
// ========================================== // ==========================================
@ -4145,6 +4156,7 @@ var HK = {
zoteStatus: { zoteStatus: {
id: "zoteStatus", id: "zoteStatus",
name: "Zote Status", name: "Zote Status",
nameDefault: "Zote Status",
nameNeglect: "Zote Choice: Neglect", nameNeglect: "Zote Choice: Neglect",
nameRivalry: "Zote Choice: Rivalry", nameRivalry: "Zote Choice: Rivalry",
nameTrappedVengefly: "Zote Status: Vengefly", nameTrappedVengefly: "Zote Status: Vengefly",
@ -4152,6 +4164,7 @@ var HK = {
nameTrappedDeepnest: "Zote Status: Deepnest", nameTrappedDeepnest: "Zote Status: Deepnest",
nameColosseum: "Zote Status: Colosseum of Fools", nameColosseum: "Zote Status: Colosseum of Fools",
spoiler: "One achievement per save file", spoiler: "One achievement per save file",
spoilerDefault: "One achievement per save file",
spoilerNeglect: "Left Zote to die", spoilerNeglect: "Left Zote to die",
spoilerRivalry: "Defeated Zote in the Colosseum of Fools", spoilerRivalry: "Defeated Zote in the Colosseum of Fools",
spoilerTrappedVengefly: "Greenpath, defeat Vengefly King", spoilerTrappedVengefly: "Greenpath, defeat Vengefly King",
@ -4163,11 +4176,13 @@ var HK = {
nailsmithStatus: { nailsmithStatus: {
id: "nailsmithStatus", id: "nailsmithStatus",
name: "Nailsmith Status", name: "Nailsmith Status",
nameDefault: "Nailsmith Status",
nameHappyCouple: "Nailsmith Choice: Happy Couple", nameHappyCouple: "Nailsmith Choice: Happy Couple",
namePurity: "Nailsmith Choice: Purity", namePurity: "Nailsmith Choice: Purity",
nameSheoHutWaiting: "Nailsmith Status: Sheo", nameSheoHutWaiting: "Nailsmith Status: Sheo",
nameUpgradeNail: "Nailsmith Status: Waiting", nameUpgradeNail: "Nailsmith Status: Waiting",
spoiler: "One achievement per save file", spoiler: "One achievement per save file",
spoilerDefault: "One achievement per save file",
spoilerHappyCouple: "Found a new calling", spoilerHappyCouple: "Found a new calling",
spoilerPurity: "Slain with Pure Nail", spoilerPurity: "Slain with Pure Nail",
spoilerSheoHutWaiting: "Waiting at Sheo's Hut", spoilerSheoHutWaiting: "Waiting at Sheo's Hut",
@ -5394,15 +5409,6 @@ function GenerateInnerHTML(db) {
obj.textPrefix += ": ".concat(entries[_entry].notActivated, " | ").concat(entries[_entry].activated, " | ").concat(entries[_entry].discoveredTotal); obj.textPrefix += ": ".concat(entries[_entry].notActivated, " | ").concat(entries[_entry].activated, " | ").concat(entries[_entry].discoveredTotal);
break; break;
case "zoteStatus":
case "nailsmithStatus":
if (entries[_entry].hasOwnProperty("currentName") && entries[_entry].hasOwnProperty("currentSpoiler")) {
obj.textPrefix = entries[_entry][entries[_entry].currentName];
obj.textSuffix = "\u2014 ".concat(entries[_entry][entries[_entry].currentSpoiler]);
}
break;
default: default:
} }
} }

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

141
src/js/HKCheckCompletion.js
View file

@ -890,18 +890,18 @@ function WorldDataActivated(idText, sceneNameText, worldData) {
*/ */
function CheckAdditionalThings(section, dataObject, playerData, worldData, sceneData) { function CheckAdditionalThings(section, dataObject, playerData, worldData, sceneData) {
let { /* let {
textPrefix, textPrefix,
textSuffix, textSuffix,
wiki wiki
} = ""; } = "";
let sFillText = ""; let sFillText = ""; */
// Start main loop // Start main loop
for (let i in dataObject) { for (let i in dataObject) {
textPrefix = dataObject[i].name; /* textPrefix = dataObject[i].name;
(dataObject[i].hasOwnProperty("spoiler")) ? textSuffix = dataObject[i].spoiler: textSuffix = ""; (dataObject[i].hasOwnProperty("spoiler")) ? textSuffix = dataObject[i].spoiler: textSuffix = "";
(dataObject[i].hasOwnProperty("wiki")) ? wiki = dataObject[i].wiki: wiki = ""; (dataObject[i].hasOwnProperty("wiki")) ? wiki = dataObject[i].wiki: wiki = ""; */
let { let {
amount, amount,
@ -951,11 +951,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
LogMissingGrubs(); LogMissingGrubs();
} }
textPrefix += `: ${countTotal}`; /* textPrefix += `: ${countTotal}`; */
if (i === "grubRewards") { if (i === "grubRewards") {
dataObject[i].amountTotal = playerData.grubsCollected; dataObject[i].amountTotal = playerData.grubsCollected;
textPrefix += ` / ${playerData.grubsCollected}`; /* textPrefix += ` / ${playerData.grubsCollected}`; */
} }
if (i === "greyPrinceDefeats") { if (i === "greyPrinceDefeats") {
@ -963,11 +963,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(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.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) { } else if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) {
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`; // textPrefix = `<del>${textPrefix}</del>`;
} }
} }
@ -976,7 +976,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} }
} }
@ -987,7 +987,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "rancidEggs": case "rancidEggs":
case "jinnEggsSold": case "jinnEggsSold":
case "xunFlowerBrokeTimes": case "xunFlowerBrokeTimes":
textPrefix += ": " + Math.abs(playerData[i]); // textPrefix += ": " + Math.abs(playerData[i]);
dataObject[i].amount = Math.abs(playerData[i]); dataObject[i].amount = Math.abs(playerData[i]);
@ -998,7 +998,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`; // textPrefix = `<del>${textPrefix}</del>`;
break; break;
} }
} }
@ -1015,7 +1015,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].notActivated = notActivated; dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated; dataObject[i].activated = activated;
textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
break; break;
@ -1029,7 +1029,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].notActivated = notActivated; dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated; dataObject[i].activated = activated;
textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; /* textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`; */
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
break; break;
@ -1076,14 +1076,14 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].amount = total; dataObject[i].amount = total;
textPrefix += ": " + total; /* textPrefix += ": " + total; */
break; break;
case "bossDoorStateTier5": case "bossDoorStateTier5":
if (playerData.hasOwnProperty("bossDoorStateTier5") === false) { if (playerData.hasOwnProperty("bossDoorStateTier5") === false) {
CurrentDataBlank(section, i); CurrentDataBlank(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) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i);
} }
@ -1093,7 +1093,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(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) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i);
@ -1107,7 +1107,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(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) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i);
@ -1118,7 +1118,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(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) ? CurrentDataTrue(section, i): CurrentDataFalse(section, i);
@ -1130,11 +1130,11 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[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; dataObject[i].disabled = true;
textPrefix = `<del>${textPrefix}</del>`; /* textPrefix = `<del>${textPrefix}</del>`; */
} }
(playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataBlank(section, i); (playerData[i] === true) ? CurrentDataTrue(section, i): CurrentDataBlank(section, i);
if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) CurrentDataFalse(section, i); if (playerData.zoteRescuedBuzzer === true && playerData[i] === false) CurrentDataFalse(section, i);
@ -1142,42 +1142,51 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "zoteStatus": case "zoteStatus":
CurrentDataFalse(section, i); CurrentDataFalse(section, i);
dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[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].currentName = "nameNeglect"; dataObject[i].name = dataObject[i].nameNeglect;
dataObject[i].currentSpoiler = "spoilerNeglect"; dataObject[i].spoiler = dataObject[i].spoilerNeglect;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameRivalry"; dataObject[i].name = dataObject[i].nameRivalry;
dataObject[i].currentSpoiler = "spoilerRivalry"; dataObject[i].spoiler = dataObject[i].spoilerRivalry;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameTrappedVengefly"; dataObject[i].name = dataObject[i].nameTrappedVengefly;
dataObject[i].currentSpoiler = "spoilerTrappedVengefly"; dataObject[i].spoiler = dataObject[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].currentName = "nameNotRescuedVengefly"; dataObject[i].name = dataObject[i].nameNotRescuedVengefly;
dataObject[i].currentSpoiler = "spoilerNotRescuedVengefly"; dataObject[i].spoiler = dataObject[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].currentName = "nameTrappedDeepnest"; dataObject[i].name = dataObject[i].nameTrappedDeepnest;
dataObject[i].currentSpoiler = "spoilerTrappedDeepnest"; dataObject[i].spoiler = dataObject[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].currentName = "nameColosseum"; dataObject[i].name = dataObject[i].nameColosseum;
dataObject[i].currentSpoiler = "spoilerColosseum"; dataObject[i].spoiler = dataObject[i].spoilerColosseum;
} }
} }
} }
@ -1185,28 +1194,36 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "nailsmithStatus": case "nailsmithStatus":
CurrentDataFalse(section, i); CurrentDataFalse(section, i);
dataObject[i].name = dataObject[i].nameDefault;
dataObject[i].spoiler = dataObject[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].currentName = "namePurity"; dataObject[i].name = dataObject[i].namePurity;
dataObject[i].currentSpoiler = "spoilerPurity"; dataObject[i].spoiler = dataObject[i].spoilerPurity;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameHappyCouple"; dataObject[i].name = dataObject[i].nameHappyCouple;
dataObject[i].currentSpoiler = "spoilerHappyCouple"; dataObject[i].spoiler = dataObject[i].spoilerHappyCouple;
CurrentDataTrue(section, i); CurrentDataTrue(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].currentName = "nameSheoHutWaiting"; dataObject[i].name = dataObject[i].nameSheoHutWaiting;
dataObject[i].currentSpoiler = "spoilerSheoHutWaiting"; dataObject[i].spoiler = dataObject[i].spoilerSheoHutWaiting;
} else { } else {
textPrefix = dataObject[i].nameUpgradeNail; /* textPrefix = dataObject[i].nameUpgradeNail;
textSuffix = dataObject[i].spoilerUpgradeNail; textSuffix = dataObject[i].spoilerUpgradeNail; */
dataObject[i].currentName = "nameUpgradeNail"; dataObject[i].name = dataObject[i].nameUpgradeNail;
dataObject[i].currentSpoiler = "spoilerUpgradeNail"; dataObject[i].spoiler = dataObject[i].spoilerUpgradeNail;
} }
break; break;
@ -1225,7 +1242,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(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); CurrentDataTrue(section, i);
@ -1234,7 +1251,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} }
} // end switch (i) } // end switch (i)
sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); /* sFillText += PrepareHTMLString(section, textPrefix, textSuffix, wiki); */
} // end for (let i in dataObject) } // end for (let i in dataObject)
// AppendHTML(section, sFillText); // AppendHTML(section, sFillText);

4
src/js/hk-database.js
View file

@ -1433,6 +1433,7 @@ const HK = {
zoteStatus: { zoteStatus: {
id: "zoteStatus", id: "zoteStatus",
name: "Zote Status", name: "Zote Status",
nameDefault: "Zote Status",
nameNeglect: "Zote Choice: Neglect", nameNeglect: "Zote Choice: Neglect",
nameRivalry: "Zote Choice: Rivalry", nameRivalry: "Zote Choice: Rivalry",
nameTrappedVengefly: "Zote Status: Vengefly", nameTrappedVengefly: "Zote Status: Vengefly",
@ -1440,6 +1441,7 @@ const HK = {
nameTrappedDeepnest: "Zote Status: Deepnest", nameTrappedDeepnest: "Zote Status: Deepnest",
nameColosseum: "Zote Status: Colosseum of Fools", nameColosseum: "Zote Status: Colosseum of Fools",
spoiler: "One achievement per save file", spoiler: "One achievement per save file",
spoilerDefault: "One achievement per save file",
spoilerNeglect: "Left Zote to die", spoilerNeglect: "Left Zote to die",
spoilerRivalry: "Defeated Zote in the Colosseum of Fools", spoilerRivalry: "Defeated Zote in the Colosseum of Fools",
spoilerTrappedVengefly: "Greenpath, defeat Vengefly King", spoilerTrappedVengefly: "Greenpath, defeat Vengefly King",
@ -1451,11 +1453,13 @@ const HK = {
nailsmithStatus: { nailsmithStatus: {
id: "nailsmithStatus", id: "nailsmithStatus",
name: "Nailsmith Status", name: "Nailsmith Status",
nameDefault: "Nailsmith Status",
nameHappyCouple: "Nailsmith Choice: Happy Couple", nameHappyCouple: "Nailsmith Choice: Happy Couple",
namePurity: "Nailsmith Choice: Purity", namePurity: "Nailsmith Choice: Purity",
nameSheoHutWaiting: "Nailsmith Status: Sheo", nameSheoHutWaiting: "Nailsmith Status: Sheo",
nameUpgradeNail: "Nailsmith Status: Waiting", nameUpgradeNail: "Nailsmith Status: Waiting",
spoiler: "One achievement per save file", spoiler: "One achievement per save file",
spoilerDefault: "One achievement per save file",
spoilerHappyCouple: "Found a new calling", spoilerHappyCouple: "Found a new calling",
spoilerPurity: "Slain with Pure Nail", spoilerPurity: "Slain with Pure Nail",
spoilerSheoHutWaiting: "Waiting at Sheo's Hut", spoilerSheoHutWaiting: "Waiting at Sheo's Hut",

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

@ -412,15 +412,6 @@ function GenerateInnerHTML(db) {
break; break;
case "zoteStatus":
case "nailsmithStatus":
if (entries[entry].hasOwnProperty("currentName") && entries[entry].hasOwnProperty("currentSpoiler")) {
obj.textPrefix = entries[entry][entries[entry].currentName];
obj.textSuffix = `— ${entries[entry][entries[entry].currentSpoiler]}`;
}
break;
default: default:
} }
} }