dungeonslayers/ds4
dungeonslayers/ds4
3
0
Fork 0
Code Issues 9 Pull requests 7 Projects Releases 10 Packages 1 Activity

Merge remote-tracking branch 'origin/master' into 056-items-compendium

Browse source
This commit is contained in:
Johannes Loher 2021-02-20 02:22:26 +01:00
commit 00e8bb2ab8
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lang/de.json
View file

@ -14,7 +14,7 @@
"DS4.HeadingTalentsAbilities": "Talente & Fähigkeiten", "DS4.HeadingTalentsAbilities": "Talente & Fähigkeiten",
"DS4.HeadingSpells": "Zaubersprüche", "DS4.HeadingSpells": "Zaubersprüche",
"DS4.HeadingDescription": "Beschreibung", "DS4.HeadingDescription": "Beschreibung",
"DS4.HeadingSpecialCreatureAbilites": "Besondere Fähigkeiten", "DS4.HeadingSpecialCreatureAbilities": "Besondere Fähigkeiten",
"DS4.AttackType": "Angriffstyp", "DS4.AttackType": "Angriffstyp",
"DS4.AttackTypeAbbr": "AT", "DS4.AttackTypeAbbr": "AT",
"DS4.WeaponBonus": "Waffenbonus", "DS4.WeaponBonus": "Waffenbonus",

2
src/lang/en.json
View file

@ -14,7 +14,7 @@
"DS4.HeadingTalentsAbilities": "Talents & Abilities", "DS4.HeadingTalentsAbilities": "Talents & Abilities",
"DS4.HeadingSpells": "Spells", "DS4.HeadingSpells": "Spells",
"DS4.HeadingDescription": "Description", "DS4.HeadingDescription": "Description",
"DS4.HeadingSpecialCreatureAbilites": "Special Abilites", "DS4.HeadingSpecialCreatureAbilities": "Special Abilities",
"DS4.AttackType": "Attack Type", "DS4.AttackType": "Attack Type",
"DS4.AttackTypeAbbr": "AT", "DS4.AttackTypeAbbr": "AT",
"DS4.WeaponBonus": "Weapon Bonus", "DS4.WeaponBonus": "Weapon Bonus",

9
src/module/actor/sheets/actor-sheet.ts
View file

@ -16,7 +16,14 @@ export class DS4ActorSheet extends ActorSheet<ActorSheet.Data<DS4Actor>> {
classes: ["ds4", "sheet", "actor"], classes: ["ds4", "sheet", "actor"],
width: 745, width: 745,
height: 600, height: 600,
scrollY: [".sheet-body"], scrollY: [
".inventory",
".spells",
".talents-abilities",
".profile",
".biography",
".special-creature-abilities",
],
template: superDefaultOptions.template, template: superDefaultOptions.template,
viewPermission: superDefaultOptions.viewPermission, viewPermission: superDefaultOptions.viewPermission,
closeOnSubmit: superDefaultOptions.closeOnSubmit, closeOnSubmit: superDefaultOptions.closeOnSubmit,

5
src/scss/components/_apps.scss
View file

@ -8,14 +8,11 @@
} }
.sheet-body { .sheet-body {
overflow-y: auto; overflow-y: hidden;
} }
.tab { .tab {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
align-content: flex-start; align-content: flex-start;
ol {
overflow-y: auto;
}
} }
} }

2
src/templates/actor/creature-sheet.hbs
View file

@ -58,7 +58,7 @@
{{!-- Sheet Tab Navigation --}} {{!-- Sheet Tab Navigation --}}
<nav class="sheet-tabs tabs" data-group="primary"> <nav class="sheet-tabs tabs" data-group="primary">
<a class="item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a> <a class="item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
<a class="item" data-tab="special-creature-abilites">{{localize 'DS4.HeadingSpecialCreatureAbilites'}}</a> <a class="item" data-tab="special-creature-abilities">{{localize 'DS4.HeadingSpecialCreatureAbilities'}}</a>
<a class="item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a> <a class="item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
<a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a> <a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
</nav> </nav>

4
src/templates/actor/partials/special-creature-abilities-overview.hbs
View file

@ -51,7 +51,7 @@
{{!-- ======================================================================== --}} {{!-- ======================================================================== --}}
<div class="tab special-creature-abilites" data-group="primary" data-tab="special-creature-abilites"> <div class="tab special-creature-abilities" data-group="primary" data-tab="special-creature-abilities">
<ol class="items-list"> <ol class="items-list">
{{> baseItemListHeader dataType='specialCreatureAbility' }} {{> baseItemListHeader dataType='specialCreatureAbility' }}
{{#each itemsByType.specialCreatureAbility as |item id|}} {{#each itemsByType.specialCreatureAbility as |item id|}}
@ -59,4 +59,4 @@
{{/each}} {{/each}}
</ol> </ol>
{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='specialCreatureAbility' }} {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='specialCreatureAbility' }}
</div> </div>