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

detect grimmkin, banishment for journal

Browse source
This commit is contained in:
ReznoRMichael 2021-07-28 21:37:28 +02:00
parent 7ab7923886
commit bfbc903b57
4 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
build/app.js
View file

@ -996,18 +996,33 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
if (i === "journalEntriesCompleted" || i === "journalNotesCompleted") { if (i === "journalEntriesCompleted" || i === "journalNotesCompleted") {
countTotal = "".concat(amount, " / ").concat(playerData.journalEntriesTotal); countTotal = "".concat(amount, " / ").concat(playerData.journalEntriesTotal);
dataObject[i].amountTotal = playerData.journalEntriesTotal; dataObject[i].amountTotal = playerData.journalEntriesTotal;
/* when Zote is dead, the max Journal entries will equal = 160 instead of 164. For the green tick */ dataObject[i].max = dataObject[i].maxDefault;
dataObject[i].spoiler = "".concat(dataObject[i].spoilerDefault, " (").concat(dataObject[i].max, " max)");
/* when Zote is dead, the max Journal entries will equal 4 less instead of 164. For the green tick */
if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
dataObject[i].max = dataObject[i].maxZoteOff; dataObject[i].max -= 4;
/* Substract GPZ and 3 Zotelings from max */ /* Substract GPZ and 3 Zotelings from max */
dataObject[i].spoiler = dataObject[i].spoilerZoteOff; dataObject[i].spoiler = "".concat(dataObject[i].spoilerDefault, " (").concat(dataObject[i].max, " max)");
/* Change spoiler for less confusion */ /* Change spoiler for less confusion */
} else { }
/* otherwise, set back to 164 */ /* when Grimm Troupe is banished, max Journal entries will be 1 or 2 less */
dataObject[i].max = dataObject[i].maxDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault;
if (playerData.destroyedNightmareLantern === true) {
dataObject[i].max--;
/* Substract Nightmare King from max */
/* if the player didn't defeat any Grimmkin Nightmare before banishing, substract it from max */
if (playerData.killedFlameBearerLarge === false) {
dataObject[i].max--;
/* Substract Grimmkin Nightmare from max */
dataObject[i].spoiler = "".concat(dataObject[i].spoilerDefault, " (").concat(dataObject[i].max, " max)");
/* Change spoiler for less confusion */
}
} }
} }
@ -5422,12 +5437,10 @@ var HK = {
}, },
journalEntriesCompleted: { journalEntriesCompleted: {
name: "Creatures Encountered", name: "Creatures Encountered",
spoiler: "Hunter's Journal (160 or 164 max)", spoiler: "Hunter's Journal (158-164 max)",
spoilerDefault: "Hunter's Journal (164 max)", spoilerDefault: "Hunter's Journal",
spoilerZoteOff: "Hunter's Journal (160 max)",
max: 164, max: 164,
maxDefault: 164, maxDefault: 164,
maxZoteOff: 160,
wiki: "Category:Enemies_(Hollow_Knight)#Compendium" wiki: "Category:Enemies_(Hollow_Knight)#Compendium"
}, },
@ -5436,12 +5449,10 @@ var HK = {
*/ */
journalNotesCompleted: { journalNotesCompleted: {
name: "Hunter Notes Completed", name: "Hunter Notes Completed",
spoiler: "Hunter's Journal (160 or 164 max)", spoiler: "Hunter's Journal (158-164 max)",
spoilerDefault: "Hunter's Journal (164 max)", spoilerDefault: "Hunter's Journal",
spoilerZoteOff: "Hunter's Journal (160 max)",
max: 164, max: 164,
maxDefault: 164, maxDefault: 164,
maxZoteOff: 160,
wiki: "Category:Enemies_(Hollow_Knight)#Compendium" wiki: "Category:Enemies_(Hollow_Knight)#Compendium"
}, },
nailDamage: { nailDamage: {

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

26
src/js/HKCheckCompletion.js
View file

@ -1112,14 +1112,26 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
countTotal = `${amount} / ${playerData.journalEntriesTotal}`; countTotal = `${amount} / ${playerData.journalEntriesTotal}`;
dataObject[i].amountTotal = playerData.journalEntriesTotal; dataObject[i].amountTotal = playerData.journalEntriesTotal;
/* when Zote is dead, the max Journal entries will equal = 160 instead of 164. For the green tick */ dataObject[i].max = dataObject[i].maxDefault;
dataObject[i].spoiler = `${dataObject[i].spoilerDefault} (${dataObject[i].max} max)`;
/* when Zote is dead, the max Journal entries will equal 4 less instead of 164. For the green tick */
if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { if (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
dataObject[i].max = dataObject[i].maxZoteOff; /* Substract GPZ and 3 Zotelings from max */
dataObject[i].spoiler = dataObject[i].spoilerZoteOff; /* Change spoiler for less confusion */ dataObject[i].max -= 4; /* Substract GPZ and 3 Zotelings from max */
} else { dataObject[i].spoiler = `${dataObject[i].spoilerDefault} (${dataObject[i].max} max)`; /* Change spoiler for less confusion */
/* otherwise, set back to 164 */ }
dataObject[i].max = dataObject[i].maxDefault;
dataObject[i].spoiler = dataObject[i].spoilerDefault; /* when Grimm Troupe is banished, max Journal entries will be 1 or 2 less */
if (playerData.destroyedNightmareLantern === true) {
dataObject[i].max --; /* Substract Nightmare King from max */
/* if the player didn't defeat any Grimmkin Nightmare before banishing, substract it from max */
if (playerData.killedFlameBearerLarge === false) {
dataObject[i].max --; /* Substract Grimmkin Nightmare from max */
dataObject[i].spoiler = `${dataObject[i].spoilerDefault} (${dataObject[i].max} max)`; /* Change spoiler for less confusion */
}
} }
} }

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

@ -2537,12 +2537,10 @@ const HK = {
}, },
journalEntriesCompleted: { journalEntriesCompleted: {
name: "Creatures Encountered", name: "Creatures Encountered",
spoiler: "Hunter's Journal (160 or 164 max)", spoiler: "Hunter's Journal (158-164 max)",
spoilerDefault: "Hunter's Journal (164 max)", spoilerDefault: "Hunter's Journal",
spoilerZoteOff: "Hunter's Journal (160 max)",
max: 164, max: 164,
maxDefault: 164, maxDefault: 164,
maxZoteOff: 160,
wiki: "Category:Enemies_(Hollow_Knight)#Compendium" wiki: "Category:Enemies_(Hollow_Knight)#Compendium"
}, },
/* /*
@ -2550,12 +2548,10 @@ const HK = {
*/ */
journalNotesCompleted: { journalNotesCompleted: {
name: "Hunter Notes Completed", name: "Hunter Notes Completed",
spoiler: "Hunter's Journal (160 or 164 max)", spoiler: "Hunter's Journal (158-164 max)",
spoilerDefault: "Hunter's Journal (164 max)", spoilerDefault: "Hunter's Journal",
spoilerZoteOff: "Hunter's Journal (160 max)",
max: 164, max: 164,
maxDefault: 164, maxDefault: 164,
maxZoteOff: 160,
wiki: "Category:Enemies_(Hollow_Knight)#Compendium" wiki: "Category:Enemies_(Hollow_Knight)#Compendium"
}, },
nailDamage: { nailDamage: {