Commit graph

462 commits

Author SHA1 Message Date
hppeng
bb2ea64580 Address PR comment (remove print) 2022-07-08 20:51:01 -07:00
hppeng
e15d947901 Merge branch 'atree' into atree-validation-fix 2022-07-08 20:50:20 -07:00
hppeng
335b8681b6 Misc. mage tree fixes
also merge abilities
2022-07-08 20:47:34 -07:00
hppeng
e58e0fa5fa Merge elemental mastery nodes 2022-07-08 20:31:44 -07:00
hppeng
ed61d3379b HOTFIX: ophanim spellcost (last one for now... do PR... don't be bad) 2022-07-08 20:22:14 -07:00
hppeng
6d61055b7a Fix lightbender consistency 2022-07-08 20:19:24 -07:00
hppeng
f703520ec3 HOTFIX: Mage atree misc. fixes 2022-07-08 20:17:56 -07:00
hppeng
3d0136df60 HOTFIX: move slider for massive bash from bash to bakal's grasp 2022-07-08 19:24:16 -07:00
hppeng
02a5577e35 Fix enraged blow slider and remove prints from damage_calc 2022-07-08 19:19:16 -07:00
hppeng
5e43db7a49 Merge branch 'atree' into atree-validation-fix 2022-07-08 19:13:37 -07:00
hppeng
277899160f Mage spell display reformat
fix it all

also separate flaming uppercut
2022-07-08 19:12:12 -07:00
hppeng
abe9c8a560 Fix flaming uppercut counting in uppercut total 2022-07-08 19:07:15 -07:00
hppeng
eea6a3c6b0 Merge branch 'atree' into atree-mage 2022-07-08 19:07:03 -07:00
hppeng-wynn
3af9f868c5
Merge pull request #87 from hppeng-wynn/atree_active_box
Atree active box
2022-07-08 17:49:54 -07:00
hppeng
159aece0c0 Merge branch 'atree' into atree_active_box 2022-07-08 17:44:43 -07:00
hppeng-wynn
bacc98b003
Merge pull request #90 from hppeng-wynn/powder-acc-fix
Fix crafted accessories apparently
2022-07-08 17:43:20 -07:00
hppeng
59e5a3303a HOTFIX: fix thunder converting abilities 2022-07-08 17:42:25 -07:00
hppeng
c5191cfe99 Merge branch 'atree' into atree_active_box 2022-07-08 17:29:40 -07:00
hppeng-wynn
b07d4d2fa5
Merge pull request #88 from hppeng-wynn/basaltic-fix
Basaltic fix
2022-07-08 17:26:43 -07:00
hppeng
5bf0157a69 Mage atree (first ed.) (no display info) 2022-07-08 17:25:18 -07:00
hppeng
22ee9322ef Fix crash if no atree selected 2022-07-08 15:45:24 -07:00
hppeng
c3cb9f129d Update items for wynn2 item changes 2022-07-08 15:01:45 -07:00
hppeng
644213e5aa Fix enraged blow slider and remove prints from damage_calc 2022-07-08 14:53:07 -07:00
hppeng
c05eb82e60 Merge in atree_active_box 2022-07-08 14:52:17 -07:00
hppeng
b256213f09 Merge branch 'atree_active_box' into atree-validation-fix 2022-07-08 14:36:16 -07:00
hppeng
75269f9b73 Begin mage atree integration.... pain and suffering... 2022-07-08 01:20:05 -07:00
hppeng
f2f9acff85 Distinguish between hard and soft atree errors 2022-07-08 00:21:21 -07:00
hppeng
adc90821e6 Fix crafted accessories apparently
....
..
stupid
2022-07-07 23:18:58 -07:00
hppeng
e6a55afc4c Split up basaltic trap 2022-07-07 22:51:38 -07:00
hppeng
70c117261d Reworked master modifiers; working sliders 2022-07-07 22:28:46 -07:00
hppeng
a4eda17f4e Merge branch 'atree' into atree_active_box 2022-07-07 21:25:27 -07:00
hppeng
b62faddfa4 Fix description for phantom ray, update minified files 2022-07-07 19:53:56 -07:00
hppeng
5b6c957e76 Working scaling abils, sliders not hooked up yet
also fixed burning heart scaling
2022-07-07 19:44:57 -07:00
aspiepuppy
17eb8d2d66 added patch 7 changes for archer on constants 2022-07-07 18:15:16 -05:00
hppeng
a28c75e177 More setup for sliders/raw stat; fix defMultiplier (base def not fixed yet)
we should really unify the multiplicative effect checking -- this is kinda stupid
2022-07-07 16:13:26 -07:00
hppeng
3ff4421de4 Merge branch 'atree' into atree_active_box 2022-07-07 15:34:16 -07:00
hppeng
cdaff5fce9 Fix More Focus base_abil, display sliders 2022-07-07 15:33:00 -07:00
aspiepuppy
049a2b07ea fixed parents for refined gunpowder and decimator 2022-07-07 17:25:19 -05:00
hppeng
4a1939b5a1 Update slider jsons
and update json updater script
2022-07-06 21:15:41 -07:00
hppeng
2e6c5b8555 Fix some ability base_abil tags and update cyclone cost 2022-07-06 20:18:01 -07:00
hppeng
9f2235e889 Some design work for how sliders/toggles are going to interface with damage calc/stat agg pipeline 2022-07-06 20:13:28 -07:00
hppeng
e69039eabd More convenience functions for creating html elements 2022-07-06 20:04:53 -07:00
hppeng
148d51924e Migrate armor powder sliders to use new slider util functions 2022-07-06 19:44:51 -07:00
hppeng
eb6dd97d2a Damage calculation hotfix
fix bug with weapon "has element" table being mutated
fix damage of uppercut
2022-07-06 12:33:09 -07:00
hppeng
a5cffc6266 Set up nodes for adding sliders, etc. 2022-07-06 12:16:44 -07:00
hppeng
fdaad6931b Merge branch 'atree' into atree_active_box 2022-07-06 11:39:11 -07:00
hppeng-wynn
eec6544a33
Merge pull request #79 from hppeng-wynn/atree-misc-patch
Implement int and costs jankily
2022-07-06 11:36:47 -07:00
hppeng
05ca629185 Fix typo with fire mastery in archer
also: fix iron lungs archetype
2022-07-06 01:50:10 -07:00
hppeng
dba4ad3220 Revert to 1.20.3 powder calculation 2022-07-06 01:46:47 -07:00
hppeng
b8cdfe28fe Patch 6 changes
also fix vehement
2022-07-06 01:45:12 -07:00
hppeng
5f0f42a98a Restore crafter to working condition i think 2022-07-06 01:40:52 -07:00
hppeng
dd3d7f128d No more infinite powders 2022-07-06 01:06:24 -07:00
hppeng
d59cdfc611 Fix raw stat bonus applying 2022-07-05 23:55:47 -07:00
hppeng
e4d7a42a50 Remove prints 2022-07-05 23:51:16 -07:00
hppeng
8d077b3b4b Implement int and costs jankily
also fix rounding jankily with -cost items
2022-07-05 23:43:44 -07:00
hppeng
5391b08b37 Declare skillpoint final multipliers in a good place 2022-07-05 20:42:36 -07:00
hppeng
59be124de6 Fix ambivalence spellcosts 2022-07-05 10:38:05 -07:00
hppeng
2879bb4502 Fix damage calc
total mult wasn't accounting for neutral mult
2022-07-05 10:33:01 -07:00
hppeng
98d2486ceb More misc fixes
Make builder not barf with classes without atree (to reduce confusion)
Skillpoint %effect changes (def/agi, ehp calc)
2022-07-05 00:51:58 -07:00
hppeng
6980005924 Remove extra print 2022-07-04 22:05:48 -07:00
hppeng
21af3cc4cd Merge branch 'atree' into atree-misc-patch 2022-07-04 21:41:36 -07:00
hppeng
97ea17565a More misc fix
Bump db version (forgot to do in last commit)
Guardian angels + more shields works now
2022-07-04 21:39:35 -07:00
aspiepuppy
a5b1fcb7d6 made focus the right color (red) 2022-07-04 22:57:17 -05:00
hppeng
a24d3c402d Merge branch 'atree' into atree-misc-patch 2022-07-04 20:47:16 -07:00
hppeng
306e3a375e Bulk multiply mana stats
by 5 and .7

item changes not in
2022-07-04 18:03:01 -07:00
aspiepuppy
eed899eaad mana trap dependency fixed to nothing from fire creep 2022-07-04 20:01:20 -05:00
hppeng
0ac8998a76 Fix bugs in #bug-reports
defense mult working correctly
rejuv skin has 5 pally req
2022-07-04 12:33:17 -07:00
hppeng
f7d4946c4b Minify file, update minify script, add README for minifying 2022-07-02 16:55:10 -07:00
aspiepuppy
b3ef2e2ff4 added nodes to all of the archer abilties in constants (not min yet tho) 2022-07-02 18:25:04 -05:00
aspiepuppy
cde60c7b25 mana trap range 16 blocks now instead of 12 2022-07-02 15:12:48 -05:00
aspiepuppy
15ad6bfeb8 Mana Trap now has the correct mana regen (2.85) instead of 4. 2022-07-02 11:57:18 -05:00
ferricles
7832c1a1aa fixed merge conflict 2022-07-01 17:19:01 -07:00
ferricles
91407766cb slider generator functional 2022-07-01 15:52:13 -07:00
aspiepuppy
c601589c88 The last few commits but it is actually in atree_constants_min now 2022-07-01 16:53:41 -05:00
aspiepuppy
633e13a2cf Fixed More Traps archetype req to 0 from 10, fixed Fire Mastery to say Fire instead of Earth 2022-07-01 16:41:19 -05:00
aspiepuppy
4754187d2c Added Sharpshooter Archetype to Homing Shots 2022-07-01 15:54:42 -05:00
aspiepuppy
0156bdb236 Added Boltslinger Archetype to Stormy Feet 2022-07-01 15:48:08 -05:00
ferricles
bc68599c84
Merge pull request #66 from aspiepuppy/atree_hotfix
Added Focus dependency to More Focus 1 & 2, fixed Air Mastery so it i…
2022-07-01 13:38:22 -07:00
aspiepuppy
dbac4eff55 Added Focus dependency to More Focus 1 & 2, fixed Air Mastery so it is Boltslinger archetype and not Battle Monk. 2022-07-01 15:22:53 -05:00
hppeng
da782cd73c HOTFIX: Patch escape artist damage 2022-07-01 02:01:29 -07:00
hppeng
8663efccf7 HOTFIX: fix computeNode bad behavior with markDirty
was always doing dusty update
2022-07-01 01:35:20 -07:00
hppeng
13e8920fe1 Merge branch 'atree' of github.com:hppeng-wynn/hppeng-wynn.github.io into atree 2022-07-01 01:23:15 -07:00
hppeng
fac2c54da9 Archer atree 2022-07-01 01:23:06 -07:00
hppeng
d139262bf5 Remove unused print 2022-06-30 23:02:50 -07:00
hppeng
b13cf0499d ComputeNode subclass that will defer updates if its value did not change 2022-06-30 22:22:15 -07:00
hppeng
4632bba69a HOTFIX: patch atree json for charge, and display code 2022-06-30 21:21:25 -07:00
hppeng
53f502b96d Bugfix pt. 2: Totals now are evaluated in second round 2022-06-30 20:44:26 -07:00
hppeng
59f28f6956 HOTFIX: fix spellparts that don't already exist 2022-06-30 20:35:34 -07:00
hppeng
19134d3ab1 Merge branch 'atree' into UI_test 2022-06-30 20:15:17 -07:00
hppeng
8e3a35b16a Small modification (Show Tree -> Edit Abilities)
discussed in PR but not implemented because i'm dense
2022-06-30 20:13:06 -07:00
hppeng
a318756058 Fix converter script, complete warrior tree 2022-06-30 09:05:09 -07:00
hppeng
61172d16d4 Merge branch 'atree-json-fix' into atree_encode 2022-06-30 09:00:07 -07:00
hppeng
a9fc53e044 Update warrior atree json... 2022-06-30 08:58:26 -07:00
hppeng
0976fff43a Working atree encoder and decoder 2022-06-30 08:03:41 -07:00
hppeng
7e40d6a926 Merge branch 'sock_encoding' into atree_encode 2022-06-30 05:40:21 -07:00
hppeng
ffc0d4b9b4 Atree error validation and input combining 2022-06-30 05:27:35 -07:00
ferricles
e9acb79f4b fixed merge conflicts 2022-06-29 20:06:33 -07:00
ferricles
07a018afda prevent active boxes from collapsing to 0 width 2022-06-29 19:20:51 -07:00
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