Merge branch 'atree' into misc_bugfix

This commit is contained in:
hppeng 2022-07-16 19:18:44 -07:00
commit 855873fd66
6 changed files with 13 additions and 21 deletions

File diff suppressed because one or more lines are too long

View file

@ -974,7 +974,12 @@
</div>
<div class="col-auto p-1">
<button class="button-boost w-100 border-0 text-white dark-8u dark-shadow-sm" id="warscream-boost" onclick="update_boosts('warscream-boost')">
War Scream (+10%)
War Scream
</button>
</div>
<div class="col-auto p-1">
<button class="button-boost w-100 border-0 text-white dark-8u dark-shadow-sm" id="ragnarokkr-boost" onclick="update_boosts('ragnarokkr-boost')">
Ragnarokkr (+30%)
</button>
</div>
<div class="col-auto p-1">
@ -988,8 +993,8 @@
</button>
</div>
<div class="col-auto p-1">
<button class="button-boost w-100 border-0 text-white dark-8u dark-shadow-sm" id="bash-boost" onclick="update_boosts('bash-boost')">
Bash (+50%)
<button class="button-boost w-100 border-0 text-white dark-8u dark-shadow-sm" id="fortitude-boost" onclick="update_boosts('fortitude-boost')">
Fortitude (+60%)
</button>
</div>
</div>

View file

@ -3121,11 +3121,6 @@ const atrees = {
"type": "add_spell_prop",
"base_spell": 4,
"cost": 10
},
{
"type": "raw_stat",
"toggle": true,
"bonuses": [ {"type": "stat", "name": "damMult.Ragnarokkr", "value": 30} ]
}
]
},
@ -4888,15 +4883,7 @@ const atrees = {
"properties": {
"duration": 5
},
"effects": [{
"type": "raw_stat",
"toggle": true,
"bonuses": [{
"type": "stat",
"name": "damMult.Fortitude",
"value": 60
}]
}]
"effects": []
},
{
"display_name": "Pyrokinesis",

File diff suppressed because one or more lines are too long

View file

@ -23,7 +23,7 @@ let boosts_node = new (class extends ComputeNode {
let elem = document.getElementById(key + "-boost")
if (elem.classList.contains("toggleOn")) {
damage_boost += value;
if (key === "warscream") { def_boost += .20 }
if (key === "warscream") { def_boost += .10 }
if (key === "vanish") { def_boost += .15 }
}
}

View file

@ -1,4 +1,4 @@
const damageMultipliers = new Map([ ["allytotem", .15], ["yourtotem", .35], ["vanish", 0.80], ["warscream", 0.10], ["bash", 0.50] ]);
const damageMultipliers = new Map([ ["allytotem", .15], ["yourtotem", .35], ["vanish", 0.80], ["warscream", 0.00], ["ragnarokkr", 0.30], ["fortitude", 0.60] ]);
function get_base_dps(item) {
const attack_speed_mult = baseDamageMultiplier[attackSpeeds.indexOf(item.get("atkSpd"))];