Migrate armor powder sliders to use new slider util functions
This commit is contained in:
parent
a5cffc6266
commit
148d51924e
5 changed files with 28 additions and 63 deletions
|
@ -1055,11 +1055,6 @@
|
||||||
<div class="col eDam">
|
<div class="col eDam">
|
||||||
Rage (Passive)
|
Rage (Passive)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<input type = "range" class = "e_slider" id = "str_boost_armor" name = "str-boost-armor" autocomplete = "off" min = '0' max = '400' value = '0' step = '1' onchange = "update_armor_powder_specials('str_boost_armor')">
|
|
||||||
<input type="text" id="str_boost_armor_prev" autocomplete = "off" value="0" style = "display:none;">
|
|
||||||
<label id = "str_boost_armor_label" for="str-boost-armor">% Earth Dmg Boost: 0</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col" id="dex-boost" style="display: none;">
|
<div class="col" id="dex-boost" style="display: none;">
|
||||||
|
@ -1099,11 +1094,6 @@
|
||||||
<div class="col tDam">
|
<div class="col tDam">
|
||||||
Kill Streak (Passive)
|
Kill Streak (Passive)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<input type = "range" class = "t_slider" id = "dex_boost_armor" name = "dex-boost-armor" autocomplete = "off" min = '0' max = '200' value = '0' step = '1' onchange = "update_armor_powder_specials('dex_boost_armor')">
|
|
||||||
<input type="text" id="dex_boost_armor_prev" autocomplete = "off" value="0" style = "display:none;">
|
|
||||||
<label id = "dex_boost_armor_label" for="dex-boost-armor">% Thunder Dmg Boost: 0</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col" id="int-boost">
|
<div class="col" id="int-boost">
|
||||||
|
@ -1143,11 +1133,6 @@
|
||||||
<div class="col wDam">
|
<div class="col wDam">
|
||||||
Concentration (Passive)
|
Concentration (Passive)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<input type = "range" class = "w_slider" id = "int_boost_armor" name = "dex-boost-armor" autocomplete = "off" min = '0' max = '150' value = '0' step = '1' onchange = "update_armor_powder_specials('int_boost_armor')">
|
|
||||||
<input type="text" id="int_boost_armor_prev" autocomplete = "off" value="0" style = "display:none;">
|
|
||||||
<label id = "int_boost_armor_label" for="dex-boost-armor">% Water Dmg Boost: 0</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col" id="def-boost" style="display: none;">
|
<div class="col" id="def-boost" style="display: none;">
|
||||||
|
@ -1187,11 +1172,6 @@
|
||||||
<div class="col fDam">
|
<div class="col fDam">
|
||||||
Endurance (Passive)
|
Endurance (Passive)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<input type = "range" class = "f_slider" id = "def_boost_armor" name = "def-boost-armor" autocomplete = "off" min = '0' max = '200' value = '0' step = '1' onchange = "update_armor_powder_specials('def_boost_armor')">
|
|
||||||
<input type="text" id="def_boost_armor_prev" autocomplete = "off" value="0" style = "display:none;">
|
|
||||||
<label id = "def_boost_armor_label" for="def-boost-armor">% Fire Dmg Boost: 0</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col" id="agi-boost" style="display: none;">
|
<div class="col" id="agi-boost" style="display: none;">
|
||||||
|
@ -1231,11 +1211,6 @@
|
||||||
<div class="col aDam">
|
<div class="col aDam">
|
||||||
Dodge (Passive)
|
Dodge (Passive)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<input type = "range" class = "a_slider" id = "agi_boost_armor" name = "agi-boost-armor" autocomplete = "off" min = '0' max = '150' value = '0' step = '1' onchange = "update_armor_powder_specials('agi_boost_armor')">
|
|
||||||
<input type="text" id="agi_boost_armor_prev" autocomplete = "off" value="0" style = "display:none;">
|
|
||||||
<label id = "agi_boost_armor_label" for="agi-boost-armor">% Air Dmg Boost: 0</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
/* builder containers */
|
/* builder containers */
|
||||||
|
|
||||||
|
|
||||||
.e_slider, .t_slider, .w_slider, .f_slider, .a_slider {
|
.slider {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
background: #AAAAAA;
|
background: #AAAAAA;
|
||||||
border-radius: 30px;
|
border-radius: 30px;
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/***** Chrome, Safari, Opera, and Edge Chromium *****/
|
/***** Chrome, Safari, Opera, and Edge Chromium *****/
|
||||||
.e_slider::-webkit-slider-runnable-track, .t_slider::-webkit-slider-runnable-track, .w_slider::-webkit-slider-runnable-track, .f_slider::-webkit-slider-runnable-track, .a_slider::-webkit-slider-runnable-track {
|
.slider::-webkit-slider-runnable-track{
|
||||||
-webkit-appeareance: none;
|
-webkit-appeareance: none;
|
||||||
background:transparent;
|
background:transparent;
|
||||||
height: 0.5rem;
|
height: 0.5rem;
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
|
|
||||||
/******** Firefox **** **/
|
/******** Firefox **** **/
|
||||||
.e_slider::-moz-range-track, .t_slider::-moz-range-track, .w_slider::-moz-range-track, .f_slider::-moz-range-track, .a_slider::-moz-range-track {
|
.slider::-moz-range-track {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
border-radius: 30px;
|
border-radius: 30px;
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.e_slider::-webkit-slider-thumb, .t_slider::-webkit-slider-thumb, .w_slider::-webkit-slider-thumb, .f_slider::-webkit-slider-thumb, .a_slider::-webkit-slider-thumb {
|
.slider::-webkit-slider-thumb {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
appearance: none;
|
appearance: none;
|
||||||
height: 0.75rem;
|
height: 0.75rem;
|
||||||
|
|
|
@ -394,6 +394,18 @@ function init() {
|
||||||
for (const eq of equipment_keys) {
|
for (const eq of equipment_keys) {
|
||||||
document.querySelector("#"+eq+"-tooltip").addEventListener("click", () => collapse_element('#'+eq+'-tooltip'));
|
document.querySelector("#"+eq+"-tooltip").addEventListener("click", () => collapse_element('#'+eq+'-tooltip'));
|
||||||
}
|
}
|
||||||
|
for (let i = 0; i < 5; ++i) {
|
||||||
|
const powder_special = powderSpecialStats[i];
|
||||||
|
const elem_name = damageClasses[i+1]; // skip neutral
|
||||||
|
const elem_char = skp_elements[i]; // TODO: merge?
|
||||||
|
const skp_name = skp_order[i]; // TODO: merge?
|
||||||
|
const boost_parent = document.getElementById(skp_name+'-boost');
|
||||||
|
const slider_id = skp_name+'_boost_armor';
|
||||||
|
const label_name = "% " + elem_name + " Dmg Boost";
|
||||||
|
const slider_container = gen_slider_labeled({label_name: label_name, max: powder_special.cap, id: slider_id, color: elem_colors[i]});
|
||||||
|
boost_parent.appendChild(slider_container);
|
||||||
|
document.getElementById(slider_id).addEventListener("change", (_) => armor_powder_node.mark_dirty().update() );
|
||||||
|
}
|
||||||
|
|
||||||
// Masonry setup
|
// Masonry setup
|
||||||
let masonry = Macy({
|
let masonry = Macy({
|
||||||
|
|
|
@ -11,29 +11,7 @@ let armor_powder_node = new (class extends ComputeNode {
|
||||||
}
|
}
|
||||||
return statMap;
|
return statMap;
|
||||||
}
|
}
|
||||||
})().update();
|
})();
|
||||||
|
|
||||||
/* Updates PASSIVE powder special boosts (armors)
|
|
||||||
*/
|
|
||||||
function update_armor_powder_specials(elem_id) {
|
|
||||||
//we only update the powder special + external stats if the player has a build
|
|
||||||
let wynn_elem = elem_id.split("_")[0]; //str, dex, int, def, agi
|
|
||||||
|
|
||||||
//update the label associated w/ the slider
|
|
||||||
let elem = document.getElementById(elem_id);
|
|
||||||
let label = document.getElementById(elem_id + "_label");
|
|
||||||
let value = elem.value;
|
|
||||||
|
|
||||||
label.textContent = label.textContent.split(":")[0] + ": " + value
|
|
||||||
|
|
||||||
//update the slider's graphics
|
|
||||||
let bg_color = elem_colors[skp_order.indexOf(wynn_elem)];
|
|
||||||
let pct = Math.round(100 * value / powderSpecialStats[skp_order.indexOf(wynn_elem)].cap);
|
|
||||||
elem.style.background = `linear-gradient(to right, ${bg_color}, ${bg_color} ${pct}%, #AAAAAA ${pct}%, #AAAAAA 100%)`;
|
|
||||||
|
|
||||||
armor_powder_node.mark_dirty().update();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
let boosts_node = new (class extends ComputeNode {
|
let boosts_node = new (class extends ComputeNode {
|
||||||
constructor() { super('builder-boost-input'); }
|
constructor() { super('builder-boost-input'); }
|
||||||
|
@ -1116,6 +1094,7 @@ function builder_graph_init() {
|
||||||
for (const input_node of item_nodes.concat(powder_nodes)) {
|
for (const input_node of item_nodes.concat(powder_nodes)) {
|
||||||
input_node.update();
|
input_node.update();
|
||||||
}
|
}
|
||||||
|
armor_powder_node.update();
|
||||||
level_input.update();
|
level_input.update();
|
||||||
|
|
||||||
// kinda janky, manually set atree and update. Some wasted compute here
|
// kinda janky, manually set atree and update. Some wasted compute here
|
||||||
|
|
19
js/utils.js
19
js/utils.js
|
@ -758,20 +758,20 @@ function deepcopy(obj) {
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function gen_slider_labeled(label_name, label_classlist = [], min = 0, max = 100, step = 1, default_val = min, id = undefined, color = "#FFFFFF", classlist = []) {
|
function gen_slider_labeled({label_name, label_classlist = [], min = 0, max = 100, step = 1, default_val = min, id = undefined, color = "#FFFFFF", classlist = []}) {
|
||||||
let slider_container = document.createElement("div");
|
let slider_container = document.createElement("div");
|
||||||
slider_container.classList.add("row");
|
slider_container.classList.add("row");
|
||||||
|
|
||||||
let buf_col = document.createElement("div");
|
let buf_col = document.createElement("div");
|
||||||
buf_col.classList.add("col", "mx-1");
|
buf_col.classList.add("col", "mx-1");
|
||||||
|
|
||||||
let slider = gen_slider(min, max, step, default_val, id, color, classlist);
|
|
||||||
|
|
||||||
let label = document.createElement("div");
|
let label = document.createElement("div");
|
||||||
label.classList.add("col");
|
label.classList.add("col");
|
||||||
label.classList.add(...label_classlist);
|
label.classList.add(...label_classlist);
|
||||||
label.textContent = label_name + ": " + default_val;
|
label.textContent = label_name + ": " + default_val;
|
||||||
|
|
||||||
|
let slider = gen_slider(min, max, step, default_val, id, color, classlist, label);
|
||||||
|
|
||||||
//we set IDs here because the slider's id is potentially only meaningful after gen_slider() is called
|
//we set IDs here because the slider's id is potentially only meaningful after gen_slider() is called
|
||||||
label.id = slider.id + "-label";
|
label.id = slider.id + "-label";
|
||||||
slider_container.id = slider.id + "-container";
|
slider_container.id = slider.id + "-container";
|
||||||
|
@ -793,7 +793,7 @@ function gen_slider_labeled(label_name, label_classlist = [], min = 0, max = 100
|
||||||
* @param {Array<String>} classlist - A list of classes to add to the slider.
|
* @param {Array<String>} classlist - A list of classes to add to the slider.
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
function gen_slider(min = 0, max = 100, step = 1, default_val = min, id = undefined, color = "#FFFFFF", classlist = []) {
|
function gen_slider(min = 0, max = 100, step = 1, default_val = min, id = undefined, color = "#FFFFFF", classlist = [], label = undefined) {
|
||||||
//simple attribute vals
|
//simple attribute vals
|
||||||
let slider = document.createElement("input");
|
let slider = document.createElement("input");
|
||||||
slider.type = "range";
|
slider.type = "range";
|
||||||
|
@ -817,11 +817,11 @@ function gen_slider(min = 0, max = 100, step = 1, default_val = min, id = undefi
|
||||||
slider.style.webkitAppearance = "none";
|
slider.style.webkitAppearance = "none";
|
||||||
slider.style.borderRadius = "30px";
|
slider.style.borderRadius = "30px";
|
||||||
slider.style.height = "0.5rem";
|
slider.style.height = "0.5rem";
|
||||||
slider.classList.add("px-0");
|
slider.classList.add("px-0", "slider");
|
||||||
|
|
||||||
//set up recoloring
|
//set up recoloring
|
||||||
slider.addEventListener("change", function(e) {
|
slider.addEventListener("change", function(e) {
|
||||||
recolor_slider(slider.id);
|
recolor_slider(slider, label);
|
||||||
});
|
});
|
||||||
//do recoloring for the default val
|
//do recoloring for the default val
|
||||||
let pct = Math.round(100 * (parseInt(slider.value) - parseInt(slider.min)) / (parseInt(slider.max) - parseInt(slider.min)));
|
let pct = Math.round(100 * (parseInt(slider.value) - parseInt(slider.min)) / (parseInt(slider.max) - parseInt(slider.min)));
|
||||||
|
@ -833,15 +833,14 @@ function gen_slider(min = 0, max = 100, step = 1, default_val = min, id = undefi
|
||||||
|
|
||||||
/** Recolors a slider. If the corresponding label exists, also update that.
|
/** Recolors a slider. If the corresponding label exists, also update that.
|
||||||
*
|
*
|
||||||
* @param {String} id - the ID of the slider
|
* @param {slider} slider - the slider element
|
||||||
|
* @param {label} label - the label element
|
||||||
*/
|
*/
|
||||||
function recolor_slider(id) {
|
function recolor_slider(slider, label) {
|
||||||
let slider = document.getElementById(id);
|
|
||||||
let color = slider.color;
|
let color = slider.color;
|
||||||
let pct = Math.round(100 * (parseInt(slider.value) - parseInt(slider.min)) / (parseInt(slider.max) - parseInt(slider.min)));
|
let pct = Math.round(100 * (parseInt(slider.value) - parseInt(slider.min)) / (parseInt(slider.max) - parseInt(slider.min)));
|
||||||
slider.style.background = `rgba(0, 0, 0, 0) linear-gradient(to right, ${color}, ${color} ${pct}%, #AAAAAA ${pct}%, #AAAAAA 100%)`;
|
slider.style.background = `rgba(0, 0, 0, 0) linear-gradient(to right, ${color}, ${color} ${pct}%, #AAAAAA ${pct}%, #AAAAAA 100%)`;
|
||||||
|
|
||||||
let label = document.getElementById(id + "-label");
|
|
||||||
if (label) {
|
if (label) {
|
||||||
//convention is that the number goes at the end... I parse by separating it at ':'
|
//convention is that the number goes at the end... I parse by separating it at ':'
|
||||||
label.textContent = label.textContent.split(":")[0] + ": " + slider.value;
|
label.textContent = label.textContent.split(":")[0] + ": " + slider.value;
|
||||||
|
|
Loading…
Reference in a new issue