shortened code for backwards compatibility

This commit is contained in:
ReznoRMichael 2021-02-24 15:36:43 +01:00
parent 647a20e1f5
commit c51a35c708
3 changed files with 21 additions and 92 deletions

View file

@ -754,29 +754,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
playerData.hasLoveKey === true || playerData.openedLoveDoor === true ? CurrentDataTrue() : CurrentDataFalse(); playerData.hasLoveKey === true || playerData.openedLoveDoor === true ? CurrentDataTrue() : CurrentDataFalse();
break; break;
case "gotLurkerKey":
case "nightmareLanternLit":
case "killedPaleLurker":
case "whiteDefenderDefeated":
case "gotGrimmNotch":
case "fragileGreed_unbreakable":
case "fragileHealth_unbreakable":
case "fragileStrength_unbreakable":
case "killedBindingSeal":
case "killedGodseekerMask":
case "givenGodseekerFlower":
case "givenOroFlower":
case "givenWhiteLadyFlower":
case "givenEmilitiaFlower":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>");
break;
}
playerData[i] === true ? CurrentDataTrue() : CurrentDataFalse();
break;
case "paleOreSeer": case "paleOreSeer":
// #2 // #2
playerData.dreamReward2 === true ? CurrentDataTrue() : CurrentDataFalse(); playerData.dreamReward2 === true ? CurrentDataTrue() : CurrentDataFalse();
@ -855,16 +832,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue(); if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue();
break; break;
case "killedVoidIdol_3":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>");
break;
}
playerData[i] === true ? CurrentDataTrue() : CurrentDataFalse();
break;
case "greyPrinceDefeated": case "greyPrinceDefeated":
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
@ -933,28 +900,22 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
break; break;
case "killedNailBros": case "mrMushroomState":
case "killedPaintmaster": sFillText += CheckMrMushroomState(divId, dataObject[i], playerData[i]);
case "killedNailsage": break;
case "killedHollowKnightPrime":
/* Godmaster backwards compatibility */ default:
// backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(); CurrentDataBlank();
textPrefix = "<del>".concat(textPrefix, "</del>"); textPrefix = "<del>".concat(dataObject[i].name, "</del>");
break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(); CurrentDataTrue();
} else { } else {
CurrentDataFalse(); CurrentDataFalse();
} }
break;
case "mrMushroomState":
sFillText += CheckMrMushroomState(divId, dataObject[i], playerData[i]);
break;
default:
playerData[i] === true ? CurrentDataTrue() : CurrentDataFalse();
} // end switch (i) } // end switch (i)

File diff suppressed because one or more lines are too long

View file

@ -833,27 +833,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
case "loveKey": case "loveKey":
(playerData.hasLoveKey === true || playerData.openedLoveDoor === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData.hasLoveKey === true || playerData.openedLoveDoor === true) ? CurrentDataTrue(): CurrentDataFalse();
break; break;
case "gotLurkerKey":
case "nightmareLanternLit":
case "killedPaleLurker":
case "whiteDefenderDefeated":
case "gotGrimmNotch":
case "fragileGreed_unbreakable":
case "fragileHealth_unbreakable":
case "fragileStrength_unbreakable":
case "killedBindingSeal":
case "killedGodseekerMask":
case "givenGodseekerFlower":
case "givenOroFlower":
case "givenWhiteLadyFlower":
case "givenEmilitiaFlower":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`;
break;
}
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
break;
case "paleOreSeer": // #2 case "paleOreSeer": // #2
(playerData.dreamReward2 === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData.dreamReward2 === true) ? CurrentDataTrue(): CurrentDataFalse();
break; break;
@ -912,14 +891,6 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse(); (playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue(); if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue();
break; break;
case "killedVoidIdol_3":
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`;
break;
}
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse();
break;
case "greyPrinceDefeated": case "greyPrinceDefeated":
// compatibility with earlier game versions // compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
@ -980,25 +951,22 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
textSuffix = dataObject[i].spoilerUpgradeNail; textSuffix = dataObject[i].spoilerUpgradeNail;
} }
break; break;
case "killedNailBros":
case "killedPaintmaster":
case "killedNailsage":
case "killedHollowKnightPrime":
/* Godmaster backwards compatibility */
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank();
textPrefix = `<del>${textPrefix}</del>`;
} else if (playerData[i] === true) {
CurrentDataTrue();
} else {
CurrentDataFalse();
}
break;
case "mrMushroomState": case "mrMushroomState":
sFillText += CheckMrMushroomState(divId, dataObject[i], playerData[i]); sFillText += CheckMrMushroomState(divId, dataObject[i], playerData[i]);
break; break;
default: default:
(playerData[i] === true) ? CurrentDataTrue(): CurrentDataFalse(); // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank();
textPrefix = `<del>${dataObject[i].name}</del>`;
break;
}
else if (playerData[i] === true) {
CurrentDataTrue();
}
else {
CurrentDataFalse();
}
} // end switch (i) } // end switch (i)
if (i === "mrMushroomState") continue; if (i === "mrMushroomState") continue;