Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree

builder/index_full.html

@@ -49,7 +49,7 @@
                             <div class="col-auto rounded order-xl-0 order-0">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="helmet-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="helmet-img-loc">
-                                        <img id="helmet-img" class="img-fluid rounded" src="../media/items/new/generic-helmet.png">
+                                        <div id="helmet-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 45.45454545454546% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -76,7 +76,7 @@
                             <div class="col-auto order-xl-0 order-1">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="ring1-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="ring1-img-loc">
-                                        <img id="ring1-img" class="img-fluid rounded" src="../media/items/new/generic-ring.png">
+                                        <div id="ring1-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 81.81818181818181% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -103,7 +103,7 @@
                             <div class="col-auto order-xl-0 order-0">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="chestplate-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="chestplate-img-loc">
-                                        <img id="chestplate-img" class="img-fluid rounded" src="../media/items/new/generic-chestplate.png">
+                                        <div id="chestplate-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 54.54545454545454% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -130,7 +130,7 @@
                             <div class="col-auto order-xl-0 order-1">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="ring2-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="ring2-img-loc">
-                                        <img id="ring2-img" class="img-fluid rounded" src="../media/items/new/generic-ring.png">
+                                        <div id="ring2-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 81.81818181818181% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -156,7 +156,7 @@
                             <div class="col-auto order-xl-0 order-0">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="leggings-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="leggings-img-loc">
-                                        <img id="leggings-img" class="img-fluid rounded" src="../media/items/new/generic-leggings.png">
+                                        <div id="leggings-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 63.63636363636363% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -183,7 +183,7 @@
                             <div class="col-auto order-xl-0 order-1">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="bracelet-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="bracelet-img-loc">
-                                        <img id="bracelet-img" class="img-fluid rounded" src="../media/items/new/generic-bracelet.png">
+                                        <div id="bracelet-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 90.90909090909092% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -210,7 +210,7 @@
                             <div class="col-auto order-xl-0 order-0">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="boots-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="boots-img-loc">
-                                        <img id="boots-img" class="img-fluid rounded" src="../media/items/new/generic-boots.png">
+                                        <div id="boots-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 72.72727272727272% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -237,7 +237,7 @@
                             <div class="col-auto order-xl-0 order-1">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id="necklace-dropdown">
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="necklace-img-loc">
-                                        <img id="necklace-img" class="img-fluid rounded" src="../media/items/new/generic-necklace.png">
+                                        <div id="necklace-img" class="img-fluid rounded item-display-new-toggleable" style="background-image: url('../media/items/new.png'); background-position: 100% 0;"></div>
                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -263,8 +263,8 @@
                             <div class="col-auto order-xl-0 order-1">
                                 <div class="row h-100 dark-shadow dark-6 rounded" id='weapon-dropdown'>
                                     <div class="col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon" id="weapon-img-loc">
-                                        <img id="weapon-img" class="img-fluid rounded" src="../media/items/new/generic-dagger.png">
+                                        <div id="weapon-img" class="img-fluid rounded item-display-new-toggleable"></div>
-                                    </div>
+background-image: url('../media/items/new.png');                                     </div>
                                     <div class="col-3">
                                         <div class="row row-cols-1 h-100 align-items-center">
                                             <div class="col text-nowrap scaled-font fw-bold gx-3 Damage base_dps" id="weapon-dps">
@@ -620,7 +620,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='weaponTome1-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="weaponTome1-img-loc">
-                                                        <img id="weaponTome1-img" class="img-fluid rounded" src="../media/items/new/generic-weaponTome.png">
+                                                        <div id="weaponTome1-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -644,7 +644,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='weaponTome2-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="weaponTome2-img-loc">
-                                                        <img id="weaponTome2-img" class="img-fluid rounded" src="../media/items/new/generic-weaponTome.png">
+                                                        <div id="weaponTome2-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -668,7 +668,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='armorTome1-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="armorTome1-img-loc">
-                                                        <img id="armorTome1-img" class="img-fluid rounded" src="../media/items/new/generic-armorTome.png">
+                                                        <div id="armorTome1-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -692,7 +692,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='armorTome2-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="armorTome2-img-loc">
-                                                        <img id="armorTome2-img" class="img-fluid rounded" src="../media/items/new/generic-armorTome.png">
+                                                        <div id="armorTome2-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -716,7 +716,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='armorTome3-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="armorTome3-img-loc">
-                                                        <img id="armorTome3-img" class="img-fluid rounded" src="../media/items/new/generic-armorTome.png">
+                                                        <div id="armorTome3-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -740,7 +740,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='armorTome4-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="armorTome4-img-loc">
-                                                        <img id="armorTome4-img" class="img-fluid rounded" src="../media/items/new/generic-armorTome.png">
+                                                        <div id="armorTome4-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -764,7 +764,7 @@
                                             <div class="col-auto rounded">
                                                 <div class="row h-100 dark-shadow rounded" id='guildTome1-dropdown'>
                                                     <div class="col-auto g-0 rounded-end my-auto text-center scaled-item-icon" id="guildTome1-img-loc">
