diff --git a/credits.txt b/credits.txt index 6b9ab70..41ef4d1 100644 --- a/credits.txt +++ b/credits.txt @@ -7,7 +7,7 @@ The game, of course Additional Contributors, in no particular order: - Kiocifer (Icons!) - - IncinerateMe (helping transition to 1.20.3 / CI helper) + - IncinerateMe (helping transition to 1.20.3 / atree / CI helper) - puppy (dog) - SockMower (ability tree encode/decode optimization) - ITechnically (coding emotional support / misc) diff --git a/js/build_encode_decode.js b/js/build_encode_decode.js index 686b3fd..81cacad 100644 --- a/js/build_encode_decode.js +++ b/js/build_encode_decode.js @@ -124,7 +124,6 @@ function decodeBuild(url_tag) { for (let i in tomes) { let tome_str = info[1].charAt(i); let tome_name = getTomeNameFromID(Base64.toInt(tome_str)); - console.log(tome_name); setValue(tomeInputs[i], tome_name); } info[1] = info[1].slice(7); diff --git a/js/builder_graph.js b/js/builder_graph.js index 96e8dc4..17d5d4e 100644 --- a/js/builder_graph.js +++ b/js/builder_graph.js @@ -1076,8 +1076,6 @@ function builder_graph_init() { // These two are defined in `atree.js` atree_node.link_to(class_node, 'player-class'); atree_merge.link_to(class_node, 'player-class'); - atree_graph_creator = new AbilityTreeEnsureNodesNode(build_node, stat_agg_node) - .link_to(atree_collect_spells, 'spells'); atree_stats.link_to(build_node, 'build'); stat_agg_node.link_to(atree_stats, 'atree-stats'); @@ -1092,6 +1090,9 @@ function builder_graph_init() { armor_powder_node.update(); level_input.update(); + atree_graph_creator = new AbilityTreeEnsureNodesNode(build_node, stat_agg_node) + .link_to(atree_collect_spells, 'spells'); + // kinda janky, manually set atree and update. Some wasted compute here if (atree_data !== null && atree_node.value !== null) { // janky check if atree is valid const atree_state = atree_state_node.value; diff --git a/media/atree/connect_0011_1.png b/media/atree/connect_0011_1.png index 07918d4..d3294b3 100644 Binary files a/media/atree/connect_0011_1.png and b/media/atree/connect_0011_1.png differ diff --git a/media/atree/connect_0101_1.png b/media/atree/connect_0101_1.png index eeb0dfb..774f2e8 100644 Binary files a/media/atree/connect_0101_1.png and b/media/atree/connect_0101_1.png differ diff --git a/media/atree/connect_0110_1.png b/media/atree/connect_0110_1.png index 23a05d8..4d725d9 100644 Binary files a/media/atree/connect_0110_1.png and b/media/atree/connect_0110_1.png differ diff --git a/media/atree/connect_0111_0011.png b/media/atree/connect_0111_0011.png index 40757d9..28ea1e3 100644 Binary files a/media/atree/connect_0111_0011.png and b/media/atree/connect_0111_0011.png differ diff --git a/media/atree/connect_0111_0101.png b/media/atree/connect_0111_0101.png index 3dd0db9..68e417f 100644 Binary files a/media/atree/connect_0111_0101.png and b/media/atree/connect_0111_0101.png differ diff --git a/media/atree/connect_0111_0110.png b/media/atree/connect_0111_0110.png index 671ad6e..9f6db4f 100644 Binary files a/media/atree/connect_0111_0110.png and b/media/atree/connect_0111_0110.png differ diff --git a/media/atree/connect_0111_0111.png b/media/atree/connect_0111_0111.png index 0ec3a63..dbf7712 100644 Binary files a/media/atree/connect_0111_0111.png and b/media/atree/connect_0111_0111.png differ diff --git a/media/atree/connect_1001_1.png b/media/atree/connect_1001_1.png index 592af89..748a9c0 100644 Binary files a/media/atree/connect_1001_1.png and b/media/atree/connect_1001_1.png differ diff --git a/media/atree/connect_1010_1.png b/media/atree/connect_1010_1.png index b8d0847..9c8bec9 100644 Binary files a/media/atree/connect_1010_1.png and b/media/atree/connect_1010_1.png differ diff --git a/media/atree/connect_1011_0011.png b/media/atree/connect_1011_0011.png index 7e61395..a396d85 100644 Binary files a/media/atree/connect_1011_0011.png and b/media/atree/connect_1011_0011.png differ diff --git a/media/atree/connect_1011_1001.png b/media/atree/connect_1011_1001.png index 413a323..7a3862a 100644 Binary files a/media/atree/connect_1011_1001.png and b/media/atree/connect_1011_1001.png differ diff --git a/media/atree/connect_1011_1010.png b/media/atree/connect_1011_1010.png index 07b5afb..d4fc9bd 100644 Binary files a/media/atree/connect_1011_1010.png and b/media/atree/connect_1011_1010.png differ diff --git a/media/atree/connect_1011_1011.png b/media/atree/connect_1011_1011.png index 4d351c7..d4b62d3 100644 Binary files a/media/atree/connect_1011_1011.png and b/media/atree/connect_1011_1011.png differ diff --git a/media/atree/connect_1100_1.png b/media/atree/connect_1100_1.png index a99a5cb..2908815 100644 Binary files a/media/atree/connect_1100_1.png and b/media/atree/connect_1100_1.png differ diff --git a/media/atree/connect_1101_0101.png b/media/atree/connect_1101_0101.png index 5d9e992..5203cef 100644 Binary files a/media/atree/connect_1101_0101.png and b/media/atree/connect_1101_0101.png differ diff --git a/media/atree/connect_1101_1001.png b/media/atree/connect_1101_1001.png index ef08023..e33ed5c 100644 Binary files a/media/atree/connect_1101_1001.png and b/media/atree/connect_1101_1001.png differ diff --git a/media/atree/connect_1101_1100.png b/media/atree/connect_1101_1100.png index 20eb331..7a41664 100644 Binary files a/media/atree/connect_1101_1100.png and b/media/atree/connect_1101_1100.png differ diff --git a/media/atree/connect_1101_1101.png b/media/atree/connect_1101_1101.png index 6e03f49..83756fc 100644 Binary files a/media/atree/connect_1101_1101.png and b/media/atree/connect_1101_1101.png differ diff --git a/media/atree/connect_1110_0110.png b/media/atree/connect_1110_0110.png index bd964ed..35a8eb5 100644 Binary files a/media/atree/connect_1110_0110.png and b/media/atree/connect_1110_0110.png differ diff --git a/media/atree/connect_1110_1010.png b/media/atree/connect_1110_1010.png index e994f46..4a08b8c 100644 Binary files a/media/atree/connect_1110_1010.png and b/media/atree/connect_1110_1010.png differ diff --git a/media/atree/connect_1110_1100.png b/media/atree/connect_1110_1100.png index 8fee6b2..de9a81b 100644 Binary files a/media/atree/connect_1110_1100.png and b/media/atree/connect_1110_1100.png differ diff --git a/media/atree/connect_1110_1110.png b/media/atree/connect_1110_1110.png index 5bba3df..8390a7e 100644 Binary files a/media/atree/connect_1110_1110.png and b/media/atree/connect_1110_1110.png differ diff --git a/media/atree/connect_1111_0011.png b/media/atree/connect_1111_0011.png index 99da072..3229c68 100644 Binary files a/media/atree/connect_1111_0011.png and b/media/atree/connect_1111_0011.png differ diff --git a/media/atree/connect_1111_0101.png b/media/atree/connect_1111_0101.png index 14bb6b7..aa78213 100644 Binary files a/media/atree/connect_1111_0101.png and b/media/atree/connect_1111_0101.png differ diff --git a/media/atree/connect_1111_0110.png b/media/atree/connect_1111_0110.png index 0b5efd7..fcef42f 100644 Binary files a/media/atree/connect_1111_0110.png and b/media/atree/connect_1111_0110.png differ diff --git a/media/atree/connect_1111_0111.png b/media/atree/connect_1111_0111.png index 70eb5a8..d54fa1d 100644 Binary files a/media/atree/connect_1111_0111.png and b/media/atree/connect_1111_0111.png differ diff --git a/media/atree/connect_1111_1001.png b/media/atree/connect_1111_1001.png index 992f522..be7c221 100644 Binary files a/media/atree/connect_1111_1001.png and b/media/atree/connect_1111_1001.png differ diff --git a/media/atree/connect_1111_1010.png b/media/atree/connect_1111_1010.png index b9a7e45..803f74a 100644 Binary files a/media/atree/connect_1111_1010.png and b/media/atree/connect_1111_1010.png differ diff --git a/media/atree/connect_1111_1011.png b/media/atree/connect_1111_1011.png index 38cf144..b67f2e8 100644 Binary files a/media/atree/connect_1111_1011.png and b/media/atree/connect_1111_1011.png differ diff --git a/media/atree/connect_1111_1100.png b/media/atree/connect_1111_1100.png index 399fa21..28bbe5a 100644 Binary files a/media/atree/connect_1111_1100.png and b/media/atree/connect_1111_1100.png differ diff --git a/media/atree/connect_1111_1101.png b/media/atree/connect_1111_1101.png index d40464e..4823513 100644 Binary files a/media/atree/connect_1111_1101.png and b/media/atree/connect_1111_1101.png differ diff --git a/media/atree/connect_1111_1110.png b/media/atree/connect_1111_1110.png index d17c444..92f9919 100644 Binary files a/media/atree/connect_1111_1110.png and b/media/atree/connect_1111_1110.png differ diff --git a/media/atree/connect_1111_1111.png b/media/atree/connect_1111_1111.png index e35fd6c..ec468ba 100644 Binary files a/media/atree/connect_1111_1111.png and b/media/atree/connect_1111_1111.png differ diff --git a/media/atree/node-blocked.png b/media/atree/node-blocked.png index 42892b6..e88055e 100644 Binary files a/media/atree/node-blocked.png and b/media/atree/node-blocked.png differ diff --git a/media/atree/node-selected.png b/media/atree/node-selected.png index f67fef9..3fb8d34 100644 Binary files a/media/atree/node-selected.png and b/media/atree/node-selected.png differ diff --git a/media/atree/node.png b/media/atree/node.png index e37bf89..77b96dc 100644 Binary files a/media/atree/node.png and b/media/atree/node.png differ diff --git a/media/atree/node_0.png b/media/atree/node_0.png index 2bd8d3c..a3ed215 100644 Binary files a/media/atree/node_0.png and b/media/atree/node_0.png differ diff --git a/media/atree/node_1.png b/media/atree/node_1.png index 5ddc042..23aa084 100644 Binary files a/media/atree/node_1.png and b/media/atree/node_1.png differ diff --git a/media/atree/node_2.png b/media/atree/node_2.png index b5da379..9e525ec 100644 Binary files a/media/atree/node_2.png and b/media/atree/node_2.png differ diff --git a/media/atree/node_3.png b/media/atree/node_3.png index 09f7d83..71f7c67 100644 Binary files a/media/atree/node_3.png and b/media/atree/node_3.png differ diff --git a/media/atree/node_archer.png b/media/atree/node_archer.png index fd2c33f..5f00770 100644 Binary files a/media/atree/node_archer.png and b/media/atree/node_archer.png differ diff --git a/media/atree/node_assassin.png b/media/atree/node_assassin.png index 7b00ea8..62ffcd4 100644 Binary files a/media/atree/node_assassin.png and b/media/atree/node_assassin.png differ diff --git a/media/atree/node_mage.png b/media/atree/node_mage.png index a2d5941..4086888 100644 Binary files a/media/atree/node_mage.png and b/media/atree/node_mage.png differ diff --git a/media/atree/node_shaman.png b/media/atree/node_shaman.png index bed3c3d..4c88259 100644 Binary files a/media/atree/node_shaman.png and b/media/atree/node_shaman.png differ diff --git a/media/atree/node_warrior.png b/media/atree/node_warrior.png index b58e9ca..9961b55 100644 Binary files a/media/atree/node_warrior.png and b/media/atree/node_warrior.png differ diff --git a/media/icons/new/Chest.png b/media/icons/new/Chest.png index 846faa9..b8c2cb4 100644 Binary files a/media/icons/new/Chest.png and b/media/icons/new/Chest.png differ diff --git a/media/icons/new/Crops.png b/media/icons/new/Crops.png index d978b29..061c832 100644 Binary files a/media/icons/new/Crops.png and b/media/icons/new/Crops.png differ diff --git a/media/icons/new/Emeralds.png b/media/icons/new/Emeralds.png index 8ba6534..b18e710 100644 Binary files a/media/icons/new/Emeralds.png and b/media/icons/new/Emeralds.png differ diff --git a/media/icons/new/Fish.png b/media/icons/new/Fish.png index 1a797a9..ee032ff 100644 Binary files a/media/icons/new/Fish.png and b/media/icons/new/Fish.png differ diff --git a/media/icons/new/Gears.png b/media/icons/new/Gears.png index 74a9944..a6e3690 100644 Binary files a/media/icons/new/Gears.png and b/media/icons/new/Gears.png differ diff --git a/media/icons/new/Ore.png b/media/icons/new/Ore.png index d96b00d..11f0570 100644 Binary files a/media/icons/new/Ore.png and b/media/icons/new/Ore.png differ diff --git a/media/icons/new/Wood.png b/media/icons/new/Wood.png index 7ec4e60..b0e2e5f 100644 Binary files a/media/icons/new/Wood.png and b/media/icons/new/Wood.png differ diff --git a/media/icons/new/atlas64.png b/media/icons/new/atlas64.png index 5e5d552..31bfbf9 100644 Binary files a/media/icons/new/atlas64.png and b/media/icons/new/atlas64.png differ diff --git a/media/icons/new/book.png b/media/icons/new/book.png index 9e41fc7..91ad8bc 100644 Binary files a/media/icons/new/book.png and b/media/icons/new/book.png differ diff --git a/media/icons/new/builder.png b/media/icons/new/builder.png index e20d030..4aa44c7 100644 Binary files a/media/icons/new/builder.png and b/media/icons/new/builder.png differ diff --git a/media/icons/new/compass.png b/media/icons/new/compass.png index 99f4650..ba221b1 100644 Binary files a/media/icons/new/compass.png and b/media/icons/new/compass.png differ diff --git a/media/icons/new/compass2.png b/media/icons/new/compass2.png index e696b72..bbbe9f2 100644 Binary files a/media/icons/new/compass2.png and b/media/icons/new/compass2.png differ diff --git a/media/icons/new/crafter.png b/media/icons/new/crafter.png index c062090..c35c0f1 100644 Binary files a/media/icons/new/crafter.png and b/media/icons/new/crafter.png differ diff --git a/media/icons/new/cursor.png b/media/icons/new/cursor.png index c0a6c19..a5b2e32 100644 Binary files a/media/icons/new/cursor.png and b/media/icons/new/cursor.png differ diff --git a/media/icons/new/custom.png b/media/icons/new/custom.png index 7d3fd27..55e5c42 100644 Binary files a/media/icons/new/custom.png and b/media/icons/new/custom.png differ diff --git a/media/icons/new/marker.png b/media/icons/new/marker.png index 8804fbd..f0fbcc3 100644 Binary files a/media/icons/new/marker.png and b/media/icons/new/marker.png differ diff --git a/media/icons/new/marker2.png b/media/icons/new/marker2.png index bcfe016..bee0c29 100644 Binary files a/media/icons/new/marker2.png and b/media/icons/new/marker2.png differ diff --git a/media/icons/new/reload.png b/media/icons/new/reload.png index e39640c..e88ad4c 100644 Binary files a/media/icons/new/reload.png and b/media/icons/new/reload.png differ diff --git a/media/icons/new/searcher.png b/media/icons/new/searcher.png index 005ca91..e3074ba 100644 Binary files a/media/icons/new/searcher.png and b/media/icons/new/searcher.png differ diff --git a/media/icons/new/toggle_down.png b/media/icons/new/toggle_down.png index 4154d3d..7737787 100644 Binary files a/media/icons/new/toggle_down.png and b/media/icons/new/toggle_down.png differ diff --git a/media/icons/new/toggle_up.png b/media/icons/new/toggle_up.png index 1fd8186..a39407c 100644 Binary files a/media/icons/new/toggle_up.png and b/media/icons/new/toggle_up.png differ diff --git a/media/items/new/generic-armorTome.png b/media/items/new/generic-armorTome.png index c46428d..ba0833b 100644 Binary files a/media/items/new/generic-armorTome.png and b/media/items/new/generic-armorTome.png differ diff --git a/media/items/new/generic-boots.png b/media/items/new/generic-boots.png index 34a827f..5cb73a2 100644 Binary files a/media/items/new/generic-boots.png and b/media/items/new/generic-boots.png differ diff --git a/media/items/new/generic-bow.png b/media/items/new/generic-bow.png index 997e51e..908ed0c 100644 Binary files a/media/items/new/generic-bow.png and b/media/items/new/generic-bow.png differ diff --git a/media/items/new/generic-bracelet.png b/media/items/new/generic-bracelet.png index a542332..f4c6da8 100644 Binary files a/media/items/new/generic-bracelet.png and b/media/items/new/generic-bracelet.png differ diff --git a/media/items/new/generic-chestplate.png b/media/items/new/generic-chestplate.png index ac7df00..60aab35 100644 Binary files a/media/items/new/generic-chestplate.png and b/media/items/new/generic-chestplate.png differ diff --git a/media/items/new/generic-dagger.png b/media/items/new/generic-dagger.png index 8ba4a13..3229d1c 100644 Binary files a/media/items/new/generic-dagger.png and b/media/items/new/generic-dagger.png differ diff --git a/media/items/new/generic-food.png b/media/items/new/generic-food.png index afdaa5a..71c579c 100644 Binary files a/media/items/new/generic-food.png and b/media/items/new/generic-food.png differ diff --git a/media/items/new/generic-guildTome.png b/media/items/new/generic-guildTome.png index c46428d..ba0833b 100644 Binary files a/media/items/new/generic-guildTome.png and b/media/items/new/generic-guildTome.png differ diff --git a/media/items/new/generic-helmet.png b/media/items/new/generic-helmet.png index df505ae..ad3fd82 100644 Binary files a/media/items/new/generic-helmet.png and b/media/items/new/generic-helmet.png differ diff --git a/media/items/new/generic-leggings.png b/media/items/new/generic-leggings.png index 24115d9..856a5fc 100644 Binary files a/media/items/new/generic-leggings.png and b/media/items/new/generic-leggings.png differ diff --git a/media/items/new/generic-necklace.png b/media/items/new/generic-necklace.png index b9d828f..1dd57f2 100644 Binary files a/media/items/new/generic-necklace.png and b/media/items/new/generic-necklace.png differ diff --git a/media/items/new/generic-potion.png b/media/items/new/generic-potion.png index 93b4b7e..53c29d0 100644 Binary files a/media/items/new/generic-potion.png and b/media/items/new/generic-potion.png differ diff --git a/media/items/new/generic-relik.png b/media/items/new/generic-relik.png index 839e5a5..b64c4e5 100644 Binary files a/media/items/new/generic-relik.png and b/media/items/new/generic-relik.png differ diff --git a/media/items/new/generic-ring.png b/media/items/new/generic-ring.png index 64a8829..edf1d19 100644 Binary files a/media/items/new/generic-ring.png and b/media/items/new/generic-ring.png differ diff --git a/media/items/new/generic-scroll.png b/media/items/new/generic-scroll.png index 168a430..ed4e8fd 100644 Binary files a/media/items/new/generic-scroll.png and b/media/items/new/generic-scroll.png differ diff --git a/media/items/new/generic-spear.png b/media/items/new/generic-spear.png index f31485b..74a6321 100644 Binary files a/media/items/new/generic-spear.png and b/media/items/new/generic-spear.png differ diff --git a/media/items/new/generic-sword.png b/media/items/new/generic-sword.png index 3317427..05243d0 100644 Binary files a/media/items/new/generic-sword.png and b/media/items/new/generic-sword.png differ diff --git a/media/items/new/generic-wand.png b/media/items/new/generic-wand.png index 8b3b1b8..9538375 100644 Binary files a/media/items/new/generic-wand.png and b/media/items/new/generic-wand.png differ diff --git a/media/items/new/generic-weaponTome.png b/media/items/new/generic-weaponTome.png index c46428d..ba0833b 100644 Binary files a/media/items/new/generic-weaponTome.png and b/media/items/new/generic-weaponTome.png differ