diff --git a/GURPS/README.md b/GURPS/README.md
index 38f491d085..577bba51ef 100644
--- a/GURPS/README.md
+++ b/GURPS/README.md
@@ -4,6 +4,6 @@ Styling is inspired primarily by GCS, but also with some influence from the offi
TODO
- - Add support for the roll comparisons script; https://app.roll20.net/forum/post/150221/script-roll-comparisons#post-424145
- Implement auto-calc for the point summary (if possible).
- - Fix auto-calc for attributes and skills. Waiting for this issue; https://github.com/Roll20/roll20-character-sheets/issues/165
+ - Automatic encumberance calculation, or at least highlighting.
+ - Automatic stat reduction at low HP/FP
diff --git a/GURPS/gurps.css b/GURPS/gurps.css
index 0151101635..adeb6d9a3a 100644
--- a/GURPS/gurps.css
+++ b/GURPS/gurps.css
@@ -4,7 +4,7 @@
}
.sheet-wrapper {
- min-width: 490px;
+ min-width: 500px;
}
.sheet-box {
@@ -13,33 +13,38 @@
float: left;
margin: 0.2em;
overflow: auto;
- outline: 1px solid gray;
+ outline: 1px solid gray;
}
.sheet-label {
font-weight: bold;
- text-align: right;
+ text-align: right;
}
-.sheet-hr * {
+.sheet-hr {
box-shadow: 0 -1px 0 #000;
}
-.sheet-roll-tracker:before {
- font-family: "Pictos" !important;
- content: "t" !important;
+
+/* ===== ENCUMBERANCE HIGHLIGHTING ===== */
+/*
+.sheet-enc0[value="0"] ~ .sheet-box .sheet-row-encumberance-0,
+.sheet-enc1[value="0"] ~ .sheet-box .sheet-row-encumberance-1,
+.sheet-enc2[value="0"] ~ .sheet-box .sheet-row-encumberance-2,
+.sheet-enc3[value="0"] ~ .sheet-box .sheet-row-encumberance-3,
+.sheet-enc4[value="0"] ~ .sheet-box .sheet-row-encumberance-4 {
+ background: white;
}
-/* ===== MODULE SUPPORT ===== */
-input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-on-roll,
-.sheet-wrapper .sheet-module-off-roll {
- display: inline-block;
+.sheet-box.sheet-encumberance .sheet-row-encumberance-0,
+.sheet-box.sheet-encumberance .sheet-row-encumberance-1,
+.sheet-box.sheet-encumberance .sheet-row-encumberance-2,
+.sheet-box.sheet-encumberance .sheet-row-encumberance-3,
+.sheet-box.sheet-encumberance .sheet-row-encumberance-4 {
+ background: beige;
}
+*/
-input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
-.sheet-wrapper .sheet-module-on-roll {
- display: none;
-}
/* ===== CUSTOM TABLES ===== */
.sheet-table {
@@ -58,9 +63,10 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
text-align: center;
font-weight: bold;
text-transform: lowercase;
- font-variant: small-caps;
+ font-variant: small-caps;
letter-spacing: 1px;
white-space: nowrap;
+ height: 22px;
}
.sheet-row {
@@ -77,69 +83,13 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
}
.sheet-cell > * {
- width: 100%;
-}
-
-/* ===== TABLES ===== */
-/*
-.sheet-box table.sheet-table {
- border-collapse: collapse;
- table-layout: fixed;
width: 100%;
}
-.sheet-box tr *:not(.sheet-tooltip) {
- white-space: nowrap;
- overflow: hidden;
- min-height: 22px;
- max-height: 22px;
- height: 22px;
-}
-.sheet-box tbody tr:nth-child(odd) {
- background: #EFEFF5;
-}
-
-.sheet-box th {
- font-weight: bold;
- text-transform: lowercase;
- font-variant: small-caps;
- letter-spacing: 1px;
-}
-
-.sheet-box table th:first-child {
- font-size: 110%;
- letter-spacing: normal;
-}
-
-.sheet-box th,
-.sheet-box td {
- padding: 0;
-}
-
-.sheet-box td {
- padding-right: 2px;
- text-align: center;
-}
-*/
-
-/* ===== INPUTS ===== */
-input[type=number]::-webkit-inner-spin-button,
-input[type=number]::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
-}
-
-button {
+/* ===== BUTTONS ===== */
+.sheet-box button {
margin: 0 !important;
-}
-
-.btn[type="roll"] {
- width: 22px;
- background: none;
-}
-
-.btn {
height: 22px;
border-radius: 0;
line-height: 16px;
@@ -147,52 +97,124 @@ button {
border: none;
}
+.sheet-box button[type="roll"] {
+ width: 22px;
+ background: none;
+}
+
+.sheet-box button.sheet-roll-tracker:before {
+ font-family: "Pictos" !important;
+ content: "t" !important;
+}
+
+
+/* ===== INPUTS ===== */
+.sheet-box input[type=number]::-webkit-inner-spin-button,
+.sheet-box input[type=number]::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+}
+
.sheet-box select {
width: 100%;
- height: 100%;
- margin: 0;
+ height: 20px;
padding: 0;
+ margin: 0;
+ margin-top: -1px;
}
.sheet-box input {
- background: transparent;
- border: none;
- width: 100% !important;
+ width: 100% !important;
+ height: 20px;
+ margin-top: -1px;
+ padding: 0 2px;
+ line-height: 22px;
+
+ background: transparent;
+ border: none;
box-shadow: none;
- padding: 0 4px;
cursor: initial;
}
.sheet-box input:not(:disabled) {
- background: #FAFAF0;
- border-radius: 2px;
+ background: #FAFAF0;
+ border-radius: 2px;
- -webkit-box-shadow: inset 0px 0px 1px 0px rgba(98, 98, 94, 0.75);
- -moz-box-shadow: inset 0px 0px 1px 0px rgba(98, 98, 94, 0.75);
- box-shadow: inset 0px 0px 1px 0px rgba(98, 98, 94, 0.75);
+ -webkit-box-shadow: inset 0px 0px 1px 0px rgba(98, 98, 94, 0.75);
+ -moz-box-shadow: inset 0px 0px 1px 0px rgba(98, 98, 94, 0.75);
+ box-shadow: inset 0px 0px 1px 0px rgba(98, 98, 94, 0.75);
}
-.sheet-box tbody tr:nth-child(odd) input:not(:disabled) {
- background: #E0E0FA;
+
+/* ===== CUSTOM CHECKBOXES ===== */
+.sheet-box input[type="checkbox"] {
+ opacity: 0;
+ width: 22px;
+ height: 22px;
+ position: relative;
+ cursor: pointer;
+ z-index: 1;
}
-/* ===== UTILITY ==== */
+.sheet-box input[type="checkbox"] ~ .sheet-checkbox:before {
+ width: 18px;
+ height: 18px;
+ line-height: 22px;
+
+ margin: 0;
+ padding: 0;
+
+ position: relative;
+ top: -23px;
+ left: -1px;
+
+ border: solid 1px #a8a8a8;
+ text-align: center;
+ display: inline-block;
+ vertical-align: middle;
+
+ font-size: 18px;
+ font-family: "Pictos";
+ content: "";
+
+ -moz-box-shadow: 0 0 2px #ccc;
+ -webkit-box-shadow: 0 0 2px #ccc;
+ box-shadow: 0 0 2px #ccc;
+
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+
+ background: #f6f6f6;
+ background: -moz-radial-gradient(#f6f6f6, #dfdfdf);
+ background: -webkit-radial-gradient(#f6f6f6, #dfdfdf);
+ background: -ms-radial-gradient(#f6f6f6, #dfdfdf);
+ background: -o-radial-gradient(#f6f6f6, #dfdfdf);
+ background: radial-gradient(#f6f6f6, #dfdfdf);
+}
+
+.sheet-box input[type="checkbox"]:checked ~ .sheet-checkbox:before {
+ content: "3";
+}
+
+
+/* ===== UTILITY ===== */
.sheet-right {
- float: right;
+ float: right;
}
.sheet-left {
- float: left;
+ float: left;
}
.sheet-clearfix:before,
.sheet-clearfix:after {
- content: "";
- display: table;
+ content: "";
+ display: table;
}
.sheet-clearfix:after {
- clear: both;
+ clear: both;
}
.sheet-hover {
@@ -200,6 +222,7 @@ button {
z-index: 0;
}
+
/* ===== CSS TOOLTIP ===== */
.sheet-popup {
color: darkred;
@@ -207,51 +230,67 @@ button {
.sheet-popup + .sheet-tooltip {
z-index: 10;
- display: none;
- padding: 4px;
- text-align: left;
- margin-left: -40px;
+ display: none;
+ padding: 4px;
+ text-align: left;
+ margin-left: -40px;
font-weight: normal;
text-transform: initial;
- font-variant: initial;
+ font-variant: initial;
}
.sheet-popup:hover + .sheet-tooltip {
- width: auto;
- display: inline;
- position: absolute;
- color: #111;
- border: 1px solid #DCA;
- background: #fffAF0;
- line-height: 1.5em;
+ width: auto;
+ display: inline;
+ position: absolute;
+ color: #111;
+ border: 1px solid #DCA;
+ background: #fffAF0;
+ line-height: 1.5em;
}
.sheet-popup + .sheet-tooltip {
- border-radius: 2px;
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- -moz-box-shadow: 5px #CCC;
- -webkit-box-shadow: 5px #CCC;
- box-shadow: 5px #CCC;
+ border-radius: 2px;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ -moz-box-shadow: 5px #CCC;
+ -webkit-box-shadow: 5px #CCC;
+ box-shadow: 5px #CCC;
}
.sheet-tooltip table {
- float: left;
- line-height: 2em;
- font-size: 11px;
- border-collapse: collapse;
- text-align: center;
+ float: left;
+ line-height: 2em;
+ font-size: 11px;
+ border-collapse: collapse;
+ text-align: center;
}
.sheet-tooltip td {
- padding: 0 8px;
+ padding: 0 8px;
}
.sheet-tooltip tbody tr:nth-child(odd) {
- background: #FFF;
+ background: #FFF;
}
+
+/* ===== MODULE SUPPORT ===== */
+input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-on-roll,
+.sheet-wrapper .sheet-module-off-roll {
+ display: inline-block;
+}
+
+input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
+.sheet-wrapper .sheet-module-on-roll {
+ display: none;
+}
+
+
/* ===== LAYOUT ===== */
+.sheet-box .sheet-row-desc .sheet-col0 { width: 40px; text-align: center; }
+.sheet-box .sheet-row-desc .sheet-col1 { width: calc(100% - 40px); }
+
.sheet-attribute { width: 130px; }
.sheet-attribute .sheet-header .sheet-col0 { width: 78px; }
.sheet-attribute .sheet-header .sheet-col1 { width: 52px; }
@@ -284,8 +323,8 @@ button {
.sheet-points .sheet-row .sheet-col1 { width: 40px; }
.sheet-lift { width: calc(100% - 130px - 140px - 1.2em); }
-.sheet-lift .sheet-col0 { width: 170px; }
-.sheet-lift .sheet-col1 { width: calc(100% - 170px); }
+.sheet-lift .sheet-col0 { width: 175px; }
+.sheet-lift .sheet-col1 { width: calc(100% - 175px); }
.sheet-encumberance { width: calc(100% - 140px - 0.8em); }
.sheet-encumberance .sheet-col0 { width: 100px; }
@@ -298,8 +337,10 @@ button {
.sheet-damage-reduction { float: right; width: 140px; }
.sheet-damage-reduction .sheet-col0 { width: 50px; }
.sheet-damage-reduction .sheet-col1 { width: 40px; text-align: center; }
-.sheet-damage-reduction .sheet-col2 { width: 50px; }
+.sheet-damage-reduction .sheet-col2 { width: 25px; }
+.sheet-damage-reduction .sheet-col3 { width: 25px; }
.sheet-damage-reduction .sheet-row-title .sheet-col0 { width: 100%; }
+.sheet-damage-reduction .sheet-header .sheet-col2 { width: 50px; }
.sheet-language { width: calc(60% - 0.4em); }
.sheet-language .sheet-col0 { width: calc(100% - 210px); }
@@ -316,7 +357,6 @@ button {
.sheet-traits .sheet-col1 { width: 30px; }
.sheet-traits .sheet-col2 { width: 30px; }
.sheet-traits .sheet-col3 { width: 40px; }
-.sheet-traits .sheet-row-desc .sheet-col0 { width: 100%; }
.sheet-skills { width: calc(100% - 0.4em); }
.sheet-skills .sheet-col0 { width: calc(100% - 302px); }
@@ -330,8 +370,8 @@ button {
.sheet-skills .sheet-col8 { width: 22px; }
.sheet-techniques { width: calc(100% - 0.4em); }
-.sheet-techniques .sheet-col0 { width: calc(100% - 360px); }
-.sheet-techniques .sheet-col1 { width: 120px; }
+.sheet-techniques .sheet-col0 { width: calc((100% - 240px) * 0.5); }
+.sheet-techniques .sheet-col1 { width: calc((100% - 240px) * 0.5); }
.sheet-techniques .sheet-col2 { width: 30px; }
.sheet-techniques .sheet-col3 { width: 30px; }
.sheet-techniques .sheet-col4 { width: 40px; }
@@ -341,36 +381,33 @@ button {
.sheet-techniques .sheet-col8 { width: 40px; }
.sheet-melee-attacks { width: calc(100% - 0.4em); }
-.sheet-melee-attacks .sheet-col0 { width: 100px; }
-.sheet-melee-attacks .sheet-col1 { width: 60px; }
+.sheet-melee-attacks .sheet-col0 { width: calc(100% - 202px); }
+.sheet-melee-attacks .sheet-col1 { width: 40px; }
.sheet-melee-attacks .sheet-col2 { width: 40px; }
.sheet-melee-attacks .sheet-col3 { width: 40px; }
-.sheet-melee-attacks .sheet-col4 { width: 40px; }
-.sheet-melee-attacks .sheet-col5 { width: calc(100% - 302px); }
-.sheet-melee-attacks .sheet-col6 { width: 22px; }
+.sheet-melee-attacks .sheet-col4 { width: 60px; }
+.sheet-melee-attacks .sheet-col5 { width: 22px; }
.sheet-ranged-attacks { width: calc(100% - 0.4em); }
-.sheet-ranged-attacks .sheet-col0 { width: 100px; }
-.sheet-ranged-attacks .sheet-col1 { width: 60px; }
-.sheet-ranged-attacks .sheet-col2 { width: 40px; }
+.sheet-ranged-attacks .sheet-col0 { width: calc(100% - 292px); }
+.sheet-ranged-attacks .sheet-col1 { width: 40px; }
+.sheet-ranged-attacks .sheet-col2 { width: 30px; }
.sheet-ranged-attacks .sheet-col3 { width: 30px; }
-.sheet-ranged-attacks .sheet-col4 { width: 30px; }
-.sheet-ranged-attacks .sheet-col5 { width: 40px; }
-.sheet-ranged-attacks .sheet-col6 { width: 30px; }
-.sheet-ranged-attacks .sheet-col7 { width: 40px; }
-.sheet-ranged-attacks .sheet-col8 { width: calc(100% - 392px); }
-.sheet-ranged-attacks .sheet-col9 { width: 22px; }
+.sheet-ranged-attacks .sheet-col4 { width: 40px; }
+.sheet-ranged-attacks .sheet-col5 { width: 30px; }
+.sheet-ranged-attacks .sheet-col6 { width: 40px; }
+.sheet-ranged-attacks .sheet-col7 { width: 60px; }
+.sheet-ranged-attacks .sheet-col8 { width: 22px; }
.sheet-items { width: calc(100% - 0.4em); }
-.sheet-items .sheet-col0 { width: 100px; }
+.sheet-items .sheet-col0 { width: calc(100% - 270px); }
.sheet-items .sheet-col1 { width: 20px; }
-.sheet-items .sheet-col2 { width: 20px; }
-.sheet-items .sheet-col3 { width: 20px; }
-.sheet-items .sheet-col4 { width: 30px; }
-.sheet-items .sheet-col5 { width: calc(100% - 250px); }
-.sheet-items .sheet-col6 { width: 30px; }
-.sheet-items .sheet-col7 { width: 30px; }
-.sheet-items .sheet-row-totals .sheet-col0 { width: calc(100% - 200px); }
-.sheet-items .sheet-row-totals .sheet-col1 { width: 50px; }
+.sheet-items .sheet-col2 { width: 50px; }
+.sheet-items .sheet-col3 { width: 50px; }
+.sheet-items .sheet-col4 { width: 50px; }
+.sheet-items .sheet-col5 { width: 50px; }
+.sheet-items .sheet-col6 { width: 50px; }
+.sheet-items .sheet-row-totals .sheet-col0 { width: calc(100% - 300px); }
+.sheet-items .sheet-row-totals .sheet-col1 { width: 100px; }
.sheet-items .sheet-row-totals .sheet-col2 { width: 100px; }
-.sheet-items .sheet-row-totals .sheet-col3 { width: 50px; }
+.sheet-items .sheet-row-totals .sheet-col3 { width: 100px; }
diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index 3124c493f7..f3f8ac2708 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -1,11 +1,12 @@
+Roll Comparisons Support
-
-
-
-
-
+
+
+
+
+
@@ -33,8 +34,8 @@
-
-
+
+
@@ -53,8 +54,8 @@
-
-
+
+
@@ -67,14 +68,14 @@
-
+
-
-
+
+
@@ -93,11 +94,11 @@
-
-
+
+
-
+
@@ -137,8 +138,8 @@
-
-
+
+
@@ -153,7 +154,7 @@
-
+
@@ -171,13 +172,13 @@
-
+
-
@@ -533,7 +534,10 @@
-7
-
+
+
+
+
@@ -544,7 +548,10 @@
-5
-
+
+
+
+
@@ -555,7 +562,10 @@
-9
-
+
+
+
+
@@ -566,7 +576,10 @@
-5
-
+
+
+
+
@@ -577,7 +590,10 @@
-2
-
+
+
+
+
@@ -588,7 +604,10 @@
-2
-
+
+
+
+
@@ -599,7 +618,10 @@
-4
-
+
+
+
+
@@ -610,7 +632,10 @@
0
-
+
+
+
+
@@ -621,7 +646,10 @@
-3
-
+
+
+
+
@@ -632,7 +660,10 @@
-3
-
+
+
+
+
@@ -643,7 +674,10 @@
-2
-
+
+
+
+
@@ -654,7 +688,10 @@
-2
-
+
+
+
+
@@ -665,7 +702,10 @@
-4
-
+
+
+
+
@@ -960,7 +1000,10 @@
-
@@ -1002,6 +1045,8 @@
+
+
-
-
+
+
+
@@ -1049,7 +1102,7 @@
Pts
Ref
-