fixed loop break error
This commit is contained in:
parent
c5de934449
commit
b55f7804e7
6 changed files with 58 additions and 10 deletions
27
build/app.js
27
build/app.js
|
|
@ -422,8 +422,11 @@ function CheckExtendedCompletion(db) {
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
// console.info("Section loop:", section);
|
||||||
for (var entry in entries) {
|
for (var entry in entries) {
|
||||||
/* Do not count these entries */
|
// console.info("Entry loop:", entry);
|
||||||
|
|
||||||
|
/* Do not count (ignore) these entries at all */
|
||||||
switch (entry) {
|
switch (entry) {
|
||||||
case "oldNail":
|
case "oldNail":
|
||||||
case "geoPool":
|
case "geoPool":
|
||||||
|
|
@ -435,6 +438,22 @@ function CheckExtendedCompletion(db) {
|
||||||
case "jinnEggsSold":
|
case "jinnEggsSold":
|
||||||
case "xunFlowerBrokeTimes":
|
case "xunFlowerBrokeTimes":
|
||||||
case "itemsDiscovered":
|
case "itemsDiscovered":
|
||||||
|
case "stagStationsOpened":
|
||||||
|
case "killedMegaMossCharger":
|
||||||
|
case "killedBigBuzzer":
|
||||||
|
case "killedOblobble":
|
||||||
|
case "killedLobsterLancer":
|
||||||
|
case "killedFlukeMother":
|
||||||
|
case "killedNailBros":
|
||||||
|
case "killedPaintmaster":
|
||||||
|
case "killedNailsage":
|
||||||
|
case "killedHollowKnightPrime":
|
||||||
|
case "killsBigBuzzer":
|
||||||
|
case "whiteDefenderDefeated":
|
||||||
|
case "greyPrinceDefeated":
|
||||||
|
case "killedHollowKnight":
|
||||||
|
case "killedFinalBoss":
|
||||||
|
// console.info("Ignored:", entry);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -443,7 +462,6 @@ function CheckExtendedCompletion(db) {
|
||||||
/* Do not add these to total and done (they will be added as amount/max later instead) */
|
/* Do not add these to total and done (they will be added as amount/max later instead) */
|
||||||
case "grubsCollected":
|
case "grubsCollected":
|
||||||
case "grubRewards":
|
case "grubRewards":
|
||||||
case "stationsOpened":
|
|
||||||
case "areaMaps":
|
case "areaMaps":
|
||||||
case "journalEntriesCompleted":
|
case "journalEntriesCompleted":
|
||||||
case "journalNotesCompleted":
|
case "journalNotesCompleted":
|
||||||
|
|
@ -455,11 +473,13 @@ function CheckExtendedCompletion(db) {
|
||||||
case "geoRocks":
|
case "geoRocks":
|
||||||
case "whiteDefenderDefeats":
|
case "whiteDefenderDefeats":
|
||||||
case "greyPrinceDefeats":
|
case "greyPrinceDefeats":
|
||||||
|
/* console.info("Ignored:", entry); */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (entries[entry].icon !== "none") {
|
if (entries[entry].icon !== "none") {
|
||||||
intro.extendedCompletionTotal++;
|
intro.extendedCompletionTotal++;
|
||||||
|
/* console.info("Counted:", entry); */
|
||||||
}
|
}
|
||||||
/* Missable Arcane Egg exception, subtract from total */
|
/* Missable Arcane Egg exception, subtract from total */
|
||||||
|
|
||||||
|
|
@ -476,6 +496,7 @@ function CheckExtendedCompletion(db) {
|
||||||
|
|
||||||
if (entries[entry].icon === "green") {
|
if (entries[entry].icon === "green") {
|
||||||
intro.extendedCompletionDone++;
|
intro.extendedCompletionDone++;
|
||||||
|
/* console.info("Counted (Done):", entry); */
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -494,7 +515,7 @@ function CheckExtendedCompletion(db) {
|
||||||
else if (entries[entry].hasOwnProperty("amount") && entries[entry].hasOwnProperty("max")) {
|
else if (entries[entry].hasOwnProperty("amount") && entries[entry].hasOwnProperty("max")) {
|
||||||
/* Skip counting 3000 Fountain Geo, too much */
|
/* Skip counting 3000 Fountain Geo, too much */
|
||||||
if (entry === "fountainGeo") {
|
if (entry === "fountainGeo") {
|
||||||
break;
|
continue; // continue to next entry loop
|
||||||
}
|
}
|
||||||
|
|
||||||
amount = entries[entry].amount;
|
amount = entries[entry].amount;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -494,9 +494,13 @@ function CheckExtendedCompletion(db) {
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
||||||
|
// console.info("Section loop:", section);
|
||||||
|
|
||||||
for (let entry in entries) {
|
for (let entry in entries) {
|
||||||
|
|
||||||
/* Do not count these entries */
|
// console.info("Entry loop:", entry);
|
||||||
|
|
||||||
|
/* Do not count (ignore) these entries at all */
|
||||||
switch (entry) {
|
switch (entry) {
|
||||||
|
|
||||||
case "oldNail":
|
case "oldNail":
|
||||||
|
|
@ -509,6 +513,23 @@ function CheckExtendedCompletion(db) {
|
||||||
case "jinnEggsSold":
|
case "jinnEggsSold":
|
||||||
case "xunFlowerBrokeTimes":
|
case "xunFlowerBrokeTimes":
|
||||||
case "itemsDiscovered":
|
case "itemsDiscovered":
|
||||||
|
case "stagStationsOpened":
|
||||||
|
case "killedMegaMossCharger":
|
||||||
|
case "killedBigBuzzer":
|
||||||
|
case "killedOblobble":
|
||||||
|
case "killedLobsterLancer":
|
||||||
|
case "killedFlukeMother":
|
||||||
|
case "killedNailBros":
|
||||||
|
case "killedPaintmaster":
|
||||||
|
case "killedNailsage":
|
||||||
|
case "killedHollowKnightPrime":
|
||||||
|
case "killsBigBuzzer":
|
||||||
|
case "whiteDefenderDefeated":
|
||||||
|
case "greyPrinceDefeated":
|
||||||
|
case "killedHollowKnight":
|
||||||
|
case "killedFinalBoss":
|
||||||
|
|
||||||
|
// console.info("Ignored:", entry);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -520,7 +541,6 @@ function CheckExtendedCompletion(db) {
|
||||||
/* Do not add these to total and done (they will be added as amount/max later instead) */
|
/* Do not add these to total and done (they will be added as amount/max later instead) */
|
||||||
case "grubsCollected":
|
case "grubsCollected":
|
||||||
case "grubRewards":
|
case "grubRewards":
|
||||||
case "stationsOpened":
|
|
||||||
case "areaMaps":
|
case "areaMaps":
|
||||||
case "journalEntriesCompleted":
|
case "journalEntriesCompleted":
|
||||||
case "journalNotesCompleted":
|
case "journalNotesCompleted":
|
||||||
|
|
@ -532,12 +552,17 @@ function CheckExtendedCompletion(db) {
|
||||||
case "geoRocks":
|
case "geoRocks":
|
||||||
case "whiteDefenderDefeats":
|
case "whiteDefenderDefeats":
|
||||||
case "greyPrinceDefeats":
|
case "greyPrinceDefeats":
|
||||||
|
|
||||||
|
/* console.info("Ignored:", entry); */
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
||||||
if (entries[entry].icon !== "none") {
|
if (entries[entry].icon !== "none") {
|
||||||
intro.extendedCompletionTotal++;
|
intro.extendedCompletionTotal++;
|
||||||
|
|
||||||
|
/* console.info("Counted:", entry); */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Missable Arcane Egg exception, subtract from total */
|
/* Missable Arcane Egg exception, subtract from total */
|
||||||
|
|
@ -555,6 +580,8 @@ function CheckExtendedCompletion(db) {
|
||||||
|
|
||||||
if (entries[entry].icon === "green") {
|
if (entries[entry].icon === "green") {
|
||||||
intro.extendedCompletionDone++;
|
intro.extendedCompletionDone++;
|
||||||
|
|
||||||
|
/* console.info("Counted (Done):", entry); */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -573,7 +600,7 @@ function CheckExtendedCompletion(db) {
|
||||||
|
|
||||||
/* Skip counting 3000 Fountain Geo, too much */
|
/* Skip counting 3000 Fountain Geo, too much */
|
||||||
if (entry === "fountainGeo") {
|
if (entry === "fountainGeo") {
|
||||||
break;
|
continue; // continue to next entry loop
|
||||||
}
|
}
|
||||||
|
|
||||||
amount = entries[entry].amount;
|
amount = entries[entry].amount;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue