corrections

This commit is contained in:
ReznoRMichael 2021-08-06 10:28:10 +02:00
parent f58444c804
commit 09d892ab98
3 changed files with 19 additions and 12 deletions

View file

@ -377,6 +377,10 @@ function CheckExtendedCompletion(db) {
if (entries[entry].icon !== "none") { if (entries[entry].icon !== "none") {
intro.extendedCompletionTotal++; // console.info("Counted Total:", entry); intro.extendedCompletionTotal++; // console.info("Counted Total:", entry);
} }
/* else {
console.info("Not Counted Total:", entry);
} */
/* Missable Arcane Egg exception, subtract from total */ /* Missable Arcane Egg exception, subtract from total */
@ -395,7 +399,7 @@ function CheckExtendedCompletion(db) {
case "none": case "none":
case "partial": case "partial":
case "partialJournal": case "partialJournal":
break; continue;
default: default:
intro.extendedCompletionDone++; intro.extendedCompletionDone++;
@ -403,7 +407,7 @@ function CheckExtendedCompletion(db) {
} }
} }
/* Skip disabled entries entirely from counting (substract a point from Total) */ /* Skip disabled entries entirely from counting (subtract a point from Total) */
if (entries[entry].hasOwnProperty("disabled") && entries[entry].disabled === true) { if (entries[entry].hasOwnProperty("disabled") && entries[entry].disabled === true) {
@ -412,7 +416,7 @@ function CheckExtendedCompletion(db) {
continue; continue;
} }
intro.extendedCompletionTotal--; intro.extendedCompletionTotal--; // console.info("Subtracted Total:", entry);
} }
/* Counting amount/max for several entries */ /* Counting amount/max for several entries */
else if (entries[entry].hasOwnProperty("amount") && entries[entry].hasOwnProperty("max")) { else if (entries[entry].hasOwnProperty("amount") && entries[entry].hasOwnProperty("max")) {
@ -430,8 +434,7 @@ function CheckExtendedCompletion(db) {
} }
intro.extendedCompletionDone += amount; intro.extendedCompletionDone += amount;
intro.extendedCompletionTotal += max; intro.extendedCompletionTotal += max; // console.info(`${entry}: ${amount}/${max}`, entries[entry].name);
/* console.info(`${entry}: ${amount}/${max}`, entries[entry].name); */
amount = 0; amount = 0;
max = 0; max = 0;
@ -447,8 +450,7 @@ function CheckExtendedCompletion(db) {
} }
intro.extendedCompletionDone += amount; intro.extendedCompletionDone += amount;
intro.extendedCompletionTotal += max; intro.extendedCompletionTotal += max; // console.info(`${entry}: ${amount}/${max}`, entries[entry].name);
/* console.info(`${entry}: ${amount}/${max}`, entries[entry].name); */
amount = 0; amount = 0;
max = 0; max = 0;

File diff suppressed because one or more lines are too long

View file

@ -479,6 +479,9 @@ function CheckExtendedCompletion(db) {
// console.info("Counted Total:", entry); // console.info("Counted Total:", entry);
} }
/* else {
console.info("Not Counted Total:", entry);
} */
/* Missable Arcane Egg exception, subtract from total */ /* Missable Arcane Egg exception, subtract from total */
if (entries[entry].icon === "none" && entry === "arcaneEggLifebloodCoreRoom") { if (entries[entry].icon === "none" && entry === "arcaneEggLifebloodCoreRoom") {
@ -499,7 +502,7 @@ function CheckExtendedCompletion(db) {
case "none": case "none":
case "partial": case "partial":
case "partialJournal": case "partialJournal":
break; continue;
default: default:
@ -509,7 +512,7 @@ function CheckExtendedCompletion(db) {
} }
} }
/* Skip disabled entries entirely from counting (substract a point from Total) */ /* Skip disabled entries entirely from counting (subtract a point from Total) */
if (entries[entry].hasOwnProperty("disabled") && entries[entry].disabled === true) { if (entries[entry].hasOwnProperty("disabled") && entries[entry].disabled === true) {
/* Do not subtract a point for WD/GPZ Defeats nr if they were not added to Total in the first place */ /* Do not subtract a point for WD/GPZ Defeats nr if they were not added to Total in the first place */
@ -518,6 +521,8 @@ function CheckExtendedCompletion(db) {
} }
intro.extendedCompletionTotal--; intro.extendedCompletionTotal--;
// console.info("Subtracted Total:", entry);
} }
/* Counting amount/max for several entries */ /* Counting amount/max for several entries */
else if (entries[entry].hasOwnProperty("amount") && entries[entry].hasOwnProperty("max")) { else if (entries[entry].hasOwnProperty("amount") && entries[entry].hasOwnProperty("max")) {
@ -538,7 +543,7 @@ function CheckExtendedCompletion(db) {
intro.extendedCompletionDone += amount; intro.extendedCompletionDone += amount;
intro.extendedCompletionTotal += max; intro.extendedCompletionTotal += max;
/* console.info(`${entry}: ${amount}/${max}`, entries[entry].name); */ // console.info(`${entry}: ${amount}/${max}`, entries[entry].name);
amount = 0; amount = 0;
max = 0; max = 0;
@ -557,7 +562,7 @@ function CheckExtendedCompletion(db) {
intro.extendedCompletionDone += amount; intro.extendedCompletionDone += amount;
intro.extendedCompletionTotal += max; intro.extendedCompletionTotal += max;
/* console.info(`${entry}: ${amount}/${max}`, entries[entry].name); */ // console.info(`${entry}: ${amount}/${max}`, entries[entry].name);
amount = 0; amount = 0;
max = 0; max = 0;