Merge branch 'atree' into misc_bugfix
This commit is contained in:
commit
855873fd66
6 changed files with 13 additions and 21 deletions
File diff suppressed because one or more lines are too long
|
@ -974,7 +974,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto p-1">
|
<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')">
|
<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>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto p-1">
|
<div class="col-auto p-1">
|
||||||
|
@ -988,8 +993,8 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto p-1">
|
<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')">
|
<button class="button-boost w-100 border-0 text-white dark-8u dark-shadow-sm" id="fortitude-boost" onclick="update_boosts('fortitude-boost')">
|
||||||
Bash (+50%)
|
Fortitude (+60%)
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3121,11 +3121,6 @@ const atrees = {
|
||||||
"type": "add_spell_prop",
|
"type": "add_spell_prop",
|
||||||
"base_spell": 4,
|
"base_spell": 4,
|
||||||
"cost": 10
|
"cost": 10
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "raw_stat",
|
|
||||||
"toggle": true,
|
|
||||||
"bonuses": [ {"type": "stat", "name": "damMult.Ragnarokkr", "value": 30} ]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -4888,15 +4883,7 @@ const atrees = {
|
||||||
"properties": {
|
"properties": {
|
||||||
"duration": 5
|
"duration": 5
|
||||||
},
|
},
|
||||||
"effects": [{
|
"effects": []
|
||||||
"type": "raw_stat",
|
|
||||||
"toggle": true,
|
|
||||||
"bonuses": [{
|
|
||||||
"type": "stat",
|
|
||||||
"name": "damMult.Fortitude",
|
|
||||||
"value": 60
|
|
||||||
}]
|
|
||||||
}]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"display_name": "Pyrokinesis",
|
"display_name": "Pyrokinesis",
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -23,7 +23,7 @@ let boosts_node = new (class extends ComputeNode {
|
||||||
let elem = document.getElementById(key + "-boost")
|
let elem = document.getElementById(key + "-boost")
|
||||||
if (elem.classList.contains("toggleOn")) {
|
if (elem.classList.contains("toggleOn")) {
|
||||||
damage_boost += value;
|
damage_boost += value;
|
||||||
if (key === "warscream") { def_boost += .20 }
|
if (key === "warscream") { def_boost += .10 }
|
||||||
if (key === "vanish") { def_boost += .15 }
|
if (key === "vanish") { def_boost += .15 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
function get_base_dps(item) {
|
||||||
const attack_speed_mult = baseDamageMultiplier[attackSpeeds.indexOf(item.get("atkSpd"))];
|
const attack_speed_mult = baseDamageMultiplier[attackSpeeds.indexOf(item.get("atkSpd"))];
|
||||||
|
|
Loading…
Reference in a new issue