From 37a862bf58a8ff0f8e77703b8b84bce97eeaa6af Mon Sep 17 00:00:00 2001 From: johnmoney-code <64189467+johnmoney-code@users.noreply.github.com> Date: Mon, 13 Jul 2020 09:04:58 -0700 Subject: [PATCH] Only War (Enhanced) code improvements (#6960) * refactoring and small corrections changed page # in Advancements tab to type 'text' code refactoring for carry-capacity switch statement and insanity/corruption range checks fixed typo in sheet.json * improved CSS, refactoring changed "Page #" in the Advancements tab to input type: text refactored range check for Insanity/Corruption refactored Unnatural Characteristics styling fixed incorrect comment in carryweight sheetworker improved css grid for armor display overall removed css grid in armor display cells Added disclaimer next to Efffective Psy Rating Added WIP framework for sheetworker psykana calculations --- Only-War-Enhanced/OnlyWarEnhanced.css | 96 ++++------ Only-War-Enhanced/OnlyWarEnhanced.html | 250 ++++++++++++++++++------- Only-War-Enhanced/sheet.json | 2 +- 3 files changed, 219 insertions(+), 129 deletions(-) diff --git a/Only-War-Enhanced/OnlyWarEnhanced.css b/Only-War-Enhanced/OnlyWarEnhanced.css index a694d459c2..576fe02158 100644 --- a/Only-War-Enhanced/OnlyWarEnhanced.css +++ b/Only-War-Enhanced/OnlyWarEnhanced.css @@ -278,31 +278,32 @@ _____________ start of grid structure for unnatural characteristics, size dropdo .sheet-unnat_centering { grid-area: e1; margin-left: 50px; } .sheet-unnat_centering_container { display: grid; - grid-template-columns: auto auto auto; + justify-items:center; + grid-template-columns: 1fr 1fr 1fr; grid-template-areas: - 'e0 e1 e2'; + '. e1 .'; } -.sheet-mythicgs_width { width: 40px; } -.sheet-mythicgs1 { grid-area: amy1; font-size: 15px; font-family: inherit; letter-spacing: 0px; text-align: center; } -.sheet-mythicgs2 { grid-area: amy2; z-index: 1; position: relative; } -.sheet-mythicgs3 { grid-area: amy3; z-index: 1; position: relative; } -.sheet-mythicgs4 { grid-area: amy4; z-index: 1; position: relative; } -.sheet-mythicgs5 { grid-area: amy5; z-index: 1; position: relative; } -.sheet-mythicgs6 { grid-area: amy6; z-index: 1; position: relative; } -.sheet-mythicgs7 { grid-area: amy7; z-index: 1; position: relative; } -.sheet-mythicgs8 { grid-area: amy8; z-index: 1; position: relative; } -.sheet-mythicgs9 { grid-area: amy9; z-index: 1; position: relative; } -.sheet-mythicgs11 { grid-area: amy10; z-index: 1; position: relative; } -.sheet-mythicgs12 { grid-area: amy11; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs13 { grid-area: amy12; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs14 { grid-area: amy13; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs15 { grid-area: amy14; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs16 { grid-area: amy15; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs17 { grid-area: amy16; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs18 { grid-area: amy17; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs19 { grid-area: amy18; font-family: inherit; font-size: 14px; text-align: center; } -.sheet-mythicgs20 { grid-area: amy19; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs_width { width: 40px; } +.sheet-unnatgs1 { grid-area: amy1; font-size: 15px; font-family: inherit; letter-spacing: 0px; text-align: center; } +.sheet-unnatgs2 { grid-area: amy2; z-index: 1; position: relative; } +.sheet-unnatgs3 { grid-area: amy3; z-index: 1; position: relative; } +.sheet-unnatgs4 { grid-area: amy4; z-index: 1; position: relative; } +.sheet-unnatgs5 { grid-area: amy5; z-index: 1; position: relative; } +.sheet-unnatgs6 { grid-area: amy6; z-index: 1; position: relative; } +.sheet-unnatgs7 { grid-area: amy7; z-index: 1; position: relative; } +.sheet-unnatgs8 { grid-area: amy8; z-index: 1; position: relative; } +.sheet-unnatgs9 { grid-area: amy9; z-index: 1; position: relative; } +.sheet-unnatgs11 { grid-area: amy10; z-index: 1; position: relative; } +.sheet-unnatgs12 { grid-area: amy11; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs13 { grid-area: amy12; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs14 { grid-area: amy13; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs15 { grid-area: amy14; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs16 { grid-area: amy15; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs17 { grid-area: amy16; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs18 { grid-area: amy17; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs19 { grid-area: amy18; font-family: inherit; font-size: 14px; text-align: center; } +.sheet-unnatgs20 { grid-area: amy19; font-family: inherit; font-size: 14px; text-align: center; } .sheet-characteristics_unnat { display: grid; @@ -746,53 +747,32 @@ display: inline-block; } .sheet-armor_display_gs1 { grid-area: ad1; } -.sheet-armor_display_grid1 { - display: grid; - width: 300px; - grid-template-columns: 0% auto 3%; - grid-template-areas: - 'ad0 ad1 ad0'; -} - .sheet-armor_display_gs2 { grid-area: ad2; } .sheet-armor_display_gs3 { grid-area: ad3; } .sheet-armor_display_gs4 { grid-area: ad4; } -.sheet-armor_display_grid2 { +.sheet-armor_display_grid1 { display: grid; - width: 300px; - grid-template-columns: 33% auto 33%; + justify-items: center; + align-content: space-around; + grid-template-columns: 1fr 1fr 1fr; + column-gap: 10px; + row-gap: 15px; grid-template-areas: + '. ad1 .' 'ad2 ad3 ad4'; } .sheet-armor_display_gs5 { grid-area: ad5; } .sheet-armor_display_gs6 { grid-area: ad6; } -.sheet-armor_display_grid3 { +.sheet-armor_display_grid2 { display: grid; - width: 300px; - grid-template-columns: 50% 50%; + justify-items: center; + grid-template-columns: 1fr 2fr 2fr 1fr; + column-gap: 15px; grid-template-areas: - 'ad5 ad6'; + '. ad5 ad6 .'; } -.sheet-armor_cell_gs1 { grid-area: ae1; font-size: 12pt; width: 80%; text-align: center; align-self: center; } -.sheet-armor_cell_gs2 { grid-area: ae2; font-size: 12pt; width: 80%; text-align: center; align-self: center; } -.sheet-armor_cell_gs3 { grid-area: ae3; font-size: 12pt; width: 80%; text-align: center; align-self: center; } -.sheet-armor_cell_gs4 { grid-area: ae4; font-size: 12pt; width: 80%; text-align: center; align-self: center; } -.sheet-armor_cell_grid { - display: grid; - align-items: center; - width: 60px; - grid-template-columns: 50px; - grid template-rows: 10px 10px 10px 10px; - grid-template-areas: - 'ae1' - 'ae2' - 'ae3' - 'ae4'; -} - - .sheet-equipment_cybernetics_grid { margin: 0px 50.5px 0.6px 0px; position: relative; @@ -949,8 +929,8 @@ ______________________________ start of Psykana tab ____________________________ display: grid; grid-template-columns: 39% 1% 60%; grid-template-areas: - 'e1 e0 e3' - 'e2 e0 e3'; + 'e1 . e3' + 'e2 . e3'; } .sheet-psykana_info { grid-area: e1; background:#6E8B3D; border-radius: 10px; padding: 2px; margin-bottom: 5px; } @@ -1048,7 +1028,7 @@ ______________________________ start of Psykana tab ____________________________ display: grid; grid-template-columns: auto auto auto auto auto auto auto auto auto auto; grid-template-areas: - 'pa19 pa19 pa20 pa20 pa20 pa21 pa22 pa0 pa0 pa0'; + 'pa19 pa19 pa20 pa20 pa20 pa21 pa22 . . . '; } diff --git a/Only-War-Enhanced/OnlyWarEnhanced.html b/Only-War-Enhanced/OnlyWarEnhanced.html index 20b822ccaa..4ad50be892 100644 --- a/Only-War-Enhanced/OnlyWarEnhanced.html +++ b/Only-War-Enhanced/OnlyWarEnhanced.html @@ -27,7 +27,7 @@
Unnatural Characteristics
- - - - - - - - - -WS
-BS
-STR
-TOU
-AGI
-INT
-PER
-WP
-FEL
+Unnatural Characteristics
+ + + + + + + + + +WS
+BS
+STR
+TOU
+AGI
+INT
+PER
+WP
+FEL
Size
+Size
Character Movement
- - - - +Character Movement
+ + + +Half
Full
Charge
Run
Weight Capacity
- - - +Weight Capacity
+ + +Carry
Lift
Push
@@ -1119,21 +1119,20 @@Head
+ +(1-10)
+Arm R
@@ -1159,7 +1158,9 @@Leg R
@@ -1176,8 +1177,8 @@