diff --git a/src/main.mjs b/src/main.mjs index 3c52c844..dcb4bd20 100644 --- a/src/main.mjs +++ b/src/main.mjs @@ -27,6 +27,7 @@ async function preloadHandlebarsTemplates() { // ui partials. 'systems/DSA_4-1/templates/ui/partial-rollable-button.hbs', 'systems/DSA_4-1/templates/ui/partial-rollable-weaponskill-button.hbs', + 'systems/DSA_4-1/templates/ui/partial-rollable-language-button.hbs', 'systems/DSA_4-1/templates/ui/partial-attribute-button.hbs', 'systems/DSA_4-1/templates/ui/partial-talent-editable.hbs', 'systems/DSA_4-1/templates/ui/partial-die.hbs', diff --git a/src/packs/_source/talente/l-asdharia.json b/src/packs/_source/talente/l-asdharia.json index 1a2795bc..fea6abd2 100644 --- a/src/packs/_source/talente/l-asdharia.json +++ b/src/packs/_source/talente/l-asdharia.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Asdharia", + "name": "Lesen/Schreiben Asdharia", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-chrmk.json b/src/packs/_source/talente/l-chrmk.json index df38890f..ab28abf2 100644 --- a/src/packs/_source/talente/l-chrmk.json +++ b/src/packs/_source/talente/l-chrmk.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Chrmk", + "name": "Lesen/Schreiben Chrmk", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-geheiligte-glyphen-von-unau.json b/src/packs/_source/talente/l-geheiligte-glyphen-von-unau.json index 83d42263..01774e2d 100644 --- a/src/packs/_source/talente/l-geheiligte-glyphen-von-unau.json +++ b/src/packs/_source/talente/l-geheiligte-glyphen-von-unau.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Geheiligte Glyphen von Unau", + "name": "Lesen/Schreiben Geheiligte Glyphen von Unau", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-hjaldingsche-runen.json b/src/packs/_source/talente/l-hjaldingsche-runen.json index 66a622a7..a3d83288 100644 --- a/src/packs/_source/talente/l-hjaldingsche-runen.json +++ b/src/packs/_source/talente/l-hjaldingsche-runen.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Hjaldingsche Runen", + "name": "Lesen/Schreiben Hjaldingsche Runen", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-isdira.json b/src/packs/_source/talente/l-isdira.json index e2bcfa05..7ebc811b 100644 --- a/src/packs/_source/talente/l-isdira.json +++ b/src/packs/_source/talente/l-isdira.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Isdira", + "name": "Lesen/Schreiben Isdira", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-kusliker-zeichen.json b/src/packs/_source/talente/l-kusliker-zeichen.json index 8e17794e..c53e07a0 100644 --- a/src/packs/_source/talente/l-kusliker-zeichen.json +++ b/src/packs/_source/talente/l-kusliker-zeichen.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Kusliker Zeichen", + "name": "Lesen/Schreiben Kusliker Zeichen", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-nanduria.json b/src/packs/_source/talente/l-nanduria.json index 4c7398c5..4b40c136 100644 --- a/src/packs/_source/talente/l-nanduria.json +++ b/src/packs/_source/talente/l-nanduria.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Nanduria", + "name": "Lesen/Schreiben Nanduria", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-rogolan.json b/src/packs/_source/talente/l-rogolan.json index 095f8590..2b492df1 100644 --- a/src/packs/_source/talente/l-rogolan.json +++ b/src/packs/_source/talente/l-rogolan.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Rogolan", + "name": "Lesen/Schreiben Rogolan", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-tulamidya.json b/src/packs/_source/talente/l-tulamidya.json index e2e90fbe..dbd8aa4d 100644 --- a/src/packs/_source/talente/l-tulamidya.json +++ b/src/packs/_source/talente/l-tulamidya.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Tulamidya", + "name": "Lesen/Schreiben Tulamidya", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-ur-tulamidya.json b/src/packs/_source/talente/l-ur-tulamidya.json index aa6c3265..0773cee6 100644 --- a/src/packs/_source/talente/l-ur-tulamidya.json +++ b/src/packs/_source/talente/l-ur-tulamidya.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Ur-Tulamidya", + "name": "Lesen/Schreiben Urtulamidya", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/packs/_source/talente/l-zhayad.json b/src/packs/_source/talente/l-zhayad.json index f4611e45..c75950d8 100644 --- a/src/packs/_source/talente/l-zhayad.json +++ b/src/packs/_source/talente/l-zhayad.json @@ -1,5 +1,5 @@ { - "name": "Lesen und Schreiben Zhayad", + "name": "Lesen/Schreiben Zhayad", "gruppe": "Sprachen", "probe": [ "KL", diff --git a/src/style/_character-sheet.scss b/src/style/_character-sheet.scss index a95fe207..b08494f8 100644 --- a/src/style/_character-sheet.scss +++ b/src/style/_character-sheet.scss @@ -411,7 +411,7 @@ left: 136px } - &.torso { + &.brust { top: 86px; left: 110px; } @@ -461,7 +461,7 @@ left: 136px } - &.torso { + &.brust { top: 120px; left: 110px; } diff --git a/src/style/_colours.scss b/src/style/_colours.scss index 1c562ed0..4fc2e42f 100644 --- a/src/style/_colours.scss +++ b/src/style/_colours.scss @@ -1,15 +1,27 @@ $nachteil-color: #555753ff; +$nachteil-text-color: #FFFF; $liturgie-color: #edd400ff; +$liturgie-text-color: #000F; $zauber-color: #3465a4ff; +$zauber-text-color: #000F; $talent-color: #f57900ff; +$talent-text-color: #000F; $kampftalent-color: #cc0000ff; +$kampftalent-text-color: #FFFF; $talent-body-color: #16bd6c; +$talent-body-text-color: #000; $talent-nature-color: #46800d; +$talent-nature-text-color: #000; $talent-social-color: #ae9809; +$talent-social-text-color: #000; $talent-knowledge-color: #d319ba; +$talent-knowledge-text-color: #000; $talent-language-color: #573bbc; +$talent-language-text-color: #fff; $talent-crafting-color: #ae6813; +$talent-crafting-text-color: #000; + $harm-fill-color: #ff0000ff; $harm-border-color: #3c0000ff; diff --git a/src/style/_lists.scss b/src/style/_lists.scss index a27c6b3d..7372c8d6 100644 --- a/src/style/_lists.scss +++ b/src/style/_lists.scss @@ -5,6 +5,10 @@ columns: 2; column-gap: 20px; + .talent-group { + break-inside: avoid-column; + } + ul { list-style-type: none; padding-left: 0; diff --git a/src/style/_rollable.scss b/src/style/_rollable.scss index 60d09406..5a294533 100644 --- a/src/style/_rollable.scss +++ b/src/style/_rollable.scss @@ -3,7 +3,6 @@ @use "_colours" as colour; @use "_numbers" as numbers; - $rollable_colours: ( "nachteil": colour.$nachteil-color, "talent": colour.$talent-color, @@ -17,6 +16,20 @@ $rollable_colours: ( "liturgie": colour.$liturgie-color, "zauber": colour.$zauber-color, ); +$rollable_colours_font: ( + "nachteil": colour.$nachteil-text-color, + "talent": colour.$talent-text-color, + "Körperlich": colour.$talent-body-text-color, + "Natur": colour.$talent-nature-text-color, + "Gesellschaft": colour.$talent-social-text-color, + "Wissen": colour.$talent-knowledge-text-color, + "Sprachen": colour.$talent-language-text-color, + "Handwerk": colour.$talent-crafting-text-color, + "kampf": colour.$kampftalent-text-color, + "liturgie": colour.$liturgie-text-color, + "zauber": colour.$zauber-text-color, +); + .dsa41.sheet.actor.character { .block.rollable { @@ -152,10 +165,16 @@ $rollable_colours: ( @mixin coloring($name) { $color: map.get($rollable_colours, $name); + $font_color: map.get($rollable_colours_font, $name); + .#{$name}.rollable { .die { stroke-width: 0.5; + span.value { + color: $font_color; + } + .border { fill: colour.$rollable-die-border-color; stroke: colour.$rollable-die-border-color; diff --git a/src/templates/actor/actor-character-sheet.hbs b/src/templates/actor/actor-character-sheet.hbs index 3b6af840..f499c11b 100644 --- a/src/templates/actor/actor-character-sheet.hbs +++ b/src/templates/actor/actor-character-sheet.hbs @@ -393,7 +393,7 @@
-
+

Kampftalente

    {{#each skills.Kampf}} @@ -403,7 +403,7 @@ {{/each}}
-
+

Körperliche Talente

  • @@ -414,7 +414,7 @@ {{/each}}
-
+

Gesellschaftliche Talente

  • @@ -425,7 +425,7 @@ {{/each}}
-
+

Natur Talente

  • @@ -436,7 +436,7 @@ {{/each}}
-
+

Wissenstalente

  • @@ -447,23 +447,23 @@ {{/each}}
-
+

Schriften & Sprachen

  • {{#each skills.Schriften}}
  • - {{> "systems/DSA_4-1/templates/ui/partial-rollable-button.hbs" this}} + {{> "systems/DSA_4-1/templates/ui/partial-rollable-language-button.hbs" this}}
  • {{/each}} - {{#each skills.Schriften}} + {{#each skills.Sprachen}}
  • - {{> "systems/DSA_4-1/templates/ui/partial-rollable-button.hbs" this}} + {{> "systems/DSA_4-1/templates/ui/partial-rollable-language-button.hbs" this}}
  • {{/each}}
-
+

Handwerkliche Talente

  • diff --git a/src/templates/ui/partial-rollable-language-button.hbs b/src/templates/ui/partial-rollable-language-button.hbs new file mode 100644 index 00000000..76027387 --- /dev/null +++ b/src/templates/ui/partial-rollable-language-button.hbs @@ -0,0 +1,29 @@ +
    + +
    + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + {{#if this.taw}} + {{this.taw}} + {{else}} + {{#if this.liturgiekenntnis}} + + {{/if}} + {{/if}} + +
    +
    + {{this.name}} +
    +
    Komp{{this.komplexität}}
    + {{#each this.werte}} +
    {{this.name}}{{this.value}}
    + {{/each}} +
    +
    +
    diff --git a/src/templates/ui/partial-rollable-weaponskill-button.hbs b/src/templates/ui/partial-rollable-weaponskill-button.hbs index 77c43db8..e1d68f60 100644 --- a/src/templates/ui/partial-rollable-weaponskill-button.hbs +++ b/src/templates/ui/partial-rollable-weaponskill-button.hbs @@ -19,7 +19,9 @@
    AT{{this.at}}
    -
    PA{{this.pa}}
    + {{#if this.pa}} +
    PA{{this.pa}}
    + {{/if}}