Fix Actor sheets

This commit is contained in:
Johannes Loher 2021-06-30 19:14:52 +02:00
parent 0369748629
commit 61b757ae8f
10 changed files with 42 additions and 39 deletions

View file

@ -9,12 +9,12 @@ SPDX-License-Identifier: MIT
<form class="{{cssClass}} flexcol" autocomplete="off"> <form class="{{cssClass}} flexcol" autocomplete="off">
{{!-- Sheet Header --}} {{!-- Sheet Header --}}
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{actor.img}}" data-edit="img" alt="Actor Icon" title="{{actor.name}}" <img class="profile-img" src="{{data.img}}" data-edit="img" alt="Actor Icon" title="{{data.name}}"
height="100" width="100" /> height="100" width="100" />
<div class="header-fields flexrow"> <div class="header-fields flexrow">
<h1 class="charname"> <h1 class="charname">
<label for="actor.name" class="hidden">Name</label> <label for="name" class="hidden">Name</label>
<input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" /> <input name="name" type="text" id="name" value="{{data.name}}" placeholder="Name" />
</h1> </h1>
{{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}} {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
@ -22,28 +22,28 @@ SPDX-License-Identifier: MIT
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.race">{{config.i18n.characterBaseInfo.race}}</label> for="data.baseInfo.race">{{config.i18n.characterBaseInfo.race}}</label>
<input type="text" name="data.baseInfo.race" id="data.baseInfo.race" value="{{data.baseInfo.race}}" <input type="text" name="data.baseInfo.race" id="data.baseInfo.race"
data-dtype="String" /> value="{{data.data.baseInfo.race}}" data-dtype="String" />
</div> </div>
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.culture">{{config.i18n.characterBaseInfo.culture}}</label> for="data.baseInfo.culture">{{config.i18n.characterBaseInfo.culture}}</label>
<input id="data.baseInfo.culture" type="text" name="data.baseInfo.culture" <input id="data.baseInfo.culture" type="text" name="data.baseInfo.culture"
value="{{data.baseInfo.culture}}" data-dtype="String" /> value="{{data.data.baseInfo.culture}}" data-dtype="String" />
</div> </div>
<div class="basic-property flex125"> <div class="basic-property flex125">
<label class="basic-property-label" <label class="basic-property-label"
for="data.progression.progressPoints.used">{{config.i18n.characterProgression.progressPoints}}</label> for="data.progression.progressPoints.used">{{config.i18n.characterProgression.progressPoints}}</label>
<div class="flexrow"> <div class="flexrow">
<input id="data.progression.progressPoints.used" type="number" <input id="data.progression.progressPoints.used" type="number"
name="data.progression.progressPoints.used" value="{{data.progression.progressPoints.used}}" name="data.progression.progressPoints.used"
data-dtype="Number" /> value="{{data.data.progression.progressPoints.used}}" data-dtype="Number" />
<span class="input-divider"> / </span> <span class="input-divider"> / </span>
<label class="hidden" for="data.progression.progressPoints.total">Total <label class="hidden" for="data.progression.progressPoints.total">Total
Progression Points</label> Progression Points</label>
<input type="number" id="data.progression.progressPoints.total" <input type="number" id="data.progression.progressPoints.total"
name="data.progression.progressPoints.total" name="data.progression.progressPoints.total"
value="{{data.progression.progressPoints.total}}" data-dtype="Number" /> value="{{data.data.progression.progressPoints.total}}" data-dtype="Number" />
</div> </div>
</div> </div>
<div class="basic-property flex125"> <div class="basic-property flex125">
@ -51,26 +51,26 @@ SPDX-License-Identifier: MIT
for="data.progression.talentPoints.used">{{config.i18n.characterProgression.talentPoints}}</label> for="data.progression.talentPoints.used">{{config.i18n.characterProgression.talentPoints}}</label>
<div class="flexrow"> <div class="flexrow">
<input type="number" name="data.progression.talentPoints.used" <input type="number" name="data.progression.talentPoints.used"
id="data.progression.talentPoints.used" value="{{data.progression.talentPoints.used}}" id="data.progression.talentPoints.used" value="{{data.data.progression.talentPoints.used}}"
data-dtype="Number" /> data-dtype="Number" />
<span class="input-divider"> / </span> <span class="input-divider"> / </span>
<label for="data.progression.talentPoints.total" class="hidden">Total Talent Points</label> <label for="data.progression.talentPoints.total" class="hidden">Total Talent Points</label>
<input type="number" name="data.progression.talentPoints.total" <input type="number" name="data.progression.talentPoints.total"
id="data.progression.talentPoints.total" value="{{data.progression.talentPoints.total}}" id="data.progression.talentPoints.total"
data-dtype="Number" /> value="{{data.data.progression.talentPoints.total}}" data-dtype="Number" />
</div> </div>
</div> </div>
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.class">{{config.i18n.characterBaseInfo.class}}</label> for="data.baseInfo.class">{{config.i18n.characterBaseInfo.class}}</label>
<input type="text" id="data.baseInfo.class" name="data.baseInfo.class" <input type="text" id="data.baseInfo.class" name="data.baseInfo.class"
value="{{data.baseInfo.class}}" data-dtype="String" /> value="{{data.data.baseInfo.class}}" data-dtype="String" />
</div> </div>
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.heroClass">{{config.i18n.characterBaseInfo.heroClass}}</label> for="data.baseInfo.heroClass">{{config.i18n.characterBaseInfo.heroClass}}</label>
<input type="text" id="data.baseInfo.heroClass" name="data.baseInfo.heroClass" <input type="text" id="data.baseInfo.heroClass" name="data.baseInfo.heroClass"
value="{{data.baseInfo.heroClass}}" data-dtype="String" /> value="{{data.data.baseInfo.heroClass}}" data-dtype="String" />
</div> </div>
</div> </div>
</div> </div>

View file

@ -13,7 +13,8 @@ SPDX-License-Identifier: MIT
"DS4.CombatValuesHitPointsCurrentAbbr"}}</label> "DS4.CombatValuesHitPointsCurrentAbbr"}}</label>
</h2> </h2>
<input class="progression-value" type="number" name="data.combatValues.hitPoints.value" <input class="progression-value" type="number" name="data.combatValues.hitPoints.value"
id="data.combatValues.hitPoints.value" value="{{data.combatValues.hitPoints.value}}" data-dtype="Number" /> id="data.combatValues.hitPoints.value" value="{{data.data.combatValues.hitPoints.value}}"
data-dtype="Number" />
</div> </div>
{{#if (eq actor.type "character")}} {{#if (eq actor.type "character")}}
{{#if settings.showSlayerPoints}} {{#if settings.showSlayerPoints}}
@ -21,9 +22,9 @@ SPDX-License-Identifier: MIT
<h2 class="progression-label"><label for="data.slayersPoints.value" <h2 class="progression-label"><label for="data.slayersPoints.value"
title="{{localize 'DS4.CharacterSlayerPoints'}}">{{localize "DS4.CharacterSlayerPointsAbbr"}}</label> title="{{localize 'DS4.CharacterSlayerPoints'}}">{{localize "DS4.CharacterSlayerPointsAbbr"}}</label>
</h2> </h2>
<input class="progression-value progression-value--slayer-points" type="number" max="{{data.slayerPoints.max}}" <input class="progression-value progression-value--slayer-points" type="number"
min="0" step="1" name="data.slayerPoints.value" id="data.slayersPoints.value" max="{{data.data.slayerPoints.max}}" min="0" step="1" name="data.slayerPoints.value"
value="{{data.slayerPoints.value}}" data-dtype="Number" /> id="data.slayersPoints.value" value="{{data.data.slayerPoints.value}}" data-dtype="Number" />
</div> </div>
{{/if}} {{/if}}
<div class="progression-entry"> <div class="progression-entry">
@ -32,7 +33,7 @@ SPDX-License-Identifier: MIT
"DS4.CharacterProgressionLevelAbbr"}}</label> "DS4.CharacterProgressionLevelAbbr"}}</label>
</h2> </h2>
<input class="progression-value" type="number" min="0" name="data.progression.level" id="data.progression.level" <input class="progression-value" type="number" min="0" name="data.progression.level" id="data.progression.level"
value="{{data.progression.level}}" data-dtype="Number" /> value="{{data.data.progression.level}}" data-dtype="Number" />
</div> </div>
<div class="progression-entry"> <div class="progression-entry">
<h2 class="progression-label"><label for="data.progression.experiencePoints" <h2 class="progression-label"><label for="data.progression.experiencePoints"
@ -40,7 +41,8 @@ SPDX-License-Identifier: MIT
"DS4.CharacterProgressionExperiencePointsAbbr"}}</label> "DS4.CharacterProgressionExperiencePointsAbbr"}}</label>
</h2> </h2>
<input class="progression-value" type="number" min="0" name="data.progression.experiencePoints" <input class="progression-value" type="number" min="0" name="data.progression.experiencePoints"
id="data.progression.experiencePoints" value="{{data.progression.experiencePoints}}" data-dtype="Number" /> id="data.progression.experiencePoints" value="{{data.data.progression.experiencePoints}}"
data-dtype="Number" />
</div> </div>
{{/if}} {{/if}}
</div> </div>

