diff --git a/items/index.html b/items/index.html index c35a4aa..f50a15c 100644 --- a/items/index.html +++ b/items/index.html @@ -140,13 +140,12 @@ - - + diff --git a/js/damage_calc.js b/js/damage_calc.js index a8b0b72..ce4f32a 100644 --- a/js/damage_calc.js +++ b/js/damage_calc.js @@ -5,6 +5,7 @@ function get_base_dps(item) { //SUPER JANK @HPP PLS FIX if (item.get("tier") !== "Crafted") { let total_damage = 0; + apply_weapon_powders(item); for (const damage_k of damage_keys) { damages = item.get(damage_k); total_damage += damages[0] + damages[1]; diff --git a/js/sq2items.js b/js/sq2items.js index c3c7185..811cf0d 100644 --- a/js/sq2items.js +++ b/js/sq2items.js @@ -184,7 +184,8 @@ function displayItems(items_copy) { box.appendChild(bckgrdbox); bckgrdbox.id = "item"+i+"b"; items_parent.appendChild(box); - displaysq2ExpandedItem(item, bckgrdbox.id); + item.set("powders", []); + displayExpandedItem(item, bckgrdbox.id, true); } } @@ -251,6 +252,11 @@ function resetItemSearch() { function init_items() { items_expanded = items.filter( (i) => !("remapID" in i) ).map( (i) => expandItem(i) ); + console.log(items_expanded); + console.log("a"); } -load_init(init_items); +(async function() { + await Promise.resolve(load_init()); + init_items(); +})();