-                                                        <img id="guildTome1-img" class="img-fluid rounded" src="../media/items/new/generic-guildTome.png">
+                                                        <div id="guildTome1-img" class="img-fluid rounded tome-image"></div>
                                                     </div>
                                                     <div class="col-3">
                                                         <div class="row row-cols-1 h-100 align-items-center">
@@ -1262,7 +1262,7 @@
     <script type="text/javascript" src="../js/utils.js"></script>
     <script type="text/javascript" src="../js/build_utils.js"></script>
     <script type="text/javascript" src="../js/computation_graph.js"></script>
-    <script type="text/javascript" src="../js/sq2icons.js"></script>
+    <script type="text/javascript" src="../js/icons.js"></script>
     <script type="text/javascript" src="../js/powders.js"></script>
     <script type="text/javascript" src="../js/skillpoints.js"></script>
     <script type="text/javascript" src="../js/damage_calc.js"></script>

crafter/index.html

@@ -39,7 +39,7 @@
                         <div class="col" id="recipe-dropdown">
                             <div class="row dark-shadow dark-5 rounded">
                                 <div id = "recipe-img-loc" class = "col-auto px-lg-1 g-0 dark-7 rounded-end my-auto text-center scaled-item-icon">
-                                    <img id = "recipe-img" class = "img-fluid rounded Crafted-shadow" src = "../media/items/new/generic-potion.png"> 
+                                    <div id = "recipe-img" class = "img-fluid rounded Crafted-shadow" style = "background-image: url('../media/items/common.png'); image-rendering: pixelated; background-position: 25% 0; aspect-ratio: 1/1;"></div>
                                 </div>
                                 <div class = "col ps-3">
                                     <div class = "row row-cols-2 align-items-center">
@@ -283,7 +283,7 @@
         <script type="text/javascript" src="../js/query_2.js"></script>
         <script type="text/javascript" src="../js/utils.js"></script>
         <script type="text/javascript" src="../js/build_utils.js"></script>
-        <script type="text/javascript" src="../js/sq2icons.js"></script>       
+        <script type="text/javascript" src="../js/icons.js"></script>       
         <script type="text/javascript" src="../js/powders.js"></script>
         <script type="text/javascript" src="../js/skillpoints.js"></script>
         <script type="text/javascript" src="../js/damage_calc.js"></script>

css/sq2bs.css

@@ -463,3 +463,16 @@ a:hover {
 .ferricles{
     color: #5be553;
 }
+
+.item-display-new-toggleable {
+    image-rendering: pixelated;
+    background-size: 1200% 100%;
+    aspect-ratio: 1/1;
+}
+.tome-image {
+    background-image: url('../media/items/common.png');
+    image-rendering: pixelated;
+    background-size: 500% 100%;
+    background-position: 100% 0;
+    aspect-ratio: 1/1;
+}

dev/index.html

@@ -959,7 +959,7 @@
         </div> -->
     </div>
     <script type="text/javascript" src="../js/dev.js"></script>
-    <script type="text/javascript" src="../js/sq2icons.js"></script>
+    <script type="text/javascript" src="../js/icons.js"></script>
 </body>
 
 </html>

items_adv/items_2_help.html

@@ -221,6 +221,6 @@
               docsFns.append(genDocEntry(entry[0], entry[1], null, entry[2]));
             }
         </script>
-        <script type="text/javascript" src="../js/sq2icons.js"></script>
+        <script type="text/javascript" src="../js/icons.js"></script>
     </body>
 </html>

js/atree.js

