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

CountGeoRocks not used

Browse source
This commit is contained in:
ReznoRMichael 2022-01-20 14:38:31 +01:00
parent a6abdd126f
commit c67b4b740f
3 changed files with 41 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
build/app.js
View file

@ -1185,21 +1185,20 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
break; break;
case "geoRocks": /* case "geoRocks":
discoveredTotal = sceneData.geoRocks.length; discoveredTotal = sceneData.geoRocks.length;
notActivated = CountGeoRocks(discoveredTotal, "unbroken"); notActivated = CountGeoRocks(discoveredTotal, "unbroken");
activated = CountGeoRocks(discoveredTotal, "broken"); activated = CountGeoRocks(discoveredTotal, "broken");
dataObject[i].discoveredTotal = discoveredTotal; dataObject[i].discoveredTotal = discoveredTotal;
dataObject[i].notActivated = notActivated; dataObject[i].notActivated = notActivated;
dataObject[i].activated = activated; dataObject[i].activated = activated;
if (activated >= dataObject[i].max) { if (activated >= dataObject[i].max) {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconGreen)(section, i); SetIconGreen(section, i);
} else { } else {
(0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.SetIconNone)(section, i); SetIconNone(section, i);
} }
break; break;
*/
case "itemsDiscovered": case "itemsDiscovered":
discoveredTotal = sceneData.persistentBoolItems.length; discoveredTotal = sceneData.persistentBoolItems.length;
@ -1636,39 +1635,33 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
* @param {string} mode Choose which Geo Rocks to count (broken or unbroken) * @param {string} mode Choose which Geo Rocks to count (broken or unbroken)
*/ */
/* function CountGeoRocks(arrayLength, mode = "unbroken") {
function CountGeoRocks(arrayLength) { let countTotal = 0;
var mode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "unbroken"; let geoRocksLog = [];
var countTotal = 0;
var geoRocksLog = [];
if (mode === "unbroken") { if (mode === "unbroken") {
for (var _i3 = 0; _i3 < arrayLength; _i3++) { for (let i = 0; i < arrayLength; i++) {
if (sceneData.geoRocks[_i3].hitsLeft > 0) { if (sceneData.geoRocks[i].hitsLeft > 0) {
countTotal++; countTotal++;
geoRocksLog.push("#".concat(countTotal, " \uD83C\uDFD4\uFE0F ").concat(sceneData.geoRocks[_i3].id, " \uD83D\uDDFA\uFE0F ").concat((0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.TranslateMapName)(sceneData.geoRocks[_i3].sceneName), " \u2328\uFE0F ").concat(sceneData.geoRocks[_i3].sceneName)); geoRocksLog.push(`#${countTotal} 🏔️ ${sceneData.geoRocks[i].id} 🗺️ ${TranslateMapName(sceneData.geoRocks[i].sceneName)} ⌨️ ${sceneData.geoRocks[i].sceneName}`);
} }
} }
if (!countTotal) { if (!countTotal) {
console.log("%cAll Geo Rocks Broken!", "color: #16c60c; font-weight: 700;"); console.log("%cAll Geo Rocks Broken!", "color: #16c60c; font-weight: 700;");
} else { } else {
console.groupCollapsed("%cUnbroken Geo Rocks (".concat(countTotal, "):"), "color: #16c60c; font-weight: 700;"); console.groupCollapsed(`%cUnbroken Geo Rocks (${countTotal}):`, "color: #16c60c; font-weight: 700;");
for (let i = 0, length = geoRocksLog.length; i < length; i++) {
for (var _i4 = 0, length = geoRocksLog.length; _i4 < length; _i4++) { console.log(geoRocksLog[i]);
console.log(geoRocksLog[_i4]);
} }
console.groupEnd(); console.groupEnd();
} }
} else { } else {
for (var _i5 = 0; _i5 < arrayLength; _i5++) { for (let i = 0; i < arrayLength; i++) {
if (sceneData.geoRocks[_i5].hitsLeft === 0) countTotal++; if (sceneData.geoRocks[i].hitsLeft === 0) countTotal++;
} }
} }
return countTotal; return countTotal;
} } */
/** /**
* Counts the amount of in-game Interactables Activated or Not Activated. Logs to console all the Not Activated IDs and Map locations. * Counts the amount of in-game Interactables Activated or Not Activated. Logs to console all the Not Activated IDs and Map locations.
* @param {number} arrayLength How many items the Interactables array is currently storing (for iteration) * @param {number} arrayLength How many items the Interactables array is currently storing (for iteration)
@ -1686,10 +1679,10 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
let list = new ItemListBox(worldData); let list = new ItemListBox(worldData);
*/ */
for (var _i6 = 0; _i6 < arrayLength; _i6++) { for (var _i3 = 0; _i3 < arrayLength; _i3++) {
if (worldData[_i6].activated === false && worldData[_i6].semiPersistent === false) { if (worldData[_i3].activated === false && worldData[_i3].semiPersistent === false) {
countTotal++; countTotal++;
itemsLog.push("#".concat(countTotal, " ").concat(worldData[_i6].id, " \uD83D\uDDFA\uFE0F ").concat((0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.TranslateMapName)(worldData[_i6].sceneName), " \u2328\uFE0F ").concat(worldData[_i6].sceneName)); itemsLog.push("#".concat(countTotal, " ").concat(worldData[_i3].id, " \uD83D\uDDFA\uFE0F ").concat((0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.TranslateMapName)(worldData[_i3].sceneName), " \u2328\uFE0F ").concat(worldData[_i3].sceneName));
} }
} }
@ -1698,15 +1691,15 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} else { } else {
console.groupCollapsed("%cNot Activated Interactables (".concat(countTotal, "):"), "color: #16c60c; font-weight: 700;"); console.groupCollapsed("%cNot Activated Interactables (".concat(countTotal, "):"), "color: #16c60c; font-weight: 700;");
for (var _i7 = 0, length = itemsLog.length; _i7 < length; _i7++) { for (var _i4 = 0, length = itemsLog.length; _i4 < length; _i4++) {
console.log(itemsLog[_i7]); console.log(itemsLog[_i4]);
} }
console.groupEnd(); console.groupEnd();
} }
} else { } else {
for (var _i8 = 0; _i8 < arrayLength; _i8++) { for (var _i5 = 0; _i5 < arrayLength; _i5++) {
if (worldData[_i8].activated === true) countTotal++; if (worldData[_i5].activated === true) countTotal++;
} }
} }
@ -1720,9 +1713,9 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
function LogMissingGrubs() { function LogMissingGrubs() {
var rescuedGrubsSceneList = []; var rescuedGrubsSceneList = [];
for (var _i9 = 0, _length = worldData.length; _i9 < _length; _i9++) { for (var _i6 = 0, _length = worldData.length; _i6 < _length; _i6++) {
if (worldData[_i9].id.includes("Grub Bottle")) { if (worldData[_i6].id.includes("Grub Bottle")) {
if (worldData[_i9].activated === true) { if (worldData[_i6].activated === true) {
// There are 3 duplicates of the same map scene name from older game save files. Prevents adding duplicates // There are 3 duplicates of the same map scene name from older game save files. Prevents adding duplicates
/* if (worldData[i].sceneName === "Ruins2_11" && worldData[i].id === "Grub Bottle (1)") { /* if (worldData[i].sceneName === "Ruins2_11" && worldData[i].id === "Grub Bottle (1)") {
@ -1730,7 +1723,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} else if (worldData[i].sceneName === "Ruins2_11" && worldData[i].id === "Grub Bottle (2)") { } else if (worldData[i].sceneName === "Ruins2_11" && worldData[i].id === "Grub Bottle (2)") {
continue; continue;
} else { */ } else { */
rescuedGrubsSceneList.push(worldData[_i9].sceneName); // } rescuedGrubsSceneList.push(worldData[_i6].sceneName); // }
} }
} }
} // Filtering the reference database Grub list to include only the missing values } // Filtering the reference database Grub list to include only the missing values
@ -1746,8 +1739,8 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} else { } else {
console.groupCollapsed("%cUnrescued Grubs (".concat(length, "):"), "color: #16c60c; font-weight: 700;"); console.groupCollapsed("%cUnrescued Grubs (".concat(length, "):"), "color: #16c60c; font-weight: 700;");
for (var _i10 = 0; _i10 < length; _i10++) { for (var _i7 = 0; _i7 < length; _i7++) {
console.log("#".concat(section.grubsList.indexOf(missingGrubsList[_i10]) + 1, " \uD83D\uDDFA\uFE0F ").concat((0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.TranslateMapName)(missingGrubsList[_i10]), " \u2328\uFE0F ").concat(missingGrubsList[_i10])); console.log("#".concat(section.grubsList.indexOf(missingGrubsList[_i7]) + 1, " \uD83D\uDDFA\uFE0F ").concat((0,_hk_functions_js__WEBPACK_IMPORTED_MODULE_2__.TranslateMapName)(missingGrubsList[_i7]), " \u2328\uFE0F ").concat(missingGrubsList[_i7]));
} }
console.groupEnd(); console.groupEnd();

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

8
src/js/HKCheckCompletion.js
View file

@ -1362,7 +1362,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
break; break;
case "geoRocks": /* case "geoRocks":
discoveredTotal = sceneData.geoRocks.length; discoveredTotal = sceneData.geoRocks.length;
notActivated = CountGeoRocks(discoveredTotal, "unbroken"); notActivated = CountGeoRocks(discoveredTotal, "unbroken");
@ -1378,7 +1378,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
SetIconNone(section, i); SetIconNone(section, i);
} }
break; break;
*/
case "itemsDiscovered": case "itemsDiscovered":
discoveredTotal = sceneData.persistentBoolItems.length; discoveredTotal = sceneData.persistentBoolItems.length;
@ -1821,7 +1821,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
* @param {number} arrayLength How many items the Geo Rocks array is currently storing (for iteration) * @param {number} arrayLength How many items the Geo Rocks array is currently storing (for iteration)
* @param {string} mode Choose which Geo Rocks to count (broken or unbroken) * @param {string} mode Choose which Geo Rocks to count (broken or unbroken)
*/ */
function CountGeoRocks(arrayLength, mode = "unbroken") { /* function CountGeoRocks(arrayLength, mode = "unbroken") {
let countTotal = 0; let countTotal = 0;
let geoRocksLog = []; let geoRocksLog = [];
@ -1852,7 +1852,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} }
return countTotal; return countTotal;
} } */
/** /**
* Counts the amount of in-game Interactables Activated or Not Activated. Logs to console all the Not Activated IDs and Map locations. * Counts the amount of in-game Interactables Activated or Not Activated. Logs to console all the Not Activated IDs and Map locations.