mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-07-23 10:59:54 +02:00
In setting sheets, split feature types and make description viewable
This commit is contained in:
Carlos Fernandez
parent
29be8c1395
commit
9d16bc48ae
9 changed files with 123 additions and 98 deletions
|
|
@ -10,11 +10,7 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
|
||||||
actions: {
|
actions: {
|
||||||
addExperience: DHAdversarySettings.#addExperience,
|
addExperience: DHAdversarySettings.#addExperience,
|
||||||
removeExperience: DHAdversarySettings.#removeExperience
|
removeExperience: DHAdversarySettings.#removeExperience
|
||||||
},
|
}
|
||||||
dragDrop: [
|
|
||||||
{ dragSelector: null, dropSelector: '.tab.features' },
|
|
||||||
{ dragSelector: '.feature-item', dropSelector: null }
|
|
||||||
]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**@override */
|
/**@override */
|
||||||
|
|
@ -38,7 +34,8 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
id: 'features',
|
id: 'features',
|
||||||
template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/features.hbs'
|
template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/features.hbs',
|
||||||
|
scrollable: ['']
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -54,12 +51,16 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
|
||||||
async _prepareContext(options) {
|
async _prepareContext(options) {
|
||||||
const context = await super._prepareContext(options);
|
const context = await super._prepareContext(options);
|
||||||
|
|
||||||
const featureForms = Object.keys(CONFIG.DH.ITEM.featureForm);
|
// Get feature groups. Uncategorized go to actions
|
||||||
context.features = context.document.system.features.sort((a, b) =>
|
const featureFormsTypes = ['passive', 'action', 'reaction'];
|
||||||
a.system.featureForm !== b.system.featureForm
|
const features = this.document.system.features.sort((a, b) => a.sort - b.sort);
|
||||||
? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
|
const featureGroups = featureFormsTypes.map(t => ({
|
||||||
: a.sort - b.sort
|
featureForm: t,
|
||||||
);
|
label: _loc(CONFIG.DH.ITEM.featureForm[t]),
|
||||||
|
features: features.filter(f => f.system.featureForm === t)
|
||||||
|
}));
|
||||||
|
featureGroups[1].features.push(...features.filter(f => !featureFormsTypes.includes(f.system.featureForm)));
|
||||||
|
context.featureGroups = featureGroups;
|
||||||
|
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,11 +32,13 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
id: 'features',
|
id: 'features',
|
||||||
template: 'systems/daggerheart/templates/sheets-settings/environment-settings/features.hbs'
|
template: 'systems/daggerheart/templates/sheets-settings/environment-settings/features.hbs',
|
||||||
|
scrollable: ['']
|
||||||
},
|
},
|
||||||
adversaries: {
|
adversaries: {
|
||||||
id: 'adversaries',
|
id: 'adversaries',
|
||||||
template: 'systems/daggerheart/templates/sheets-settings/environment-settings/adversaries.hbs'
|
template: 'systems/daggerheart/templates/sheets-settings/environment-settings/adversaries.hbs',
|
||||||
|
scrollable: ['']
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -52,12 +54,16 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
|
||||||
async _prepareContext(options) {
|
async _prepareContext(options) {
|
||||||
const context = await super._prepareContext(options);
|
const context = await super._prepareContext(options);
|
||||||
|
|
||||||
const featureForms = ['passive', 'action', 'reaction'];
|
// Get feature groups. Uncategorized go to actions
|
||||||
context.features = context.document.system.features.sort((a, b) =>
|
const featureFormsTypes = ['passive', 'action', 'reaction'];
|
||||||
a.system.featureForm !== b.system.featureForm
|
const features = this.document.system.features.sort((a, b) => a.sort - b.sort);
|
||||||
? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
|
const featureGroups = featureFormsTypes.map(t => ({
|
||||||
: a.sort - b.sort
|
featureForm: t,
|
||||||
);
|
label: _loc(CONFIG.DH.ITEM.featureForm[t]),
|
||||||
|
features: features.filter(f => f.system.featureForm === t)
|
||||||
|
}));
|
||||||
|
featureGroups[1].features.push(...features.filter(f => !featureFormsTypes.includes(f.system.featureForm)));
|
||||||
|
context.featureGroups = featureGroups;
|
||||||
|
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,8 @@ export default class DHNPCSettings extends DHBaseActorSettings {
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
id: 'features',
|
id: 'features',
|
||||||
template: 'systems/daggerheart/templates/sheets-settings/npc-settings/features.hbs'
|
template: 'systems/daggerheart/templates/sheets-settings/npc-settings/features.hbs',
|
||||||
|
scrollable: ['']
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -43,12 +44,16 @@ export default class DHNPCSettings extends DHBaseActorSettings {
|
||||||
async _prepareContext(options) {
|
async _prepareContext(options) {
|
||||||
const context = await super._prepareContext(options);
|
const context = await super._prepareContext(options);
|
||||||
|
|
||||||
const featureForms = ['passive', 'action', 'reaction'];
|
// Get feature groups. Uncategorized go to actions
|
||||||
context.features = context.document.system.features.sort((a, b) =>
|
const featureFormsTypes = ['passive', 'action', 'reaction'];
|
||||||
a.system.featureForm !== b.system.featureForm
|
const features = this.document.system.features.sort((a, b) => a.sort - b.sort);
|
||||||
? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
|
const featureGroups = featureFormsTypes.map(t => ({
|
||||||
: a.sort - b.sort
|
featureForm: t,
|
||||||
);
|
label: _loc(CONFIG.DH.ITEM.featureForm[t]),
|
||||||
|
features: features.filter(f => f.system.featureForm === t)
|
||||||
|
}));
|
||||||
|
featureGroups[1].features.push(...features.filter(f => !featureFormsTypes.includes(f.system.featureForm)));
|
||||||
|
context.featureGroups = featureGroups;
|
||||||
|
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ export default class DHBaseActorSettings extends DHApplicationMixin(ActorSheetV2
|
||||||
},
|
},
|
||||||
dragDrop: [
|
dragDrop: [
|
||||||
{ dragSelector: null, dropSelector: '.tab.features' },
|
{ dragSelector: null, dropSelector: '.tab.features' },
|
||||||
{ dragSelector: '.feature-item', dropSelector: null }
|
{ dragSelector: '.feature-item, .inventory-item[data-type="feature"]', dropSelector: null }
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -77,7 +77,7 @@ export default class DHBaseActorSettings extends DHApplicationMixin(ActorSheetV2
|
||||||
}
|
}
|
||||||
|
|
||||||
async _onDragStart(event) {
|
async _onDragStart(event) {
|
||||||
const featureItemEl = event.currentTarget.closest('.feature-item');
|
const featureItemEl = event.currentTarget.closest('.feature-item, .inventory-item[data-type="feature"]');
|
||||||
const feature = this.actor.items.get(featureItemEl?.dataset.itemId);
|
const feature = this.actor.items.get(featureItemEl?.dataset.itemId);
|
||||||
if (feature && event.target.closest('.tab.features')) {
|
if (feature && event.target.closest('.tab.features')) {
|
||||||
const featureData = { ...feature.toDragData(), fromInternal: true };
|
const featureData = { ...feature.toDragData(), fromInternal: true };
|
||||||
|
|
|
||||||
|
|
@ -734,7 +734,7 @@ export default function DHApplicationMixin(Base) {
|
||||||
* @type {ApplicationClickAction}
|
* @type {ApplicationClickAction}
|
||||||
*/
|
*/
|
||||||
static async #onCreateDoc(event, target) {
|
static async #onCreateDoc(event, target) {
|
||||||
const { documentClass, type, inVault, disabled } = target.dataset;
|
const { documentClass, type, inVault, disabled, featureForm } = target.dataset;
|
||||||
const parentIsItem = this.document.documentName === 'Item';
|
const parentIsItem = this.document.documentName === 'Item';
|
||||||
const featureOnCharacter = this.document.parent?.type === 'character' && type === 'feature';
|
const featureOnCharacter = this.document.parent?.type === 'character' && type === 'feature';
|
||||||
const parent = featureOnCharacter
|
const parent = featureOnCharacter
|
||||||
|
|
@ -752,6 +752,7 @@ export default function DHApplicationMixin(Base) {
|
||||||
identifier: this.document.system.isMulticlass ? 'multiclass' : null
|
identifier: this.document.system.isMulticlass ? 'multiclass' : null
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
if (featureForm) systemData.featureForm = featureForm;
|
||||||
|
|
||||||
const cls =
|
const cls =
|
||||||
type === 'action' ? game.system.api.models.actions.actionsTypes.base : getDocumentClass(documentClass);
|
type === 'action' ? game.system.api.models.actions.actionsTypes.base : getDocumentClass(documentClass);
|
||||||
|
|
|
||||||
|
|
@ -3,27 +3,30 @@
|
||||||
data-tab='{{tabs.features.id}}'
|
data-tab='{{tabs.features.id}}'
|
||||||
data-group='{{tabs.features.group}}'
|
data-group='{{tabs.features.group}}'
|
||||||
>
|
>
|
||||||
<button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
|
{{#each featureGroups as |group|}}
|
||||||
{{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
|
<fieldset>
|
||||||
</button>
|
<legend>
|
||||||
<fieldset>
|
{{group.label}}
|
||||||
<legend>{{localize tabs.features.label}}</legend>
|
<a data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize "TYPES.Item.feature")}}" data-feature-form="{{group.featureForm}}">
|
||||||
<ul class="feature-list">
|
<i class="fa-solid fa-plus icon-button"></i>
|
||||||
{{#each @root.features as |feature|}}
|
</a>
|
||||||
<li class="feature-item" data-item-id="{{feature.id}}" draggable="true">
|
</legend>
|
||||||
<img src="{{feature.img}}" alt="">
|
<ul class="feature-list">
|
||||||
<div class="label">
|
{{#each group.features as |feature|}}
|
||||||
<span>{{feature.name}}</span>
|
{{> 'daggerheart.inventory-item'
|
||||||
</div>
|
item=feature
|
||||||
<div class="controls">
|
type='feature'
|
||||||
<a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
|
actorType=@root.document.type
|
||||||
<a data-action="deleteDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
|
hideTags=true
|
||||||
</div>
|
hideContextMenu=true
|
||||||
</li>
|
hideResources=true
|
||||||
{{/each}}
|
showActions=false
|
||||||
</ul>
|
}}
|
||||||
<div class="features-dragger">
|
{{/each}}
|
||||||
<span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
|
</ul>
|
||||||
</div>
|
</fieldset>
|
||||||
</fieldset>
|
{{/each}}
|
||||||
|
<div class="features-dragger">
|
||||||
|
<span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -3,24 +3,30 @@
|
||||||
data-tab='{{tabs.features.id}}'
|
data-tab='{{tabs.features.id}}'
|
||||||
data-group='{{tabs.features.group}}'
|
data-group='{{tabs.features.group}}'
|
||||||
>
|
>
|
||||||
<button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
|
{{#each featureGroups as |group|}}
|
||||||
{{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
|
<fieldset>
|
||||||
</button>
|
<legend>
|
||||||
<fieldset>
|
{{group.label}}
|
||||||
<legend>{{localize tabs.features.label}}</legend>
|
<a data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize "TYPES.Item.feature")}}" data-feature-form="{{group.featureForm}}">
|
||||||
<ul class="feature-list">
|
<i class="fa-solid fa-plus icon-button"></i>
|
||||||
{{#each @root.features as |feature|}}
|
</a>
|
||||||
<li class="feature-item" data-item-id="{{feature.id}}">
|
</legend>
|
||||||
<img src="{{feature.img}}" alt="">
|
<ul class="feature-list">
|
||||||
<div class="label">
|
{{#each group.features as |feature|}}
|
||||||
<span>{{feature.name}}</span>
|
{{> 'daggerheart.inventory-item'
|
||||||
</div>
|
item=feature
|
||||||
<div class="controls">
|
type='feature'
|
||||||
<a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
|
actorType=@root.document.type
|
||||||
<a data-action="deleteDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
|
hideTags=true
|
||||||
</div>
|
hideContextMenu=true
|
||||||
</li>
|
hideResources=true
|
||||||
{{/each}}
|
showActions=false
|
||||||
</ul>
|
}}
|
||||||
</fieldset>
|
{{/each}}
|
||||||
|
</ul>
|
||||||
|
</fieldset>
|
||||||
|
{{/each}}
|
||||||
|
<div class="features-dragger">
|
||||||
|
<span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -3,27 +3,30 @@
|
||||||
data-tab='{{tabs.features.id}}'
|
data-tab='{{tabs.features.id}}'
|
||||||
data-group='{{tabs.features.group}}'
|
data-group='{{tabs.features.group}}'
|
||||||
>
|
>
|
||||||
<button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
|
{{#each featureGroups as |group|}}
|
||||||
{{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
|
<fieldset>
|
||||||
</button>
|
<legend>
|
||||||
<fieldset>
|
{{group.label}}
|
||||||
<legend>{{localize tabs.features.label}}</legend>
|
<a data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize "TYPES.Item.feature")}}" data-feature-form="{{group.featureForm}}">
|
||||||
<ul class="feature-list">
|
<i class="fa-solid fa-plus icon-button"></i>
|
||||||
{{#each @root.features as |feature|}}
|
</a>
|
||||||
<li class="feature-item" data-item-id="{{feature.id}}" draggable="true">
|
</legend>
|
||||||
<img src="{{feature.img}}" alt="">
|
<ul class="feature-list">
|
||||||
<div class="label">
|
{{#each group.features as |feature|}}
|
||||||
<span>{{feature.name}}</span>
|
{{> 'daggerheart.inventory-item'
|
||||||
</div>
|
item=feature
|
||||||
<div class="controls">
|
type='feature'
|
||||||
<a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
|
actorType=@root.document.type
|
||||||
<a data-action="deleteDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
|
hideTags=true
|
||||||
</div>
|
hideContextMenu=true
|
||||||
</li>
|
hideResources=true
|
||||||
{{/each}}
|
showActions=false
|
||||||
</ul>
|
}}
|
||||||
<div class="features-dragger">
|
{{/each}}
|
||||||
<span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
|
</ul>
|
||||||
</div>
|
</fieldset>
|
||||||
</fieldset>
|
{{/each}}
|
||||||
|
<div class="features-dragger">
|
||||||
|
<span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -46,10 +46,10 @@ Parameters:
|
||||||
<span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
|
<span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
|
||||||
|
|
||||||
{{!-- Tags Start --}}
|
{{!-- Tags Start --}}
|
||||||
{{#if (not ../hideTags)}}
|
{{#if (not hideTags)}}
|
||||||
{{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item}}
|
{{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item}}
|
||||||
{{#if (eq ../type 'feature')}}
|
{{#if (eq ../type 'feature')}}
|
||||||
{{#if (and system.featureForm (or (eq @root.document.type "adversary") (eq @root.document.type "environment")))}}
|
{{#if (and system.featureForm (ne @root.document.type "character"))}}
|
||||||
<div class="tag feature-form">
|
<div class="tag feature-form">
|
||||||
<span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
|
<span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue