diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md
index 1fd6b24528..9b9cade5c8 100644
--- a/Warhammer 4e Character Sheet/README.md
+++ b/Warhammer 4e Character Sheet/README.md
@@ -9,16 +9,31 @@ I'm a active WFRP player and I plan to further enhance this sheet at time goes o
///// ============ Change Log ============ /////
-- Jan 20 2020
-- Asset and Color palate rework (darker)
-- Spellbook rework, added all known spell names. And Extended Channeling tweak.
+Feb 10 2020
+
+- Banner rework, added light/dark mode to settings
+- Roll test clean up and rules, Crit Success/Failure added
+- Crit roll fixed
+- Wounds updated, locked between 0 and max wounds
+- Roll template rework
+- Roll public/whisper chooser moved to settings
+- Fields for Career level and Career Path added.
+- Perception/Stealth rolls influence from armour fixed
+- Critical Hit roll fixed
+
+
+
+Jan 20 2020
+
+- Asset and Color palate rework, light/dark mode
- Clean up of global rolls mechanic
- Xp spend log tab added, these field interact with Xp current/earned/spent fields.
- Bug fixes
-- Jan 13 2020
+
+Jan 13 2020
- Reworked Initiative Roll button, with 3 Core book rule options. See Settings cog.
- Moved Wounds/Advantage/Fate points out of the tabs to the top of the sheet for better access.
@@ -27,10 +42,15 @@ I'm a active WFRP player and I plan to further enhance this sheet at time goes o
- Rework of Weapons (formerly Combat) Tab. With Skill selector for Melee/Ranged specilizations.
- Rework of Spellbook Tab. Removed unused 2e spell sub tabs. Spells now work correctly and added Channelling Test button for Arcane spells.
-Dec 2019
+
+
+Dec 24 2019
- Project Forked
+
+
+
Usage Notes:
- Wounds: ensure correct Race and HArdy level are chose. Wounds are subtracted by adding damage, and given back by subtracting it.
@@ -45,8 +65,7 @@ Usage Notes:
Possible additons to come :
- Condition Tracker
-- Spellbook enhancemnts
-- Map Tab
+- Map/Info Tab
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index eb0d7f8f2f..2e16087272 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
@@ -6,14 +6,25 @@
min-width: 850px;
}
-.charsheet {
+
+.sheet-useBackground input[value="1"]:checked ~ *.sheet-background {
padding: 0 3px 3px !important;
- margin-top: -13px;
- min-width: 850px;
background: url('https://github.com/Djjus/roll20-character-sheets/blob/master/Warhammer%204e%20Character%20Sheet/assets/parchment.jpg?raw=true');
border: 27px solid transparent;
border-image: url('https://github.com/Djjus/roll20-character-sheets/blob/master/Warhammer%204e%20Character%20Sheet/assets/csborder.png?raw=true') 27 round;
+ margin-top: -13px;
+ min-width: 850px;
}
+
+.sheet-useBackground input[value="2"]:checked ~ *.sheet-background {
+ padding: 0 3px 3px !important;
+ background: url('https://github.com/Djjus/roll20-character-sheets/blob/master/Warhammer%204e%20Character%20Sheet/assets/parchment_dark.jpg?raw=true');
+ border: 27px solid transparent;
+ border-image: url('https://github.com/Djjus/roll20-character-sheets/blob/master/Warhammer%204e%20Character%20Sheet/assets/csborder_dark.png?raw=true') 27 round;
+ margin-top: -13px;
+ min-width: 850px;
+}
+
.sheet-area-border {
border-radius: 5px;
padding:2px;
@@ -28,6 +39,14 @@
border-radius: 5px;
padding: 1px;
}
+.sheet-wrap-box-banner {
+ border: 1px solid black;
+ background-color: rgb(253, 249, 239);
+ border-radius: 5px;
+ padding: 1px;
+ float: left;
+ height: 80px;
+}
.sheet-wrap-box-transparent {
border: 1px solid black;
border-radius: 3px;
@@ -386,14 +405,22 @@ button[type=roll] span {
}
.sheet-header-info input[type=text],
.sheet-header-info input[type=number] {
- margin-top: 5px;
+ margin-top: 0 !important;
margin-bottom: 0 !important;
- padding: 2px 2px 0 2px;
}
.sheet-dnd-image-wrapper img {
display: block;
max-height: 40px;
}
+.sheet-banner-l-wrapper img {
+ float: left;
+ height: 80px;
+ border-radius: 5px;
+}
+.sheet-banner-r-wrapper img {
+ float: left;
+ height: 80px;
+}
/* === SKILLS === */
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 1101d13f99..b82773466f 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
@@ -1,51 +1,31 @@
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
- Character Name
-
-
-
-
-
+
+
+
+
-
+
-
+
- Career
+ Character Name
-
-
-
- Level
-
-
-
-
-
- Status
-
-
-
-
-
- Tier
-
-
-
-
-
+
-
+
+
+
+ Class
+
+
+
+
+
+ Career
+
+
+
+
+
+ CAREER LVL
+
+
+
+
+
+ Status
+
+
+
+
+
+
+
+ CAREER PATH
+
+
+
Religion
@@ -70,12 +82,6 @@
XP Earned
-
-
-
- XP Spent
-
-
@@ -86,9 +92,16 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -141,12 +154,18 @@
-
+
-
+
+
+
+
+
+
+
-
+
@@ -198,7 +217,7 @@
-
@@ -215,9 +234,9 @@
-
+
-
+ Critical Hit
@@ -229,44 +248,44 @@
-
+
-
+ Amputation
-
+ Athletics
-
+ Endurance
-
+ Perception
-
+ Cool
-
+ Dodge
@@ -322,13 +341,7 @@
y
-
-
-
-
+
@@ -645,34 +658,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -878,7 +891,7 @@
- Criticals
+ Criticals & Injuries
@@ -957,7 +970,7 @@
-
+
-
+
@@ -1028,7 +1041,7 @@
-
+
@@ -1062,7 +1075,7 @@
-
+
@@ -1096,7 +1109,7 @@
-
+
@@ -1130,7 +1143,7 @@
-
+
@@ -1164,7 +1177,7 @@
-
+
@@ -1198,7 +1211,7 @@
-
+
@@ -1232,7 +1245,7 @@
-
+
@@ -1266,7 +1279,7 @@
-
+
@@ -1300,7 +1313,7 @@
-
+
@@ -1334,7 +1347,7 @@
-
+
@@ -1369,7 +1382,7 @@
-
+
@@ -1405,7 +1418,7 @@
-
+
@@ -1442,7 +1455,7 @@
-
+
@@ -1476,7 +1489,7 @@
-
+
@@ -1510,7 +1523,7 @@
-
+
@@ -1544,7 +1557,7 @@
-
+
@@ -1578,7 +1591,7 @@
-
+
@@ -1612,7 +1625,7 @@
-
+
@@ -1651,7 +1664,7 @@
-
+
@@ -1687,7 +1700,7 @@
-
+
@@ -1723,7 +1736,7 @@
-
+
@@ -1759,7 +1772,7 @@
-
+
@@ -1795,7 +1808,7 @@
-
+
@@ -1831,7 +1844,7 @@
-
+
@@ -1867,7 +1880,7 @@
-
+
@@ -1903,7 +1916,7 @@
-
+
@@ -1940,7 +1953,7 @@
-
+
@@ -1974,7 +1987,7 @@
-
+
@@ -2008,7 +2021,7 @@
-
+
@@ -2043,7 +2056,7 @@
-
+
@@ -2079,7 +2092,7 @@
-
+
@@ -2116,7 +2129,7 @@
-
+
@@ -2151,7 +2164,7 @@
-
+
@@ -2187,7 +2200,7 @@
-
+
@@ -2248,7 +2261,7 @@
-
+
@@ -2292,7 +2305,7 @@
-
+
@@ -2342,7 +2355,7 @@
-
+
@@ -2381,7 +2394,7 @@
-
+
@@ -2427,7 +2440,7 @@
-
+
@@ -2466,7 +2479,7 @@
-
+
@@ -2505,7 +2518,7 @@
-
+
@@ -2544,7 +2557,7 @@
-
+
@@ -2583,7 +2596,7 @@
-
+
@@ -2622,7 +2635,7 @@
-
+
@@ -2661,7 +2674,7 @@
-
+
@@ -2700,7 +2713,7 @@
-
+
@@ -2739,7 +2752,7 @@
-
+
@@ -2779,7 +2792,7 @@
-
+
@@ -2816,7 +2829,7 @@
-
+
@@ -2860,7 +2873,7 @@
-
+
@@ -2907,7 +2920,7 @@
-
+
@@ -2954,7 +2967,7 @@
-
+
@@ -3001,7 +3014,7 @@
-
+
@@ -3041,7 +3054,7 @@
-
+
@@ -3084,7 +3097,7 @@
-
+
@@ -3123,7 +3136,7 @@
-
+
@@ -3162,7 +3175,7 @@
-
+
@@ -3201,7 +3214,7 @@
-
+
@@ -3240,7 +3253,7 @@
-
+
@@ -3279,7 +3292,7 @@
-
+
@@ -3318,7 +3331,7 @@
-
+
@@ -3357,7 +3370,7 @@
-
+
@@ -3398,7 +3411,7 @@
-
+
@@ -3442,7 +3455,7 @@
-
+
@@ -3489,7 +3502,7 @@
-
+
@@ -3529,7 +3542,7 @@
-
+
@@ -3566,7 +3579,7 @@
-
+
@@ -3603,7 +3616,7 @@
-
+
@@ -3640,7 +3653,7 @@
-
+
@@ -3684,7 +3697,7 @@
-
+
@@ -4031,10 +4044,10 @@
-
+
-
+
@@ -4111,7 +4124,7 @@
-
+
@@ -5056,11 +5069,6 @@
-
-
- Dispel
-
-
@@ -5068,6 +5076,12 @@
+
+
+ Dispel
+
+
+
@@ -5075,11 +5089,7 @@
-
-
- Dispel
-
-
+
Minor Miscast
@@ -5095,6 +5105,12 @@
Wrath of the Gods
+
+
+ Dispel
+
+
+
@@ -5131,32 +5147,33 @@
-
@@ -5184,17 +5201,31 @@
-
+
Damage
+
+
+ Damage Spell?
+
+
+
+
-
+ Cast
+
+
+
+ Cast
+
+
+
@@ -5214,149 +5245,152 @@
+
+
+
@@ -5375,12 +5409,7 @@
-
-
- Accu Ext SL
-
-
-
+
Duration
@@ -5399,22 +5428,36 @@
-
+
Damage
+
+
+ Damage Spell?
+
+
+
+
+
+
+ Cast
+
+
+
-
+ Cast
+
- Extended Channelling Test :
+ Channelling Test Lore
A cut bites down into the hip. Gain 2 Bleeding , 1 Prone Condition, and suffer a Broken Bone (Minor) injury. Further, take a Hard (ֲ0) Endurance Test or also gain a Stunned condition from the pain.
+
A cut bites down into the hip. Gain 1 Prone and 2 Bleeding Conditions, and suffer a Broken Bone (Minor) injury. Further, take a Hard (–20) Endurance Test or also gain a Stunned condition from the pain.
Gain the Prone and Stunned Condition as one of your tendons tears badly. Pass a Hard (ֲ0) Endurance Test or gain the Unconscious Condition. Your leg is useless (see Amputated Parts). , Suffer a Torn Muscle (Major) injury.
+
Gain a Prone and Stunned Condition as one of your tendons tears badly. Pass a Hard (–20) Endurance Test or gain the Unconscious Condition. Your leg is useless (see Amputated Parts). Suffer a Torn Muscle (Major) injury.
Your knee is wrenched out of its socket. Gain the Prone Condition. Pass a Hard (ֲ0) Endurance Test, or gain the Stunned Condition, which is not removed until you receive Medical Attention. After this initial Medical Attention, an Extended Routine (+20) Heal Test needing 6 SL is required to reset the knee at which point you regain its use. Movement is halved, and Tests made using this leg suffer a ֱ0 penalty for d10 days.
+
Your knee is wrenched out of its socket. Gain the Prone Condition. Pass a Hard (ֲ0) Endurance Test, or gain the Stunned Condition, which is not removed until you receive Medical Attention. After this initial Medical Attention, an Extended Routine (+20) Heal Test needing 6 SL is required to reset the knee at which point you regain its use. Movement is halved, and Tests made using this leg suffer a -10 penalty for d10 days.
The blow crushes your foot. Make an Average (+20) Endurance Test; if you fail, gain the Prone condition and lose 1 toe, plus 1 additional toe for each SL below 0 נAmputation (Average). Gain 2 Bleeding Conditions. If you don't receive Surgery within 1d10 days, you will lose the foot entirely.
+
The blow crushes your foot. Make an Average (+20) Endurance Test; if you fail, gain the Prone condition and lose 1 toe, plus 1 additional toe for each SL below 0 ~Amputation (Average). Gain 2 Bleeding Conditions. If you don't receive Surgery within 1d10 days, you will lose the foot entirely.
Your foot is severed at the ankle and lands 1d10 feet away in a random direction נAmputation (Hard) (see Scatter). You gain 3 Bleeding , 2 Stunned , and 1 Prone Condition.
+
Your foot is severed at the ankle and lands 1d10 feet away in a random direction ~Amputation (Hard) (see Scatter). You gain 3 Bleeding , 2 Stunned , and 1 Prone Condition.
A major tendon at the back of your leg is cut, causing you to scream out in pain as your leg collapses. Gain 2 Bleeding , 2 Stunned , and 1 Prone Condition and look on in horror as your leg never works again נAmputation (Very Hard).
+
A major tendon at the back of your leg is cut, causing you to scream out in pain as your leg collapses. Gain 2 Bleeding , 2 Stunned , and 1 Prone Condition and look on in horror as your leg never works again ~Amputation (Very Hard).