@@ -371,11 +371,11 @@ const atree_validate = new (class extends ComputeNode {
             const abil = node.ability;
             if (atree_state.get(abil.id).active) {
                 atree_to_add.push([node, 'not reachable', false]);
-                atree_state.get(abil.id).img.src = '../media/atree/' + abil.display.icon + '_selected.png';
+                atree_state.get(abil.id).img.style.backgroundPosition = atlasBGPositionCalc([atreeNodeAtlasPositions[abil.display.icon], 2], atreeNodeAtlasSize);
             }
             else {
                 atree_not_present.push(abil.id);
-                atree_state.get(abil.id).img.src = '../media/atree/' + abil.display.icon + '_blocked.png';
+                atree_state.get(abil.id).img.style.backgroundPosition = atlasBGPositionCalc([atreeNodeAtlasPositions[abil.display.icon], 0], atreeNodeAtlasSize);
             }
         }
 
@@ -424,7 +424,7 @@ const atree_validate = new (class extends ComputeNode {
             const node = atree_state.get(node_id);
             const [success, hard_error, reason] = abil_can_activate(node, atree_state, reachable, archetype_count, ap_left);
             if (success) {
-                node.img.src = '../media/atree/'+node.ability.display.icon+'.png';
+                node.img.style.backgroundPosition = atlasBGPositionCalc([atreeNodeAtlasPositions[node.ability.display.icon], 1], atreeNodeAtlasSize);
             }
         }
 
@@ -976,7 +976,7 @@ function render_AT(UI_elem, list_elem, tree) {
             const parent_id = parent_abil.id;
 
             let connect_elem = document.createElement("div");
-            connect_elem.style = "background-size: cover; width: 200%; height: 200%; position: absolute; top: -50%; left: -50%; image-rendering: pixelated;";
+            connect_elem.style = "width: 112.5%; height: 112.5%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); image-rendering: pixelated; background-image: url('../media/atree/connectors.png'); background-size: 1700% 500%;"
             // connect up
             for (let i = ability.display.row - 1; i > parent_abil.display.row; i--) {
                 const coord = i + "," + ability.display.col;
@@ -1011,17 +1011,9 @@ function render_AT(UI_elem, list_elem, tree) {
         }
 
         // create node
-        let node_elem = document.createElement('div');
+        let node_elem = document.getElementById("atree-row-" + ability.display.row).children[ability.display.col];
-        let icon = ability.display.icon;
+        node_wrap.img = make_elem("div", [], {style: "width: 200%; height: 200%; position: absolute; top: -50%; left: -50%; image-rendering: pixelated; z-index: 1; background-image: url('../media/atree/icons.png'); background-size: 900% 300%;"})
-        if (icon === undefined) {
+        node_elem.appendChild(node_wrap.img);
-            icon = "node";
-        }
-        let node_img = document.createElement('img');
-        node_img.src = '../media/atree/'+icon+'.png';
-        node_img.style = "width: 200%; height: 200%; position: absolute; top: -50%; left: -50%; image-rendering: pixelated; z-index: 1;";
-        node_elem.appendChild(node_img);
-
-        node_wrap.img = node_img;
 
         // create hitbox
         // this is necessary since images exceed the size of their square, but should only be interactible within that square
@@ -1059,8 +1051,6 @@ function render_AT(UI_elem, list_elem, tree) {
                 delete node_wrap.tooltip_elem;
             }
         });
-
-        document.getElementById("atree-row-" + ability.display.row).children[ability.display.col].appendChild(node_elem);
     };
     atree_render_connection(atree_connectors_map);
 
@@ -1236,26 +1226,6 @@ function set_connector_type(connector_info) {  // left right up down
     }
 }
 
