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

geo rocks and interactables display

Browse source
This commit is contained in:
ReznoRMichael 2021-07-08 10:56:35 +02:00
parent d3055983de
commit d4969e7830
5 changed files with 64 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
build/app.js
View file

@ -766,6 +766,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "jinnEggsSold":
case "xunFlowerBrokeTimes":
textPrefix += ": " + Math.abs(playerData[i]);
dataObject[i].amount = Math.abs(playerData[i]);
i === "geoPool" && playerData[i] > 0 ? CurrentDataBlank(section, i) : CurrentDataTrue(section, i);
if (i === "jinnEggsSold") {
@ -783,6 +784,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
discoveredTotal = sceneData.geoRocks.length;
notActivated = CountGeoRocks(discoveredTotal, "unbroken");
activated = CountGeoRocks(discoveredTotal, "broken");
dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated;
textPrefix += ": ".concat(notActivated, " | ").concat(activated, " | ").concat(discoveredTotal);
CurrentDataTrue(section, i);
break;
@ -791,6 +795,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
discoveredTotal = sceneData.persistentBoolItems.length;
notActivated = CountItems(discoveredTotal, "notActivated");
activated = CountItems(discoveredTotal, "active");
dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated;
textPrefix += ": ".concat(notActivated, " | ").concat(activated, " | ").concat(discoveredTotal);
CurrentDataTrue(section, i);
break;
@ -4117,14 +4124,22 @@ var HK = {
wiki: "Delicate_Flower"
},
geoRocks: {
id: "geoRocks",
name: "Geo Rocks",
spoiler: "Unbroken | Broken | Discovered",
wiki: "Geo#How_to_Acquire"
wiki: "Geo#How_to_Acquire",
notActivated: 0,
activated: 0,
discoveredTotal: 0
},
itemsDiscovered: {
id: "itemsDiscovered",
name: "Interactables",
spoiler: "Not A. | Activated | Discovered",
wiki: "Category:Exploration_(Hollow_Knight)"
wiki: "Category:Exploration_(Hollow_Knight)",
notActivated: 0,
activated: 0,
discoveredTotal: 0
},
notchShroomOgres: {
name: "Charm Notch #1",
@ -5213,6 +5228,17 @@ function SingleEntryFill(section, entry) {
textPrefix += " / ".concat(entry.amountTotal);
}
if (entry.hasOwnProperty("id")) {
switch (entry.id) {
case "geoRocks":
case "itemsDiscovered":
textPrefix += ": ".concat(entry.notActivated, " | ").concat(entry.activated, " | ").concat(entry.discoveredTotal);
break;
default:
}
}
if (textSuffix.length && textPrefix.length) textSuffix = "\u2014 ".concat(textSuffix);
if (textPrefix.includes("<del>")) textSuffix = "<del>".concat(textSuffix, "</del>");
}

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

11
src/js/HKCheckCompletion.js
View file

@ -861,6 +861,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "jinnEggsSold":
case "xunFlowerBrokeTimes":
textPrefix += ": " + Math.abs(playerData[i]);
dataObject[i].amount = Math.abs(playerData[i]);
(i === "geoPool" && playerData[i] > 0) ? CurrentDataBlank(section, i): CurrentDataTrue(section, i);
if (i === "jinnEggsSold") {
@ -880,6 +883,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
notActivated = CountGeoRocks(discoveredTotal, "unbroken");
activated = CountGeoRocks(discoveredTotal, "broken");
dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated;
textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`;
CurrentDataTrue(section, i);
break;
@ -890,6 +897,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
notActivated = CountItems(discoveredTotal, "notActivated");
activated = CountItems(discoveredTotal, "active");
dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated;
textPrefix += `: ${notActivated} | ${activated} | ${discoveredTotal}`;
CurrentDataTrue(section, i);
break;

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

@ -1605,14 +1605,22 @@ const HK = {
wiki: "Delicate_Flower"
},
geoRocks: {
id: "geoRocks",
name: "Geo Rocks",
spoiler: "Unbroken | Broken | Discovered",
wiki: "Geo#How_to_Acquire"
wiki: "Geo#How_to_Acquire",
notActivated: 0,
activated: 0,
discoveredTotal: 0
},
itemsDiscovered: {
id: "itemsDiscovered",
name: "Interactables",
spoiler: "Not A. | Activated | Discovered",
wiki: "Category:Exploration_(Hollow_Knight)"
wiki: "Category:Exploration_(Hollow_Knight)",
notActivated: 0,
activated: 0,
discoveredTotal: 0
},
notchShroomOgres: {
name: "Charm Notch #1",

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

@ -445,6 +445,20 @@ function SingleEntryFill(section, entry) {
if (entry.hasOwnProperty("amountTotal")) {
textPrefix += ` / ${entry.amountTotal}`;
}
if (entry.hasOwnProperty("id")) {
switch (entry.id) {
case "geoRocks":
case "itemsDiscovered":
textPrefix += `: ${entry.notActivated} | ${entry.activated} | ${entry.discoveredTotal}`;
break;
default:
}
}
if (textSuffix.length && textPrefix.length) textSuffix = `— ${textSuffix}`;
if (textPrefix.includes("<del>")) textSuffix = `<del>${textSuffix}</del>`;