From a70234cadb2eedb31c38f6a13c726f37c2eee0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Thu, 5 Dec 2024 10:11:09 -0800 Subject: [PATCH 01/12] data-i18n key and actual text didn't match for artifact die --- Forbidden_Lands/Forbidden_Lands.html | 76 ++++++++++++++-------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index 60ca944e2e7e..43ecf4c9b1d0 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -717,10 +717,10 @@

WEAPONS

D8
- D8 + D10
- D8 + D12
Dmg @@ -981,10 +981,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1085,10 +1085,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1188,10 +1188,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1246,10 +1246,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1304,10 +1304,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1362,10 +1362,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1420,10 +1420,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1478,10 +1478,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1581,10 +1581,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1684,10 +1684,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1742,10 +1742,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1800,10 +1800,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1858,10 +1858,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1916,10 +1916,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -1974,10 +1974,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -2032,10 +2032,10 @@

SKILLS

D8
- D8 + D10
- D8 + D12
@@ -2592,10 +2592,10 @@

ARMOR/HELMET

D8
- D8 + D10
- D8 + D12
@@ -2912,10 +2912,10 @@

SHIELD

D8
- D8 + D10
- D8 + D12
From 3d7ba09d14cf8cfc564fc7a13e330700602fb24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Thu, 5 Dec 2024 23:33:31 -0800 Subject: [PATCH 02/12] fake selector for artifact dice selections --- Forbidden_Lands/Forbidden_Lands.css | 107 +++++++++++++++++++-------- Forbidden_Lands/Forbidden_Lands.html | 26 +++---- 2 files changed, 89 insertions(+), 44 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index 877b1ff11995..e463aa82795e 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -99,6 +99,68 @@ transform: rotate(-45deg); } +.charsheet details:has(.fake-selector) { + justify-items: center; + align-content: center; +} + +.charsheet .fake-selector { + background-color: #f5f5f5; + display: flex; + flex-direction: column; + margin: -10px 0 0 -5px; + outline: 1px solid #777; + overflow: hidden; + position: absolute; + row-gap: 2px; + z-index: 5; +} + +.charsheet .fake-selector label { + justify-content: left; + margin: auto; + width: 100%; + padding: 5px; +} + +.charsheet .fake-selector label:hover { + background-color: dodgerblue; + color: #fff; +} + +.charsheet .fake-selector label:hover span { + color: #fff; +} + +.charsheet .wrapper .span-two, +.charsheet .wrapper .span-three, +.charsheet .wrapper .span-four, +.charsheet .wrapper .span-five, +.charsheet .wrapper .span-six { + display: inline-flex; + justify-content: space-evenly; + width: 100%; +} +.charsheet .span-two { + grid-column: span 2; +} + +.charsheet .span-three { + grid-column: span 3; +} + +.charsheet .span-four { + grid-column: span 4; +} + +.charsheet .span-five { + grid-column: span 5; +} + +.charsheet .span-six { + grid-column: span 6; +} + /* announcements */ .charsheet input.announcements-show.toggle-monster-only { height: 1.5em; @@ -590,12 +652,14 @@ .charsheet .label, .charsheet label { - color: #333; - cursor: default; - font-size: 1.1rem; - font-weight: bold; - padding: 0 2px 0 2px; - font-family: "Inknut Antiqua"; + color: #333; + cursor: default; + display: flex; + font-family: "Inknut Antiqua"; + font-size: 1.1rem; + font-weight: bold; + justify-content: center; + padding: 0 2px 0 2px; } .charsheet .header-top .label { @@ -3032,12 +3096,12 @@ button.torches:hover::after { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; - grid-template-columns: 2em 5em auto 5em 3em 3em 3em 3em 0 3em 3em 3em 3em 0 1.5em 1.5em 1.5em 1.5em 0 3em 3em 3em; + grid-template-columns: 2em 5em auto 5em 3em 3em 3em 3em 0 3em 3em 3em 3em 0 3.5em 0 3em 3em 3em; padding: 0 0 2px 0; } .charsheet div.weapons-box { - grid-column: 1/23; + grid-column: 1/-1; grid-row-start: 1; width: calc(101% + 1px); margin: 0 0 0 -4px; @@ -3128,43 +3192,28 @@ button.torches:hover::after { grid-row-start: 1; } -.charsheet .weapons-box16 { - grid-column-start: 16; - grid-row-start: 1; -} - -.charsheet .weapons-box17 { - grid-column-start: 17; - grid-row-start: 1; -} - -.charsheet .weapons-box18 { - grid-column-start: 18; - grid-row-start: 1; -} - .charsheet .weapons-box19 { - grid-column-start: 19; + grid-column-start: 20; grid-row-start: 1; } .charsheet .weapons-box20 { - grid-column-start: 20; + grid-column-start: 17; grid-row-start: 1; } .charsheet .weapons-box21 { - grid-column-start: 21; + grid-column-start: 18; grid-row-start: 1; } .charsheet .weapons-box22 { - grid-column-start: 22; + grid-column-start: 19; grid-row-start: 1; } .charsheet .weapons-box23 { - grid-column: 1/23; + grid-column: 1/-1; grid-row-start: 2; } @@ -3176,7 +3225,7 @@ button.torches:hover::after { align-items: baseline; display: grid; grid-column-gap: 2px; - grid-column: 1/23; + grid-column: 1/-1; grid-row-start: 3; grid-template-columns: 4em 3em 4em 7em 6em auto 3em 4em 2em 3em; justify-items: center; diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index 43ecf4c9b1d0..b46dc4f83e16 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -710,17 +710,8 @@

WEAPONS

Tot
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 +
+ Artifact Dice
Dmg @@ -813,10 +804,15 @@

WEAPONS

0
- - - - +
+ D.. + + + + + + +
*

Latest Announcements

- 12/4/24 + 12/6/24
    v1.9 +
  1. Changed the artifact dice checkboxes to a drop-down selector.
  2. Minor adjustments for translations.
  3. Fixed a bug introduced in the last update (major appologies!) that could cause Strength to keep reseting to 0 unless set on the monster tab first. Collaterally, the other abilities were capped according to strength. The sheet logic should now be fixed to properly handle PC strength and Monster strength when switching tabs.
  4. Small cosmetic change to the Willpower checkboxes and Ability background image.
    5. From b09716d72fc9ee85beb5068f13b668bc5a8652e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 00:38:05 -0800 Subject: [PATCH 04/12] armor artifact dice --- Forbidden_Lands/Forbidden_Lands.css | 30 +++-------- Forbidden_Lands/Forbidden_Lands.html | 76 ++++++++++++++++------------ 2 files changed, 52 insertions(+), 54 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index e463aa82795e..e009ea1f1896 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -3804,7 +3804,7 @@ button.torches:hover::after { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; - grid-template-columns: auto 3em 3em 3em 3em 1.5em 1.5em 1.5em 1.5em; + grid-template-columns: 1fr 3em 3em 3em 3em 4em; } .charsheet .armor-row2 { @@ -3818,7 +3818,7 @@ button.torches:hover::after { } .charsheet div.armor-box { - grid-column: 1/10; + grid-column: 1/-1; grid-row-start: 1; width: calc(101% + 1px); margin: 0 0 0 -3px; @@ -3853,11 +3853,12 @@ button.torches:hover::after { } .charsheet .armor-subgrid { - align-items: center; - display: grid; - grid-column-gap: 2px; - grid-template-columns: auto auto auto auto auto 1.5em 1.5em 1.5em 1.5em; - height: 3em; + align-items: center; + display: grid; + grid-column-gap: 2px; + grid-template-columns: auto auto 15em auto auto; + height: 3em; + margin-bottom: 5px; } .charsheet .armor-subgrid > span { @@ -3912,21 +3913,6 @@ button.torches:hover::after { grid-row-start: 1; } -.charsheet .armor-box7 { - grid-column-start: 7; - grid-row-start: 1; -} - -.charsheet .armor-box8 { - grid-column-start: 8; - grid-row-start: 1; -} - -.charsheet .armor-box9 { - grid-column-start: 9; - grid-row-start: 1; -} - .charsheet .armor-box10 { grid-column: 1/10; grid-row-start: 2; diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index fda9f3fa0b6e..ca2c76a7e579 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -2582,19 +2582,9 @@

    ARMOR/HELMET

    Tot
    -
    - D8 -
    -
    - D8 -
    -
    - D10 -
    -
    - D12 +
    + Artifact Dice
    -
    @@ -2615,10 +2605,15 @@

    ARMOR/HELMET

    0 - - - - +
    + D.. + + + + + + +
    @@ -2677,10 +2672,15 @@

    ARMOR/HELMET

    0 - - - - +
    + D.. + + + + + + +
    @@ -2745,10 +2745,15 @@

    ARMOR/HELMET

    0 - - - - +
    + D.. + + + + + + +
    @@ -2807,10 +2812,15 @@

    ARMOR/HELMET

    0 - - - - +
    + D.. + + + + + + +
    @@ -2864,10 +2874,12 @@

    - - - - + + D8 + D8 + D10 + D12 +

From 116c71d4fa974f1d23a5f53db8a6e4278697af1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 01:27:10 -0800 Subject: [PATCH 05/12] - hide/show armor artifact totals - opacity 1 if artifact die is checked --- Forbidden_Lands/Forbidden_Lands.css | 24 +++++++++++++++---- Forbidden_Lands/Forbidden_Lands.html | 36 +++++++++++++--------------- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index e009ea1f1896..5e95d64204c4 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -102,6 +102,12 @@ .charsheet details:has(.fake-selector) { justify-items: center; align-content: center; + opacity: .5; +} + +.charsheet details[open]:has(.fake-selector), +.charsheet details:has(.fake-selector input:checked) { + opacity: 1; } .charsheet .fake-selector { @@ -3856,7 +3862,7 @@ button.torches:hover::after { align-items: center; display: grid; grid-column-gap: 2px; - grid-template-columns: auto auto 15em auto auto; + grid-template-columns: auto auto 14em 4em 6em 14em; height: 3em; margin-bottom: 5px; } @@ -3952,13 +3958,23 @@ button.torches:hover::after { grid-column: 1/10; } +.charsheet .armor-artifact-totals label { + display: none; + justify-content: center; + margin: auto; +} + +.charsheet .armor-artifact-totals label:has(input:checked) { + display: flex; +} + /* ---------------------------------- Shield */ .charsheet .shield-grid { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; grid-row-start: 2; - grid-template-columns: 2em 2em auto 3em 3em 3em 3em 3em 3em 1.5em 1.5em 1.5em 1.5em; + grid-template-columns: 2em 2em auto 3em 3em 3em 3em 3em 3em 4em; } .charsheet .shield-row2 { @@ -3973,7 +3989,7 @@ button.torches:hover::after { } .charsheet div.shield-box { - grid-column: 1/14; + grid-column: 1/-1; grid-row-start: 1; width: calc(101% + 1px); margin: 0 0 0 -3px; @@ -4054,7 +4070,7 @@ button.torches:hover::after { } .charsheet .shield-box14 { - grid-column: 1/14; + grid-column: 1/-1; grid-row-start: 2; position: relative; } diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index ca2c76a7e579..66896e396b88 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -2874,11 +2874,11 @@

- - D8 - D8 - D10 - D12 + + + + +

@@ -2914,17 +2914,8 @@

SHIELD

Tot
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 +
+ Artifact Dice
@@ -2951,10 +2942,15 @@

SHIELD

0 - - - - +
+ D.. + + + + + + +
From e7297615afed936d735894ea61cb3b67d300e827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 10:55:39 -0800 Subject: [PATCH 06/12] - hide deails/summary by clicking anywhere - only show artifact totals if checked --- Forbidden_Lands/Forbidden_Lands.css | 45 +++++++++++++++++++++++----- Forbidden_Lands/Forbidden_Lands.html | 15 ++++++---- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index 5e95d64204c4..bf8a37ac01ca 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -99,6 +99,19 @@ transform: rotate(-45deg); } +/* fake selector ie a list of checkboxes */ + +/* click anywhere to close */ +.charsheet details:has(.fake-selector)[open] summary::before { + content: ""; + cursor: auto; + height: 100vh; + left: 0; + position: absolute; + top: 0; + width: 100vw; +} + .charsheet details:has(.fake-selector) { justify-items: center; align-content: center; @@ -110,7 +123,7 @@ opacity: 1; } -.charsheet .fake-selector { +.ui-dialog .charsheet .wrapper details .fake-selector { background-color: #f5f5f5; display: flex; flex-direction: column; @@ -122,19 +135,23 @@ z-index: 5; } -.charsheet .fake-selector label { +.charsheet details .fake-selector label { justify-content: left; margin: auto; width: 100%; padding: 5px; } -.charsheet .fake-selector label:hover { +.ui-dialog .charsheet .wrapper details .fake-selector label span { + color: #000; +} + +.ui-dialog .charsheet .wrapper details .fake-selector label:hover { background-color: dodgerblue; color: #fff; } -.charsheet .fake-selector label:hover span { +.ui-dialog .charsheet .wrapper details .fake-selector label:hover span { color: #fff; } @@ -3862,13 +3879,16 @@ button.torches:hover::after { align-items: center; display: grid; grid-column-gap: 2px; - grid-template-columns: auto auto 14em 4em 6em 14em; + grid-template-columns: 1fr 2fr 14em 4em 1fr auto; height: 3em; margin-bottom: 5px; } .charsheet .armor-subgrid > span { - display: flex; + display: flex; + justify-self: left; + margin: auto; + margin-left: 0; } .charsheet .armor-subgrid .armor-box3 { @@ -3958,16 +3978,25 @@ button.torches:hover::after { grid-column: 1/10; } -.charsheet .armor-artifact-totals label { +/* only show total if any artifact dice have been selected from above */ +.charsheet .armor-artifact-totals input + span { display: none; justify-content: center; margin: auto; } -.charsheet .armor-artifact-totals label:has(input:checked) { +.charsheet .armor-artifact-totals input:checked + span { display: flex; } +.charsheet .armor-artifact-totals input:checked + span::before { + content: "+"; + font-size: 2em; + line-height: .5em; + margin: -2px 0 0 10px; + position: relative; +} + /* ---------------------------------- Shield */ .charsheet .shield-grid { display: grid; diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index 66896e396b88..55bb4223989f 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -2874,11 +2874,16 @@

- - - - - + + + + D8 + + D8 + + D10 + + D12

From a949662bfba47595589a17d4f90e36a00106ab6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 15:24:31 -0800 Subject: [PATCH 07/12] updated skills artifact dice ui --- Forbidden_Lands/Forbidden_Lands.css | 17 +- Forbidden_Lands/Forbidden_Lands.html | 457 ++++++++++----------------- 2 files changed, 170 insertions(+), 304 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index bf8a37ac01ca..b625d4473a98 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -3775,29 +3775,22 @@ button.torches:hover::after { grid-template-columns: 100%; } -.charsheet .skills-row2-header { - background-color: #000; - display: grid; - grid-template-columns: auto 2em 2em 2em 2em; - height: 1.1em; -} - .charsheet .skills-row2-body { display: grid; grid-row-start: 2; - grid-template-columns: auto 2em 2em 2em 2em; + grid-template-columns: auto 3em; } .charsheet .skills-box6 { grid-column-start: 1; - grid-row-start: 1; - margin: -15px 0 0 0; - padding: 0 0 4px 0; + grid-row-start: 2; + margin: auto; + padding-left: 2px; } .charsheet .skills-box7 { grid-column-start: 2; - grid-row-start: 1; + grid-row-start: 2; } .charsheet .skills-box8 { diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index 55bb4223989f..c58cd0a37f94 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -806,7 +806,7 @@

WEAPONS

0
- D.. + D.. @@ -968,28 +968,18 @@

SKILLS

0 -
-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
- - - - +
+ D.. + + + + + + +
@@ -1074,26 +1064,17 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
- - - - +
+ D.. + + + + + + +
@@ -1177,26 +1158,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1235,26 +1208,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1293,26 +1258,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1351,26 +1308,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1409,26 +1358,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1467,26 +1408,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1570,26 +1503,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1673,26 +1598,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1731,26 +1648,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1789,26 +1698,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1847,26 +1748,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -1906,25 +1799,21 @@

SKILLS

-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 +
+ Artifact Dice
- - - - +
+ D.. + + + + + + +
@@ -1963,26 +1852,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -2021,26 +1902,18 @@

SKILLS

-
-
- D8 -
-
- D8 -
-
- D10 -
-
- D12 -
-
+
- - - - +
+ D.. + + + + + + +
@@ -2606,7 +2479,7 @@

ARMOR/HELMET

0
- D.. + D.. @@ -2673,7 +2546,7 @@

ARMOR/HELMET

0
- D.. + D.. @@ -2746,7 +2619,7 @@

ARMOR/HELMET

0
- D.. + D.. @@ -2813,7 +2686,7 @@

ARMOR/HELMET

0
- D.. + D.. @@ -2948,7 +2821,7 @@

SHIELD

0
- D.. + D.. From 3f8ef2e9f031562d5e55461a7a2c823b2c8bb387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 15:30:10 -0800 Subject: [PATCH 08/12] cleanup --- Forbidden_Lands/Forbidden_Lands.css | 15 -------------- Forbidden_Lands/Forbidden_Lands.html | 30 +--------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index b625d4473a98..b0e09333c307 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -3793,21 +3793,6 @@ button.torches:hover::after { grid-row-start: 2; } -.charsheet .skills-box8 { - grid-column-start: 3; - grid-row-start: 1; -} - -.charsheet .skills-box9 { - grid-column-start: 4; - grid-row-start: 1; -} - -.charsheet .skills-box10 { - grid-column-start: 5; - grid-row-start: 1; -} - /* ---------------------------------- Armor/Helmet */ .charsheet .armor-container { diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index c58cd0a37f94..e0c57361eaf5 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -1062,7 +1062,6 @@

SKILLS

-
@@ -1156,9 +1155,7 @@

SKILLS

-
-
@@ -1206,9 +1203,7 @@

SKILLS

0 -
-
@@ -1256,9 +1251,7 @@

SKILLS

0 -
-
@@ -1306,9 +1299,7 @@

SKILLS

0 -
-
@@ -1356,9 +1347,7 @@

SKILLS

0 -
-
@@ -1406,9 +1395,7 @@

SKILLS

0 -
-
@@ -1501,9 +1488,7 @@

SKILLS

-
-
@@ -1596,9 +1581,7 @@

SKILLS

-
-
@@ -1646,9 +1629,7 @@

SKILLS

0 -
-
@@ -1696,9 +1677,7 @@

SKILLS

0 -
-
@@ -1746,9 +1725,7 @@

SKILLS

0 -
-
@@ -1796,14 +1773,13 @@

SKILLS

0 -
Artifact Dice
-
+
D.. @@ -1850,9 +1826,7 @@

SKILLS

0 -
-
@@ -1900,9 +1874,7 @@

SKILLS

0 -
-
From 4b820301dbff06c8541b4043fb746ae9422205d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 16:37:36 -0800 Subject: [PATCH 09/12] added some flex in the css grid columns --- Forbidden_Lands/Forbidden_Lands.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index b0e09333c307..4e6af2d13228 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -3068,7 +3068,7 @@ button.torches:hover::after { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; - grid-template-columns: 1fr 4em 3em 2fr 3em; + grid-template-columns: 2fr minmax(4em, 1fr) minmax(3em, 1fr) 3fr 3em; padding: 0 0 2px 0; } @@ -3119,7 +3119,7 @@ button.torches:hover::after { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; - grid-template-columns: 2em 5em auto 5em 3em 3em 3em 3em 0 3em 3em 3em 3em 0 3.5em 0 3em 3em 3em; + grid-template-columns: 2em minmax(5em, 1fr) minmax(5em, 3fr) minmax(5em, 1fr) repeat(4, minmax(3em, 1fr)) 0 repeat(4, minmax(3em, 1fr)) 0 minmax(3.5em, 1fr) 0 repeat(3, minmax(3em, 1fr)); padding: 0 0 2px 0; } @@ -3716,14 +3716,14 @@ button.torches:hover::after { .charsheet .skills-grid .skills-header { display: grid; grid-column-gap: 2px; - grid-template-columns: auto 2.85em 2.5em 2.5em 2.5em 2.75em; + grid-template-columns: 3.5fr minmax(2.85em, 1fr) repeat(3, minmax(2.5em, 1fr)) minmax(2.75em, 1.25fr); } .charsheet .skills-grid .skills-row { display: grid; grid-column-gap: 2px; grid-row-gap: 1px; - grid-template-columns: auto 2.5em 2.5em 2.5em 2.75em; + grid-template-columns: 4fr repeat(3, minmax(2.5em, 1fr)) minmax(2.75em, 1fr); padding: 1px 0 1px 0; position: relative; } @@ -3805,7 +3805,7 @@ button.torches:hover::after { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; - grid-template-columns: 1fr 3em 3em 3em 3em 4em; + grid-template-columns: 3fr repeat(4, minmax(3em, 1fr)) minmax(4em, 1fr); } .charsheet .armor-row2 { @@ -3981,7 +3981,7 @@ button.torches:hover::after { grid-column-gap: 2px; grid-row-gap: 2px; grid-row-start: 2; - grid-template-columns: 2em 2em auto 3em 3em 3em 3em 3em 3em 4em; + grid-template-columns: 2em 2em 3fr repeat(6, minmax(3em, 1fr)) minmax(4em, 1fr); } .charsheet .shield-row2 { @@ -4675,7 +4675,7 @@ span.willpower-box3 { display: grid; grid-column-gap: 2px; grid-row-gap: 2px; - grid-template-columns: 2em 2em 3em auto 4em 4em 6.5em 3em 3em; + grid-template-columns: 2em 2em 3em 3fr repeat(2, minmax(4em, 1fr)) minmax(6.5em, 2fr) repeat(2, minmax(4em, 1fr)); } .charsheet div.spells-box { From 89c486cd693f76f757bc23b3f96ddd99a53d7b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Fri, 6 Dec 2024 23:38:13 -0800 Subject: [PATCH 10/12] input width adjustments --- Forbidden_Lands/Forbidden_Lands.css | 14 +++++++------- Forbidden_Lands/Forbidden_Lands.html | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index 4e6af2d13228..d4d07564fe15 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -1599,11 +1599,12 @@ .charsheet input[type="text"].input-number, .charsheet input[type="number"].input-number { - color: #000; - max-height: 2.25em; - text-align: center; - width: 100%; - padding: 4px 2px 4px 2px; + color: #000; + max-height: 2.25em; + max-width: 3em; + padding: 4px 2px 4px 2px; + text-align: center; + width: 100%; } .charsheet input[type="text"].input-number.small-width, @@ -1774,7 +1775,6 @@ color: #6e6e6e; cursor: help; font-style: italic; - justify-self: center; text-align: center; } @@ -3250,7 +3250,7 @@ button.torches:hover::after { grid-column-gap: 2px; grid-column: 1/-1; grid-row-start: 3; - grid-template-columns: 4em 3em 4em 7em 6em auto 3em 4em 2em 3em; + grid-template-columns: 4em 3em 4em minmax(7em, 1fr) 6em 3fr 3em 4em 2em 3em; justify-items: center; padding: 0 0 2px 0; } diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index e0c57361eaf5..fc895cf6e9e5 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -239,7 +239,7 @@

Latest Announcements

- + @@ -249,7 +249,7 @@

Latest Announcements

 - + +
@@ -3079,7 +3079,7 @@

NOTES

- +
@@ -3106,14 +3106,14 @@

Location

- +
Name
- +
From 4747cd4169d70172171c700300ee5893cbc29d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Sun, 8 Dec 2024 01:04:52 -0800 Subject: [PATCH 11/12] artifact die positioning --- Forbidden_Lands/Forbidden_Lands.css | 48 +++++++++++++++------------- Forbidden_Lands/Forbidden_Lands.html | 15 ++++++--- Forbidden_Lands/translation.json | 1 + 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index d4d07564fe15..abfea824ca13 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -3376,7 +3376,9 @@ button.torches:hover::after { .charsheet .dice-artifact { display: grid; grid-area: dice-artifact; - grid-template-areas: "dice-artifact-header dice-artifact-header dice-artifact-header dice-artifact-header" "dice-artifact-rolls dice-artifact-rolls dice-artifact-rolls dice-artifact-rolls"; + grid-template-areas: + "dice-artifact-header dice-artifact-header dice-artifact-header dice-artifact-header" + "dice-artifact-rolls dice-artifact-rolls dice-artifact-rolls dice-artifact-rolls"; grid-template-columns: 1fr 1fr 1fr 1fr; grid-template-rows: 2.5em 2em; } @@ -3388,14 +3390,13 @@ button.torches:hover::after { } .charsheet .dice-artifact-rolls { - background-color: black; - display: flex; - flex-flow: row; - grid-area: dice-artifact-rolls; - height: 0.5em; - justify-content: space-evenly; - margin: -5px 0 0 0; - width: 100%; + background-color: black; + display: flex; + grid-area: dice-artifact-rolls; + height: 0.5em; + justify-content: space-evenly; + margin: -10px auto 0 auto; + width: 20em; } .charsheet .dice-rolls { @@ -5267,19 +5268,21 @@ span.willpower-box3 { .charsheet input.mighty, .charsheet input.mighty2, -.charsheet input.epic { - margin: 0 -4.25em 0 0; - width: 3em; - height: 2.85em; - z-index: 2; +.charsheet input.epic, +.charsheet input.legendary { + height: 2.85em; + margin: 0 -4.65em 0 0; + opacity: 0; + width: 3em; + z-index: 2; } -.charsheet input.legendary { +/* .charsheet input.legendary { margin: 0 -3.75em 0 -.35em; width: 3em; height: 2.85em; z-index: 2; -} +} */ .charsheet input.dice-selection + span::before { background-color: #fff; @@ -5956,12 +5959,13 @@ span.willpower-box3 { .sheet-rolltemplate-forbiddenlands .sheet-template-grid:has(.sheet-template-maroon-dice) .sheet-template-grid-item .sheet-template-stacked-text, .sheet-rolltemplate-forbiddenlands .sheet-template-grid:has(.sheet-template-purple-dice) .sheet-template-grid-item .sheet-template-stacked-text, .sheet-rolltemplate-forbiddenlands .sheet-template-grid:has(.sheet-template-black-dice) .sheet-template-grid-item .sheet-template-stacked-text { - border-right: 1px solid #777; - box-shadow: 2px 0 1px #000; - margin-inline: auto; - margin-right: 5px; - padding-inline: 5px; - width: min-content; + border-right: 1px solid #777; + box-shadow: 2px 0 1px #000; + margin-inline: auto; + margin-right: 5px; + padding-inline: 5px; + text-align: center; + width: min-content; } .sheet-rolltemplate-forbiddenlands .sheet-template-grid-item { diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html index fc895cf6e9e5..770801245864 100644 --- a/Forbidden_Lands/Forbidden_Lands.html +++ b/Forbidden_Lands/Forbidden_Lands.html @@ -41,6 +41,7 @@

Latest Announcements

12/6/24
    v1.9 +
  1. Note about character names; Including non-alpha-numeric characters 'may' break sheet rolls/macros. Specifically ')', ']', '}', or '|'. Underscores, dashes, and apostrophes should be fine.
  2. Changed the artifact dice checkboxes to a drop-down selector.
  3. Minor adjustments for translations.
  4. Fixed a bug introduced in the last update (major appologies!) that could cause Strength to keep reseting to 0 unless set on the monster tab first. Collaterally, the other abilities were capped according to strength. The sheet logic should now be fixed to properly handle PC strength and Monster strength when switching tabs.
    5. @@ -499,7 +500,7 @@

    MONSTER ATTACKS

    Kin
- +
Profession @@ -2005,18 +2006,23 @@

DICE POOL

Artifact Dice
+ + + + - + +
@@ -3927,7 +3933,7 @@

STRONGHOLD NOTES

{{#rollGreater() computed::push 0}}
- [Push the Roll](~{{character_name}}|push||{{computed::pushroll}}) + [Push the Roll](~{{character_name}}|push||{{computed::pushroll}})
{{/rollGreater() computed::push 0}} @@ -5634,8 +5640,7 @@

STRONGHOLD NOTES

push_latest: pushRoll, pushable: 1, }); - - // clog("Push data: "+ JSON.stringify(pushRoll)); + // clog('Push data: ' + JSON.stringify(pushRoll)); finishRoll(dicePoolRoll.rollId, { pushroll: rollEscape.escape(pushRoll), push: roll.pushable, diff --git a/Forbidden_Lands/translation.json b/Forbidden_Lands/translation.json index ddb754b4dabd..08056e89e704 100644 --- a/Forbidden_Lands/translation.json +++ b/Forbidden_Lands/translation.json @@ -72,6 +72,7 @@ "casting-overcharged-chance": "Chance Casting & Overcharged", "casting-safe": "Safe Casting", "character": "Character", + "character-name": "@{character_name} | NOTE: Including non-alpha-numeric characters 'may' break sheet rolls/macros. Specifically ')', ']', '}', or '|'. Underscores, dashes, and apostrophes should be fine.", "clear-dice-pool": "Clear Dice Pool", "close": "[close]", "close-announcements": "Close Announcements", From 3964b8c00f2ec463a0b3c0f0cf708e4f5851b9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=88=87ince?= Date: Sun, 8 Dec 2024 02:52:20 -0800 Subject: [PATCH 12/12] darkmode help --- Forbidden_Lands/Forbidden_Lands.css | 116 ++++++++++++++++------------ 1 file changed, 66 insertions(+), 50 deletions(-) diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css index abfea824ca13..d34e3022ad56 100644 --- a/Forbidden_Lands/Forbidden_Lands.css +++ b/Forbidden_Lands/Forbidden_Lands.css @@ -336,14 +336,6 @@ color: #fff; } -.sheet-darkmode .tab-content .charsheet .wrapper .dice-base { - background-color: #888; -} - -.sheet-darkmode .tab-content .charsheet .wrapper .dice-skill { - background-color: #4b0c0c; -} - .charsheet span.announcements-show::before { content: "v"; } @@ -1164,20 +1156,22 @@ .charsheet .wrapper button.roll-button-textonly, .charsheet .wrapper button.dice-pool { - align-items: center; - background-image: -webkit-linear-gradient(top, #fff, #e6e6e6); - border: 1px solid #ccc; - border-bottom-color: #bbb; - border-image: initial; - border-style: outset; - border-width: 2px; - color: initial; - cursor: pointer; - display: inline-flex; - font-size: 1.3em; - font-weight: normal; - justify-content: center; - min-height: 1.35em; + align-items: center; + background-image: -webkit-linear-gradient(top, #fff, #e6e6e6); + border: 1px solid #ccc; + border-bottom-color: #bbb; + border-image: initial; + border-style: outset; + border-width: 2px; + color: initial; + cursor: pointer; + display: inline-flex; + font-size: 1.3em; + font-weight: normal; + justify-content: center; + max-width: 4.75em; + min-height: 1.35em; + overflow: hidden; } .charsheet .wrapper button.roll-button-textonly span, @@ -1327,6 +1321,7 @@ display: none; } +.charsheet span.weapons-box28.readonly::before, .charsheet span.weapons-box31.readonly::before, .charsheet span.weapons-box36.readonly::before, .charsheet span.weapons-box45.readonly::before, @@ -2310,16 +2305,8 @@ button.torches:hover::after { margin: 0; padding: 2px; width: 75%; - width: -moz-available; - justify-self: center; -} - -.sheet-darkmode .charsheet .gear-grid button.roll-button-textonly.header-h1 { - margin: 0; - padding: 2px; - width: 75%; - width: -moz-available; justify-self: center; + max-width: 8em; } .charsheet .character-coins, @@ -2620,15 +2607,15 @@ button.torches:hover::after { } .charsheet .monster-stat1 input[type="text"].header-h1 { - background-color: white; - color: #333; - font-size: 1.65em; - height: 1.35em; - width: fit-content; - align-self: center; - margin: 0 0 .5em 0; - grid-column: 1/-1; - justify-self: center; + align-self: center; + background-color: white; + color: #333; + font-size: 1.65em; + grid-column: 1/-1; + height: 1.35em; + justify-self: center; + margin: 0 0 .5em 0; + max-width: 12em; } .charsheet .monster-stats-box1 { @@ -2759,7 +2746,7 @@ button.torches:hover::after { display: grid; grid-column-gap: 1px; grid-row-gap: 2px; - grid-template-columns: 1em 2em auto 2.5em 2.5em 7em 6em; + grid-template-columns: 1em 2em 2fr 3em 3em minmax(7em, 1fr) minmax(6em, 8em); } .charsheet .monster-attacks-box { @@ -2935,7 +2922,7 @@ button.torches:hover::after { .charsheet .conditions-grid { display: grid; - grid-template-columns: 6.5em 2em auto auto; + grid-template-columns: 6.5em minmax(2em, 3em) 4.75em 2fr; grid-row-gap: 4px; padding-bottom: .5em; } @@ -3123,6 +3110,31 @@ button.torches:hover::after { padding: 0 0 2px 0; } +.charsheet .wrapper .weapons-grid .weapons-box28 { + background-color: #fff; + color: #222; + outline: 1px solid #000; +} + +.charsheet .wrapper .weapons-grid .weapons-box28::before { + background-color: #fff; + color: #222; +} + +.charsheet .wrapper .weapons-grid .weapons-box31, +.charsheet .wrapper .weapons-grid .weapons-box31::before { + background-color: #ac2727; + color: #fff; + text-shadow: 1px 1px black; +} + +.charsheet .wrapper .weapons-grid .weapons-box36, +.charsheet .wrapper .weapons-grid .weapons-box36::before { + background-color: #404040; + color: #fff; + text-shadow: 1px 1px black; +} + .charsheet div.weapons-box { grid-column: 1/-1; grid-row-start: 1; @@ -3276,7 +3288,7 @@ button.torches:hover::after { grid-template-columns: 1fr 1fr 1fr; } -.charsheet .dice-base { +.ui-dialog .charsheet .wrapper .dice_pool-grid .dice-base { background-color: white; border: 1px solid #000; display: grid; @@ -3306,8 +3318,8 @@ button.torches:hover::after { grid-area: dice-base-col1; } -.charsheet .dice-skill { - background-color: #db5f5f; +.ui-dialog .charsheet .wrapper .dice-skill { + background-color: #ac2727; border: 1px solid #000; color: #fff; display: grid; @@ -3337,7 +3349,7 @@ button.torches:hover::after { grid-area: dice-skill-col1; } -.charsheet .dice-gear { +.ui-dialog .charsheet .wrapper .dice-gear { background-color: #404040; border: 1px solid #000; color: #fff; @@ -3356,7 +3368,13 @@ button.torches:hover::after { grid-area: dice-gear-header; } -.charsheet .dice-gear-header span { + +.charsheet .wrapper .dice_pool-grid .dice-base-header span { + color: #333; +} + +.charsheet .wrapper .dice_pool-grid .dice-skill-header span, +.charsheet .wrapper .dice_pool-grid .dice-gear-header span { color: #fff; font-weight: normal; } @@ -3804,7 +3822,6 @@ button.torches:hover::after { .charsheet .armor-grid { display: grid; - grid-column-gap: 2px; grid-row-gap: 2px; grid-template-columns: 3fr repeat(4, minmax(3em, 1fr)) minmax(4em, 1fr); } @@ -3979,7 +3996,6 @@ button.torches:hover::after { /* ---------------------------------- Shield */ .charsheet .shield-grid { display: grid; - grid-column-gap: 2px; grid-row-gap: 2px; grid-row-start: 2; grid-template-columns: 2em 2em 3fr repeat(6, minmax(3em, 1fr)) minmax(4em, 1fr); @@ -4611,7 +4627,7 @@ span.willpower-box3 { grid-row-gap: 4px; grid-template-columns: 7em repeat(3, 1fr); grid-template-rows: auto; - margin: 0 0 0 3px; + justify-items: center; } .charsheet .coins-grid div[class$="-header"] {