Update sr-formula and add March7th sheet #1403

nguyentvan7 · 2024-01-01T07:44:32Z

Describe your changes

Update sr-formula to use premod/final stat calculations
Update sr-formula to better match the in-game calcs/stats (still a little bit of work needs to be done relating to defense, res, etc)
Add utils for sheet creation
Add March7th sheet
Update UI to display calculated values for character sheet targets
Set up formula listing for sr-formula
Add eidolon parsing from datamine
Add debug calculator

Issue or discord link

Testing/validation

Did not validate numbers. But validated site did not crash and all targets are showing as expected for March 7th

Checklist before requesting a review (leave this PR as draft if any part of this list is not done.)

I have commented my code, in hard-to understand areas.
I have made corresponding changes to README or wiki.
For front-end changes, I have updated the corresponding English translations.
Ran yarn run mini-ci locally to validate format + lint.
If there were format issues, I ran nx format write to resolve them automatically.

github-actions · 2024-01-01T07:46:19Z

Logs

[gi-frontend] [Mon Jan 1 07:46:18 UTC 2024] - Building version 6163c67

[frontend] [Mon Jan 1 07:46:21 UTC 2024] - Building version 6163c67

[sr-frontend] [Mon Jan 1 07:46:22 UTC 2024] - Building version 6163c67

[frontend] [Mon Jan 1 07:47:58 UTC 2024] - Deployed 6163c67 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 08:43:02 UTC 2024] - Building version c07ee56

[frontend] [Mon Jan 1 08:43:07 UTC 2024] - Building version c07ee56

[sr-frontend] [Mon Jan 1 08:43:11 UTC 2024] - Building version c07ee56

[frontend] [Mon Jan 1 08:44:40 UTC 2024] - Deployed c07ee56 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 18:45:48 UTC 2024] - Building version 9956f69

[sr-frontend] [Mon Jan 1 18:45:51 UTC 2024] - Building version 9956f69

[frontend] [Mon Jan 1 18:46:22 UTC 2024] - Building version 9956f69

[frontend] [Mon Jan 1 18:47:58 UTC 2024] - Deployed 9956f69 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 19:27:23 UTC 2024] - Building version e5a29ce

[sr-frontend] [Mon Jan 1 19:27:26 UTC 2024] - Building version e5a29ce

[frontend] [Mon Jan 1 19:27:34 UTC 2024] - Building version e5a29ce

[frontend] [Mon Jan 1 19:29:15 UTC 2024] - Deployed e5a29ce to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[sr-frontend] [Mon Jan 1 19:45:52 UTC 2024] - Building version b5f1b43

[frontend] [Mon Jan 1 19:45:53 UTC 2024] - Building version b5f1b43

[gi-frontend] [Mon Jan 1 19:45:54 UTC 2024] - Building version b5f1b43

[frontend] [Mon Jan 1 19:47:28 UTC 2024] - Deployed b5f1b43 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 20:23:39 UTC 2024] - Building version f11f2f1

[sr-frontend] [Mon Jan 1 20:23:44 UTC 2024] - Building version f11f2f1

[frontend] [Mon Jan 1 20:23:57 UTC 2024] - Building version f11f2f1

[frontend] [Mon Jan 1 20:25:41 UTC 2024] - Deployed f11f2f1 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 20:25:53 UTC 2024] - Deployed f11f2f1 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[sr-frontend] [Mon Jan 1 20:43:32 UTC 2024] - Building version 3072707

[frontend] [Mon Jan 1 20:43:36 UTC 2024] - Building version 3072707

[gi-frontend] [Mon Jan 1 20:43:36 UTC 2024] - Building version 3072707

[frontend] [Mon Jan 1 20:45:10 UTC 2024] - Deployed 3072707 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 20:45:43 UTC 2024] - Deployed 3072707 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[sr-frontend] [Mon Jan 1 20:47:25 UTC 2024] - Building version 31dfc4d

[frontend] [Mon Jan 1 20:47:30 UTC 2024] - Building version 31dfc4d

[gi-frontend] [Mon Jan 1 20:47:32 UTC 2024] - Building version 31dfc4d

