Merge branch 'dev' into master

This commit is contained in:
hppeng-wynn 2021-01-10 16:38:17 -06:00 committed by GitHub
commit 29eb1c28e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View file

@ -213,7 +213,7 @@ class Build{
defenseStats.push(totalHpr); defenseStats.push(totalHpr);
//EHPR //EHPR
let ehpr = totalHpr; let ehpr = totalHpr;
ehp /= ((1-def_pct)*(1-agi_pct)*(2-defMult)); ehpr /= ((1-def_pct)*(1-agi_pct)*(2-defMult));
defenseStats.push(ehpr); defenseStats.push(ehpr);
//skp stats //skp stats
defenseStats.push([def_pct*100, agi_pct*100]); defenseStats.push([def_pct*100, agi_pct*100]);

View file

@ -499,6 +499,7 @@ function displayEquipOrder(parent_elem,buildOrder){
parent_elem.append(p_elem); parent_elem.append(p_elem);
} }
} }
function displayMeleeDamage(parent_elem, overallparent_elem, meleeStats){ function displayMeleeDamage(parent_elem, overallparent_elem, meleeStats){
let attackSpeeds = ["Super Slow", "Very Slow", "Slow", "Normal", "Fast", "Very Fast", "Super Fast"]; let attackSpeeds = ["Super Slow", "Very Slow", "Slow", "Normal", "Fast", "Very Fast", "Super Fast"];
//let damagePrefixes = ["Neutral Damage: ","Earth Damage: ","Thunder Damage: ","Water Damage: ","Fire Damage: ","Air Damage: "]; //let damagePrefixes = ["Neutral Damage: ","Earth Damage: ","Thunder Damage: ","Water Damage: ","Fire Damage: ","Air Damage: "];
@ -681,9 +682,9 @@ function displayDefenseStats(parent_elem,defenseStats){
hpr.classList.add("left"); hpr.classList.add("left");
hpr.textContent = "HP Regen:"; hpr.textContent = "HP Regen:";
boost = document.createElement("td"); boost = document.createElement("td");
boost.textContent =stats[2]; boost.textContent = stats[2];
boost.classList.add("right"); boost.classList.add("right");
hprRow.appendChild(hpr); hprRow.appendChild(hpr);
hprRow.appendChild(boost); hprRow.appendChild(boost);
statsTable.appendChild(hprRow); statsTable.appendChild(hprRow);
@ -729,7 +730,6 @@ function displayDefenseStats(parent_elem,defenseStats){
row.appendChild(boost); row.appendChild(boost);
statsTable.appendChild(row); statsTable.appendChild(row);
} }
//skp //skp
let defRow = document.createElement("tr"); let defRow = document.createElement("tr");
let defElem = document.createElement("td"); let defElem = document.createElement("td");

View file

@ -173,6 +173,7 @@
<div class = "center build-overall" id = "build-overall"> <div class = "center build-overall" id = "build-overall">
<br/> <br/>
<div class = "center" id = "build-overall-stats"></div> <div class = "center" id = "build-overall-stats"></div>
</div> </div>
</div> </div>
<div class="center" style="grid-column:4;"> <div class="center" style="grid-column:4;">