Commit graph

414 commits

Author SHA1 Message Date
ferricles 1ed723f9b5 fixed merge conflict 2022-06-29 16:33:34 -07:00
ferricles 25645300b5 refactoring + removing old comments 2022-06-29 16:28:41 -07:00
hppeng f1488a4352 Fix some json for warrior (from the bottom up to massive bash) 2022-06-29 00:14:40 -07:00
hppeng 44d3fc996a Merge branch 'atree' into atree_aggregator 2022-06-28 23:26:43 -07:00
hppeng 25102100ae Pull info from abil tree; construct spell objects and render them 2022-06-28 23:23:27 -07:00
hppeng a42f79afb5 Aggregate ability descriptions and effects....
design pain... just YOLO time... kinda assuming that abilities will only affect one spell majorly..
2022-06-28 12:03:49 -07:00
hppeng f6bf0875b5 Fix double toggle bug 2022-06-28 11:48:02 -07:00
hppeng 259ffb2395 Begin working on abil merging framework... fix a bunch of mistakes in atree constants 2022-06-28 11:43:35 -07:00
reschan 1b721cd810 remove forceful open/hide 2022-06-28 14:28:45 +07:00
reschan 881467cf0b fix: atree img display relatively to parent 2022-06-28 14:10:25 +07:00
reschan c5951195fe bump latest change 2022-06-28 13:01:36 +07:00
hppeng 4d3a922bb2 Merge branch 'atree' into atree_aggregator 2022-06-27 22:57:05 -07:00
hppeng f23895ee48 Address PR comments 2022-06-27 22:16:23 -07:00
hppeng a982756ce6 Merge branch 'atree' into spell_reformat 2022-06-27 22:09:24 -07:00
ferricles 8b0fe24482 eliminate repeated appendChild() in construct_AT 2022-06-27 21:33:38 -07:00
aspiepuppy 1a14f230f2 wawa 2022-06-27 22:42:19 -05:00
aspiepuppy e427532424 wa 2022-06-27 22:41:56 -05:00
ferricles 2db1a3a336 quick documentation + refactoring to add new param for render_AT() 2022-06-27 16:49:21 -07:00
reschan ebcdbc14fc remove redundant atree data files 2022-06-27 16:53:18 +07:00
reschan b36b16c49d fix: separate atree ids for each class 2022-06-27 16:23:22 +07:00
hppeng 5106b7b681 HOTFIX: damage multipliers from potion effect not being registered 2022-06-27 01:41:13 -07:00
hppeng 5fde5faacb really minor code cleanup 2022-06-27 01:32:26 -07:00
ferricles b4172744e1 Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-27 00:09:53 -07:00
ferricles 65c2d39754 atree ID rework started 2022-06-27 00:09:49 -07:00
hppeng 3fb59494d9 Testing healing 2022-06-26 23:54:05 -07:00
hppeng c7fd1c53f8 Internal spell representation overhaul
Using new (more expressive) schema
Somehow made display code cleaner !!!
2022-06-26 23:42:00 -07:00
hppeng 581891116d Fix a compute graph state update bug (double link), fix powder special display 2022-06-26 20:24:38 -07:00
hppeng 913b5a7c85 Fix guardian angels spell mult 2022-06-26 18:23:07 -07:00
hppeng 8007a80889 Spell schema comment 2022-06-26 18:11:17 -07:00
hppeng ce44d949d0 Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 16:57:26 -07:00
hppeng 8ff0afa685 Begin atree integration
also don't re-render the entire thing every time something changes -- local updates
2022-06-26 16:49:35 -07:00
ferricles d5d3f15c27 prevent node unrendering 2022-06-26 11:18:20 -07:00
ferricles f854889846 fixed merge conflicts 2022-06-26 10:25:57 -07:00
hppeng 281955ec93 Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 06:14:26 -07:00
hppeng a99f164a29 Clean up js files
rename display_atree -> atree
remove d3_export
2022-06-26 06:14:19 -07:00
reschan 496a9b87d2 Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 19:47:18 +07:00
reschan 18524b44fa atree name to id json 2022-06-26 19:47:12 +07:00
hppeng 8f5f5c9d8e Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 05:46:35 -07:00
reschan af3c76681b fix: cosmetic defect on tri connector 2022-06-26 19:46:04 +07:00
hppeng a7be5e15be Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 05:45:22 -07:00
hppeng 8b4fb7cb32 Merge branch 'UI_test' into atree 2022-06-26 05:45:13 -07:00
hppeng 379ebb8224 HOTFIX -- update "Original Value" skillpoint display 2022-06-26 05:44:10 -07:00
reschan 9fa23e6b6f Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 19:40:27 +07:00
reschan 83fcfd15f4 change to id, from display_name 2022-06-26 19:40:17 +07:00
hppeng 21773ab52d Fix set initial load 2022-06-26 05:37:15 -07:00
hppeng 1303c959b1 HOTFIX: remove const from SumInputNode to allow default value fixing 2022-06-26 05:35:04 -07:00
hppeng 94e4b52615 Print stack visually on error 2022-06-26 05:29:06 -07:00
hppeng 72999c3014 Fix set initial load 2022-06-26 05:18:23 -07:00
reschan 01e02d603b fix: unsafe connector rotation (for real this time) 2022-06-26 18:34:35 +07:00
reschan dcc65516cd fix: unsafe connector rotation 2022-06-26 18:29:55 +07:00
hppeng 762120d189 Fix tomes (for real...) 2022-06-26 04:12:04 -07:00
hppeng aa9041bd01 Fix tome damage calculation... 2022-06-26 04:08:54 -07:00
reschan b9e04c4c9f add general comments 2022-06-26 17:55:06 +07:00
reschan d3c11a8a72 fix: tri failing case 2022-06-26 17:48:00 +07:00
hppeng 295e8f3e36 Fix damage calc... somewhat unify powder format 2022-06-26 03:14:31 -07:00
hppeng 24892c91fe Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-26 03:00:35 -07:00
reschan ab38e5cf5f remove debug code 2022-06-26 16:32:41 +07:00
reschan 72f9b2b30d fix: tri connector rotation 2022-06-26 16:25:54 +07:00
reschan 5992d5db7f fix: connector not updating when node is unselected 2022-06-26 16:04:02 +07:00
reschan 92f4df3659 implement atree connector highlighting 2022-06-26 15:59:02 +07:00
ferricles 8d357f7531 current AP count display 2022-06-26 01:15:26 -07:00
hppeng 056ff84972 Misc. changes to powdering workings
Items no longer have powders array defined by default (only weapons/armors)
2022-06-26 01:07:43 -07:00
hppeng 58555f232c Merge branch 'UI_test' into atree 2022-06-26 00:50:13 -07:00
ferricles 6561731a59 node highlighting + cost display in tooltip 2022-06-26 00:48:42 -07:00
hppeng c25d424194 HOTFIX: patch str/dex optimizer 2022-06-26 00:43:11 -07:00
hppeng 472c35e425 Merge branch 'UI_test' into damage_calc 2022-06-26 00:08:58 -07:00
hppeng 1d96725313 Merge branch 'UI_test' into damage_calc 2022-06-26 00:08:32 -07:00
hppeng 975c0faa1f Fix crafter page, fix damage calculation for crafted and normal items (no longer rounded powder damage) 2022-06-26 00:08:02 -07:00
ferricles cb3c627300
Merge pull request #45 from hppeng-wynn/autodoc
Compute graph documentation
2022-06-25 20:30:31 -07:00
hppeng efe3a7b0e8 Merge branch 'atree' into damage_calc 2022-06-25 13:25:10 -07:00
hppeng 2e65e88b6c autodoc done 2022-06-25 05:23:58 -07:00
hppeng 94b67115aa Fix builder throwing error on empty URL
TODO: clean up dirty flags
2022-06-24 22:43:28 -07:00
ferricles d8d76a0df9 fix merge conflict 2022-06-24 21:26:13 -07:00
ferricles 8805521ce2 assert error change for error thrown, formatted getScript, added default epsilon for assert near 2022-06-24 21:24:22 -07:00
ferricles 61dfe2de65 assert error 2022-06-24 21:01:54 -07:00
hppeng 2000d381a8 Incremental progress 2022-06-24 20:26:26 -07:00
ferricles 17311ff3b1 first batch of generic assert tests 2022-06-24 19:19:15 -07:00
hppeng 39e6ade142 HOTFIX: Patch dps_vis 2022-06-24 06:06:24 -07:00
hppeng 46e784b248 Merge branch 'UI_test' into damage_calc 2022-06-24 05:36:32 -07:00
reschan 6ba3b6de49 Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-24 19:05:05 +07:00
reschan 8ce25cf2c9 space out and confine active abil window 2022-06-24 19:04:58 +07:00
hppeng eb84f1de6e Rudimentary display code and repair atree file 2022-06-24 04:56:56 -07:00
hppeng 2e287447ff Add some display info to atree 2022-06-24 04:48:48 -07:00
hppeng 2b18774395 Wynn2 damage calculation 2022-06-24 03:35:03 -07:00
ferricles c7054ce25a append() number bug fix 2022-06-24 00:43:24 -07:00
ferricles 7e82213b36 simple range bug fix in set and clear bit 2022-06-24 00:29:43 -07:00
ferricles 95cd93ad4d major bug fixes, append number yet to be unit tested 2022-06-24 00:15:06 -07:00
hppeng 623037eda0 HOTFIX: display weapon as the last part of copy for sharing 2022-06-23 22:33:17 -07:00
hppeng 14ab20c446 Remove extra prints, make response time of nodes much faster
hides a bug that we have where two updates are scheduled if you hit enter and tab... no.......
2022-06-23 20:18:08 -07:00
hppeng 3f3ed18455 Fix minified file / update 2022-06-23 20:10:02 -07:00
hppeng 032fa26d1c Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-23 20:01:47 -07:00
hppeng beb47c7f3d Minified atree constants file; remove unused (old) script 2022-06-23 20:01:31 -07:00
reschan e86152af18 delete nonexist function call 2022-06-24 09:51:43 +07:00
reschan cba1bb5eb0 catch if given atree does not exist 2022-06-24 09:50:18 +07:00
reschan 32ee15dc2b delete empty atrees, move assassin to old 2022-06-24 09:49:54 +07:00
reschan debbeee9f8 for reference when creating beta atree data 2022-06-24 09:49:24 +07:00
reschan fe3445c16b fix: auto connector logic 2022-06-24 09:36:50 +07:00
ferricles bbede794b9 removed remaining printouts 2022-06-23 11:21:11 -07:00
ferricles 738286275e toString() change, b64 constructor fix, append() functionality 2022-06-23 11:20:23 -07:00
ferricles ab4de136f2 optimized slice(), string construction, toB64 and toString 2022-06-23 09:44:03 -07:00
reschan bb98b2c5e4 fix archer tree (2) 2022-06-23 22:11:47 +07:00
reschan e4861df3ef Merge branch 'atree' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-23 22:02:41 +07:00
reschan 39bbf45b12 change connector logic 2022-06-23 22:00:15 +07:00
reschan d68af2f4c4 fix archer tree 2022-06-23 22:00:04 +07:00
hppeng c42e96d360 Finally fixed bugs -- please test your code before pushing
bad hpp
2022-06-23 07:53:55 -07:00
hppeng b5f05cb1e6 Whoops -- missing case 2022-06-23 07:43:32 -07:00
hppeng e0f2dde953 Fix typo 2022-06-23 07:42:58 -07:00
hppeng d8d5b6caf6 Minor code cleanup
combine code in corners case
combine cases in horiz. drawing
2022-06-23 07:29:25 -07:00
hppeng 730ddea551 Merge branch 'UI_test' into atree 2022-06-23 04:24:12 -07:00
hppeng 5f9c0d5185 HOTFIX: str/dex optimizer working now 2022-06-23 03:55:13 -07:00
hppeng ef5dd8f6c6 HOTFIX: tome patch 2022-06-23 03:42:18 -07:00
hppeng 12e4c1e88c Revert to current dev branch behaviour somewhat 2022-06-23 03:16:36 -07:00
hppeng 8945261c31 Merge branch 'UI_test' into compute_graph 2022-06-23 02:51:51 -07:00
hppeng 6ea34708a6 Fully working tomes !!! 2022-06-23 02:23:56 -07:00
reschan 3939f83ffc partially change to new format 2022-06-23 16:15:51 +07:00
reschan 0d70214906 implement auto connectors 2022-06-23 16:15:06 +07:00
hppeng 9227dd0f56 Working armor special sliders (don't reset properly i think) 2022-06-23 01:25:19 -07:00
hppeng-wynn adcf0b5db9
Merge pull request #35 from hppeng-wynn/melee_breakdown
Re-enable melee breakdown
2022-06-23 01:24:31 -07:00
ferricles cac7e6b04b functional set bit, clear bit, read bit, slice 2022-06-22 17:45:13 -07:00
hppeng e4466d8095 Add back morph easter egg 2022-06-21 22:53:04 -07:00
hppeng 651ae9f3d5 Small refactor to prepare for atree; fix reset health/lvl 2022-06-21 22:39:10 -07:00
ferricles 361d4cca54 bruh 2022-06-21 22:09:54 -07:00
ferricles 64e076cbb4 dummy commit 2022-06-21 21:51:26 -07:00
hppeng 6620d011e5 Fix edit id resetting 2022-06-21 20:41:40 -07:00
reschan 564e4709cd change clickable arrow to a function 2022-06-22 09:34:06 +07:00
ferricles 28955fe661 temp 2022-06-20 12:07:25 -07:00
hppeng d1a468a227 Remove unused files (should be merged into builder.js... etc now.) 2022-06-20 10:52:46 -07:00
hppeng ebcdf9ae27 Powder specials and potion boosts 2022-06-20 10:51:17 -07:00
hppeng f7a1f4fc7e Fix melee damage, fix edit ids spell calc 2022-06-20 07:37:14 -07:00
hppeng 18d21e21ae Ready for dev branch merge 2022-06-20 06:12:32 -07:00
hppeng 4d7197fc53 Add instructions 2022-06-19 20:20:22 -07:00
hppeng 4a54635e2d More cleanup 2022-06-19 19:07:59 -07:00
hppeng 7980980f9a Build display working, still have to do edit ids / skillpoints 2022-06-19 13:59:16 -07:00
hppeng 81dfe767a3 Item display, build display (partially) 2022-06-19 13:44:02 -07:00
ferricles 2d719e9a4e BitVector class 2022-06-19 12:05:01 -07:00
hppeng 7bd27a9675 Merge branch 'UI_test' into compute_graph 2022-06-19 11:43:02 -07:00
hppeng fd97eb45e0 Copying code
from sq2display.js to display.js
2022-06-19 11:30:10 -07:00
hppeng e5b653619f Working spell damage calculation pipeline
broke like everything else
2022-06-19 11:02:28 -07:00
hppeng 8db34d68a7 Almost working spell damage calculation 2022-06-19 09:49:04 -07:00
hppeng 62a9a4f0c2 Compute graph cleanup, prepping for full build calc (currently broke) 2022-06-19 00:42:49 -07:00
ferricles 6277b50d12 fixed atree display bugs | functional atree toggle on/off + switching based on inferred class type 2022-06-18 21:00:32 -07:00
ferricles ec13bdea1e small bug fixes for atree swapping - some unwanted behavior still exists 2022-06-17 20:46:52 -07:00
hppeng 0417a68e65 Remove duplicate warrior tag 2022-06-16 04:39:20 -07:00
hppeng 65d47117c8 Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-06-16 04:38:21 -07:00
hppeng 1c3ef6d545 Add warrior abilities (71) 2022-06-16 04:38:09 -07:00
reschan e2eaf48984 remove empty title and desc 2022-06-16 16:53:59 +07:00
reschan a1179911ab parse newlines to line breaks 2022-06-16 16:14:56 +07:00
reschan a1227f6e75 add archer tree 2022-06-16 16:14:16 +07:00
ferricles 9036de536b modified atree graphics, added full assassin ability tree 2022-06-15 22:03:20 -07:00
ferricles b2fa8a81b6 fixed merge conflict; new atree connector image 2022-06-15 18:50:07 -07:00
reschan 4f43a81313 change columns to 9, adjust sizes, fix selecteds 2022-06-16 07:18:29 +07:00
ferricles 5216686040 ability trees for different classes + selection based on weapon 2022-06-15 17:07:54 -07:00
ferricles db7981024f removed printouts 2022-06-15 15:25:47 -07:00
ferricles 0166b7814d crafted item version 4 build decode bug fix, crafted page slight bug fixes 2022-06-15 12:53:51 -07:00
reschan 8df8632c6d add hover tooltips and active abilities 2022-06-14 16:45:41 +07:00
reschan 8108f033e5 atree initial commit 2022-06-13 16:21:01 +07:00
hppeng 4f7f0f9cfc Clean up loading code, much cleaner invocation during init (and less prone to races) 2022-06-12 07:45:48 -07:00
hppeng-wynn 9f399846a3
Merge pull request #36 from hppeng-wynn/documentation
Documentation
2022-06-09 20:16:45 -07:00
hppeng e525cc0ec3 Remove extra debug prints 2022-06-09 20:03:14 -07:00
ferricles 0484bdfee3 Custom Item encoding section 2022-05-30 23:31:37 -07:00
ferricles 8381f0bfce CR weapon powder hotfix 2022-05-27 13:56:27 -07:00
ferricles a52891c3ec modern version build link (v4,5,6) decoding 2022-05-27 00:06:04 -07:00
ferricles be69c687b4 Merge branch 'UI_test' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into UI_test 2022-05-25 13:17:50 -07:00
ferricles fc745e73c5 tome decoding hotfix 2022-05-25 13:17:42 -07:00
ferricles 827f9f11d5 documentation page prototype 2022-05-25 12:57:20 -07:00
reschan 1d1addd762 fix: making necklace a thing in search 2022-05-23 22:04:00 +07:00
reschan adcf1ee362 re-enable melee breakdown 2022-05-23 13:20:03 +07:00
ferricles ce87d110c5 changed base dps display to be an icon 2022-05-22 22:33:37 -07:00
ferricles 9ebc65ff90 calculateCraftSchedule added 2022-05-22 14:27:57 -07:00
ferricles 0bed0dab91 added copy hash button, removed craft button, added automatic craft upon input, lightened user input fields 2022-05-22 14:09:32 -07:00
hppeng 0f4dba258f Proof of concept (compute nodes to get items from names and highlight) 2022-05-22 03:21:34 -07:00
ferricles 45b2b99602
Merge pull request #26 from hppeng-wynn/spell_detail_clickable
Spell detail clickable
2022-05-22 01:20:18 -07:00
ferricles 20fe476f32 more code cleanup 2022-05-22 01:20:07 -07:00
ferricles e46ea31ba5 refactored changes to more appropriate places 2022-05-22 01:10:55 -07:00
hppeng 06f745c158 Consolidate constants/utils files, start working on new builder file 2022-05-22 00:57:47 -07:00
ferricles 5ff9d6ff22 spell detail clickable indicator added 2022-05-22 00:50:53 -07:00
hppeng 0234101262 Remove common (we already have build_utils), edit instances of expandItems 2022-05-22 00:14:20 -07:00
ferricles ae6c0c7541 reset button/margin fix on item dropdowns 2022-05-21 22:58:04 -07:00
ferricles d4b47a0f3b Merge branch 'UI_test' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into UI_test 2022-05-21 22:40:18 -07:00
ferricles ae46df287d margin 'fix' 2022-05-21 22:38:57 -07:00
hppeng 1e863fd015 Create common.js for more common stuff (Item class, expandItem func) 2022-05-21 22:38:43 -07:00
hppeng 1c4042325d Add method for "linking" compute nodes together
just smol standard things
2022-05-21 21:19:43 -07:00
ferricles 54c42322ef temp 2022-05-21 19:29:30 -07:00
hppeng 958017fc5c Move item input field into class, vars for scaling font, fullwidth 2022-05-21 19:14:00 -07:00
hppeng ce5532e1d9 Smol work on compute graph 2022-05-21 15:51:09 -07:00
hppeng ac636c9498 Make encoding method backwards compatible and export the lowest version encoding possible (up to 4) 2022-05-21 11:33:28 -07:00
ferricles f8d90b347e fix armor powder tooltip display bug 2022-05-21 00:43:03 -07:00
ferricles 98dfe1c62c fixed merge conflict 2022-05-20 21:46:43 -07:00
ferricles 8460b2e0a7 full tome functionality 2022-05-20 21:34:24 -07:00
ferricles 1c1964a814 fix reset editable IDs 2022-05-20 19:13:20 -07:00
ferricles 621a115a5c fixed tome ID system, tome encoding and decoding support in build link 2022-05-20 19:01:53 -07:00
ferricles 58e75eb0a2 barebones tome functionality [tome load, tome inputs, tome expandedItem display] 2022-05-20 02:03:46 -07:00
ferricles 78317647db Smaller item link hitboxes, no more clickable link when item view not expanded 2022-05-19 01:54:26 -07:00
ferricles 94256cd94a readded optimize str/dex button 2022-05-18 15:14:36 -07:00
ferricles 11bd4844dc wynnatlas mini bug fix (level input id) 2022-05-17 10:57:51 -07:00
ferricles c5645ffa0c item info page in bootstrap + items link to item info page 2022-05-16 19:44:40 -07:00
ferricles 3a75db643d crafted recipe choice image updates upon recipe type input change 2022-05-16 14:37:49 -07:00
ferricles 0fa7c2e4bd crafted skp not displaying bug fix 2022-05-16 13:02:09 -07:00
hppeng 6474e1bb2b Fix edit IDs 2022-05-16 00:04:55 -07:00
ferricles bcef76a0a9 Merge branch 'UI_test' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into UI_test 2022-05-15 23:50:50 -07:00