endernon/wynnbuilder-forked-for-changes
1
0
Fork 0
forked from morphNon/wynnbuilder-idk
Code Pull requests Activity

Merge pull request #35 from hppeng-wynn/melee_breakdown

Browse source 
Re-enable melee breakdown
This commit is contained in:
hppeng-wynn 2022-06-23 01:24:31 -07:00 committed by GitHub
commit adcf0b5db9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/index.html
View file

@ -1240,7 +1240,7 @@
<div class="col-xl-3 mb-3 px-0"> <div class="col-xl-3 mb-3 px-0">
<div class="row row-cols-1 gy-3 mb-4 text-center scaled-font"> <div class="row row-cols-1 gy-3 mb-4 text-center scaled-font">
<div class = "col"> <div class = "col">
<div class = "spell-display dark-5 rounded dark-shadow py-2 border border-dark" id="build-melee-statsAvg">melee</div> <div class = "spell-display spell-expand dark-5 rounded dark-shadow py-2 border border-dark" id="build-melee-statsAvg">melee</div>
<div class = "spell-display dark-5 rounded-bottom py-2 dark-shadow" id = "build-melee-stats" style="display: none;"></div> <div class = "spell-display dark-5 rounded-bottom py-2 dark-shadow" id = "build-melee-stats" style="display: none;"></div>
</div> </div>
<div class = "col"> <div class = "col">

2
js/sq2bs.js
View file

@ -29,6 +29,8 @@ document.addEventListener('DOMContentLoaded', function() {
document.querySelector("#"+i+"Avg").setAttribute("onclick", "toggle_spell_tab('"+i+"')"); document.querySelector("#"+i+"Avg").setAttribute("onclick", "toggle_spell_tab('"+i+"')");
} }
document.querySelector("#build-melee-statsAvg").setAttribute("onclick", "toggle_spell_tab('build-melee-stats')");
document.querySelector("#level-choice").setAttribute("oninput", "calcBuildSchedule()") document.querySelector("#level-choice").setAttribute("oninput", "calcBuildSchedule()")
document.querySelector("#weapon-choice").setAttribute("oninput", document.querySelector("#weapon-choice").getAttribute("oninput") + "resetArmorPowderSpecials();"); document.querySelector("#weapon-choice").setAttribute("oninput", document.querySelector("#weapon-choice").getAttribute("oninput") + "resetArmorPowderSpecials();");
// document.querySelector("#edit-IDs-button").setAttribute("onclick", "toggle_edit_id_tab()"); // document.querySelector("#edit-IDs-button").setAttribute("onclick", "toggle_edit_id_tab()");

37
js/sq2display.js
View file

