diff --git a/builder/index.html b/builder/index.html index 37b62f6..eec6e2b 100644 --- a/builder/index.html +++ b/builder/index.html @@ -1,2 +1,2 @@ - WynnBuilder
Join the discord today to suggest new features, submit bug reports, and hangout/talk to devs!
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
Level:
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Active boosts
Earth
Thunder
Water
Fire
Air
Curse (Active)
Concentration (Passive)
Offense
Defense
Overall
Input a weapon to see abilities!
\ No newline at end of file + WynnBuilder
Join the discord today to suggest new features, submit bug reports, and hangout/talk to devs!
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
Level:
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Assign: 0
Original: 0
Active boosts
Earth
Thunder
Water
Fire
Air
Curse (Active)
Concentration (Passive)
Offense
Defense
Overall
Input a weapon to see abilities!
\ No newline at end of file diff --git a/builder/index_full.html b/builder/index_full.html index fcf508e..4e7d217 100644 --- a/builder/index_full.html +++ b/builder/index_full.html @@ -49,7 +49,7 @@
- +
@@ -76,7 +76,7 @@
- +
@@ -103,7 +103,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -156,7 +156,7 @@
- +
@@ -183,7 +183,7 @@
- +
@@ -210,7 +210,7 @@
- +
@@ -237,7 +237,7 @@
- +
@@ -263,7 +263,7 @@
- +
@@ -620,7 +620,7 @@
- +
@@ -644,7 +644,7 @@
- +
@@ -668,7 +668,7 @@
- +
@@ -692,7 +692,7 @@
- +
@@ -716,7 +716,7 @@
- +
@@ -740,7 +740,7 @@
- +
@@ -764,7 +764,7 @@
- +
@@ -1262,7 +1262,7 @@ - + diff --git a/crafter/index.html b/crafter/index.html index 20e4a4c..34cacf7 100644 --- a/crafter/index.html +++ b/crafter/index.html @@ -39,7 +39,7 @@
- +
@@ -283,7 +283,7 @@ - + diff --git a/dev/index.html b/dev/index.html index 0ee432b..9aea30c 100644 --- a/dev/index.html +++ b/dev/index.html @@ -959,7 +959,7 @@
-->
- + diff --git a/items_adv/items_2_help.html b/items_adv/items_2_help.html index 9e89d9d..4736c14 100644 --- a/items_adv/items_2_help.html +++ b/items_adv/items_2_help.html @@ -221,6 +221,6 @@ docsFns.append(genDocEntry(entry[0], entry[1], null, entry[2])); } - + diff --git a/js/builder_graph.js b/js/builder_graph.js index 093f367..ff51b64 100644 --- a/js/builder_graph.js +++ b/js/builder_graph.js @@ -307,7 +307,8 @@ class WeaponInputDisplayNode extends ComputeNode { const [item] = input_map.values(); // Extract values, pattern match it into size one list and bind to first element const type = item.statMap.get('type'); - this.image.setAttribute('src', '../media/items/new/generic-'+type+'.png'); + this.image.style.backgroundPosition = itemBGPositions[type]; + let dps = get_base_dps(item.statMap); if (isNaN(dps)) { dps = dps[1]; diff --git a/js/crafter.js b/js/crafter.js index 865b740..4c19efe 100644 --- a/js/crafter.js +++ b/js/crafter.js @@ -345,9 +345,16 @@ function toggleMaterial(buttonId) { function updateCraftedImage() { let input = document.getElementById("recipe-choice"); if (all_types.includes(input.value)) { - document.getElementById("recipe-img").src = "../media/items/" + (newIcons ? "new/":"old/") + "generic-" + input.value.toLowerCase() + ".png"; + let img = document.getElementById("recipe-img"); + if (["potion", "scroll", "food"].includes(input.value.toLowerCase())) { + img.style.backgroundImage = "url('../media/items/common.png')"; + img.style.backgroundSize = "500% 100%"; + } else { + img.style.backgroundImage = "url('../media/items/" + (newIcons ? "new.png')" : "old.png')"); + img.style.backgroundSize = "1200% 100%"; + } + img.style.backgroundPosition = itemBGPositions[input.value.toLowerCase()] } - } /* Reset all fields diff --git a/js/display.js b/js/display.js index cfc064f..48eefb8 100644 --- a/js/display.js +++ b/js/display.js @@ -1,3 +1,7 @@ +const itemBGPositions = {"bow": "0 0", "spear": "9.090909090909088% 0", "wand": "18.181818181818183% 0", "dagger": "27.27272727272727% 0", "relik": "36.36363636363637% 0", + "helmet": "45.45454545454546% 0", "chestplate": "54.54545454545454% 0", "leggings": "63.63636363636363% 0", "boots": "72.72727272727272% 0", + "ring": "81.81818181818181% 0", "bracelet": "90.90909090909092% 0", "necklace": "100% 0", + "potion": "25% 0", "scroll": "50% 0", "food": "75% 0"}; function apply_elemental_format(p_elem, id, suffix) { suffix = (typeof suffix !== 'undefined') ? suffix : ""; @@ -286,11 +290,18 @@ function displayExpandedItem(item, parent_id){ parent_div.appendChild(nolink_row); if (item.has("type")) { - let img = make_elem("img", [], { - src: "../media/items/" + (newIcons ? "new/":"old/") + "generic-" + item.get("type") + ".png", + let img = make_elem("div", [], { alt: item.get("type"), - style: " z=index: 1; position: relative;" + style: "z-index: 1; position: relative; image-rendering: pixelated; width: 50%; height: 50%; background-position: " + itemBGPositions[item.get("type")] + ";" }); + if (["potion", "scroll", "food"].includes(item.get("type"))) { + img.style.backgroundImage = "url('../media/items/common.png')"; + img.style.backgroundSize = "500% 100%"; + } else { + img.style.backgroundImage = "url('../media/items/" + (newIcons ? "new.png')" : "old.png')"); + img.style.backgroundSize = "1200% 100%"; + } + let container = make_elem("div"); let bckgrd = make_elem("div", ["col", "px-0", "d-flex", "align-items-center", "justify-content-center", 'scaled-bckgrd'], { // , "no-collapse" diff --git a/js/icons.js b/js/icons.js index a796942..ddf9ef0 100644 --- a/js/icons.js +++ b/js/icons.js @@ -1,33 +1,39 @@ //which icons to use let window_storage = window.localStorage; +console.log(window_storage); icon_state_stored = window_storage.getItem("newicons"); newIcons = true; if (icon_state_stored === "false") {toggleIcons()} + /** Toggle icons on the ENTIRE page. * */ -function toggleIcons() { + function toggleIcons() { newIcons = !newIcons; - let imgs = document.getElementsByTagName("IMG"); + let imgs = document.getElementsByTagName("img"); + let divs = document.getElementsByTagName("div"); let favicon = document.querySelector("link[rel~='icon']"); - let toggleiconbutton = document.getElementById("toggle-icon-button"); if (newIcons) { //switch to new favicon.href = favicon.href.replace("media/icons/old","media/icons/new"); for (const img of imgs) { if (img.src.includes("media/icons/old")) {img.src = img.src.replace("media/icons/old","media/icons/new");} - if (img.src.includes("media/items/old")) {img.src = img.src.replace("media/items/old","media/items/new");} } - toggleiconbutton.textContent = "Use Old Icons"; + for (const div of divs) { + if (div.style.backgroundImage.includes("media/items/old")) {div.style.backgroundImage = div.style.backgroundImage.replace("media/items/old","media/items/new");} + } + //toggleiconbutton.textContent = "Use Old Icons"; window_storage.setItem("newicons","true"); } else { //switch to old favicon.href = favicon.href.replace("media/icons/new","media/icons/old"); for (const img of imgs) { if (img.src.includes("media/icons/new")) {img.src = img.src.replace("media/icons/new","media/icons/old");} - if (img.src.includes("media/items/new")) {img.src = img.src.replace("media/items/new","media/items/old");} } - toggleiconbutton.textContent = "Use New Icons"; + for (const div of divs) { + if (div.style.backgroundImage.includes("media/items/new")) {div.style.backgroundImage = div.style.backgroundImage.replace("media/items/new","media/items/old");} + } + //toggleiconbutton.textContent = "Use New Icons"; window_storage.setItem("newicons","false"); - } + } } \ No newline at end of file diff --git a/js/sq2icons.js b/js/sq2icons.js deleted file mode 100644 index 96b97b8..0000000 --- a/js/sq2icons.js +++ /dev/null @@ -1,34 +0,0 @@ -//which icons to use -let window_storage = window.localStorage; -console.log(window_storage); -icon_state_stored = window_storage.getItem("newicons"); -newIcons = true; -if (icon_state_stored === "false") {toggleIcons()} - - -/** Toggle icons on the ENTIRE page. - * - */ - function toggleIcons() { - newIcons = !newIcons; - let imgs = document.getElementsByTagName("IMG"); - let favicon = document.querySelector("link[rel~='icon']"); - - if (newIcons) { //switch to new - favicon.href = favicon.href.replace("media/icons/old","media/icons/new"); - for (const img of imgs) { - if (img.src.includes("media/icons/old")) {img.src = img.src.replace("media/icons/old","media/icons/new");} - if (img.src.includes("media/items/old")) {img.src = img.src.replace("media/items/old","media/items/new");} - } - //toggleiconbutton.textContent = "Use Old Icons"; - window_storage.setItem("newicons","true"); - } else { //switch to old - favicon.href = favicon.href.replace("media/icons/new","media/icons/old"); - for (const img of imgs) { - if (img.src.includes("media/icons/new")) {img.src = img.src.replace("media/icons/new","media/icons/old");} - if (img.src.includes("media/items/new")) {img.src = img.src.replace("media/items/new","media/items/old");} - } - //toggleiconbutton.textContent = "Use New Icons"; - window_storage.setItem("newicons","false"); - } -} \ No newline at end of file diff --git a/media/items/common.png b/media/items/common.png new file mode 100644 index 0000000..417c2ec Binary files /dev/null and b/media/items/common.png differ diff --git a/media/items/new.png b/media/items/new.png new file mode 100644 index 0000000..9a498f6 Binary files /dev/null and b/media/items/new.png differ diff --git a/media/items/new/generic-armorTome.png b/media/items/new/generic-armorTome.png deleted file mode 100644 index ba0833b..0000000 Binary files a/media/items/new/generic-armorTome.png and /dev/null differ diff --git a/media/items/new/generic-boots.png b/media/items/new/generic-boots.png deleted file mode 100644 index 35198d7..0000000 Binary files a/media/items/new/generic-boots.png and /dev/null differ diff --git a/media/items/new/generic-bow.png b/media/items/new/generic-bow.png deleted file mode 100644 index 9ab6c2a..0000000 Binary files a/media/items/new/generic-bow.png and /dev/null differ diff --git a/media/items/new/generic-bracelet.png b/media/items/new/generic-bracelet.png deleted file mode 100644 index 4683abe..0000000 Binary files a/media/items/new/generic-bracelet.png and /dev/null differ diff --git a/media/items/new/generic-chestplate.png b/media/items/new/generic-chestplate.png deleted file mode 100644 index 1231eae..0000000 Binary files a/media/items/new/generic-chestplate.png and /dev/null differ diff --git a/media/items/new/generic-dagger.png b/media/items/new/generic-dagger.png deleted file mode 100644 index dadc4c1..0000000 Binary files a/media/items/new/generic-dagger.png and /dev/null differ diff --git a/media/items/new/generic-food.png b/media/items/new/generic-food.png deleted file mode 100644 index 71c579c..0000000 Binary files a/media/items/new/generic-food.png and /dev/null differ diff --git a/media/items/new/generic-guildTome.png b/media/items/new/generic-guildTome.png deleted file mode 100644 index ba0833b..0000000 Binary files a/media/items/new/generic-guildTome.png and /dev/null differ diff --git a/media/items/new/generic-helmet.png b/media/items/new/generic-helmet.png deleted file mode 100644 index e8230b0..0000000 Binary files a/media/items/new/generic-helmet.png and /dev/null differ diff --git a/media/items/new/generic-leggings.png b/media/items/new/generic-leggings.png deleted file mode 100644 index 845fa01..0000000 Binary files a/media/items/new/generic-leggings.png and /dev/null differ diff --git a/media/items/new/generic-necklace.png b/media/items/new/generic-necklace.png deleted file mode 100644 index bbaa89f..0000000 Binary files a/media/items/new/generic-necklace.png and /dev/null differ diff --git a/media/items/new/generic-potion.png b/media/items/new/generic-potion.png deleted file mode 100644 index 53c29d0..0000000 Binary files a/media/items/new/generic-potion.png and /dev/null differ diff --git a/media/items/new/generic-relik.png b/media/items/new/generic-relik.png deleted file mode 100644 index ae690ba..0000000 Binary files a/media/items/new/generic-relik.png and /dev/null differ diff --git a/media/items/new/generic-ring.png b/media/items/new/generic-ring.png deleted file mode 100644 index b910021..0000000 Binary files a/media/items/new/generic-ring.png and /dev/null differ diff --git a/media/items/new/generic-scroll.png b/media/items/new/generic-scroll.png deleted file mode 100644 index ed4e8fd..0000000 Binary files a/media/items/new/generic-scroll.png and /dev/null differ diff --git a/media/items/new/generic-spear.png b/media/items/new/generic-spear.png deleted file mode 100644 index 89c46ab..0000000 Binary files a/media/items/new/generic-spear.png and /dev/null differ diff --git a/media/items/new/generic-sword.png b/media/items/new/generic-sword.png deleted file mode 100644 index 05243d0..0000000 Binary files a/media/items/new/generic-sword.png and /dev/null differ diff --git a/media/items/new/generic-wand.png b/media/items/new/generic-wand.png deleted file mode 100644 index cfebab9..0000000 Binary files a/media/items/new/generic-wand.png and /dev/null differ diff --git a/media/items/new/generic-weaponTome.png b/media/items/new/generic-weaponTome.png deleted file mode 100644 index ba0833b..0000000 Binary files a/media/items/new/generic-weaponTome.png and /dev/null differ diff --git a/media/items/new/palette.png b/media/items/new/palette.png deleted file mode 100644 index af1b1d5..0000000 Binary files a/media/items/new/palette.png and /dev/null differ diff --git a/media/items/old.png b/media/items/old.png new file mode 100644 index 0000000..d44a097 Binary files /dev/null and b/media/items/old.png differ diff --git a/media/items/old/generic-armorTome.png b/media/items/old/generic-armorTome.png deleted file mode 100644 index c46428d..0000000 Binary files a/media/items/old/generic-armorTome.png and /dev/null differ diff --git a/media/items/old/generic-boots.png b/media/items/old/generic-boots.png deleted file mode 100644 index e74bc1b..0000000 Binary files a/media/items/old/generic-boots.png and /dev/null differ diff --git a/media/items/old/generic-bow.png b/media/items/old/generic-bow.png deleted file mode 100644 index 1313b1d..0000000 Binary files a/media/items/old/generic-bow.png and /dev/null differ diff --git a/media/items/old/generic-bracelet.png b/media/items/old/generic-bracelet.png deleted file mode 100644 index 3dc5df2..0000000 Binary files a/media/items/old/generic-bracelet.png and /dev/null differ diff --git a/media/items/old/generic-chestplate.png b/media/items/old/generic-chestplate.png deleted file mode 100644 index 0f90a4c..0000000 Binary files a/media/items/old/generic-chestplate.png and /dev/null differ diff --git a/media/items/old/generic-dagger.png b/media/items/old/generic-dagger.png deleted file mode 100644 index f90e830..0000000 Binary files a/media/items/old/generic-dagger.png and /dev/null differ diff --git a/media/items/old/generic-food.png b/media/items/old/generic-food.png deleted file mode 100644 index afdaa5a..0000000 Binary files a/media/items/old/generic-food.png and /dev/null differ diff --git a/media/items/old/generic-guildTome.png b/media/items/old/generic-guildTome.png deleted file mode 100644 index c46428d..0000000 Binary files a/media/items/old/generic-guildTome.png and /dev/null differ diff --git a/media/items/old/generic-helmet.png b/media/items/old/generic-helmet.png deleted file mode 100644 index c085f9d..0000000 Binary files a/media/items/old/generic-helmet.png and /dev/null differ diff --git a/media/items/old/generic-leggings.png b/media/items/old/generic-leggings.png deleted file mode 100644 index 0747218..0000000 Binary files a/media/items/old/generic-leggings.png and /dev/null differ diff --git a/media/items/old/generic-necklace.png b/media/items/old/generic-necklace.png deleted file mode 100644 index 6f7d81a..0000000 Binary files a/media/items/old/generic-necklace.png and /dev/null differ diff --git a/media/items/old/generic-potion.png b/media/items/old/generic-potion.png deleted file mode 100644 index 93b4b7e..0000000 Binary files a/media/items/old/generic-potion.png and /dev/null differ diff --git a/media/items/old/generic-relik.png b/media/items/old/generic-relik.png deleted file mode 100644 index 0593e15..0000000 Binary files a/media/items/old/generic-relik.png and /dev/null differ diff --git a/media/items/old/generic-ring.png b/media/items/old/generic-ring.png deleted file mode 100644 index 744ba7f..0000000 Binary files a/media/items/old/generic-ring.png and /dev/null differ diff --git a/media/items/old/generic-scroll.png b/media/items/old/generic-scroll.png deleted file mode 100644 index 168a430..0000000 Binary files a/media/items/old/generic-scroll.png and /dev/null differ diff --git a/media/items/old/generic-spear.png b/media/items/old/generic-spear.png deleted file mode 100644 index 96299d6..0000000 Binary files a/media/items/old/generic-spear.png and /dev/null differ diff --git a/media/items/old/generic-sword.png b/media/items/old/generic-sword.png deleted file mode 100644 index 3317427..0000000 Binary files a/media/items/old/generic-sword.png and /dev/null differ diff --git a/media/items/old/generic-wand.png b/media/items/old/generic-wand.png deleted file mode 100644 index 2aa60f5..0000000 Binary files a/media/items/old/generic-wand.png and /dev/null differ diff --git a/media/items/old/generic-weaponTome.png b/media/items/old/generic-weaponTome.png deleted file mode 100644 index c46428d..0000000 Binary files a/media/items/old/generic-weaponTome.png and /dev/null differ