View file

@ -7,6 +7,6 @@ SPDX-License-Identifier: MIT
<div class="ds4-checks"> <div class="ds4-checks">
{{#each config.i18n.checks as |check-label check-key|}} {{#each config.i18n.checks as |check-label check-key|}}
{{> systems/ds4/templates/sheets/actor/components/check.hbs check-key=check-key check-target-number=(lookup {{> systems/ds4/templates/sheets/actor/components/check.hbs check-key=check-key check-target-number=(lookup
../data.checks check-key) check-label=check-label}} ../data.data.checks check-key) check-label=check-label}}
{{/each}} {{/each}}
</div> </div>

View file

@ -8,6 +8,6 @@ SPDX-License-Identifier: MIT
<div class="ds4-combat-values"> <div class="ds4-combat-values">
{{#each config.i18n.combatValues as |combat-value-label combat-value-key|}} {{#each config.i18n.combatValues as |combat-value-label combat-value-key|}}
{{> systems/ds4/templates/sheets/actor/components/combat-value.hbs combat-value-key=combat-value-key {{> systems/ds4/templates/sheets/actor/components/combat-value.hbs combat-value-key=combat-value-key
combat-value-data=(lookup ../data.combatValues combat-value-key) combat-value-label=combat-value-label}} combat-value-data=(lookup ../data.data.combatValues combat-value-key) combat-value-label=combat-value-label}}
{{/each}} {{/each}}
</div> </div>

View file

@ -8,12 +8,12 @@ SPDX-License-Identifier: MIT
<div class="ds4-core-values"> <div class="ds4-core-values">
{{#each config.i18n.attributes as |attribute-label attribute-key|}} {{#each config.i18n.attributes as |attribute-label attribute-key|}}
{{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=attribute-label {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=attribute-label
core-value-key=attribute-key core-value-data=(lookup ../data.attributes core-value-key=attribute-key core-value-data=(lookup ../data.data.attributes
attribute-key) core-value-variant="attribute"}} attribute-key) core-value-variant="attribute"}}
{{/each}} {{/each}}
{{#each config.i18n.traits as |trait-label trait-key|}} {{#each config.i18n.traits as |trait-label trait-key|}}
{{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=trait-label {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=trait-label
core-value-key=trait-key core-value-key=trait-key
core-value-data=(lookup ../data.traits trait-key) core-value-variant="trait"}} core-value-data=(lookup ../data.data.traits trait-key) core-value-variant="trait"}}
{{/each}} {{/each}}
</div> </div>

View file

@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT
<h4 class="ds4-currency-title">{{localize 'DS4.CharacterCurrency'}}</h4> <h4 class="ds4-currency-title">{{localize 'DS4.CharacterCurrency'}}</h4>
<div class="ds4-currency"> <div class="ds4-currency">
{{#each data.currency as |value key|}} {{#each data.data.currency as |value key|}}
<label for="data.currency.{{key}}" class="flex05">{{lookup ../config.i18n.characterCurrency key}}</label> <label for="data.currency.{{key}}" class="flex05">{{lookup ../config.i18n.characterCurrency key}}</label>
<input class="ds4-currency__value ds4-currency__value--{{key}} item-change" type="number" min="0" step="1" <input class="ds4-currency__value ds4-currency__value--{{key}} item-change" type="number" min="0" step="1"
name="data.currency.{{key}}" id="data.currency.{{key}}" value="{{value}}" data-dtype="Number" /> name="data.currency.{{key}}" id="data.currency.{{key}}" value="{{value}}" data-dtype="Number" />

View file

@ -9,11 +9,11 @@ SPDX-License-Identifier: MIT
<form class="{{cssClass}} flexcol" autocomplete="off"> <form class="{{cssClass}} flexcol" autocomplete="off">
{{!-- Sheet Header --}} {{!-- Sheet Header --}}
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100" /> <img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}" height="100" width="100" />
<div class="header-fields flexrow"> <div class="header-fields flexrow">
<h1 class="charname"> <h1 class="charname">
<label for="actor.name" class="hidden">Name</label> <label for="name" class="hidden">Name</label>
<input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" /> <input name="name" type="text" id="name" value="{{data.name}}" placeholder="Name" />
</h1> </h1>
{{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}} {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
@ -21,7 +21,7 @@ SPDX-License-Identifier: MIT
<div class="basic-property"> <div class="basic-property">
<label>{{config.i18n.creatureBaseInfo.creatureType}}</label> <label>{{config.i18n.creatureBaseInfo.creatureType}}</label>
<select name="data.baseInfo.creatureType" data-type="String"> <select name="data.baseInfo.creatureType" data-type="String">
{{#select data.baseInfo.creatureType}} {{#select data.data.baseInfo.creatureType}}
{{#each config.i18n.creatureTypes as |value key|}} {{#each config.i18n.creatureTypes as |value key|}}
<option value="{{key}}">{{value}}</option> <option value="{{key}}">{{value}}</option>
{{/each}} {{/each}}
@ -31,18 +31,19 @@ SPDX-License-Identifier: MIT
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.loot">{{config.i18n.creatureBaseInfo.loot}}</label> for="data.baseInfo.loot">{{config.i18n.creatureBaseInfo.loot}}</label>
<input type="text" name="data.baseInfo.loot" value="{{data.baseInfo.loot}}" data-dtype="String" /> <input type="text" name="data.baseInfo.loot" value="{{data.data.baseInfo.loot}}"
data-dtype="String" />
</div> </div>
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.foeFactor">{{config.i18n.creatureBaseInfo.foeFactor}}</label> for="data.baseInfo.foeFactor">{{config.i18n.creatureBaseInfo.foeFactor}}</label>
<input type="text" name="data.baseInfo.foeFactor" value="{{data.baseInfo.foeFactor}}" <input type="text" name="data.baseInfo.foeFactor" value="{{data.data.baseInfo.foeFactor}}"
data-dtype="Number" /> data-dtype="Number" />
</div> </div>
<div class="basic-property"> <div class="basic-property">
<label>{{config.i18n.creatureBaseInfo.sizeCategory}}</label> <label>{{config.i18n.creatureBaseInfo.sizeCategory}}</label>
<select name="data.baseInfo.sizeCategory" data-type="String"> <select name="data.baseInfo.sizeCategory" data-type="String">
{{#select data.baseInfo.sizeCategory}} {{#select data.data.baseInfo.sizeCategory}}
{{#each config.i18n.creatureSizeCategories as |value key|}} {{#each config.i18n.creatureSizeCategories as |value key|}}
<option value="{{key}}">{{value}}</option> <option value="{{key}}">{{value}}</option>
{{/each}} {{/each}}
@ -52,8 +53,8 @@ SPDX-License-Identifier: MIT
<div class="basic-property"> <div class="basic-property">
<label class="basic-property-label" <label class="basic-property-label"
for="data.baseInfo.experiencePoints">{{config.i18n.creatureBaseInfo.experiencePoints}}</label> for="data.baseInfo.experiencePoints">{{config.i18n.creatureBaseInfo.experiencePoints}}</label>
<input type="text" name="data.baseInfo.experiencePoints" value="{{data.baseInfo.experiencePoints}}" <input type="text" name="data.baseInfo.experiencePoints"
data-dtype="Number" /> value="{{data.data.baseInfo.experiencePoints}}" data-dtype="Number" />
</div> </div>
</div> </div>
</div> </div>

View file

@ -5,6 +5,6 @@ SPDX-License-Identifier: MIT
--}} --}}
<div class="tab biography" data-group="primary" data-tab="biography"> <div class="tab biography" data-group="primary" data-tab="biography">
{{editor content=data.profile.biography target="data.profile.biography" button=true owner=owner {{editor content=data.data.profile.biography target="data.profile.biography" button=true owner=owner
editable=editable}} editable=editable}}
</div> </div>

View file

@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
<div class="tab profile" data-group="primary" data-tab="profile"> <div class="tab profile" data-group="primary" data-tab="profile">
<div class="grid grid-2col"> <div class="grid grid-2col">
{{#each data.profile as |profile-data-value profile-data-key|}} {{#each data.data.profile as |profile-data-value profile-data-key|}}
{{#if (and (ne profile-data-key 'biography') (ne profile-data-key 'specialCharacteristics'))}} {{#if (and (ne profile-data-key 'biography') (ne profile-data-key 'specialCharacteristics'))}}
<div class="profile-entry"> <div class="profile-entry">
<label for="data.profile.{{profile-data-key}}"> <label for="data.profile.{{profile-data-key}}">
@ -23,7 +23,7 @@ SPDX-License-Identifier: MIT
{{lookup config.i18n.characterProfile 'specialCharacteristics'}} {{lookup config.i18n.characterProfile 'specialCharacteristics'}}
</label> </label>
<textarea name="data.profile.specialCharacteristics" data-dtype="String" <textarea name="data.profile.specialCharacteristics" data-dtype="String"
rows="4">{{data.profile.specialCharacteristics}}</textarea> rows="4">{{data.data.profile.specialCharacteristics}}</textarea>
</div> </div>
</div> </div>
</div> </div>

View file

@ -6,9 +6,9 @@ SPDX-License-Identifier: MIT
--}} --}}
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" /> <img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}" />
<div class="header-fields flexrow"> <div class="header-fields flexrow">
<h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1> <h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name" /></h1>
<h2 class="item-type">{{lookup config.i18n.itemTypes item.type}}</h2> <h2 class="item-type">{{lookup config.i18n.itemTypes item.type}}</h2>
{{> @partial-block}} {{> @partial-block}}
</div> </div>