Merge pull request #7293 from bts1967/master

W&G v3.1 Release

Wrath and Glory API/readme.md

@@ -9,8 +9,8 @@ Please note that the inline dice roll macros do not fully enable the type of dic
 If you have any questions, comments, or feedback (all welcome) please contact Barry at btsnyder@gmail.com
 
 ### Current Version
-Version 3.0 (May 18th, 2020) Wrath & Glory Revision Updates.
-This release has a significant number of updates to align with the revised edition.  The major change revolves around traumatic injuries and replacement of dice with wrath dice = to number of traumatic injuries.
+Version 3.1 (August 30th, 2020) Revised Release (3.1) fixes.
+this release focused on incorporating max wounds changes from errata, a wiley defect (logical error) in dice rolls, and the addition of dying around trauma.
 
 ### Thanks	
 Many thanks to my players (Dave, Brian, Matt, and Tyler) for their patience as I evolved the sheet and die roller (sometimes - literally - in the middle of play).
@@ -19,13 +19,31 @@ Many thanks to the following individuals who reported defects and provided impro
 1. Morback: extra die on rolls + implement force to add 1/2 willpower to weapon DR + corruption level and roll changes
 2. Zoraste: update wounds to include wounds_max for token bar linking + notes field for Gear + minor spelling errors + request for private rolls + contributed code for automating trait calculations
 3. Fenrir: new layout was his work; full contributions in the API.
+4. Thomas: whose help in identifying the underlying issue with a bug fix and willingness to test was a great aid!
 
 ### Planned Releases
-3.1 After update to Wrath & Glory handling of additional wrath dice for Injuries (swapping them out) will update all rolls to feed Trauma Count (introduced in 3.0) to all dice rolls using wrath.
+3.2 Maintenance - refactor code to align with Roll20 standards.
 
 ### Current Release Changelog
 
-v3.0. Revisions to Align with Cubicle 7 Revised Edition
+v3.1. Errata, Fixes, and Dying Enhancement
+
+The major element of this release, beyond cosmetic changes to match against the Revised rules is the additon of traumatic weapons and replacing existing dice with a number of wrath dice = traumatic injuries.
+
+Updates:
+01. New: Added Dying checkbox to align with how Traumatic wounds work.  The Wrath dice for Traumatic Wounds only apply when a player is dying.
+02. Fix: Additional wrath dice are only triggered if the Dying checkbox is checked.  Before it was triggered if the number of Traumatic wounds was greater than 0.  This is per RAW.
+03. Fix: Updated load to account for weapons field value that is not being reset for character sheets prior to 3.01.
+04. Fix: Under very specific circumstances, dice rolls for skills and weapon attacks were off by 1 to 2 dice.
+05. Fix: Number of dice being rolled for roll20 standard dice rolling mechanics for damage on attacks was not being properly updated - resulting in missing dice.
+06. New: Errata changes for calculating wounds - I opted to leave in the recovery roll for shock to allow groups to have that option if so desired.
+
+### Changelog
+
+** August 30th, 2020 - v3.1 - Fixes with Dying Enhancement** 
+
+
+** May 18th, 2020 - v3.0 - Revisions to Align with Cubicle 7 Revised Edition** 
 
 The major element of this release, beyond cosmetic changes to match against the Revised rules is the additon of traumatic weapons and replacing existing dice with a number of wrath dice = traumatic injuries.
 
@@ -52,8 +70,6 @@ Updates:
 20. NEW: Automated replacement of wrath dice with traumatic injuries for Attributes, Traits, Skills, Weapons, and Psychic Powers.  This does not include vehicle and voidship rules till those rules are released.
 21. NEW: On personal tab added fields for - Appearance, Age, Eyes, Hair, Height,Size, and Features.
 
-### Changelog
-
 ** July 28th, 2019: version 2.7 - Dice overhaul + fixes, updates, and enhancements** 
 
 Updates:

Wrath and Glory API/sheet.json

@@ -4,5 +4,5 @@
 	"authors": "Barry Snyder, Fenrhir",
 	"roll20userid": "399162,1048520",
 	"preview": "WrathAndGloryWithAPI.png",
-	"instructions": "**Wrath & Glory (with Advanced API Integration) v3.0**\n\nThe W&G API sheet is for the revised edition of Wrath & Glory.  The previous version of this sheet supports the original edition.  This is a multi-purpose sheet for both characters (default view) and threats based on the core rules.  **Dice Rolling**\n\nThis Wrath & Glory character sheet provides automated dice rolls using the Roll20 Inline dice rolling and integration with a Wrath and Glory API Dice Roller. If you have any questions, comments, or feedback (all welcome) please contact Barry at btsnyder@gmail.com or MrBS on Roll20."
-}
+	"instructions": "**Wrath & Glory (with Advanced API Integration) v3.1**\n\nThe W&G API sheet is for the revised edition of Wrath & Glory.  The previous version of this sheet supports the original edition.  This is a multi-purpose sheet for both characters (default view), threats, vehicles, and voidships.\r\r A core philosophy behind the design of this sheet was to automate as much of the manual calculation around dice pools and crunchy mechanics to give players the ability to focus on the game and not how to execute the mechanics. \r\r##Features\r\r* Automated calculations of base ratings - if you are using variant rules or equipment that modifies a particular value use the +Adj for static vaules (Attributes, Traits, and Skills). \r* Ability to add additional dice (bonus die) or modifier to a given roll (roll mod).  Note I do not use the pop-up to add modifiers as this slows down play as you switch windows. \r* The ability to add custom skills.  \r* Automatic calculation of additional wrath dice when the character is Dying (Dying checkbox is checked) and the character takes trauma.  \r* Ability to roll a d66, a d6, or a d3 (under rolls). \r* Progression Tracking with automated summing of XP.\r\r## Dice Rolling\r\r*This Wrath & Glory character sheet provides automated dice rolls using the Roll20 Inline dice rolling and integration with the **Wrath and Glory API Dice Roller**.  To use the API die roller you need to be a pro subscriber and select the **Wrath & Glory Dice Roller** in the API scripts.  While standard dice rolling is supported on this character sheet; it does not support the specific dice mechanics in capturing 2 successes with a 6 - this is a limitation of Roll20 with no known way to codify.  The API Dice Roller has the ability to calculate number of successes based on the number rolled as well as additional functionality such as adding +1 on all die rolls with specific weapon feats but is not necessary to use this sheet.  To use the Roll20 dice rolling mechanics, make sure to have the **Use Inline dice(vs API)** checkbox checked at the top of the character sheet. \n\nIf you have any questions, comments, or feedback (all welcome) please contact Barry at btsnyder@gmail.com or MrBS on Roll20."
+}

Wrath and Glory API/wrath_and_glory.css

@@ -1,4 +1,5 @@
-/* Version: 3.0 */
+/* Version: 3.1 */
+
 /* ================ COLOR GUIDE ================
 LIGHT TEAL: #d0dfe5
 DARK TEAL: #023244
@@ -7,6 +8,7 @@ DARK TEAL: #023244
 .sheet-rolltemplate-meltadamage_roll table,
 .sheet-rolltemplate-alternative_rolld66 table,
 .sheet-rolltemplate-alternative_roll table,
+.sheet-rolltemplate-roll_dicepool_damage table,
 .sheet-rolltemplate-roll_dicepool_nowrath table,
 .sheet-rolltemplate-roll_dicepool table,
 .sheet-rolltemplate-glory_roll table,
@@ -18,6 +20,7 @@ DARK TEAL: #023244
 .sheet-rolltemplate-meltadamage_roll th,
 .sheet-rolltemplate-alternative_rolld66 th,
 .sheet-rolltemplate-alternative_roll th,
+.sheet-rolltemplate-roll_dicepool_damage th,
 .sheet-rolltemplate-roll_dicepool_nowrath th,
 .sheet-rolltemplate-roll_dicepool th,
 .sheet-rolltemplate-glory_roll  th,
@@ -33,6 +36,7 @@ DARK TEAL: #023244
 .sheet-rolltemplate-meltadamage_roll td,
 .sheet-rolltemplate-alternative_rolld66 td,
 .sheet-rolltemplate-alternative_roll td,
+.sheet-rolltemplate-roll_dicepool_damage td,
 .sheet-rolltemplate-roll_dicepool_nowrath td,
 .sheet-rolltemplate-roll_dicepool td,
 .sheet-rolltemplate-glory_roll td,
@@ -41,6 +45,7 @@ DARK TEAL: #023244
 	line-height:1.1em;
 	vertical-align:top;
 }
+.sheet-rolltemplate-roll_dicepool_damage td:first-child, 
 .sheet-rolltemplate-roll_dicepool_nowrath td:first-child,  
 .sheet-rolltemplate-roll_dicepool td:first-child, 
 .sheet-rolltemplate-glory_roll td:first-child,
@@ -61,6 +66,7 @@ DARK TEAL: #023244
 .sheet-rolltemplate-meltadamage_roll tr:nth-child(even),
 .sheet-rolltemplate-alternative_rolld66 tr:nth-child(even),
 .sheet-rolltemplate-alternative_roll tr:nth-child(even),
+.sheet-rolltemplate-roll_dicepool_damage tr:nth-child(even),
 .sheet-rolltemplate-roll_dicepool_nowrath tr:nth-child(even),
 .sheet-rolltemplate-roll_dicepool tr:nth-child(even), 
 .sheet-rolltemplate-glory_roll tr:nth-child(even),