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

AD&D 1e - small updates and fixes #12885

Merged
merged 9 commits into from May 14, 2024
Merged

Conversation

vince-roll20
Copy link
Contributor

@vince-roll20 vince-roll20 commented May 10, 2024

  • Fixed a bug in the Attack Matrix class drop-down selector where the "Cleric, Druid, and Monk" selection incorrectly used the Fighter table data. This was related to last week's change to the class dropdown. Big apologies.
  • Attacks that have the "In-Use" box enabled will auto-fill the global attributes @{weapon_in_use} (shows the weapon's name), @{weapon_in_use_speed} and @{weapon_in_use_misc}. You can see these in the Misc. Attack Info section found just above the repeating attacks. I believe these attributes could be used for those of you that wish to modify/customize their initiative rolls and/or other macros.
  • Added a "Misc." attribute to repeating attacks. @{repeating_weapon_$X_weapon_misc} this attribute will also be used to auto-fill @{weapon_in_use_misc} when the weapon is marked "In-Use".
  • Adjusted roll template to limit the image size to max-height of 100px if placed within the {{subtag}} key. Images posted included within other keys will still have a max-height of 300px.
  • THAC0 table alignment fix

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)

New Sheet Details

  • The name of this game is: < > (i.e. Dungeons & Dragons 5th Edition, The Dresden Files RPG)

  • The publisher of this game is: < > (i.e. Wizards of the Coast, Evil Hat)

  • The name of this game system/family is: < > (i.e. Dungeons & Dragons, FATE)

  • I have followed the Character Sheets Standards when building this sheet.

  • I have authorization from the game's publisher to make this an official sheet on Roll20 with their name attached.
  • This game is not a traditionally published game, but a copy of the game rules can be purchased/downloaded/found at: < >
  • This sheet is for an unofficial fan game, modification to an existing game, or a homebrew system.

Changes / Description

- THAC0 table alignment fix
@roll20deploy
Copy link
Contributor

Character Sheet Info Roll20 Internal Use only.

- margin adjustment for input fields
- updated sheet.json instructions
…ss dropdown. Big apologies.

- Attacks that have the "In-Use" box enabled will auto-fill the global attributes @{weapon_in_use} (shows the weapon's name), @{weapon_in_use_speed} and @{weapon_in_use_misc}. You can see these in the Misc. Attack Info section found just above the repeating attacks. I believe these attributes could be used for those of you that wish to modify/customize their initiative rolls and/or other macros.
- Added a "Misc." attribute to repeating attacks. @{repeating_weapon_$X_weapon_misc} this attribute will also be used to auto-fill @{weapon_in_use_misc} when the weapon is marked "In-Use".
- Adjusted roll template to limit the image size to max-height of 100px if placed within the {{subtag}} key. Images posted included within other keys will still have a max-height of 300px.
@vince-roll20 vince-roll20 changed the title AD&D 1e - couple small fixes AD&D 1e - small updates and fixes May 13, 2024
@kfroll20
Copy link
Contributor

Hi @vince-roll20 !

This pull request has a merge conflict in the html file that needs to be resolved before it can be merged. I recall seeing similar changes from the last PR you made so the branch you were working on may not have been updated with the newer version.

Once this gets resolved, we can merge :)

@vince-roll20
Copy link
Contributor Author

vince-roll20 commented May 14, 2024

Hi @vince-roll20 !

This pull request has a merge conflict in the html file that needs to be resolved before it can be merged. I recall seeing similar changes from the last PR you made so the branch you were working on may not have been updated with the newer version.

Once this gets resolved, we can merge :)

Thanks for the explanation @kfroll20.
I'm really not sure what happened. Both of the conflicts were resolved on my local fork and branch, and nothing was being marked as a conflict AFAICT...? IDK
Anyhow I've resolved the two conflicts and committed and would GREATLY APPRECIATE it if this could get merged today. Pretty please. :-)

@kfroll20 kfroll20 merged commit 32d39db into Roll20:master May 14, 2024
1 check passed
@vince-roll20
Copy link
Contributor Author

Thank you very much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants