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

fixed merge conflict

Browse source
This commit is contained in:
ferricles 2021-03-25 19:20:04 -07:00
commit c53e0d970b
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.js
View file

@ -411,8 +411,13 @@ class Build{
adjAtkSpd = 0;
}
// 0 for melee damage.
let results = calculateSpellDamage(stats, [100, 0, 0, 0, 0, 0], stats.get("mdRaw"), stats.get("mdPct") + this.externalStats.get("mdPct"), 0, this.weapon, this.total_skillpoints, this.damageMultiplier, this.externalStats);
let damage_mult = 1;
if (this.weapon.get("type") === "relik") {
console.log("ASDFASDFASDFA");
damage_mult = 0.99; // CURSE YOU WYNNCRAFT
}
// 0spellmult for melee damage.
let results = calculateSpellDamage(stats, [100, 0, 0, 0, 0, 0], stats.get("mdRaw"), stats.get("mdPct") + this.externalStats.get("mdPct"), 0, this.weapon, this.total_skillpoints, damage_mult * this.damageMultiplier, this.externalStats);
let dex = this.total_skillpoints[1];

4
display.js
View file

@ -402,7 +402,7 @@ function displayBuildStats(parent_id,build){
title.textContent = "Effective Life Steal:"
let value = document.createElement("td");
let defStats = build.getDefenseStats();
value.textContent = Math.round(defStats[1][0]*id_val/defStats[0]) + "/4s";
value.textContent = Math.round(defStats[1][0]*id_val/defStats[0]) + "/3s";
value.classList.add("right");
value.classList.add(style);
row.appendChild(title);
@ -2485,4 +2485,4 @@ function stringCDF(id,val,base) {
document.getElementById(id + "-cdf").appendChild(b2);
document.getElementById(id + "-cdf").appendChild(b3);
document.getElementById(id + "-cdf").style.textAlign = "left";
}
}