From 14275f5b866c4ceb10445d67da5d5bced08dbddc Mon Sep 17 00:00:00 2001 From: johnmoney-code <64189467+johnmoney-code@users.noreply.github.com> Date: Mon, 20 Jul 2020 11:44:20 -0700 Subject: [PATCH] psyker sheetworker fixed (#6990) CSS: added semicolons to all padding statements for consistency HTML: changed "1 2 3" choices to "0 1 2" fixed a bug in the sheetworker that had broken calculations in the Psykana tab added (EPR * 5) to Focus Power Tests --- Only-War-Enhanced/OnlyWarEnhanced.css | 100 ++++++++-------- Only-War-Enhanced/OnlyWarEnhanced.html | 153 +++++++++---------------- 2 files changed, 103 insertions(+), 150 deletions(-) diff --git a/Only-War-Enhanced/OnlyWarEnhanced.css b/Only-War-Enhanced/OnlyWarEnhanced.css index 576fe02158..775ac928d9 100644 --- a/Only-War-Enhanced/OnlyWarEnhanced.css +++ b/Only-War-Enhanced/OnlyWarEnhanced.css @@ -155,7 +155,7 @@ ______________________________ start of multipurpose or special-use classes such width: 80px !important; } -.sheet-end_field { margin-right: 0px } +.sheet-end_field { margin-right: 0px; } .sheet-edge_padding { padding: 2px; } @@ -176,7 +176,7 @@ ______________________________ start of multipurpose or special-use classes such .sheet-huge_text { font-size: 36px; } .sheet-text_centered { text-align: center; } .sheet-ssc { font-family: inherit; } -.sheet-bttn_top_padding { padding-top: 5px } +.sheet-bttn_top_padding { padding-top: 5px; } .sheet-radius_border { border-radius: 10px; } .sheet-radius_border_top { @@ -205,7 +205,7 @@ ______________________________ start of multipurpose or special-use classes such ______________________________ start of grid structure for character information ______________________________ */ -.sheet-gs1 { grid-area: ah1; margin-top: 5px; font-size: 15px; padding-left: 2px } +.sheet-gs1 { grid-area: ah1; margin-top: 5px; font-size: 15px; padding-left: 2px; } .sheet-gs2 { grid-area: ah2; margin-top: 5px; font-size: 15px; } .sheet-gs3 { grid-area: ah3; margin-top: 5px; font-size: 15px; } .sheet-gs4 { grid-area: ah4; margin-top: 5px; font-size: 15px; } @@ -576,42 +576,42 @@ ______________________________ start of equipment tab __________________________ .sheet-equipment_numerics { grid-area: e3; margin-top: 10px; } .sheet-equipment_ranged_weapons_rep, .sheet-equipment_melee_weapons_rep { background:#6E8B3D; border:1px solid white; border-radius: 10px; padding: 2px; } -.sheet-equipment_ranged_weapons_gs1 { grid-area: rw1; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs1 { grid-area: rw1; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs2 { grid-area: rw2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs3 { grid-area: rw3; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs3 { grid-area: rw3; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs4 { grid-area: rw4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs5 { grid-area: rw5; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs5 { grid-area: rw5; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs6 { grid-area: rw6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; border-top-right-radius: 10px; } -.sheet-equipment_ranged_weapons_gs7 { grid-area: rw7; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs7 { grid-area: rw7; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs8 { grid-area: rw8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-equipment_ranged_weapons_gs9 { grid-area: rw9; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; } .sheet-equipment_ranged_weapons_gs10 { grid-area: rw10; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-equipment_ranged_weapons_gs11 { grid-area: rw11; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; } .sheet-equipment_ranged_weapons_gs12 { grid-area: rw12; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs13 { grid-area: rw13; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs13 { grid-area: rw13; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs14 { grid-area: rw14; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs15 { grid-area: rw15; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs15 { grid-area: rw15; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs16 { grid-area: rw16; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs17 { grid-area: rw17; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs17 { grid-area: rw17; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs18 { grid-area: rw18; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs19 { grid-area: rw19; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs19 { grid-area: rw19; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs20 { grid-area: rw20; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-equipment_ranged_weapons_gs21 { grid-area: rw21; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; } .sheet-equipment_ranged_weapons_gs22 { grid-area: rw22; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs23 { grid-area: rw23; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs23 { grid-area: rw23; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs24 { grid-area: rw24; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-equipment_ranged_weapons_gs25 { grid-area: rw25; color: white; font-size: 12px; width: 50px!important;} .sheet-equipment_ranged_weapons_gs26 { grid-area: rw26; color: white; font-size: 12px; width: 50px!important;} -.sheet-equipment_ranged_weapons_gs27 { grid-area: rw27; color: white; font-size: 12px; padding: 0px 2px } -.sheet-equipment_ranged_weapons_gs28 { grid-area: rw28; color: white; font-size: 12px; padding: 0px 2px } -.sheet-equipment_ranged_weapons_gs29 { grid-area: rw29; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs27 { grid-area: rw27; color: white; font-size: 12px; padding: 0px 2px; } +.sheet-equipment_ranged_weapons_gs28 { grid-area: rw28; color: white; font-size: 12px; padding: 0px 2px; } +.sheet-equipment_ranged_weapons_gs29 { grid-area: rw29; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs30 { grid-area: rw30; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs31 { grid-area: rw31; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs31 { grid-area: rw31; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs32 { grid-area: rw32; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_ranged_weapons_gs33 { grid-area: rw33; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_ranged_weapons_gs33 { grid-area: rw33; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_ranged_weapons_gs34 { grid-area: rw34; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-equipment_ranged_weapons_grid1 { /* gs1-6, Name, Class, Range */ @@ -647,25 +647,25 @@ ______________________________ start of equipment tab __________________________ 'rw27 rw28 rw29 rw30 rw31 rw31 rw32 rw32 rw33 rw34'; } -.sheet-equipment_melee_weapons_gs1 { grid-area: mw1; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs1 { grid-area: mw1; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs2 { grid-area: mw2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs3 { grid-area: mw3; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs3 { grid-area: mw3; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs4 { grid-area: mw4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs5 { grid-area: mw5; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs5 { grid-area: mw5; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs6 { grid-area: mw6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs7 { grid-area: mw7; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs7 { grid-area: mw7; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs8 { grid-area: mw8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs9 { grid-area: mw9; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs9 { grid-area: mw9; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs10 { grid-area: mw10; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs11 { grid-area: mw11; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs11 { grid-area: mw11; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs12 { grid-area: mw12; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs13 { grid-area: mw13; color: white; font-size: 12px; padding: 0px 2px } -.sheet-equipment_melee_weapons_gs14 { grid-area: mw14; color: white; font-size: 12px; padding: 0px 2px } -.sheet-equipment_melee_weapons_gs15 { grid-area: mw15; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs13 { grid-area: mw13; color: white; font-size: 12px; padding: 0px 2px; } +.sheet-equipment_melee_weapons_gs14 { grid-area: mw14; color: white; font-size: 12px; padding: 0px 2px; } +.sheet-equipment_melee_weapons_gs15 { grid-area: mw15; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs16 { grid-area: mw16; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-equipment_melee_weapons_gs17 { grid-area: mw17; color: white; font-size: 12px; padding: 0px 2px } +.sheet-equipment_melee_weapons_gs17 { grid-area: mw17; color: white; font-size: 12px; padding: 0px 2px; } .sheet-equipment_melee_weapons_gs18 { grid-area: mw18; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-equipment_melee_weapons_gs19 { grid-area: mw19; color: white; font-size: 12px; width: 50px!important; } .sheet-equipment_melee_weapons_gs20 { grid-area: mw20; color: white; font-size: 12px; width: 50px!important; } @@ -800,10 +800,10 @@ ______________________________ start of comrade tab ____________________________ .sheet-comrade_ability { grid-area: e2; background:#6E8B3D; border-radius: 10px; padding: 2px; } .sheet-comrade_name_status_rep, .sheet-comrade_ability_rep { background:#6E8B3D; border:1px solid white; border-radius: 10px; padding: 2px; } -.sheet-comrade_name_status_gs1 { grid-area: cn1; color: white; font-size: 13px; padding: 0px 2px } +.sheet-comrade_name_status_gs1 { grid-area: cn1; color: white; font-size: 13px; padding: 0px 2px; } .sheet-comrade_name_status_gs2 { grid-area: cn2; color: white; font-size: 13px; border: none; border-bottom: 1px dotted white; } -.sheet-comrade_name_status_gs3 { grid-area: cn3; color: white; font-size: 13px; padding: 0px 2px } +.sheet-comrade_name_status_gs3 { grid-area: cn3; color: white; font-size: 13px; padding: 0px 2px; } .sheet-comrade_name_status_gs4 { grid-area: cn4; color: white; font-size: 13px; border: none; border-bottom: 1px dotted white; } .sheet-comrade_name_status_grid1 { @@ -883,7 +883,7 @@ ______________________________ start of Journal tab ____________________________ } -.sheet-insanity_gs1 { grid-area: in1; margin-top: 5px; color: white; font-size: 16px; border: none; border-bottom: 1px dotted white; margin-top: 2px } +.sheet-insanity_gs1 { grid-area: in1; margin-top: 5px; color: white; font-size: 16px; border: none; border-bottom: 1px dotted white; margin-top: 2px; } .sheet-insanity_gs2 { grid-area: in2; margin-top: 5px; color: white; font-size: 14px; } .sheet-insanity_gs3 { grid-area: in3; margin-top: 5px; font-size: 14px; text-align: center; } .sheet-insanity_gs4 { grid-area: in4; margin-top: 5px; font-size: 14px; } @@ -903,7 +903,7 @@ ______________________________ start of Journal tab ____________________________ 'in6 in6'; } -.sheet-corruption_gs1 { grid-area: co1; margin-top: 5px; color: white; font-size: 16px; border: none; border-bottom: 1px dotted white; margin-top: 2px } +.sheet-corruption_gs1 { grid-area: co1; margin-top: 5px; color: white; font-size: 16px; border: none; border-bottom: 1px dotted white; margin-top: 2px; } .sheet-corruption_gs2 { grid-area: co2; margin-top: 5px; color: white; font-size: 14px; } .sheet-corruption_gs3 { grid-area: co3; margin-top: 5px; font-size: 15px; text-align: center; } .sheet-corruption_gs4 { grid-area: co4; margin-top: 5px; font-size: 15px; } @@ -939,23 +939,23 @@ ______________________________ start of Psykana tab ____________________________ .sheet-minormanifestation_rep, .sheet-psykana_ability_rep { background:#6E8B3D; border:1px solid white; border-radius: 10px; padding: 2px; } -.sheet-psykana_info_gs1 { grid-area: pi1; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs1 { grid-area: pi1; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs2 { grid-area: pi2; color: white; font-size: 14px; margin-top: 5px; } -.sheet-psykana_info_gs3 { grid-area: pi3; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs3 { grid-area: pi3; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs4 { grid-area: pi4; color: white; font-size: 14px; margin-top: 5px; } -.sheet-psykana_info_gs5 { grid-area: pi5; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs5 { grid-area: pi5; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs6 { grid-area: pi6; color: white; font-size: 14px; } -.sheet-psykana_info_gs7 { grid-area: pi7; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs7 { grid-area: pi7; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs8 { grid-area: pi8; color: white; font-size: 14px; } -.sheet-psykana_info_gs9 { grid-area: pi9; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs9 { grid-area: pi9; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs10 { grid-area: pi10; color: white; font-size: 14px; } -.sheet-psykana_info_gs11 { grid-area: pi11; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs11 { grid-area: pi11; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs12 { grid-area: pi12; color: white; font-size: 14px; } -.sheet-psykana_info_gs13 { grid-area: pi13; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs13 { grid-area: pi13; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs14 { grid-area: pi14; color: white; font-size: 14px; } -.sheet-psykana_info_gs15 { grid-area: pi15; color: white; font-size: 14px; padding: 0px 2px } +.sheet-psykana_info_gs15 { grid-area: pi15; color: white; font-size: 14px; padding: 0px 2px; } .sheet-psykana_info_gs16 { grid-area: pi16; color: white; font-size: 14px; } @@ -973,30 +973,30 @@ ______________________________ start of Psykana tab ____________________________ } -.sheet-psykana_ability_gs1 { grid-area: pa1; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs1 { grid-area: pa1; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs2 { grid-area: pa2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-psykana_ability_gs3 { grid-area: pa3; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs3 { grid-area: pa3; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs4 { grid-area: pa4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; border-top-right-radius: 10px; } -.sheet-psykana_ability_gs5 { grid-area: pa5; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs5 { grid-area: pa5; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs6 { grid-area: pa6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-psykana_ability_gs7 { grid-area: pa7; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs7 { grid-area: pa7; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs8 { grid-area: pa8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-psykana_ability_gs9 { grid-area: pa9; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs9 { grid-area: pa9; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs10 { grid-area: pa10; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-psykana_ability_gs11 { grid-area: pa11; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs11 { grid-area: pa11; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs12 { grid-area: pa12; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-psykana_ability_gs13 { grid-area: pa13; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs13 { grid-area: pa13; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs14 { grid-area: pa14; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } -.sheet-psykana_ability_gs15 { grid-area: pa15; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs15 { grid-area: pa15; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs16 { grid-area: pa16; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-psykana_ability_gs17 { grid-area: pa17; color: white; font-size: 12px; width: 50px!important;} .sheet-psykana_ability_gs18 { grid-area: pa18; color: white; font-size: 12px; width: 50px!important;} -.sheet-psykana_ability_gs19 { grid-area: pa19; color: white; font-size: 12px; padding: 0px 2px } -.sheet-psykana_ability_gs20 { grid-area: pa20; color: white; font-size: 12px; } -.sheet-psykana_ability_gs21 { grid-area: pa21; color: white; font-size: 12px; padding: 0px 2px } +.sheet-psykana_ability_gs19 { grid-area: pa19; color: white; font-size: 12px; padding: 0px 5px; } +.sheet-psykana_ability_gs20 { grid-area: pa20; color: white; font-size: 12px; padding: 0px 5px; } +.sheet-psykana_ability_gs21 { grid-area: pa21; color: white; font-size: 12px; padding: 0px 2px; } .sheet-psykana_ability_gs22 { grid-area: pa22; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; } .sheet-psykana_ability_grid1 { /* gs1-4, Name, Subtype */ diff --git a/Only-War-Enhanced/OnlyWarEnhanced.html b/Only-War-Enhanced/OnlyWarEnhanced.html index 4ad50be892..8011e363c8 100644 --- a/Only-War-Enhanced/OnlyWarEnhanced.html +++ b/Only-War-Enhanced/OnlyWarEnhanced.html @@ -1118,9 +1118,6 @@
- - -

Armor Display

@@ -1406,49 +1403,32 @@
Class
Limit
Psy Rating
- +
Push Level
- + -
Sustaining?
# Powers
- - - -
Effective PR
- - - - - -
- (EPR * 5 not yet added to Focus Power Tests) -
- - - +
@@ -1490,13 +1470,12 @@
Sustained
- - +
Focus Power
- +