From 4a54a22c4c751f89a5063667f253c19be32be97a Mon Sep 17 00:00:00 2001 From: mfcp-git <68969644+mfcp-git@users.noreply.github.com> Date: Mon, 17 Aug 2020 17:54:25 +0100 Subject: [PATCH] [Mongoose Traveller 2e] Enhance Boon/Bane selection and roll modifier handling (#7200) * Changed boon/bane and modifiers Added new modes for boon/bane rolling: Legacy (as before), Prompt (ask every time) and Toggle (gives Normal/Boon/Bane selection buttons). Added new modes for roll modifier queries: Yes (ask every time), No (never ask) and Toggle (gives Yes/No selection buttons). * Updated preview Updated preview to show new options --- Mongoose_Traveller2e/MongooseTraveller.css | 43 ++- Mongoose_Traveller2e/MongooseTraveller.html | 335 +++++++++++++++----- Mongoose_Traveller2e/MongooseTraveller.png | Bin 46280 -> 39100 bytes Mongoose_Traveller2e/sheet.json | 33 +- Mongoose_Traveller2e/translation.json | 16 +- 5 files changed, 346 insertions(+), 81 deletions(-) diff --git a/Mongoose_Traveller2e/MongooseTraveller.css b/Mongoose_Traveller2e/MongooseTraveller.css index 8d26c92baf..b08357e88d 100644 --- a/Mongoose_Traveller2e/MongooseTraveller.css +++ b/Mongoose_Traveller2e/MongooseTraveller.css @@ -402,12 +402,12 @@ input.sheet-skillbox[type="checkbox"]:checked + span { } /*==== Button Reset ====*/ -button[type="roll"]:before { +button[type="roll"]:before, button[type="action"]:before { content: ""!important; display: none; } -button[type="roll"] { +button[type="roll"], button[type="action"] { width: 95%; height:24px; padding-bottom: 0; @@ -436,7 +436,7 @@ button[type="roll"]:hover { color:white } -button[type="roll"] label, button[type="roll"] input { +button[type="roll"] label, button[type="roll"] input, button[type="action"] label, button[type="action"] input { height:24px; line-height: 24px; text-align:center; @@ -466,7 +466,7 @@ button[type="roll"]:hover label, button[type="roll"]:hover input { /*==== sheet-button Reset ====*/ -button.sheet-button[type="roll"] { +button.sheet-button[type="roll"], button.sheet-button[type="action"] { width: 95%; height:24px; padding-bottom: 0; @@ -495,7 +495,7 @@ button.sheet-button[type="roll"]:hover { color:white } -button.sheet-button[type="roll"] label, button[type="roll"] input { +button.sheet-button[type="roll"] label, button[type="roll"] input, button.sheet-button[type="action"] label, button[type="action"] input { height:24px; line-height: 24px; text-align:center; @@ -514,6 +514,39 @@ button.sheet-button[type="roll"]:hover label, button[type="roll"]:hover input { color: white; border: none; } + +input.sheet-modselect[value="yes"] ~ .sheet-mod_yes, +input.sheet-modselect[value="no"] ~ .sheet-mod_no, +input.sheet-rollselect[value="normal"] ~ .sheet-roll_normal, +input.sheet-rollselect[value="boon"] ~ .sheet-roll_boon, +input.sheet-rollselect[value="bane"] ~ .sheet-roll_bane { + background-color: black; + border-color: red; + color:white +} + +input.sheet-modselect[value="yes"] ~ .sheet-button:not(.sheet-mod_yes), +input.sheet-modselect[value="no"] ~ .sheet-button:not(.sheet-mod_no), +input.sheet-rollselect[value="normal"] ~ .sheet-button:not(.sheet-roll_normal), +input.sheet-rollselect[value="boon"] ~ .sheet-button:not(.sheet-roll_boon), +input.sheet-rollselect[value="bane"] ~ .sheet-button:not(.sheet-roll_bane) { + background-color: white; + border-color: red; + color:black +} + +.sheet-mod-switch[value="1"] ~ .sheet-mod_toggle, +.sheet-mod-switch[value="2"] ~ .sheet-mod_toggle, +.sheet-roll-switch[value="1"] ~ .sheet-roll_toggle, +.sheet-roll-switch[value="2"] ~ .sheet-roll_toggle { + display: none +} + +.sheet-mod-switch[value="3"] ~ .sheet-mod_toggle, +.sheet-roll-switch[value="3"] ~ .sheet-roll_toggle { + display: inline +} + /* ==== sheet 2 colrow ====*/ .charsheet .sheet-2colrow .sheet-col { diff --git a/Mongoose_Traveller2e/MongooseTraveller.html b/Mongoose_Traveller2e/MongooseTraveller.html index 828261e8f6..8595a7d2f2 100644 --- a/Mongoose_Traveller2e/MongooseTraveller.html +++ b/Mongoose_Traveller2e/MongooseTraveller.html @@ -3,6 +3,45 @@
+ + +
+ +
+ Roll behaviour: + + + Ask for Modifier? + + +
+
+
+ + + + + + + + + +    + + + + + + +
@@ -22,38 +61,38 @@ - + - + - + - + - + - + @@ -337,7 +376,7 @@ - + - + - +
Mod
- + @@ -460,7 +499,7 @@ - +
- + @@ -517,7 +556,7 @@ - +
- + @@ -573,7 +612,7 @@ - + - + - + - + - + - +
- + @@ -794,7 +833,7 @@ - +
- + @@ -850,7 +889,7 @@ - +
- + @@ -906,7 +945,7 @@ - + - +
- + @@ -995,7 +1034,7 @@ - + - +
- + @@ -1084,7 +1123,7 @@ - +
- + @@ -1140,7 +1179,7 @@ - +
- + @@ -1196,7 +1235,7 @@ - + - + - +
- + @@ -1318,7 +1357,7 @@ - + - + - + - +
- + @@ -1473,7 +1512,7 @@ - + - + - +
- + @@ -1595,7 +1634,7 @@ - +
- + @@ -1651,7 +1690,7 @@ - + - +
- + @@ -1740,7 +1779,7 @@ - +
- + @@ -1796,7 +1835,7 @@ - + - + - + - + - +
- + @@ -1984,7 +2023,7 @@ - + - + @@ -2387,7 +2426,7 @@ - + + {{#rollhasboon}} + + + + {{/rollhasboon}} + {{#rollhasbane}} + + + + {{/rollhasbane}} {{#dm}} + {{#bb}} + + + + {{/bb}}
-
+ - +
@@ -2238,7 +2277,7 @@ Magazine
- +
- +
- +
- +
- +
- +
Skill Level
- + + {{#rollhasboon}} + + + + {{/rollhasboon}} + {{#rollhasbane}} + + + + {{/rollhasbane}} @@ -2455,10 +2504,26 @@ + {{#rollhasboon}} + + + + {{/rollhasboon}} + {{#rollhasbane}} + + + + {{/rollhasbane}} + {{#bb}} + + + + {{/bb}} @@ -2481,10 +2546,26 @@ + {{#rollhasboon}} + + + + {{/rollhasboon}} + {{#rollhasbane}} + + + + {{/rollhasbane}} + {{#bb}} + + + + {{/bb}}
{{character}}
Rolling with BOON
Rolling with BANE
Roll {{roll}}
{{character}}
Rolling with BOON
Rolling with BANE
Attack {{roll}}
Boon/Bane + {{bb}}
Damage {{damage}}
{{character}}
Rolling with BOON
Rolling with BANE
Roll {{roll}}
Boon/Bane + {{bb}}
@@ -2498,6 +2579,16 @@
{{character}}
Rolling with BOON
Rolling with BANE
DM @@ -2516,10 +2607,106 @@ Roll {{roll}}
Boon/Bane + {{bb}}