-// draw the connector onto the screen
-function atree_render_connection(atree_connectors_map) {
-    for (let i of atree_connectors_map.keys()) {
-        let connector_info = atree_connectors_map.get(i);
-        let connector_elem = connector_info.connector;
-        let connector_img = document.createElement('img');
-        set_connector_type(connector_info);
-        connector_img.src = '../media/atree/connect_'+connector_info.type+'.png';
-        connector_img.style = "width: 100%; height: 100%;"
-        connector_elem.replaceChildren(connector_img);
-        connector_info.highlight = [0, 0, 0, 0];
-        let target_elem = document.getElementById("atree-row-" + i.split(",")[0]).children[i.split(",")[1]];
-        if (target_elem.children.length != 0) {
-            // janky special case...
-            connector_elem.style.display = 'none';
-        }
-        target_elem.appendChild(connector_elem);
-    };
-};
-
 // toggle the state of a node.
 function atree_set_state(node_wrapper, new_state) {
     let icon = node_wrapper.ability.display.icon;
@@ -1264,11 +1234,11 @@ function atree_set_state(node_wrapper, new_state) {
     }
     if (new_state) {
         node_wrapper.active = true;
-        node_wrapper.elem.children[0].src = "../media/atree/" + icon + "_selected.png";
+        node_wrapper.img.style.backgroundPosition = atlasBGPositionCalc([atreeNodeAtlasPositions[icon], 2], atreeNodeAtlasSize);
     } 
     else {
         node_wrapper.active = false;
-        node_wrapper.elem.children[0].src = "../media/atree/" + icon + ".png";
+        node_wrapper.img.style.backgroundPosition = atlasBGPositionCalc([atreeNodeAtlasPositions[icon], 1], atreeNodeAtlasSize);
     }
     let atree_connectors_map = node_wrapper.all_connectors_ref;
     for (const parent of node_wrapper.parents) {
@@ -1283,6 +1253,62 @@ function atree_set_state(node_wrapper, new_state) {
     }
 };
 
+// first key is connector type, second key is highlight, then [x, y] pair of 0-index positions in the tile atlas
+const atreeConnectorAtlasPositions = {
+    "1100": {"0000": [0, 0], "1100": [1, 0]},
+    "1010": {"0000": [2, 0], "1010": [3, 0]},
+    "0110": {"0000": [4, 0], "0110": [5, 0]},
+    "1001": {"0000": [6, 0], "1001": [7, 0]},
+    "0101": {"0000": [8, 0], "0101": [9, 0]},
+    "0011": {"0000": [10, 0], "0011": [11, 0]},
+    "1101": {"0000": [0, 1], "1101": [1, 1], "1100": [2, 1], "1001": [3, 1], "0101": [4, 1]},
+    "0111": {"0000": [5, 1], "0111": [6, 1], "0110": [7, 1], "0101": [8, 1], "0011": [9, 1]},
+    "1110": {"0000": [0, 2], "1110": [1, 2], "1100": [2, 2], "1010": [3, 2], "0110": [4, 2]},
+    "1011": {"0000": [5, 2], "1011": [6, 2], "1010": [7, 2], "1001": [8, 2], "0011": [9, 2]},
+    "1111": {"0000": [0, 3], "1111": [1, 3], "1110": [2, 3], "1101": [3, 3], "1100": [4, 3], "1011": [5, 3], "1010": [6, 3], "1001": [7, 3], "0111": [8, 3], "0110": [9, 3], "0101": [10, 3], "0011": [11, 3]}
+}
+const atreeConnectorAtlasSize = [17, 5]
+// just has the x position, y is based on state
+const atreeNodeAtlasPositions = {
+    "node_0": 0,
+    "node_1": 1,
+    "node_2": 2,
+    "node_3": 3,
+    "node_archer": 4,
+    "node_warrior": 5,
+    "node_mage": 6,
+    "node_assassin": 7,
+    "node_shaman": 8
+}
+const atreeNodeAtlasSize = [9, 3]
+function atlasBGPositionCalc(pos, atlasSize) {
+    // https://css-tricks.com/focusing-background-image-precise-location-percentages/
+    // p = (c + 0.5/z - 0.5) * z/(z - 1) + 0.5
+    // z = num tiles in direction
+    // c = starting pos of tile in percent of total atlas (equal to index/z)
+    let x = ((pos[0]/atlasSize[0]) + 0.5/atlasSize[0] - 0.5) * atlasSize[0]/(atlasSize[0] - 1) + 0.5
+    let y = ((pos[1]/atlasSize[1]) + 0.5/atlasSize[1] - 0.5) * atlasSize[1]/(atlasSize[1] - 1) + 0.5
+    return (x * 100) + "% " + (y * 100) + "%" // multiply by 100 to convert decimal to percent
+}
+
+// draw the connector onto the screen
+function atree_render_connection(atree_connectors_map) {
+    for (let i of atree_connectors_map.keys()) {
+        let connector_info = atree_connectors_map.get(i);
+        let connector_elem = connector_info.connector;
+        set_connector_type(connector_info);
+        connector_info.highlight = [0, 0, 0, 0];
+        connector_elem.style.backgroundPosition = atlasBGPositionCalc(atreeConnectorAtlasPositions[connector_info.type]["0000"], atreeConnectorAtlasSize);
+        let target_elem = document.getElementById("atree-row-" + i.split(",")[0]).children[i.split(",")[1]];
+        if (target_elem.children.length != 0) {
+            // janky special case...
+            connector_elem.style.display = 'none';
+        }
+        target_elem.appendChild(connector_elem);
+    };
+};
+
+// update the connector (after being drawn the first time by atree_render_connection)
 function atree_set_edge(atree_connectors_map, parent, child, state) {
     const connectors = child.connectors.get(parent);
     const parent_row = parent.ability.display.row;
@@ -1297,8 +1323,6 @@ function atree_set_edge(atree_connectors_map, parent, child, state) {
         let connector_info = atree_connectors_map.get(connector_label);
         let connector_elem = connector_info.connector;
         let highlight_state = connector_info.highlight; // left right up down
-        let connector_img_elem = document.createElement("img");
-        connector_img_elem.style = "width: 100%; height: 100%;";
         const ctype = connector_info.type;
         let num_1s = 0;
         for (let i = 0; i < 4; i++) {
@@ -1326,23 +1350,16 @@ function atree_set_edge(atree_connectors_map, parent, child, state) {
             for (let i = 0; i < 4; i++) {
                 render += highlight_state[i] === 0 ? "0" : "1";
             }
-            if (render == "0000") {
+            connector_elem.style.backgroundPosition = atlasBGPositionCalc(atreeConnectorAtlasPositions[ctype][render], atreeConnectorAtlasSize);
-                connector_img_elem.src = "../media/atree/connect_" + ctype + ".png";
-            } else {
-                connector_img_elem.src = "../media/atree/connect_" + ctype + "_" + render + ".png";
-            }
-            connector_elem.replaceChildren(connector_img_elem);
             continue;
-        }
+        } else {
-        // lol bad overloading, [0] is just the whole state
+            // lol bad overloading, [0] is just the whole state
-        highlight_state[0] += state_delta;
+            highlight_state[0] += state_delta;
-        if (highlight_state[0] > 0) {
+            if (highlight_state[0] > 0) {
-            connector_img_elem.src = '../media/atree/connect_' + ctype + '_1.png';
+                connector_elem.style.backgroundPosition = atlasBGPositionCalc(atreeConnectorAtlasPositions[ctype][ctype], atreeConnectorAtlasSize);
-            connector_elem.replaceChildren(connector_img_elem);
+            } else {
-        }
+                connector_elem.style.backgroundPosition = atlasBGPositionCalc(atreeConnectorAtlasPositions[ctype]["0000"], atreeConnectorAtlasSize);
-        else {
+            }
-            connector_img_elem.src = '../media/atree/connect_'+ctype+'.png';
-            connector_elem.replaceChildren(connector_img_elem);
         }
     }
 }

js/builder_graph.js

@@ -312,7 +312,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];

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

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", [], {
+                        let img = make_elem("div", [], {
-                            src: "../media/items/" + (newIcons ? "new/":"old/") + "generic-" + item.get("type") + ".png",
                             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"

js/icons.js

@@ -1,33 +1,26 @@
-//which icons to use
 let window_storage = window.localStorage;
-icon_state_stored = window_storage.getItem("newicons");
 newIcons = true;
-if (icon_state_stored === "false") {toggleIcons()} 
+if (window_storage.getItem("newicons") === "false") {
+    toggleIcons();
+} 
 
 /** Toggle icons on the ENTIRE page.
  * 
  */
 function toggleIcons() {
     newIcons = !newIcons;
-    let imgs = document.getElementsByTagName("IMG");
+    window_storage.setItem("newicons", newIcons.toString());
-    let favicon = document.querySelector("link[rel~='icon']");
+    let newOrOld = (newIcons ? "new" : "old");
-    let toggleiconbutton = document.getElementById("toggle-icon-button");
 
-    if (newIcons) { //switch to new
+    let imgs = document.getElementsByTagName("img");
-        favicon.href = favicon.href.replace("media/icons/old","media/icons/new");
+    let divs = document.getElementsByClassName("item-display-new-toggleable");
-        for (const img of imgs) {
+    let favicon = document.querySelector("link[rel~='icon']");
-            if (img.src.includes("media/icons/old")) {img.src = img.src.replace("media/icons/old","media/icons/new");}
+    favicon.href = favicon.href.replace("media/icons/" + (newIcons ? "old" : "new"), "media/icons/" + newOrOld);
-            if (img.src.includes("media/items/old")) {img.src = img.src.replace("media/items/old","media/items/new");}
+    for (const img of imgs) {
-        }
+        // if doesn't contain, replace() does nothing
-        toggleiconbutton.textContent = "Use Old Icons";
+        img.src = img.src.replace("media/icons/" + (newIcons ? "old" : "new"), "media/icons/" + newOrOld);
-        window_storage.setItem("newicons","true");
+    }
-    } else { //switch to old
+    for (let i = 0; i < divs.length; i++) {
-        favicon.href = favicon.href.replace("media/icons/new","media/icons/old");
+        divs.item(i).style.backgroundImage = "url('../media/items/" + (newIcons ? "new" : "old") + ".png')";
-        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");
-     }
 }

js/sq2icons.js

@@ -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");
-   }
-}