[frontend] [Mon Jan 1 20:49:03 UTC 2024] - Deployed 31dfc4d to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 20:49:43 UTC 2024] - Deployed 31dfc4d to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[sr-frontend] [Mon Jan 1 21:03:42 UTC 2024] - Building version 75d0247

[frontend] [Mon Jan 1 21:03:46 UTC 2024] - Building version 75d0247

[gi-frontend] [Mon Jan 1 21:03:54 UTC 2024] - Building version 75d0247

[sr-frontend] [Mon Jan 1 21:05:01 UTC 2024] - Deployed 75d0247 to https://genshin-optimizer-prs.github.io/pr/1403/sr-frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Mon Jan 1 21:05:23 UTC 2024] - Deployed 75d0247 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 21:06:14 UTC 2024] - Deployed 75d0247 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Mon Jan 1 21:46:39 UTC 2024] - Building version 3328edc

[sr-frontend] [Mon Jan 1 21:46:40 UTC 2024] - Building version 3328edc

[gi-frontend] [Mon Jan 1 21:46:46 UTC 2024] - Building version 3328edc

[sr-frontend] [Mon Jan 1 21:47:57 UTC 2024] - Deployed 3328edc to https://genshin-optimizer-prs.github.io/pr/1403/sr-frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Mon Jan 1 21:48:13 UTC 2024] - Deployed 3328edc to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Mon Jan 1 21:48:58 UTC 2024] - Deployed 3328edc to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Tue Jan 2 04:04:46 UTC 2024] - Building version 9eea9a8

[frontend] [Tue Jan 2 04:04:54 UTC 2024] - Building version 9eea9a8

[sr-frontend] [Tue Jan 2 04:06:13 UTC 2024] - Deployed 9eea9a8 to https://genshin-optimizer-prs.github.io/pr/1403/sr-frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Tue Jan 2 04:06:32 UTC 2024] - Deployed 9eea9a8 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Tue Jan 2 04:06:56 UTC 2024] - Deployed 9eea9a8 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Tue Jan 2 15:51:03 UTC 2024] - Building version 321aa20

[sr-frontend] [Tue Jan 2 15:51:06 UTC 2024] - Building version 321aa20

[frontend] [Tue Jan 2 15:51:25 UTC 2024] - Building version 321aa20

[frontend] [Tue Jan 2 15:51:44 UTC 2024] - Building version 4e70bc3

[gi-frontend] [Tue Jan 2 15:51:47 UTC 2024] - Building version 4e70bc3

[sr-frontend] [Tue Jan 2 15:51:49 UTC 2024] - Building version 4e70bc3

[sr-frontend] [Tue Jan 2 15:52:25 UTC 2024] - Deployed 321aa20 to https://genshin-optimizer-prs.github.io/pr/1403/sr-frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Tue Jan 2 15:53:08 UTC 2024] - Deployed 321aa20 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Tue Jan 2 15:53:11 UTC 2024] - Deployed 321aa20 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[sr-frontend] [Tue Jan 2 15:53:21 UTC 2024] - Deployed 4e70bc3 to https://genshin-optimizer-prs.github.io/pr/1403/sr-frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Tue Jan 2 15:53:55 UTC 2024] - Deployed 4e70bc3 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

[frontend] [Tue Jan 2 16:34:20 UTC 2024] - Building version 0a08170

[sr-frontend] [Tue Jan 2 16:34:48 UTC 2024] - Building version 0a08170

[gi-frontend] [Tue Jan 2 16:35:03 UTC 2024] - Building version 0a08170

[frontend] [Tue Jan 2 16:36:02 UTC 2024] - Deployed 0a08170 to https://genshin-optimizer-prs.github.io/pr/1403/frontend (Takes 3-5 minutes after this completes to be available)

[sr-frontend] [Tue Jan 2 16:36:16 UTC 2024] - Deployed 0a08170 to https://genshin-optimizer-prs.github.io/pr/1403/sr-frontend (Takes 3-5 minutes after this completes to be available)

[gi-frontend] [Tue Jan 2 16:37:30 UTC 2024] - Deployed 0a08170 to https://genshin-optimizer-prs.github.io/pr/1403/gi-frontend (Takes 3-5 minutes after this completes to be available)

