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

show geo and shade geo

Browse source
This commit is contained in:
ReznoRMichael 2021-07-07 22:48:51 +02:00
parent 9355accd09
commit 63a386a42a
4 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
build/app.js
View file

@ -349,12 +349,17 @@ function CheckSoulOrbs(section, totalSoul) {
function CheckGeo(section) { function CheckGeo(section) {
var geoValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0; var geoValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
var geoPoolValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0; var geoPoolValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
var icon = SYMBOL_EMPTY; section.entries.geo.amount = geoValue;
var textFill = "<span>Geo:</span><img src='".concat(_img_geo_png__WEBPACK_IMPORTED_MODULE_9__, "' class='geo-symbol' alt='geo symbol image' title='Geo'><b>").concat(geoValue, "</b>"); // Show Shade Geo value and image only if Shade has at least 1 Geo on it section.entries.geo.amountShade = geoPoolValue;
section.entries.geo.amountTotal = geoValue + geoPoolValue;
if (geoPoolValue > 0) textFill += "\n ".concat(pSpan, "+<img src='").concat(_img_geo_shade_png__WEBPACK_IMPORTED_MODULE_10__, "' class='geo-symbol' alt='shade geo symbol image' title='Shade Geo'><b>").concat(geoPoolValue, "</b>"); // Show also total Geo (Geo + Shade Geo) if player has at least 1 geo alongside the shade geo /* let icon = SYMBOL_EMPTY;
let textFill = `<span>Geo:</span><img src='${GEO_IMAGE}' class='geo-symbol' alt='geo symbol image' title='Geo'><b>${geoValue}</b>`;
if (geoValue > 0 && geoPoolValue > 0) textFill += "".concat(pSpan, "=").concat(pSpan, "<b>").concat(geoValue + geoPoolValue, "</b>"); // document.getElementById(section.id).innerHTML += divStartCenter + icon + textFill + divEnd; // Show Shade Geo value and image only if Shade has at least 1 Geo on it
if (geoPoolValue > 0) textFill += `
${pSpan}+<img src='${GEO_SHADE_IMAGE}' class='geo-symbol' alt='shade geo symbol image' title='Shade Geo'><b>${geoPoolValue}</b>`;
// Show also total Geo (Geo + Shade Geo) if player has at least 1 geo alongside the shade geo
if (geoValue > 0 && geoPoolValue > 0) textFill += `${pSpan}=${pSpan}<b>${geoValue+geoPoolValue}</b>`; */
// document.getElementById(section.id).innerHTML += divStartCenter + icon + textFill + divEnd;
} }
/** /**
* Fills HTML with appropriate number of notch images * Fills HTML with appropriate number of notch images
@ -5047,6 +5052,8 @@ function SingleEntryFill(section, entry) {
var notchNormalImage = "<img src='".concat(_img_notch_png__WEBPACK_IMPORTED_MODULE_3__, "' class='notch' alt='notch image' title='Charm Notch (Free)'>"); var notchNormalImage = "<img src='".concat(_img_notch_png__WEBPACK_IMPORTED_MODULE_3__, "' class='notch' alt='notch image' title='Charm Notch (Free)'>");
var notchFilledImage = "<img src='".concat(_img_notch_filled_png__WEBPACK_IMPORTED_MODULE_4__, "' class='notch' alt='notch image' title='Charm Notch (Used)'>"); var notchFilledImage = "<img src='".concat(_img_notch_filled_png__WEBPACK_IMPORTED_MODULE_4__, "' class='notch' alt='notch image' title='Charm Notch (Used)'>");
var notchOvercharmedImage = "<img src='".concat(_img_notch_overcharmed_png__WEBPACK_IMPORTED_MODULE_5__, "' class='notch' alt='notch image' title='Charm Notch (Overcharmed)'>"); var notchOvercharmedImage = "<img src='".concat(_img_notch_overcharmed_png__WEBPACK_IMPORTED_MODULE_5__, "' class='notch' alt='notch image' title='Charm Notch (Overcharmed)'>");
var geoNormalImage = "<img src='".concat(_img_geo_png__WEBPACK_IMPORTED_MODULE_6__, "' class='geo-symbol' alt='geo symbol image' title='Geo'>");
var geoShadeImage = "<img src='".concat(_img_geo_shade_png__WEBPACK_IMPORTED_MODULE_7__, "' class='geo-symbol' alt='shade geo symbol image' title='Shade Geo'>");
var wiki = ""; var wiki = "";
var div = "<div class='single-entry'>"; var div = "<div class='single-entry'>";
var divFlex = "<div class='flex-container align-center'>"; var divFlex = "<div class='flex-container align-center'>";
@ -5158,6 +5165,17 @@ function SingleEntryFill(section, entry) {
textSuffix += "".concat(p, "<sup>(").concat(entry.amountTotal, ")</sup>"); textSuffix += "".concat(p, "<sup>(").concat(entry.amountTotal, ")</sup>");
break; break;
case "geo":
div = divFlex;
span = ["", ""];
textSuffix += "".concat(geoNormalImage, "<b>").concat(entry.amount, "</b>"); // Show Shade Geo value and image only if Shade has at least 1 Geo on it
if (entry.amountShade > 0) textSuffix += "".concat(p, "+").concat(geoShadeImage, "<b>").concat(entry.amountShade, "</b>"); // Show also total Geo (Geo + Shade Geo) if player has at least 1 geo alongside the shade geo
if (entry.amount > 0 && entry.amountShade > 0) textSuffix += "".concat(p, "=").concat(p, "<b>").concat(entry.amountTotal, "</b>");
p = "";
break;
default: default:
} }
/* Optimized only for the "intro" section! */ /* Optimized only for the "intro" section! */

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

8
src/js/HKCheckCompletion.js
View file

@ -431,7 +431,11 @@ function CheckSoulOrbs(section, totalSoul) {
*/ */
function CheckGeo(section, geoValue = 0, geoPoolValue = 0) { function CheckGeo(section, geoValue = 0, geoPoolValue = 0) {
let icon = SYMBOL_EMPTY; section.entries.geo.amount = geoValue;
section.entries.geo.amountShade = geoPoolValue;
section.entries.geo.amountTotal = geoValue + geoPoolValue;
/* let icon = SYMBOL_EMPTY;
let textFill = `<span>Geo:</span><img src='${GEO_IMAGE}' class='geo-symbol' alt='geo symbol image' title='Geo'><b>${geoValue}</b>`; let textFill = `<span>Geo:</span><img src='${GEO_IMAGE}' class='geo-symbol' alt='geo symbol image' title='Geo'><b>${geoValue}</b>`;
// Show Shade Geo value and image only if Shade has at least 1 Geo on it // Show Shade Geo value and image only if Shade has at least 1 Geo on it
@ -439,7 +443,7 @@ function CheckGeo(section, geoValue = 0, geoPoolValue = 0) {
${pSpan}+<img src='${GEO_SHADE_IMAGE}' class='geo-symbol' alt='shade geo symbol image' title='Shade Geo'><b>${geoPoolValue}</b>`; ${pSpan}+<img src='${GEO_SHADE_IMAGE}' class='geo-symbol' alt='shade geo symbol image' title='Shade Geo'><b>${geoPoolValue}</b>`;
// Show also total Geo (Geo + Shade Geo) if player has at least 1 geo alongside the shade geo // Show also total Geo (Geo + Shade Geo) if player has at least 1 geo alongside the shade geo
if (geoValue > 0 && geoPoolValue > 0) textFill += `${pSpan}=${pSpan}<b>${geoValue+geoPoolValue}</b>`; if (geoValue > 0 && geoPoolValue > 0) textFill += `${pSpan}=${pSpan}<b>${geoValue+geoPoolValue}</b>`; */
// document.getElementById(section.id).innerHTML += divStartCenter + icon + textFill + divEnd; // document.getElementById(section.id).innerHTML += divStartCenter + icon + textFill + divEnd;
} }

16
src/js/page-functions.js
View file

@ -284,6 +284,8 @@ function SingleEntryFill(section, entry) {
let notchNormalImage = `<img src='${NOTCH_IMAGE}' class='notch' alt='notch image' title='Charm Notch (Free)'>`; let notchNormalImage = `<img src='${NOTCH_IMAGE}' class='notch' alt='notch image' title='Charm Notch (Free)'>`;
let notchFilledImage = `<img src='${NOTCH_FILLED_IMAGE}' class='notch' alt='notch image' title='Charm Notch (Used)'>`; let notchFilledImage = `<img src='${NOTCH_FILLED_IMAGE}' class='notch' alt='notch image' title='Charm Notch (Used)'>`;
let notchOvercharmedImage = `<img src='${NOTCH_OVERCHARMED_IMAGE}' class='notch' alt='notch image' title='Charm Notch (Overcharmed)'>`; let notchOvercharmedImage = `<img src='${NOTCH_OVERCHARMED_IMAGE}' class='notch' alt='notch image' title='Charm Notch (Overcharmed)'>`;
let geoNormalImage = `<img src='${GEO_IMAGE}' class='geo-symbol' alt='geo symbol image' title='Geo'>`;
let geoShadeImage = `<img src='${GEO_SHADE_IMAGE}' class='geo-symbol' alt='shade geo symbol image' title='Shade Geo'>`;
let wiki = ""; let wiki = "";
let div = `<div class='single-entry'>`; let div = `<div class='single-entry'>`;
@ -401,6 +403,20 @@ function SingleEntryFill(section, entry) {
break; break;
case "geo":
div = divFlex;
span = ["", ""];
textSuffix += `${geoNormalImage}<b>${entry.amount}</b>`;
// Show Shade Geo value and image only if Shade has at least 1 Geo on it
if (entry.amountShade > 0) textSuffix += `${p}+${geoShadeImage}<b>${entry.amountShade}</b>`;
// Show also total Geo (Geo + Shade Geo) if player has at least 1 geo alongside the shade geo
if (entry.amount > 0 && entry.amountShade > 0) textSuffix += `${p}=${p}<b>${entry.amountTotal}</b>`;
p = "";
break;
default: default:
} }