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

relic amounts partial

Browse source
This commit is contained in:
ReznoRMichael 2021-07-27 16:47:22 +02:00
parent fa949f310e
commit 32cf1985b2
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/app.js
View file

@ -1060,7 +1060,7 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "xunFlowerBrokeTimes": case "xunFlowerBrokeTimes":
// textPrefix += ": " + Math.abs(playerData[i]); // textPrefix += ": " + Math.abs(playerData[i]);
dataObject[i].amount = Math.abs(playerData[i]); dataObject[i].amount = Math.abs(playerData[i]);
i === "geoPool" && playerData[i] > 0 ? CurrentDataBlank(section, i) : CurrentDataTrue(section, i); i === "geoPool" && playerData[i] > 0 ? CurrentDataPartial(section, i) : CurrentDataTrue(section, i);
if (i === "jinnEggsSold") { if (i === "jinnEggsSold") {
// fade out if not on Steel Soul // fade out if not on Steel Soul
@ -1147,7 +1147,15 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "relicsKingsIdol": case "relicsKingsIdol":
case "relicsArcaneEgg": case "relicsArcaneEgg":
total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold]; total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold];
total >= dataObject[i].max ? CurrentDataTrue(section, i) : CurrentDataBlank(section, i);
if (total >= dataObject[i].max) {
CurrentDataTrue(section, i);
} else if (total > 0) {
CurrentDataPartial(section, i);
} else {
CurrentDataBlank(section, i);
}
dataObject[i].amount = total; dataObject[i].amount = total;
/* textPrefix += ": " + total; */ /* textPrefix += ": " + total; */

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

22
src/js/HKCheckCompletion.js
View file

@ -1156,10 +1156,13 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
} }
if (amount >= dataObject[i].max) { if (amount >= dataObject[i].max) {
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
} else if (amount > 0) { } else if (amount > 0) {
CurrentDataPartial(section, i); CurrentDataPartial(section, i);
} else { } else {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
} }
break; break;
@ -1172,11 +1175,12 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
dataObject[i].amount = Math.abs(playerData[i]); dataObject[i].amount = Math.abs(playerData[i]);
(i === "geoPool" && playerData[i] > 0) ? CurrentDataBlank(section, i): CurrentDataTrue(section, i); (i === "geoPool" && playerData[i] > 0) ? CurrentDataPartial(section, i): CurrentDataTrue(section, i);
if (i === "jinnEggsSold") { if (i === "jinnEggsSold") {
// fade out if not on Steel Soul // fade out if not on Steel Soul
if (playerData.permadeathMode < 1) { if (playerData.permadeathMode < 1) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
// textPrefix = `<del>${textPrefix}</del>`; // textPrefix = `<del>${textPrefix}</del>`;
@ -1255,7 +1259,16 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
case "relicsArcaneEgg": case "relicsArcaneEgg":
total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold]; total = playerData[dataObject[i].nameHeld] + playerData[dataObject[i].nameSold];
(total >= dataObject[i].max) ? CurrentDataTrue(section, i): CurrentDataBlank(section, i); if (total >= dataObject[i].max) {
CurrentDataTrue(section, i);
} else if (total > 0) {
CurrentDataPartial(section, i);
} else {
CurrentDataBlank(section, i);
}
dataObject[i].amount = total; dataObject[i].amount = total;
@ -1421,15 +1434,20 @@ function CheckAdditionalThings(section, dataObject, playerData, worldData, scene
break; break;
default: default:
// backwards compatibility with earlier game versions // backwards compatibility with earlier game versions
if (playerData.hasOwnProperty(i) === false) { if (playerData.hasOwnProperty(i) === false) {
CurrentDataBlank(section, i); CurrentDataBlank(section, i);
dataObject[i].disabled = true; dataObject[i].disabled = true;
// textPrefix = `<del>${dataObject[i].name}</del>`; // textPrefix = `<del>${dataObject[i].name}</del>`;
break; break;
} else if (playerData[i] === true) { } else if (playerData[i] === true) {
CurrentDataTrue(section, i); CurrentDataTrue(section, i);
} else { } else {
CurrentDataFalse(section, i); CurrentDataFalse(section, i);
} }
} // end switch (i) } // end switch (i)