Commit graph

139 commits

Author SHA1 Message Date
hppeng
5f464f9e7c Fix rounding for scaling IDs
should work for damMult too (.. for now...) because those are specified in units of % (integer div 100)
2022-07-12 23:36:01 -07:00
fin444
f78d911c1e resolve PR comments 2022-07-12 16:56:36 -07:00
fin444
89f699df74 fix merge issues & update atree constants 2022-07-12 15:06:40 -07:00
fin444
50082a4060 merge everyone else's changes into fin444's branch 2022-07-12 14:36:20 -07:00
fin444
4ae9655a3f final style touches 2022-07-12 14:09:09 -07:00
fin444
2aee7ca589 connections no longer work by rotating
since rotations had issues with the pixel art
2022-07-12 13:48:55 -07:00
hppeng-wynn
6cb003f9bd
Merge pull request #116 from hppeng-wynn/atree-validation-hotfix
Fix bug that would count abilities' AP cost and archetype even if it was not "added" to AT
2022-07-12 11:02:16 -05:00
hppeng
df14970e5f Fix bug that would count abilities' AP cost and archetype even if it was not "added" to AT 2022-07-12 00:00:51 -07:00
fin444
9118225319 backup of current work 2022-07-11 20:17:00 -07:00
hppeng
7d2626d1dc Merge branch 'atree' into weapon-powder-optimization 2022-07-11 19:57:24 -07:00
hppeng
250627f9a9 Merge branch 'atree' into misc-bugfix 2022-07-11 08:16:53 -07:00
hppeng
ebe322cbb3 Winded implementation
also general raw spell base modifier
2022-07-11 07:33:03 -07:00
hppeng
dc8973a73f Don't reload atree when build changes, only when player class changes
for some reason `atree-merge` node was depending on build instead of `player-class` node, which auto caches things.

Also first time debugging compute graph using `builder/doc.html`! epic success
2022-07-11 06:15:53 -07:00
hppeng
dc04101dde Fix blockers highlighting
whooo
2022-07-11 02:03:42 -07:00
hppeng
25cb2d4d9e Fix intelligence spellcost formula
mfw bug becomes feature
2022-07-11 01:25:25 -07:00
hppeng
fa5280d089 Merge branch 'atree' into misc-bugfix 2022-07-11 01:08:55 -07:00
hppeng
3c1ff1a263 Fix isNaN typo 2022-07-11 00:59:53 -07:00
touhoku-wynn
baf08cb533
Update atree.js 2022-07-10 20:28:08 -07:00
hppeng
dbd7c45ff1 Add atree level table, begin work on highlight... death... 2022-07-09 19:30:29 -07:00
hppeng
e37c4696e0 Misc bugfixes in #bug-reports
biggest one is prolly implementing spell-part-specific damage mult
2022-07-09 03:09:50 -07:00
hppeng-wynn
25e55bec92
Merge pull request #94 from hppeng-wynn/merge-mastery
Merge mastery
2022-07-08 21:41:39 -07:00
hppeng
e0c91ffabb Merge branch 'atree' into merge-mastery 2022-07-08 21:27:43 -07:00
hppeng
7b1693c7f5 Fix archetype failure msg 2022-07-08 21:25:45 -07:00
reschan
c2a41b2e79 remove duplicates 2022-07-09 11:16:44 +07:00
reschan
4434b0969c remove extraneous/debug code 2022-07-09 11:14:38 +07:00
reschan
07c39c0780 fix: multiple transform on an image 2022-07-09 11:13:09 +07:00
reschan
cadd06864a fix: remove connector logic, add lookup table instead 2022-07-09 10:59:45 +07:00
hppeng
bb2ea64580 Address PR comment (remove print) 2022-07-08 20:51:01 -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
5e43db7a49 Merge branch 'atree' into atree-validation-fix 2022-07-08 19:13:37 -07:00
hppeng
eea6a3c6b0 Merge branch 'atree' into atree-mage 2022-07-08 19:07:03 -07:00
hppeng
c5191cfe99 Merge branch 'atree' into atree_active_box 2022-07-08 17:29:40 -07:00
hppeng
22ee9322ef Fix crash if no atree selected 2022-07-08 15:45:24 -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
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
5b6c957e76 Working scaling abils, sliders not hooked up yet
also fixed burning heart scaling
2022-07-07 19:44:57 -07: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
cdaff5fce9 Fix More Focus base_abil, display sliders 2022-07-07 15:33:00 -07:00
hppeng
4a1939b5a1 Update slider jsons
and update json updater script
2022-07-06 21:15:41 -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
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
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
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
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
hppeng
306e3a375e Bulk multiply mana stats
by 5 and .7

item changes not in
2022-07-04 18:03:01 -07: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
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
59f28f6956 HOTFIX: fix spellparts that don't already exist 2022-06-30 20:35:34 -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
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
hppeng
4d3a922bb2 Merge branch 'atree' into atree_aggregator 2022-06-27 22:57:05 -07:00
ferricles
8b0fe24482 eliminate repeated appendChild() in construct_AT 2022-06-27 21:33:38 -07:00
ferricles
2db1a3a336 quick documentation + refactoring to add new param for render_AT() 2022-06-27 16:49:21 -07:00
hppeng
5fde5faacb really minor code cleanup 2022-06-27 01:32:26 -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
a99f164a29 Clean up js files
rename display_atree -> atree
remove d3_export
2022-06-26 06:14:19 -07:00
Renamed from js/display_atree.js (Browse further)