diff --git a/src/lang/en.json b/src/lang/en.json index 51ad8c8..d1f6493 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -155,6 +155,7 @@ "OSE.armor.unarmored": "Unarmored", "OSE.armor.light": "Light", "OSE.armor.heavy": "Heavy", + "OSE.armor.shield": "Shield", "OSE.spells.Memorized": "Memorized", "OSE.spells.Cast": "Cast", diff --git a/src/module/actor/character-sheet.js b/src/module/actor/character-sheet.js index 53eb99f..a70b192 100644 --- a/src/module/actor/character-sheet.js +++ b/src/module/actor/character-sheet.js @@ -162,11 +162,17 @@ export class OseActorSheetCharacter extends OseActorSheet { $(event.currentTarget.parentElement.parentElement).slideUp(200); }) - html.find(".inventory .item-titles").click(ev => { - let items = $(event.currentTarget.parentElement).children('.item-list'); + html.find(".inventory .item-titles .item-caret").click(ev => { + let items = $(event.currentTarget.parentElement.parentElement).children('.item-list'); if (items.css('display') == "none") { + let el = $(event.currentTarget).find('.fas.fa-caret-right'); + el.removeClass('fa-caret-right'); + el.addClass('fa-caret-down'); items.slideDown(200); } else { + let el = $(event.currentTarget).find('.fas.fa-caret-down'); + el.removeClass('fa-caret-down'); + el.addClass('fa-caret-right'); items.slideUp(200); } }) diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index e88dc8d..4d8f960 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -290,7 +290,7 @@ export class OseActor extends Actor { }, }; let skip = options.event && options.event.ctrlKey; - + // Roll and return return OseDice.Roll({ event: options.event, diff --git a/src/module/config.js b/src/module/config.js index 8765dac..b158219 100644 --- a/src/module/config.js +++ b/src/module/config.js @@ -25,5 +25,6 @@ export const OSE = { unarmored: "OSE.armor.unarmored", light: "OSE.armor.light", heavy: "OSE.armor.heavy", + shield: "OSE.armor.shield", } }; diff --git a/src/scss/actor-base.scss b/src/scss/actor-base.scss index d597b83..cac7d12 100644 --- a/src/scss/actor-base.scss +++ b/src/scss/actor-base.scss @@ -192,7 +192,6 @@ line-height: 30px; } .item-titles { - cursor: pointer; text-align: center; padding: 4px 0; border: 1px solid $colorDark; @@ -294,6 +293,11 @@ } } } + .item-caret { + flex: 0 0 10px; + margin: 0 4px; + cursor: pointer; + } .item-controls { font-size: 12px; flex-basis: 50px; @@ -306,7 +310,7 @@ } &.spells { .item-titles { - padding: 0; + line-height: 24px; } .item-controls { flex-basis: 30px; diff --git a/src/templates/actors/partials/character-inventory-tab.html b/src/templates/actors/partials/character-inventory-tab.html index e022d5b..b5d990e 100644 --- a/src/templates/actors/partials/character-inventory-tab.html +++ b/src/templates/actors/partials/character-inventory-tab.html @@ -1,6 +1,7 @@
  • +
    {{localize "OSE.items.Weapons"}}
    {{localize "OSE.items.Qualities"}}
    @@ -44,6 +45,7 @@
  • +
    {{localize "OSE.items.Armors"}}
    {{#if @root.config.ascendingAC}}
    {{localize "OSE.items.ArmorAAC"}}
    @@ -96,6 +98,7 @@
    {{!-- Misc items --}}
  • +
    {{localize "OSE.items.Misc"}}
    @@ -139,6 +142,7 @@
    {{!-- Treasure items --}}
  • +
    {{localize "OSE.items.Treasure"}}
    {{treasure}}
    diff --git a/src/templates/actors/partials/character-spells-tab.html b/src/templates/actors/partials/character-spells-tab.html index 3e3a08a..802cca7 100644 --- a/src/templates/actors/partials/character-spells-tab.html +++ b/src/templates/actors/partials/character-spells-tab.html @@ -1,7 +1,8 @@
    {{#each spells as |spellGroup id|}} -
      +
    1. +
      {{localize "OSE.spells.Level"}} {{id}}
      {{localize 'OSE.spells.Slots'}}
    2. +
        {{#each spellGroup as |item|}}
      1. @@ -37,6 +39,7 @@
      2. {{/each}} -
      +
    +
  • {{/each}}
    \ No newline at end of file