detect troupe banishment Journal

This commit is contained in:
ReznoRMichael 2021-07-28 20:24:20 +02:00
parent 4733e9c8f8
commit a71c2ed0a6
3 changed files with 57 additions and 7 deletions

View file

@ -1561,11 +1561,32 @@ function CheckHuntersJournal(db, sectionName, playerData) {
case "ZotelingBalloon": case "ZotelingBalloon":
case "ZotelingHopper": case "ZotelingHopper":
case "ZotelingBuzzer": case "ZotelingBuzzer":
/* When Zote == OFF (Neglect route), fade the entry and move to the next entry */ /* When Zote == OFF (Neglect route), fade the entry and move to the next iteration */
if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) { if (playerData.zoteDead === true || playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true) {
amountKillsLeft = 0;
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = name; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry);
continue;
}
break;
case "FlameBearerLarge":
/* If the troupe was banished and the player didn't defeat any Grimmkin Nightmare, then it's entry cannot be obtained on this save */
if (playerData.grimmChildLevel >= 5 && playerData.killedFlameBearerLarge === false) {
entries[entry].disabled = true;
entries[entry].name = nameDefault;
CurrentDataBlank(section, entry);
continue;
}
break;
case "NightmareGrimm":
/* if the troupe was banished, the Nightmare King entry cannot be obtained on this save */
if (playerData.grimmChildLevel >= 5) {
entries[entry].disabled = true;
entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); CurrentDataBlank(section, entry);
continue; continue;
} }

File diff suppressed because one or more lines are too long

View file

@ -764,6 +764,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
break; break;
case 5: case 5:
dataObject[i].name = dataObject[i].nameBanishment; dataObject[i].name = dataObject[i].nameBanishment;
dataObject[i].spoiler = dataObject[i].spoilerBanishment; dataObject[i].spoiler = dataObject[i].spoilerBanishment;
@ -772,6 +773,7 @@ function CheckIfDataTrue(section, dataObject, playerData, worldData = []) {
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
break; break;
default: default:
CurrentDataFalse(section, i); CurrentDataFalse(section, i);
dataObject[i].name = dataObject[i].nameDefault; dataObject[i].name = dataObject[i].nameDefault;
@ -1667,17 +1669,44 @@ function CheckHuntersJournal(db, sectionName, playerData) {
case "ZotelingHopper": case "ZotelingHopper":
case "ZotelingBuzzer": case "ZotelingBuzzer":
/* When Zote == OFF (Neglect route), fade the entry and move to the next entry */ /* When Zote == OFF (Neglect route), fade the entry and move to the next iteration */
if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) { if (playerData.zoteDead === true || (playerData.zoteRescuedBuzzer === false && playerData.hasWalljump === true)) {
amountKillsLeft = 0;
entries[entry].disabled = true; entries[entry].disabled = true;
entries[entry].name = name; entries[entry].name = nameDefault;
CurrentDataBlank(section, entry); CurrentDataBlank(section, entry);
continue; continue;
} }
break;
case "FlameBearerLarge":
/* If the troupe was banished and the player didn't defeat any Grimmkin Nightmare, then it's entry cannot be obtained on this save */
if (playerData.grimmChildLevel >= 5 && playerData.killedFlameBearerLarge === false) {
entries[entry].disabled = true;
entries[entry].name = nameDefault;
CurrentDataBlank(section, entry);
continue;
}
break;
case "NightmareGrimm":
/* if the troupe was banished, the Nightmare King entry cannot be obtained on this save */
if (playerData.grimmChildLevel >= 5) {
entries[entry].disabled = true;
entries[entry].name = nameDefault;
CurrentDataBlank(section, entry);
continue;
}
break; break;
} }