mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-04-21 23:13:39 +02:00
Move resources select to scrolly text and accept actor object
This commit is contained in:
parent
a4a7b8e7ca
commit
007d1bc055
4 changed files with 18 additions and 17 deletions
|
|
@ -140,18 +140,6 @@ export const companionResources = {
|
||||||
...companionBaseResources
|
...companionBaseResources
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getScrollingTextResources = actorType => ({
|
|
||||||
armor: {
|
|
||||||
label: 'DAGGERHEART.GENERAL.armor',
|
|
||||||
reverse: true
|
|
||||||
},
|
|
||||||
...(actorType === 'character'
|
|
||||||
? characterResources
|
|
||||||
: actorType === 'adversary'
|
|
||||||
? adversaryResources
|
|
||||||
: companionResources)
|
|
||||||
});
|
|
||||||
|
|
||||||
export const featureProperties = {
|
export const featureProperties = {
|
||||||
agility: {
|
agility: {
|
||||||
name: 'DAGGERHEART.CONFIG.Traits.agility.name',
|
name: 'DAGGERHEART.CONFIG.Traits.agility.name',
|
||||||
|
|
|
||||||
|
|
@ -213,7 +213,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
|
||||||
const textData = Object.keys(changes.system.resources).reduce((acc, key) => {
|
const textData = Object.keys(changes.system.resources).reduce((acc, key) => {
|
||||||
const resource = changes.system.resources[key];
|
const resource = changes.system.resources[key];
|
||||||
if (resource.value !== undefined && resource.value !== this.resources[key].value) {
|
if (resource.value !== undefined && resource.value !== this.resources[key].value) {
|
||||||
acc.push(getScrollTextData(this.resources, resource, key, this.parent.type));
|
acc.push(getScrollTextData(this.parent, resource, key));
|
||||||
}
|
}
|
||||||
|
|
||||||
return acc;
|
return acc;
|
||||||
|
|
|
||||||
|
|
@ -225,10 +225,9 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
|
||||||
changed.system?.marks?.value !== undefined && changed.system.marks.value !== this.marks.value;
|
changed.system?.marks?.value !== undefined && changed.system.marks.value !== this.marks.value;
|
||||||
if (armorChanged && autoSettings.resourceScrollTexts && this.parent.parent?.type === 'character') {
|
if (armorChanged && autoSettings.resourceScrollTexts && this.parent.parent?.type === 'character') {
|
||||||
const armorData = getScrollTextData(
|
const armorData = getScrollTextData(
|
||||||
this.parent.parent.system.resources,
|
this.parent.parent,
|
||||||
changed.system.marks,
|
changed.system.marks,
|
||||||
'armor',
|
'armor',
|
||||||
this.parent.parent.type
|
|
||||||
);
|
);
|
||||||
options.scrollingTextData = [armorData];
|
options.scrollingTextData = [armorData];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { adversaryResources, characterResources, companionResources } from '../config/actorConfig.mjs';
|
||||||
import { diceTypes, getDiceSoNicePresets, getDiceSoNicePreset, range } from '../config/generalConfig.mjs';
|
import { diceTypes, getDiceSoNicePresets, getDiceSoNicePreset, range } from '../config/generalConfig.mjs';
|
||||||
import Tagify from '@yaireo/tagify';
|
import Tagify from '@yaireo/tagify';
|
||||||
|
|
||||||
|
|
@ -378,8 +379,21 @@ export const arraysEqual = (a, b) =>
|
||||||
|
|
||||||
export const setsEqual = (a, b) => a.size === b.size && [...a].every(value => b.has(value));
|
export const setsEqual = (a, b) => a.size === b.size && [...a].every(value => b.has(value));
|
||||||
|
|
||||||
export function getScrollTextData(resources, resource, key, actorType) {
|
export function getScrollTextData(actor, resource, key) {
|
||||||
const { reverse, label } = CONFIG.DH.ACTOR.getScrollingTextResources(actorType)[key];
|
const actorType = actor.type;
|
||||||
|
const resources = actor.system.resources;
|
||||||
|
const { reverse, label } = {
|
||||||
|
armor: {
|
||||||
|
label: 'DAGGERHEART.GENERAL.armor',
|
||||||
|
reverse: true
|
||||||
|
},
|
||||||
|
...(actorType === 'character'
|
||||||
|
? characterResources
|
||||||
|
: actorType === 'adversary'
|
||||||
|
? adversaryResources
|
||||||
|
: companionResources)
|
||||||
|
}[key];
|
||||||
|
|
||||||
const { BOTTOM, TOP } = CONST.TEXT_ANCHOR_POINTS;
|
const { BOTTOM, TOP } = CONST.TEXT_ANCHOR_POINTS;
|
||||||
const increased = resources[key].value < resource.value;
|
const increased = resources[key].value < resource.value;
|
||||||
const value = -1 * (resources[key].value - resource.value);
|
const value = -1 * (resources[key].value - resource.value);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue