Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Das_Schwarze_Auge_4-1] In-Chat Confirmation Rolls #12021

Merged
merged 71 commits into from Jul 20, 2023

Conversation

kreuvf
Copy link
Contributor

@kreuvf kreuvf commented Jul 20, 2023

Submission Checklist

Required

  • The pull request title clearly contains the name of the sheet I am editing.
  • The pull request title clearly states the type of change I am submitting (New Sheet/New Feature/Bugfix/etc.).
  • The pull request makes changes to files in only one sub-folder.
  • The pull request does not contain changes to any json files in the translations folder (translation.json is permitted)

Changes / Description

New Features

Interface/Style

  • Parry weapon actions moved to shield actions (3f5f0bd)
  • Configuration section overhaul (e5c53b0)
  • Combat technique of shields/parry weapons selectable (d6ac0dd)
  • New beta button/feature styling (ff972f0, 29f6ab5)
  • Margin/padding in select at default again (bf85a73)

Fixes

  • No parry value for whips (3c11b0f)
  • Correct return value in case of errors (23a3d65)
  • Combat damage roll templates warn about less than 0 damage (b17aa90)
  • Typos (9bdd19a)

Miscellaneous

Any old used attributes are still usable via an automatically running migration function.

kreuvf added 30 commits July 19, 2023 20:42
* Add melee roll names to ability call generation
* Reintroduce lowercasing method to work around bad attribute naming (may be tackled in the future)
… utilizing (nested) roll macros for the Ausfall manoeuvre (lunge)
Nested rolls need to be escaped and going beyond three levels of nesting by hand is madness. Also, readjusting the same macro to the current level of nesting poses and extra challenge for misplaced special characters. To minimize time lost finding such bugs, roll macros (for use in roll buttons) can now be generated from two objects: the 'macros' object and the 'reuse' object. The reuse object contains macros (and can contain other macros defined in the same reuse object) to allow easy generation of almost arbitrarily complex nested roll macros. The macros object defines the variables available to the roll and can call reuse macros as well. Combined, both allow to build complex macros in a rather elegant and easy to understand way. The output is the string for use in a roll button. The input sanitation present was written with a user of the roll macro generator in mind, not an intelligent attacker trying to bypass certain checks.
Proof of concept for utilizing the Roll Macro Generator.
This uses <span> within the button description that can be styled later to imitate real roll buttons.
kreuvf added 27 commits July 19, 2023 20:42
…se appropriate section names for parryweapons and shields
…ValuesAndWeaponNumber()

* Create more general calculateTpKKMod() function
* Use calculateTpKKMod() in calculateTpKKModFromValuesAndWeaponNumber()
Note: Currently, the advantage 'ambidextrous' and the special skills 'left hand', 'ambidextrous fighting I' and 'ambidextrous fighting II' are not considered when rolling parryweapon attacks.
… the left/wrong hand taking into consideration the advantage ambidextrous and the special skills left hand, ambidextrous fighting 1 and ambidextrous fighting 2

* Add default value for the attribute
This attribute has been replaced for a long time and sees no use in the sheet.
…iv' and 'TP_Bonus_Aktiv' with sheetworker scripts
Hide those that are non-functional for now and the near future/release.
* Closes #115
* Closes #121
@roll20deploy
Copy link
Contributor

Character Sheet Info Roll20 Internal Use only.

@NorWhal NorWhal merged commit e1e611d into Roll20:master Jul 20, 2023
1 check passed
@kreuvf kreuvf deleted the dsa4.1-crp-combat-confirmation-rolls branch July 25, 2023 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants