diff --git a/Wrath and Glory API/readme.md b/Wrath and Glory API/readme.md
index d0275afc74..ec60cae473 100644
--- a/Wrath and Glory API/readme.md
+++ b/Wrath and Glory API/readme.md
@@ -9,10 +9,11 @@ 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 2.7 (July 28th, 2019)
+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.
### Thanks
-Many thanks to my players (Dave, Brian, Charles, Matt, and Tyler) for their patience as I evolved the sheet and die roller (sometimes in the middle of play).
+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).
Many thanks to the following individuals who reported defects and provided improvements:
1. Morback: extra die on rolls + implement force to add 1/2 willpower to weapon DR + corruption level and roll changes
@@ -20,21 +21,36 @@ Many thanks to the following individuals who reported defects and provided impro
3. Fenrir: new layout was his work; full contributions in the API.
### 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.
-Next: Overhaul of inline dice rolls!
+### Current Release Changelog
-v2.0. Automate all calculated fields for performance and speed of character creation.
- - includes automated calculation of traits
- DONE: conviction, corruption, resist corruption, passive awareness, resolve, defense, resilience, and soak
- TO DO: Influence and Attribute adjusted rating & Skill Total for performance (no new functionality)
- - when auto-calculating influence, need to allow the use of STR for Fel for influence for orks, and intellect in place of Fel for Mechanicus
-
-v3.0. Redo NPC Layout with an order close to the core rulebook stat block.
- - Create capability to enter values in place of auto-calculating (this will be a variant capability)
+v3.0. Revisions to Align with Cubicle 7 Revised Edition
-v4.0. Refine Inline rolls
- - Add modifiers to each roll
- - a 6 = two successes
+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. Cosmetic: Replaced all references to BP and Buildpoints with XP and Experience Points respectively.
+02. Cosmetic: Updated references to Soak to Determination. Note till vehicle and voidship rules are updated I have left them with Soak.
+03. Cosmetic: References to Race changed to Species.
+04. Cosmetic: References to Malignancy/ies changed to Mutation/s.
+05. Cosmetic: relabled Defining Trait to Background Type, removed Keyword from the list and renamed Custom to Other.
+06. Cosmetic: swapped Faction (previously Framework) with Species/Gender
+07. Cosmetic: added text in skills flagging those with optional use requirements.
+08. Cosmetic: added text to DMOD insturcting to add +1 for Brutal and Melta Short weapons.
+09. Cosmetic: Moved Memoriable Injuries to Combat tab.
+10. Cosmetic: Switched presentation of Current and Max for Shock and Wounds.
+11. Cosmetic: Removed Hvy and Lght wounds; no longer in use.
+12. Fix: Brutal Roll for non-api die roller on weapon damage.
+13. Fix: Total Corruption Adjusted value.
+14. Update: Per revised rules, removed ranks 4 and 5 and updated rank label accordingly.
+15. Update: removed defiance rolls - no longer used.
+16. NEW: Added Faith to first tab.
+17. NEW: Added Traumatic Injuries section next to memoriable injuries.
+18. NEW: created script workers to manage Traumatic Injury count - when you add counter goes up; when you remove counter goes down.
+19. NEW: Added a Melta dice roller for when using Melta vs structure and vehicles; too complex for adding to W&G dice roller at this point.
+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
@@ -146,4 +162,4 @@ Fixes:
- resubmitted on August 6th due to roll20 packaging error.
### Known Issues
-1. Inline rolls do not show two successes on a 6 and die modifier is not added; this functionality is not core within the Roll20 capabilities and an expanded formula needs to be created.
+1. Inline rolls do not show two successes on a 6 and die modifier is not added; this functionality is not core within the Roll20 capabilities and an expanded formula needs to be created.
\ No newline at end of file
diff --git a/Wrath and Glory API/sheet.json b/Wrath and Glory API/sheet.json
index ee317a2822..53a9faced5 100644
--- a/Wrath and Glory API/sheet.json
+++ b/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) v2.7**\n\nThis 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.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."
+}
\ No newline at end of file
diff --git a/Wrath and Glory API/wrath_and_glory.css b/Wrath and Glory API/wrath_and_glory.css
index cd36e2486c..835b2697b4 100644
--- a/Wrath and Glory API/wrath_and_glory.css
+++ b/Wrath and Glory API/wrath_and_glory.css
@@ -1,26 +1,26 @@
-/* Version: 2.7 */
+/* Version: 3.0 */
/* ================ COLOR GUIDE ================
LIGHT TEAL: #d0dfe5
DARK TEAL: #023244
*/
/* ================ Roll Templates ================ */
+.sheet-rolltemplate-meltadamage_roll table,
.sheet-rolltemplate-alternative_rolld66 table,
.sheet-rolltemplate-alternative_roll table,
.sheet-rolltemplate-roll_dicepool_nowrath table,
.sheet-rolltemplate-roll_dicepool table,
.sheet-rolltemplate-glory_roll table,
-.sheet-rolltemplate-defiance_roll table,
.sheet-rolltemplate-recovershock_roll table {
width:100%;
background-color: white;
border:1px solid Black
}
+.sheet-rolltemplate-meltadamage_roll th,
.sheet-rolltemplate-alternative_rolld66 th,
.sheet-rolltemplate-alternative_roll th,
.sheet-rolltemplate-roll_dicepool_nowrath th,
.sheet-rolltemplate-roll_dicepool th,
.sheet-rolltemplate-glory_roll th,
-.sheet-rolltemplate-defiance_roll th,
.sheet-rolltemplate-recovershock_roll th {
text-align: center;
font-family: Helvetica;
@@ -30,12 +30,12 @@ DARK TEAL: #023244
background-color: Black;
color: white;
}
+.sheet-rolltemplate-meltadamage_roll td,
.sheet-rolltemplate-alternative_rolld66 td,
.sheet-rolltemplate-alternative_roll td,
.sheet-rolltemplate-roll_dicepool_nowrath td,
.sheet-rolltemplate-roll_dicepool td,
.sheet-rolltemplate-glory_roll td,
-.sheet-rolltemplate-defiance_roll td,
.sheet-rolltemplate-recovershock_roll td {
padding:5px;
line-height:1.1em;
@@ -44,13 +44,13 @@ DARK TEAL: #023244
.sheet-rolltemplate-roll_dicepool_nowrath td:first-child,
.sheet-rolltemplate-roll_dicepool td:first-child,
.sheet-rolltemplate-glory_roll td:first-child,
-.sheet-rolltemplate-defiance_roll td:first-child,
.sheet-rolltemplate-recovershock_roll td:first-child {
color: black;
text-align:Left;
min-width:50px;
padding-right:5px;
}
+.sheet-rolltemplate-meltadamage_roll td:first-child,
.sheet-rolltemplate-alternative_rolld66 td:first-child,
.sheet-rolltemplate-alternative_roll td:first-child {
color: black;
@@ -58,12 +58,12 @@ DARK TEAL: #023244
min-width:50px;
padding-right:5px;
}
+.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_nowrath tr:nth-child(even),
.sheet-rolltemplate-roll_dicepool tr:nth-child(even),
.sheet-rolltemplate-glory_roll tr:nth-child(even),
-.sheet-rolltemplate-defiance_roll tr:nth-child(even),
.sheet-rolltemplate-recovershock_roll tr:nth-child(even) {
background-color:#EEEEEE
}
@@ -397,6 +397,13 @@ textarea[name=attr_rinjury] {
height: 1.25em;
/* margin-left: 10px !important;*/
}
+textarea[name=attr_trauma] {
+ resize: vertical;
+ display: block;
+ width: 97.5% !important;
+ height: 1.25em;
+ /* margin-left: 10px !important;*/
+}
textarea[name=attr_rinjuryDescription] {
resize: vertical;
display: block;
@@ -726,9 +733,15 @@ th {
.sheet-width-W50 {width: 50%;}
.sheet-width-W45 {width: 45%;}
.sheet-width-W40 {width: 40%;}
+.sheet-width-W35 {width: 37%;}
+.sheet-width-W35 {width: 38%;}
.sheet-width-W35 {width: 35%;}
.sheet-width-W33 {width: 33%;}
.sheet-width-W30 {width: 30%;}
+.sheet-width-W25 {width: 29%;}
+.sheet-width-W25 {width: 28%;}
+.sheet-width-W25 {width: 27%;}
+.sheet-width-W25 {width: 26%;}
.sheet-width-W25 {width: 25%;}
.sheet-width-W24 {width: 24%;}
.sheet-width-W23 {width: 23%;}
diff --git a/Wrath and Glory API/wrath_and_glory_api.html b/Wrath and Glory API/wrath_and_glory_api.html
index 50b1b29b6e..b72002fa9a 100644
--- a/Wrath and Glory API/wrath_and_glory_api.html
+++ b/Wrath and Glory API/wrath_and_glory_api.html
@@ -1,4245 +1,4863 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Use inline dice (vs API)?
- Private roll to the GM?
-
-
-
-
- PC\Adversary
- NPC
- Vehicle
- Voidship
-
-
-
-
-