@ -699,7 +699,6 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
title_elem.classList.add("title"); title_elem.classList.add("title");
title_elem.textContent = "Melee Stats"; title_elem.textContent = "Melee Stats";
parent_elem.append(title_elem); parent_elem.append(title_elem);
parent_elem.append(document.createElement("br"));
//overall title //overall title
let title_elemavg = document.createElement("b"); let title_elemavg = document.createElement("b");
@ -710,9 +709,6 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
let averageDamage = document.createElement("p"); let averageDamage = document.createElement("p");
averageDamage.classList.add("left"); averageDamage.classList.add("left");
averageDamage.textContent = "Average DPS: " + stats[10]; averageDamage.textContent = "Average DPS: " + stats[10];
tooltiptext = `= ((${stats[8]} * ${(stats[6][2]).toFixed(2)}) + (${stats[9]} * ${(stats[7][2]).toFixed(2)}))`
tooltip = createTooltip(tooltip, "p", tooltiptext, averageDamage, ["melee-tooltip"]);
averageDamage.appendChild(tooltip);
parent_elem.append(averageDamage); parent_elem.append(averageDamage);
//overall average DPS //overall average DPS
@ -758,8 +754,6 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
dmg.textContent = stats[i][0] + " \u2013 " + stats[i][1]; dmg.textContent = stats[i][0] + " \u2013 " + stats[i][1];
dmg.classList.add(damageClasses[i]); dmg.classList.add(damageClasses[i]);
dmg.classList.add("itemp"); dmg.classList.add("itemp");
tooltiptext = tooltipinfo.get("damageformulas")[i].slice(0,2).join("\n");
tooltip = createTooltip(tooltip, "p", tooltiptext, dmg, ["melee-tooltip"]);
nonCritStats.append(dmg); nonCritStats.append(dmg);
} }
} }
@ -774,15 +768,11 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
arr2.push(stats[i][1]); arr2.push(stats[i][1]);
} }
} }
tooltiptext = tooltiparr[0] + arr.join(" + ") + "\n" + tooltiparr[1] + arr2.join(" + ");
tooltip = createTooltip(tooltip, "p", tooltiptext, normalDamage, ["melee-tooltip"]);
nonCritStats.append(normalDamage); nonCritStats.append(normalDamage);
let normalDPS = document.createElement("p"); let normalDPS = document.createElement("p");
normalDPS.textContent = "Normal DPS: " + stats[8]; normalDPS.textContent = "Normal DPS: " + stats[8];
normalDPS.classList.add("tooltip"); normalDPS.classList.add("tooltip");
tooltiptext = ` = ((${stats[6][0]} + ${stats[6][1]}) / 2) * ${baseDamageMultiplier[stats[11]]}`;
tooltip = createTooltip(tooltip, "p", tooltiptext, normalDPS, ["melee-tooltip"]);
nonCritStats.append(normalDPS); nonCritStats.append(normalDPS);
//overall average DPS //overall average DPS
@ -792,9 +782,6 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
let singleHitDamageSecond = document.createElement("span"); let singleHitDamageSecond = document.createElement("span");
singleHitDamageSecond.classList.add("Damage"); singleHitDamageSecond.classList.add("Damage");
singleHitDamageSecond.textContent = stats[12].toFixed(2); singleHitDamageSecond.textContent = stats[12].toFixed(2);
tooltiptext = ` = ((${stats[6][0]} + ${stats[6][1]}) / 2) * ${stats[6][2].toFixed(2)} + ((${stats[7][0]} + ${stats[7][1]}) / 2) * ${stats[7][2].toFixed(2)}`;
// tooltip = createTooltip(tooltip, "p", tooltiptext, singleHitDamage, ["melee-tooltip", "summary-tooltip"]);
singleHitDamage.appendChild(singleHitDamageFirst); singleHitDamage.appendChild(singleHitDamageFirst);
singleHitDamage.appendChild(singleHitDamageSecond); singleHitDamage.appendChild(singleHitDamageSecond);
overallparent_elem.append(singleHitDamage); overallparent_elem.append(singleHitDamage);
@ -819,8 +806,6 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
dmg.textContent = stats[i][2] + " \u2013 " + stats[i][3]; dmg.textContent = stats[i][2] + " \u2013 " + stats[i][3];
dmg.classList.add(damageClasses[i]); dmg.classList.add(damageClasses[i]);
dmg.classList.add("itemp"); dmg.classList.add("itemp");
tooltiptext = tooltipinfo.get("damageformulas")[i].slice(2,4).join("\n");
tooltip = createTooltip(tooltip, "p", tooltiptext, dmg, ["melee-tooltip"]);
critStats.append(dmg); critStats.append(dmg);
} }
} }
@ -834,15 +819,11 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
arr2.push(stats[i][3]); arr2.push(stats[i][3]);
} }
} }
tooltiptext = tooltiparr[0] + arr.join(" + ") + "\n" + tooltiparr[1] + arr2.join(" + ");
tooltip = createTooltip(tooltip, "p", tooltiptext, critDamage, ["melee-tooltip"]);
critStats.append(critDamage); critStats.append(critDamage);
let critDPS = document.createElement("p"); let critDPS = document.createElement("p");
critDPS.textContent = "Crit DPS: " + stats[9]; critDPS.textContent = "Crit DPS: " + stats[9];
tooltiptext = ` = ((${stats[7][0]} + ${stats[7][1]}) / 2) * ${baseDamageMultiplier[stats[11]]}`;
tooltip = createTooltip(tooltip, "p", tooltiptext, critDPS, ["melee-tooltip"]);
critStats.append(critDPS); critStats.append(critDPS);
let critChance = document.createElement("p"); let critChance = document.createElement("p");
@ -852,6 +833,8 @@ function displaysq2MeleeDamage(parent_elem, overallparent_elem, meleeStats){
critStats.append(critChance); critStats.append(critChance);
parent_elem.append(critStats); parent_elem.append(critStats);
addClickableArrow(overallparent_elem);
} }
function displaysq2ArmorStats(build) { function displaysq2ArmorStats(build) {
@ -1420,12 +1403,7 @@ function displaysq2SpellDamage(parent_elem, overallparent_elem, build, spell, sp
} }
} }
//up and down arrow - done ugly addClickableArrow(overallparent_elem);
let arrow = document.createElement("img");
arrow.id = "arrow_" + overallparent_elem.id;
arrow.style.maxWidth = document.body.clientWidth > 900 ? "3rem" : "10rem";
arrow.src = "../media/icons/" + (newIcons ? "new" : "old") + "/toggle_down.png";
overallparent_elem.appendChild(arrow);
} }
function displaysq2EquipOrder(parent_elem, buildOrder){ function displaysq2EquipOrder(parent_elem, buildOrder){
@ -2409,3 +2387,12 @@ function sq2StringCDF(id,val,base,amp) {
document.getElementById(id + "-cdf").appendChild(div2); document.getElementById(id + "-cdf").appendChild(div2);
document.getElementById(id + "-cdf").appendChild(div3); document.getElementById(id + "-cdf").appendChild(div3);
} }
function addClickableArrow(elem) {
//up and down arrow - done ugly
let arrow = document.createElement("img");
arrow.id = "arrow_" + elem.id;
arrow.style.maxWidth = document.body.clientWidth > 900 ? "3rem" : "10rem";
arrow.src = "../media/icons/" + (newIcons ? "new" : "old") + "/toggle_down.png";
elem.appendChild(arrow);
}