lantua

I only checked the sr-formula portion.

libs/sr-formula/src/data/char/March7th.ts

libs/sr-formula/src/data/char/util.ts

lantua · 2024-01-01T21:43:10Z

libs/sr-formula/src/data/common/index.ts

+  reader.withTag({ src: 'agg', et: 'self' }).reread(reader.src('custom')),
+
+  // convert src:char, lightCone, relic to src:agg for accumulation
+  reader.src('agg').add(reader.sum.src('char')),


According to the table in data/util/tag.ts, do we also include src:iso <= sum { src:char } somewhere?

Think this is it?

genshin-optimizer/libs/sr-formula/src/util.ts

Line 28 in 3badff1

reader.src('char').reread(reader.src(data.key)),

libs/sr-formula/src/util.ts

nguyentvan7 added 18 commits December 29, 2023 14:18

Adjust usage of context

a672c30

Use CalcContext

1278c17

Add global override for object functions

54f300d

Fix key naming

798cb55

Export SkillTreeNodeBonusStat type

b3b31c5

Fix tag shape

da02c8a

Update stat calculation

74fe689

Export Calculator type

dbe96bd

Export type dmg keys

7c200c9

Fix default char stats

eeb2dfa

Add small trace and eidolon utils

326d014

Add gen files and fix typing

2766e3f

Add base stats to util

0546d10

Add dmg and shield utils

1c68d5b

Add jsdoc and heal util

107f5a1

Add March7th sheet and fix bugs in formula impl

b7f1eb1

Add formula printer

10cb091

Add simple copy-pasted listFormulas (broken)

f011b75

nguyentvan7 added 11 commits January 1, 2024 01:10

Fix more bugs

209f9af

Rename march damage

e2fea54

Fix stat display

0879e82

Add damage calcs

f3b0ed5

Attempt to compute nodes

e419d69

Delete bad UI

86765ba

Fix damage calcs

6f740bb

Fix ui display

17629ee

Fix typings

2e507b5

Fix some todos

ab1e70d

Fix light cone calc

7999a0e

nguyentvan7 added 7 commits January 1, 2024 12:21

Fix def/res calcs

e9b877e

Fix typeRoots

9d172f6

Fix typings

b5257f5

Fix unit tests

174b00d

Fix typing again

6b04f40

Fix src for char, lightCone and relic

06868dd

Fix errors

c0d4a55

nguyentvan7 marked this pull request as ready for review January 1, 2024 21:14

nguyentvan7 requested a review from frzyc January 1, 2024 21:14

Add comments for srsim splits

3badff1

lantua reviewed Jan 1, 2024

View reviewed changes

nguyentvan7 added 5 commits January 1, 2024 21:02

Resolve comments

82c302f

Fix percent(1) for critmulti

d6e72e8

Fix circular read

2919a45

Add back char and lightCone src

201d5df

Fix bug and add debug calculator

8efc5da

nguyentvan7 marked this pull request as draft January 2, 2024 19:17

nguyentvan7 closed this Jan 5, 2024

nguyentvan7 deleted the van/sro/formula branch January 6, 2024 02:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update sr-formula and add March7th sheet #1403

Update sr-formula and add March7th sheet #1403

nguyentvan7 commented Jan 1, 2024 •

edited

Loading

github-actions bot commented Jan 1, 2024 •

edited

Loading

lantua left a comment

lantua Jan 1, 2024

nguyentvan7 Jan 2, 2024

Update sr-formula and add March7th sheet #1403

Update sr-formula and add March7th sheet #1403

Conversation

nguyentvan7 commented Jan 1, 2024 • edited Loading

Describe your changes

Issue or discord link

Testing/validation

Checklist before requesting a review (leave this PR as draft if any part of this list is not done.)

github-actions bot commented Jan 1, 2024 • edited Loading

lantua left a comment

Choose a reason for hiding this comment

lantua Jan 1, 2024

Choose a reason for hiding this comment

nguyentvan7 Jan 2, 2024

Choose a reason for hiding this comment

nguyentvan7 commented Jan 1, 2024 •

edited

Loading

github-actions bot commented Jan 1, 2024 •

edited

Loading