subtract from journal backwards compatibility
This commit is contained in:
parent
0437cbf4ae
commit
38f9e98c04
3 changed files with 51 additions and 35 deletions
39
build/app.js
39
build/app.js
|
|
@ -151,9 +151,7 @@ function HKCheckCompletion(jsonObject) {
|
||||||
|
|
||||||
CheckCompletionPercent(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro, HKPlayerData); // ---------------- Game Completion Status ----------------- //
|
CheckCompletionPercent(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro, HKPlayerData); // ---------------- Game Completion Status ----------------- //
|
||||||
|
|
||||||
CheckSaveFileVersion(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro, HKPlayerData.version); // ---------------- Fleur Divide ----------------- //
|
CheckSaveFileVersion(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro, HKPlayerData.version); // ---------------- Health Masks ----------------- //
|
||||||
// AppendHTML(HK.sections.intro, FLEUR_DIVIDE);
|
|
||||||
// ---------------- Health Masks ----------------- //
|
|
||||||
|
|
||||||
CheckHealthMasks(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro, HKPlayerData.maxHealthBase, HKPlayerData.permadeathMode); // ---------------- Soul Orbs ----------------- //
|
CheckHealthMasks(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.intro, HKPlayerData.maxHealthBase, HKPlayerData.permadeathMode); // ---------------- Soul Orbs ----------------- //
|
||||||
|
|
||||||
|
|
@ -191,20 +189,16 @@ function HKCheckCompletion(jsonObject) {
|
||||||
|
|
||||||
CheckIfDataTrue(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.lifeblood, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.lifeblood.entries, HKPlayerData); // ---------------- Godmaster Content Pack --------------------- //
|
CheckIfDataTrue(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.lifeblood, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.lifeblood.entries, HKPlayerData); // ---------------- Godmaster Content Pack --------------------- //
|
||||||
|
|
||||||
CheckIfDataTrue(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.godmaster, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.godmaster.entries, HKPlayerData); // ---------------- Fleur Divide ----------------- //
|
CheckIfDataTrue(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.godmaster, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.godmaster.entries, HKPlayerData); // ------------------------- Hunter's Journal ----------------------------- //
|
||||||
// AppendHTML(HK.sections.godmaster, FLEUR_DIVIDE);
|
|
||||||
// ------------------------- Essential Things ----------------------------- //
|
|
||||||
|
|
||||||
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.essential, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.essential.entries, HKPlayerData, HKWorldItems); // ---------------- Fleur Divide ----------------- //
|
/* Must be checked before Statistics (for correct entry numbers) */
|
||||||
// AppendHTML(HK.sections.essential, FLEUR_DIVIDE);
|
|
||||||
// ------------------------- Achievements ----------------------------- //
|
|
||||||
|
|
||||||
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.achievements, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.achievements.entries, HKPlayerData, HKWorldItems); // ------------------------- Hunter's Journal ----------------------------- //
|
|
||||||
|
|
||||||
CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default, "huntersJournal", HKPlayerData);
|
CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default, "huntersJournal", HKPlayerData);
|
||||||
CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default, "huntersJournalOptional", HKPlayerData); // ---------------- Fleur Divide ----------------- //
|
CheckHuntersJournal(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default, "huntersJournalOptional", HKPlayerData); // ------------------------- Essential Things ----------------------------- //
|
||||||
// AppendHTML(HK.sections.achievements, FLEUR_DIVIDE);
|
|
||||||
// ------------------------- Game Statistics ----------------------------- //
|
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.essential, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.essential.entries, HKPlayerData, HKWorldItems); // ------------------------- Achievements ----------------------------- //
|
||||||
|
|
||||||
|
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.achievements, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.achievements.entries, HKPlayerData, HKWorldItems); // ------------------------- Game Statistics ----------------------------- //
|
||||||
|
|
||||||
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.statistics, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.statistics.entries, HKPlayerData, HKWorldItems, HKSceneData); // ------------------------- Godhome Statistics ----------------------------- //
|
CheckAdditionalThings(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.statistics, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.sections.statistics.entries, HKPlayerData, HKWorldItems, HKSceneData); // ------------------------- Godhome Statistics ----------------------------- //
|
||||||
|
|
||||||
|
|
@ -1698,6 +1692,7 @@ function CheckMrMushroomState(section, entry) {
|
||||||
function CheckHuntersJournal(db, sectionName, playerData) {
|
function CheckHuntersJournal(db, sectionName, playerData) {
|
||||||
var section = db.sections[sectionName];
|
var section = db.sections[sectionName];
|
||||||
var entries = db.sections[sectionName].entries;
|
var entries = db.sections[sectionName].entries;
|
||||||
|
var entriesStatistics = db.sections.statistics.entries;
|
||||||
var name = "";
|
var name = "";
|
||||||
var nameDefault = "";
|
var nameDefault = "";
|
||||||
var amountKillsLeft = 0;
|
var amountKillsLeft = 0;
|
||||||
|
|
@ -1780,6 +1775,22 @@ function CheckHuntersJournal(db, sectionName, playerData) {
|
||||||
amountKillsLeft = 0;
|
amountKillsLeft = 0;
|
||||||
entries[entry].disabled = true;
|
entries[entry].disabled = true;
|
||||||
entries[entry].name = name;
|
entries[entry].name = name;
|
||||||
|
/* Subtract one from maximum of journal entries (for extended completion and green icons) */
|
||||||
|
|
||||||
|
switch (entry) {
|
||||||
|
case "VoidIdol_1":
|
||||||
|
case "VoidIdol_2":
|
||||||
|
case "VoidIdol_3":
|
||||||
|
case "BindingSeal":
|
||||||
|
case "GodseekerMask":
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
entriesStatistics.journalEntriesCompleted.max--;
|
||||||
|
entriesStatistics.journalNotesCompleted.max--;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.info(entry, entriesStatistics.journalEntriesCompleted.max);
|
||||||
SetIconNone(section, entry);
|
SetIconNone(section, entry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -162,10 +162,6 @@ function HKCheckCompletion(jsonObject, benchStart = performance.now()) {
|
||||||
|
|
||||||
CheckSaveFileVersion(HK.sections.intro, HKPlayerData.version);
|
CheckSaveFileVersion(HK.sections.intro, HKPlayerData.version);
|
||||||
|
|
||||||
// ---------------- Fleur Divide ----------------- //
|
|
||||||
|
|
||||||
// AppendHTML(HK.sections.intro, FLEUR_DIVIDE);
|
|
||||||
|
|
||||||
// ---------------- Health Masks ----------------- //
|
// ---------------- Health Masks ----------------- //
|
||||||
|
|
||||||
CheckHealthMasks(HK.sections.intro, HKPlayerData.maxHealthBase, HKPlayerData.permadeathMode);
|
CheckHealthMasks(HK.sections.intro, HKPlayerData.maxHealthBase, HKPlayerData.permadeathMode);
|
||||||
|
|
@ -241,32 +237,21 @@ function HKCheckCompletion(jsonObject, benchStart = performance.now()) {
|
||||||
// ---------------- Godmaster Content Pack --------------------- //
|
// ---------------- Godmaster Content Pack --------------------- //
|
||||||
|
|
||||||
CheckIfDataTrue(HK.sections.godmaster, HK.sections.godmaster.entries, HKPlayerData);
|
CheckIfDataTrue(HK.sections.godmaster, HK.sections.godmaster.entries, HKPlayerData);
|
||||||
|
|
||||||
|
// ------------------------- Hunter's Journal ----------------------------- //
|
||||||
|
/* Must be checked before Statistics (for correct entry numbers) */
|
||||||
|
|
||||||
// ---------------- Fleur Divide ----------------- //
|
CheckHuntersJournal(HK, "huntersJournal", HKPlayerData);
|
||||||
|
CheckHuntersJournal(HK, "huntersJournalOptional", HKPlayerData);
|
||||||
// AppendHTML(HK.sections.godmaster, FLEUR_DIVIDE);
|
|
||||||
|
|
||||||
// ------------------------- Essential Things ----------------------------- //
|
// ------------------------- Essential Things ----------------------------- //
|
||||||
|
|
||||||
CheckAdditionalThings(HK.sections.essential, HK.sections.essential.entries, HKPlayerData, HKWorldItems);
|
CheckAdditionalThings(HK.sections.essential, HK.sections.essential.entries, HKPlayerData, HKWorldItems);
|
||||||
|
|
||||||
// ---------------- Fleur Divide ----------------- //
|
|
||||||
|
|
||||||
// AppendHTML(HK.sections.essential, FLEUR_DIVIDE);
|
|
||||||
|
|
||||||
// ------------------------- Achievements ----------------------------- //
|
// ------------------------- Achievements ----------------------------- //
|
||||||
|
|
||||||
CheckAdditionalThings(HK.sections.achievements, HK.sections.achievements.entries, HKPlayerData, HKWorldItems);
|
CheckAdditionalThings(HK.sections.achievements, HK.sections.achievements.entries, HKPlayerData, HKWorldItems);
|
||||||
|
|
||||||
// ------------------------- Hunter's Journal ----------------------------- //
|
|
||||||
|
|
||||||
CheckHuntersJournal(HK, "huntersJournal", HKPlayerData);
|
|
||||||
CheckHuntersJournal(HK, "huntersJournalOptional", HKPlayerData);
|
|
||||||
|
|
||||||
// ---------------- Fleur Divide ----------------- //
|
|
||||||
|
|
||||||
// AppendHTML(HK.sections.achievements, FLEUR_DIVIDE);
|
|
||||||
|
|
||||||
// ------------------------- Game Statistics ----------------------------- //
|
// ------------------------- Game Statistics ----------------------------- //
|
||||||
|
|
||||||
CheckAdditionalThings(HK.sections.statistics, HK.sections.statistics.entries, HKPlayerData, HKWorldItems, HKSceneData);
|
CheckAdditionalThings(HK.sections.statistics, HK.sections.statistics.entries, HKPlayerData, HKWorldItems, HKSceneData);
|
||||||
|
|
@ -1815,6 +1800,7 @@ function CheckHuntersJournal(db, sectionName, playerData) {
|
||||||
|
|
||||||
let section = db.sections[sectionName];
|
let section = db.sections[sectionName];
|
||||||
let entries = db.sections[sectionName].entries;
|
let entries = db.sections[sectionName].entries;
|
||||||
|
let entriesStatistics = db.sections.statistics.entries;
|
||||||
let name = "";
|
let name = "";
|
||||||
let nameDefault = "";
|
let nameDefault = "";
|
||||||
let amountKillsLeft = 0;
|
let amountKillsLeft = 0;
|
||||||
|
|
@ -1917,6 +1903,25 @@ function CheckHuntersJournal(db, sectionName, playerData) {
|
||||||
amountKillsLeft = 0;
|
amountKillsLeft = 0;
|
||||||
entries[entry].disabled = true;
|
entries[entry].disabled = true;
|
||||||
entries[entry].name = name;
|
entries[entry].name = name;
|
||||||
|
|
||||||
|
/* Subtract one from maximum of journal entries (for extended completion and green icons) */
|
||||||
|
switch (entry) {
|
||||||
|
case "VoidIdol_1":
|
||||||
|
case "VoidIdol_2":
|
||||||
|
case "VoidIdol_3":
|
||||||
|
case "BindingSeal":
|
||||||
|
case "GodseekerMask":
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
|
||||||
|
entriesStatistics.journalEntriesCompleted.max--;
|
||||||
|
entriesStatistics.journalNotesCompleted.max--;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.info(entry, entriesStatistics.journalEntriesCompleted.max);
|
||||||
|
|
||||||
SetIconNone(section, entry);
|
SetIconNone(section, entry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue