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

Zote and Nailsmith statuses display

Browse source
This commit is contained in:
ReznoRMichael 2021-07-08 22:08:06 +02:00
parent 49bafb7fde
commit e1cd043bba
5 changed files with 65 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
build/app.js
View file

@ -737,6 +737,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
textPrefix += ": ".concat(countTotal); textPrefix += ": ".concat(countTotal);
if (i === "grubRewards") { if (i === "grubRewards") {
dataObject[i].amountTotal = playerData.grubsCollected;
textPrefix += " / ".concat(playerData.grubsCollected); textPrefix += " / ".concat(playerData.grubsCollected);
} }
@ -932,27 +933,39 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "spoilerColosseum";
} }
} }
} }
@ -965,17 +978,25 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "spoilerUpgradeNail";
} }
break; break;
@ -3951,6 +3972,7 @@ var HK = {
wiki: "Salubra's_Blessing" wiki: "Salubra's_Blessing"
}, },
zoteStatus: { zoteStatus: {
id: "zoteStatus",
name: "Zote Status", name: "Zote Status",
nameNeglect: "Zote Choice: Neglect", nameNeglect: "Zote Choice: Neglect",
nameRivalry: "Zote Choice: Rivalry", nameRivalry: "Zote Choice: Rivalry",
@ -3968,6 +3990,7 @@ var HK = {
wiki: "Zote" wiki: "Zote"
}, },
nailsmithStatus: { nailsmithStatus: {
id: "nailsmithStatus",
name: "Nailsmith Status", name: "Nailsmith Status",
nameHappyCouple: "Nailsmith Choice: Happy Couple", nameHappyCouple: "Nailsmith Choice: Happy Couple",
namePurity: "Nailsmith Choice: Purity", namePurity: "Nailsmith Choice: Purity",
@ -5255,6 +5278,15 @@ function SingleEntryFill(section, entry) {
textPrefix += ": ".concat(entry.notActivated, " | ").concat(entry.activated, " | ").concat(entry.discoveredTotal); textPrefix += ": ".concat(entry.notActivated, " | ").concat(entry.activated, " | ").concat(entry.discoveredTotal);
break; break;
case "zoteStatus":
case "nailsmithStatus":
if (entry.hasOwnProperty("currentName") && entry.hasOwnProperty("currentSpoiler")) {
textPrefix = entry[entry.currentName];
textSuffix = entry[entry.currentSpoiler];
}
break;
default: default:
} }
} }

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

21
src/js/HKCheckCompletion.js
View file

@ -833,6 +833,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
textPrefix += `: ${countTotal}`; textPrefix += `: ${countTotal}`;
if (i === "grubRewards") { if (i === "grubRewards") {
dataObject[i].amountTotal = playerData.grubsCollected;
textPrefix += ` / ${playerData.grubsCollected}`; textPrefix += ` / ${playerData.grubsCollected}`;
} }
@ -1023,27 +1024,39 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "spoilerColosseum";
} }
} }
} }
@ -1054,17 +1067,25 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "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].currentSpoiler = "spoilerUpgradeNail";
} }
break; break;

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

@ -1416,6 +1416,7 @@ const HK = {
wiki: "Salubra's_Blessing" wiki: "Salubra's_Blessing"
}, },
zoteStatus: { zoteStatus: {
id: "zoteStatus",
name: "Zote Status", name: "Zote Status",
nameNeglect: "Zote Choice: Neglect", nameNeglect: "Zote Choice: Neglect",
nameRivalry: "Zote Choice: Rivalry", nameRivalry: "Zote Choice: Rivalry",
@ -1433,6 +1434,7 @@ const HK = {
wiki: "Zote" wiki: "Zote"
}, },
nailsmithStatus: { nailsmithStatus: {
id: "nailsmithStatus",
name: "Nailsmith Status", name: "Nailsmith Status",
nameHappyCouple: "Nailsmith Choice: Happy Couple", nameHappyCouple: "Nailsmith Choice: Happy Couple",
namePurity: "Nailsmith Choice: Purity", namePurity: "Nailsmith Choice: Purity",

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

@ -462,6 +462,15 @@ function SingleEntryFill(section, entry) {
break; break;
case "zoteStatus":
case "nailsmithStatus":
if (entry.hasOwnProperty("currentName") && entry.hasOwnProperty("currentSpoiler")) {
textPrefix = entry[entry.currentName];
textSuffix = entry[entry.currentSpoiler];
}
break;
default: default:
} }
} }