Commit graph

1597 commits

Author SHA1 Message Date
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
7ef6b39de0 Fix credits 2022-07-08 17:49:10 -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-wynn
1778d1fabc
Merge pull request #92 from hppeng-wynn/more-items
Update items for wynn2 item changes
2022-07-08 15:43:31 -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
f12515a885 Edit credits.txt 2022-07-07 22:54:28 -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-wynn
86719b749a
Merge pull request #86 from hppeng-wynn/atree_branch_hotfix
added patch 7 changes for archer on constants
2022-07-07 19:54:22 -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-wynn
5323ed2286
Merge pull request #81 from hppeng-wynn/atree-damage-debug
Atree damage hotfix
2022-07-07 14:27:40 -07:00
hppeng-wynn
e38faf192c
Merge pull request #85 from lodenrogue/feature/replace-credits-links
Replaced credits url
2022-07-06 21:32:47 -07:00
lodenrogue
f23a7d39a6 Added back files 2022-07-07 00:27:18 -04:00
lodenrogue
2e3e6f3640 Fixed credits links 2022-07-07 00:24:33 -04:00
hppeng
4a1939b5a1 Update slider jsons
and update json updater script
2022-07-06 21:15:41 -07:00
lodenrogue
147e34aa09 Merge 2022-07-07 00:10:20 -04:00
hppeng
310aa52557 Merge branch 'master' into atree 2022-07-06 20:34:59 -07:00
hppeng
2e6c5b8555 Fix some ability base_abil tags and update cyclone cost 2022-07-06 20:18:01 -07:00
lodenrogue
8d503580a8 Replaced credits url 2022-07-06 23:17:10 -04: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-wynn
5d8c5aa6b4
Merge pull request #80 from hppeng-wynn/crafter_fix
Restore crafter to working condition i think
2022-07-06 11:36:24 -07:00