diff --git a/src/lang/en.json b/src/lang/en.json index 952b330..31e7cae 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -13,6 +13,7 @@ "OSE.Formula": "Formula", "OSE.SitMod": "Situational Modifier", "OSE.Modifier": "Modifier", + "OSE.Modifiers": "Modifiers", "OSE.RollMode": "Roll Mode", "OSE.RollExample": "e.g. +1d4", diff --git a/src/module/actor/character-sheet.js b/src/module/actor/character-sheet.js index fffd902..e861545 100644 --- a/src/module/actor/character-sheet.js +++ b/src/module/actor/character-sheet.js @@ -336,7 +336,7 @@ export class OseActorSheetCharacter extends OseActorSheet { } }); - html.find("button[data-action='modifiers']").click((ev) => { + html.find("a[data-action='modifiers']").click((ev) => { this._onShowModifiers(ev); }); diff --git a/src/scss/actor-base.scss b/src/scss/actor-base.scss index 0ca06f8..b5e6fce 100644 --- a/src/scss/actor-base.scss +++ b/src/scss/actor-base.scss @@ -111,13 +111,16 @@ .sheet-body { padding: 5px 0; height: calc(100% - 140px); + .tab { + height: 100%; + } .attributes { list-style: none; margin: 0; padding: 0; + justify-content: space-evenly; .attribute { position: relative; - margin: 8px; border: 1px solid $colorTan; box-shadow: 0 0 2px $colorTan; .attribute-name { @@ -128,9 +131,6 @@ background: $darkBackground; text-align: center; } - &.attribute-secondaries { - margin: 10px 5px; - } &.ability-score { height: 40px; .attribute-value { @@ -145,31 +145,15 @@ line-height: 24px; } } - .attribute-mod { - position: absolute; - color: $colorFaint; - text-shadow: 0 0 2px black; - right: 1px; - top: 1px; - line-height: 10px; - font-size: 8px; - } - .attribute-bonuses { - display: none; - position: absolute; - background: #222; - padding: 2px; - font-size: 10px; - color: whitesmoke; - width: 100%; - height: 100%; - } } } .attribute-group { - flex: 0 0 105px; - margin: auto 0; + flex: 0 0 88px; .attributes { + display: flex; + flex-direction: column; + justify-content: space-evenly; + height: 100%; .attribute { display: flex; flex-direction: row; diff --git a/src/scss/character.scss b/src/scss/character.scss index 9d6831d..d0402c7 100644 --- a/src/scss/character.scss +++ b/src/scss/character.scss @@ -25,6 +25,29 @@ /* Sheet Body */ /* ----------------------------------------- */ .sheet-body { + .tab { + height: 100%; + } + .attributes-tab{ + justify-content: space-between; + height: 100%; + } + .resources { + margin: 20px; + display: flex; + justify-content: space-around; + flex-direction: column; + .modifiers-btn { + width: 30px; + } + .attribute { + flex: 0 0 55px; + &.attribute-secondaries { + flex: 0 0 40px; + margin-bottom: 5px + } + } + } .notes-tab { .inventory { .languages { @@ -79,7 +102,6 @@ font-size: 18px; } } - margin: 10px 0; height: 70px; position: relative; .health-value { diff --git a/src/scss/monster.scss b/src/scss/monster.scss index cbe297f..19a51aa 100644 --- a/src/scss/monster.scss +++ b/src/scss/monster.scss @@ -16,8 +16,25 @@ .editor { height: 300px; } - .attributes .attribute.health { - min-width: 75px; + .attributes-tab { + display: flex; + justify-content: space-around; + flex-direction: column; + height: 100%; + .attribute-row { + .attribute-group { + margin: 5px; + } + } + .attributes .attribute { + flex: 0 0 60px; + &.health { + flex: 0 0 85px; + } + &.saving-throw { + flex: 1; + } + } } } .attributes { diff --git a/src/templates/actors/monster-sheet.html b/src/templates/actors/monster-sheet.html index 0e286a3..8bcf4e9 100644 --- a/src/templates/actors/monster-sheet.html +++ b/src/templates/actors/monster-sheet.html @@ -32,8 +32,10 @@
{{localize "OSE.category.notes"}}
- {{editor content=data.details.biography target="data.details.biography" - button=true owner=owner editable=editable}} +
+ {{editor content=data.details.biography target="data.details.biography" + button=true owner=owner editable=editable}} +
diff --git a/src/templates/actors/partials/character-attributes-tab.html b/src/templates/actors/partials/character-attributes-tab.html index f7effcc..a4fe8b3 100644 --- a/src/templates/actors/partials/character-attributes-tab.html +++ b/src/templates/actors/partials/character-attributes-tab.html @@ -1,4 +1,4 @@ -
+
{{!-- Scores --}}
    @@ -61,13 +61,13 @@
{{/if}} -
  • - -
    • {{!-- Resource Tracking --}} -
    +
    +
    + +
    -
      -
    • -

      {{ localize "OSE.HealthShort" }}

      -
      - - / - -
      -
      • -
    • -

      {{ localize "OSE.HitDiceShort" }} -

      -
      - -
      -
      • -
    • - {{#if config.ascendingAC}} -

      - {{ localize "OSE.AscArmorClassShort" }}

      -
      - -
      - {{else}} -

      - {{ localize "OSE.ArmorClassShort" }}

      -
      - -
      - {{/if}} -
      • -
    • - {{#if config.ascendingAC}} -

      {{ localize "OSE.ABShort" }}

      -
      - -
      - {{else}} -

      {{ localize "OSE.Thac0" }}

      -
      - -
      - {{/if}} -
      • - {{#if data.retainer.enabled}} -
    • -

      {{ localize "OSE.LoyaltyShort" }} -

      -
      - -
      -
      • - {{/if}} -
    • -

      {{ localize "OSE.MovementShort" }} -

      -
      - -
      -
      • -
    -
    -
    - {{!-- Skills and abilities --}} -
    -
    -
  • -
    {{localize 'OSE.panel.abilities'}} & {{localize 'OSE.panel.equipment'}}
    -
    - {{#if owner}} - - - {{/if}} +
    +
    +
      +
    • +

      {{ localize "OSE.HealthShort" }} +

      +
      + + / +
      • -
        - {{#each abilities as |item|}} -
      1. -
        -
        -
        -

        - {{item.name~}} -

        -
        -
        - {{#if ../owner}} - - - - {{/if}} -
        -
        -
        2. - {{/each}} - {{#each owned as |section| }} - {{#each section as |item|}} -
      2. -
        -
        -
        -

        - {{item.name~}} -

        -
        - {{#if (eq item.type 'weapon')}} -
        - - / -
        - {{/if}} -
        - {{#if ../../owner}} - - - {{/if}} -
        -
        -
        3. - {{/each}} - {{/each}} -
      -
    -
    • - {{!-- Saving throws --}} -
    -
    - - -
    -
    + {{else}} +

    {{ localize "OSE.Thac0" }} +

    - +
    + {{/if}} -
  • -

    - {{ localize "OSE.saves.paralysis.long" }}

    + {{#if data.retainer.enabled}} +
  • +

    + {{ localize "OSE.LoyaltyShort" }} +

    - + +
    • -
  • -

    - {{ localize "OSE.saves.breath.long" }}

    + {{/if}} +
  • +

    + {{ localize "OSE.MovementShort" }} +

    - -
    • -
  • -

    - {{ localize "OSE.saves.spell.long" }}

    -
    - + +
    • -
    +
    +
    + {{!-- Skills and abilities --}} +
    +
    +
  • +
    {{localize 'OSE.panel.abilities'}} & {{localize 'OSE.panel.equipment'}}
    +
    + {{#if owner}} + + + {{/if}} +
    +
    • +
      + {{#each abilities as |item|}} +
    1. +
      +
      +
      +

      + {{item.name~}} +

      +
      +
      + {{#if ../owner}} + + + + {{/if}} +
      +
      +
      2. + {{/each}} + {{#each owned as |section| }} + {{#each section as |item|}} +
    2. +
      +
      +
      +

      + {{item.name~}} +

      +
      + {{#if (eq item.type 'weapon')}} +
      + + / +
      + {{/if}} +
      + {{#if ../../owner}} + + + {{/if}} +
      +
      +
      3. + {{/each}} + {{/each}} +
    +
    +
    + {{!-- Saving throws --}} +
    + +
    +
    \ No newline at end of file