cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-21 23:13:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor ArmorChange schema and fix some bugs

Browse source
This commit is contained in:
Carlos Fernandez 2026-03-21 02:42:43 -04:00
parent 6193153596
commit 251baba5b3
60 changed files with 128 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/en.json
View file

@ -1891,7 +1891,7 @@
"armor": { "armor": {
"newArmorEffect": "Armor Effect", "newArmorEffect": "Armor Effect",
"FIELDS": { "FIELDS": {
"armorInteraction": { "interaction": {
"label": "Armor Interaction", "label": "Armor Interaction",
"hint": "Does the character wearing armor suppress this effect?" "hint": "Does the character wearing armor suppress this effect?"
} }

38
module/applications/sheets-configs/activeEffectConfig.mjs
View file

@ -190,23 +190,14 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
})); }));
break; break;
case 'changes': case 'changes':
const fields = this.document.system.schema.fields.changes.element.fields;
const singleTypes = ['armor']; const singleTypes = ['armor'];
const { base, ...typedChanges } = context.source.changes.reduce((acc, change, index) => { const typedChanges = context.source.changes.reduce((acc, change, index) => {
const type = CONFIG.DH.GENERAL.baseActiveEffectModes[change.type] ? 'base' : change.type; if (singleTypes.includes(change.type)) {
if (singleTypes.includes(type)) { acc[change.type] = { ...change, index };
acc[type] = { ...change, index };
} else {
if (!acc[type]) acc[type] = [];
acc[type].push({ ...change, index });
} }
return acc; return acc;
}, {}); }, {});
partContext.changes = await Promise.all( partContext.changes = partContext.changes.filter(c => !!c);
foundry.utils.deepClone(base ?? []).map(c => this._prepareChangeContext(c, fields))
);
partContext.typedChanges = typedChanges; partContext.typedChanges = typedChanges;
break; break;
} }
@ -238,29 +229,38 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
return this.submit({ updateData: { system: { changes } } }); return this.submit({ updateData: { system: { changes } } });
} }
_prepareChangeContext(change, fields) { /** @inheritdoc */
_renderChange(context) {
const { change, index, defaultPriority } = context;
if (!(change.type in CONFIG.DH.GENERAL.baseActiveEffectModes)) return null;
const changeTypesSchema = this.document.system.schema.fields.changes.element.types;
const fields = context.fields ?? (changeTypesSchema[change.type] ?? changeTypesSchema.add).fields;
if (typeof change.value !== 'string') change.value = JSON.stringify(change.value); if (typeof change.value !== 'string') change.value = JSON.stringify(change.value);
const defaultPriority = game.system.api.documents.DhActiveEffect.CHANGE_TYPES[change.type]?.defaultPriority;
Object.assign( Object.assign(
change, change,
['key', 'type', 'value', 'priority'].reduce((paths, fieldName) => { ['key', 'type', 'value', 'priority'].reduce((paths, fieldName) => {
paths[`${fieldName}Path`] = `system.changes.${change.index}.${fieldName}`; paths[`${fieldName}Path`] = `system.changes.${index}.${fieldName}`;
return paths; return paths;
}, {}) }, {})
); );
return ( return (
game.system.api.documents.DhActiveEffect.CHANGE_TYPES[change.type].render?.( game.system.api.documents.DhActiveEffect.CHANGE_TYPES[change.type].render?.(
change, change,
change.index, index,
defaultPriority defaultPriority
) ?? ) ??
foundry.applications.handlebars.renderTemplate( foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/sheets/activeEffect/change.hbs', 'systems/daggerheart/templates/sheets/activeEffect/change.hbs',
{ {
change, change,
index: change.index, index,
defaultPriority, defaultPriority,
fields fields,
types: Object.keys(CONFIG.DH.GENERAL.baseActiveEffectModes).reduce((r, key) => {
r[key] = CONFIG.DH.GENERAL.baseActiveEffectModes[key].label;
return r;
}, {})
} }
) )
); );

41
module/data/activeEffect/baseEffect.mjs
View file

@ -18,23 +18,34 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
static defineSchema() { static defineSchema() {
const fields = foundry.data.fields; const fields = foundry.data.fields;
const baseChanges = Object.keys(CONFIG.DH.GENERAL.baseActiveEffectModes).reduce((r, type) => {
r[type] = new fields.SchemaField({
key: new fields.StringField({ required: true }),
type: new fields.StringField({
required: true,
choices: [type],
initial: type,
validate: BaseEffect.#validateType
}),
value: new fields.AnyField({
required: true,
nullable: true,
serializable: true,
initial: ''
}),
phase: new fields.StringField({ required: true, blank: false, initial: 'initial' }),
priority: new fields.NumberField()
});
return r;
}, {});
return { return {
...super.defineSchema(), ...super.defineSchema(),
changes: new fields.ArrayField( changes: new fields.ArrayField(
new fields.SchemaField({ new fields.TypedSchemaField(
key: new fields.StringField({ required: true }), { ...changeTypes, ...baseChanges },
type: new fields.StringField({ { initial: baseChanges.add.getInitialValue() }
required: true, )
blank: false,
choices: CONFIG.DH.GENERAL.activeEffectModes,
initial: CONFIG.DH.GENERAL.activeEffectModes.add.id,
validate: BaseEffect.#validateType
}),
value: new fields.AnyField({ required: true, nullable: true, serializable: true, initial: '' }),
phase: new fields.StringField({ required: true, blank: false, initial: 'initial' }),
priority: new fields.NumberField(),
typeData: new fields.TypedSchemaField(changeTypes, { nullable: true, initial: null })
})
), ),
duration: new fields.SchemaField({ duration: new fields.SchemaField({
type: new fields.StringField({ type: new fields.StringField({
@ -97,7 +108,7 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
const armorChange = this.armorChange; const armorChange = this.armorChange;
if (!armorChange) return null; if (!armorChange) return null;
return armorChange.typeData.getArmorData(armorChange); return armorChange.getArmorData(armorChange);
} }
static getDefaultObject() { static getDefaultObject() {

53
module/data/activeEffect/changeTypes/armor.mjs
View file

@ -2,42 +2,35 @@ import { itemAbleRollParse } from '../../../helpers/utils.mjs';
const fields = foundry.data.fields; const fields = foundry.data.fields;
export default class Armor extends foundry.abstract.DataModel { export default class ArmorChange extends foundry.abstract.DataModel {
static defineSchema() { static defineSchema() {
return { return {
type: new fields.StringField({ required: true, initial: 'armor', blank: false }), type: new fields.StringField({ required: true, initial: 'armor', blank: false }),
max: new fields.StringField({ priority: new fields.NumberField(),
required: true, phase: new fields.StringField({ required: true, blank: false, initial: 'initial' }),
nullable: false, value: new fields.SchemaField({
initial: '1', max: new fields.StringField({
label: 'DAGGERHEART.GENERAL.max' required: true,
nullable: false,
initial: '1',
label: 'DAGGERHEART.GENERAL.max'
}),
interaction: new fields.StringField({
required: true,
choices: CONFIG.DH.GENERAL.activeEffectArmorInteraction,
initial: CONFIG.DH.GENERAL.activeEffectArmorInteraction.none.id,
label: 'DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.interaction.label',
hint: 'DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.interaction.hint'
})
}), }),
armorInteraction: new fields.StringField({
required: true,
choices: CONFIG.DH.GENERAL.activeEffectArmorInteraction,
initial: CONFIG.DH.GENERAL.activeEffectArmorInteraction.none.id,
label: 'DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.armorInteraction.label',
hint: 'DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.armorInteraction.hint'
})
}; };
} }
static changeEffect = { static changeEffect = {
label: 'Armor', label: 'Armor',
defaultPriortiy: 20, defaultPriority: 20,
handler: (actor, change, _options, _field, replacementData) => { handler: (actor, change, _options, _field, replacementData) => {
const parsedMax = itemAbleRollParse(change.typeData.max, actor, change.effect.parent); const parsedMax = itemAbleRollParse(change.value.max, actor, change.effect.parent);
game.system.api.documents.DhActiveEffect.applyChange(
actor,
{
...change,
key: 'system.armorScore.value',
type: CONFIG.DH.GENERAL.activeEffectModes.add.id,
value: change.value
},
replacementData
);
game.system.api.documents.DhActiveEffect.applyChange( game.system.api.documents.DhActiveEffect.applyChange(
actor, actor,
{ {
@ -54,7 +47,7 @@ export default class Armor extends foundry.abstract.DataModel {
}; };
get isSuppressed() { get isSuppressed() {
switch (this.armorInteraction) { switch (this.value.interaction) {
case CONFIG.DH.GENERAL.activeEffectArmorInteraction.active.id: case CONFIG.DH.GENERAL.activeEffectArmorInteraction.active.id:
return !this.parent.parent?.actor.system.armor; return !this.parent.parent?.actor.system.armor;
case CONFIG.DH.GENERAL.activeEffectArmorInteraction.inactive.id: case CONFIG.DH.GENERAL.activeEffectArmorInteraction.inactive.id:
@ -68,9 +61,7 @@ export default class Armor extends foundry.abstract.DataModel {
return { return {
key: 'Armor', key: 'Armor',
type: CONFIG.DH.GENERAL.activeEffectModes.armor.id, type: CONFIG.DH.GENERAL.activeEffectModes.armor.id,
value: 0, value: {
typeData: {
type: 'armor',
max: 0, max: 0,
locked locked
}, },
@ -84,7 +75,7 @@ export default class Armor extends foundry.abstract.DataModel {
name: game.i18n.localize('DAGGERHEART.EFFECTS.ChangeTypes.armor.newArmorEffect'), name: game.i18n.localize('DAGGERHEART.EFFECTS.ChangeTypes.armor.newArmorEffect'),
img: 'icons/equipment/chest/breastplate-helmet-metal.webp', img: 'icons/equipment/chest/breastplate-helmet-metal.webp',
system: { system: {
changes: [Armor.getInitialValue(true)] changes: [ArmorChange.getInitialValue(true)]
} }
}; };
} }

9
module/documents/activeEffect.mjs
View file

@ -1,5 +1,5 @@
import { itemAbleRollParse } from '../helpers/utils.mjs'; import { itemAbleRollParse } from '../helpers/utils.mjs';
import { RefreshType, socketEvent } from '../systemRegistration/socket.mjs'; import { RefreshType } from '../systemRegistration/socket.mjs';
export default class DhActiveEffect extends foundry.documents.ActiveEffect { export default class DhActiveEffect extends foundry.documents.ActiveEffect {
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -155,11 +155,6 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
/* Methods */ /* Methods */
/* -------------------------------------------- */ /* -------------------------------------------- */
/**@inheritdoc */
static applyChange(actor, change, options) {
super.applyChange(actor, change, options);
}
/**@inheritdoc*/ /**@inheritdoc*/
static applyChangeField(model, change, field) { static applyChangeField(model, change, field) {
change.value = Number.isNumeric(change.value) change.value = Number.isNumeric(change.value)
@ -168,7 +163,7 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
super.applyChangeField(model, change, field); super.applyChangeField(model, change, field);
} }
_applyChangeUnguided(actor, change, changes, options) { static _applyChangeUnguided(actor, change, changes, options) {
change.value = DhActiveEffect.getChangeValue(actor, change, change.effect); change.value = DhActiveEffect.getChangeValue(actor, change, change.effect);
super._applyChangeUnguided(actor, change, changes, options); super._applyChangeUnguided(actor, change, changes, options);
} }

7
src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json
View file

@ -94,15 +94,12 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "1", "max": "1",
"armorInteraction": "active" "interaction": "active"
} }
} }
] ]

7
src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json
View file

@ -26,15 +26,12 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"value": 0,
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"typeData": { "value": {
"type": "armor",
"max": "3 + @system.traits.strength.value", "max": "3 + @system.traits.strength.value",
"armorInteraction": "inactive" "interaction": "inactive"
} }
} }
] ]

5
src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
View file

@ -263,13 +263,10 @@
}, },
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "1" "max": "1"
} }
} }

5
src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json
View file

@ -95,13 +95,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "1" "max": "1"
} }
} }

5
src/packs/items/armors/armor_Advanced_Chainmail_Armor_LzLOJ9EVaHWAjoq9.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Advanced_Full_Plate_Armor_crIbCb9NZ4K0VpoU.json
View file

@ -76,13 +76,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Advanced_Gambeson_Armor_epkAmlZVk7HOfUUT.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Advanced_Leather_Armor_itSOp2GCyem0f7oM.json
View file

@ -33,13 +33,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Bellamoi_Fine_Armor_WuoVwZA53XRAIt6d.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Bladefare_Armor_mNN6pvcsS10ChrWF.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Chainmail_Armor_haULhuEg37zUUvhb.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Channeling_Armor_vMJxEWz1srfwMsoj.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Dragonscale_Armor_mdQ69eFHyAQUDmE7.json
View file

@ -70,13 +70,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Dunamis_Silkchain_hAY6UgdGT7dj22Pr.json
View file

@ -96,13 +96,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "7" "max": "7"
} }
} }

5
src/packs/items/armors/armor_Elundrian_Chain_Armor_Q6LxmtFetDDkoZVZ.json
View file

@ -72,13 +72,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Emberwoven_Armor_bcQUh4QG3qFX0Vx6.json
View file

@ -94,13 +94,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Full_Fortified_Armor_7emTSt6nhZuTlvt5.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Full_Plate_Armor_UdUJNa31WxFW2noa.json
View file

@ -76,13 +76,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Gambeson_Armor_yJFp1bfpecDcStVK.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "3" "max": "3"
} }
} }

5
src/packs/items/armors/armor_Harrowbone_Armor_dvyQeUVRLc9y6rnt.json
View file

@ -87,13 +87,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Improved_Chainmail_Armor_K5WkjS0NGqHYmhU3.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Improved_Full_Plate_Armor_9f7RozpPTqrzJS1m.json
View file

@ -76,13 +76,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Improved_Gambeson_Armor_jphnMZjnS2FkOH3s.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Improved_Leather_Armor_t91M61pSCMKStTNt.json
View file

@ -33,13 +33,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Irontree_Breastplate_Armor_tzZntboNtHL5C6VM.json
View file

@ -83,13 +83,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Leather_Armor_nibfdNtp2PtxvbVz.json
View file

@ -33,13 +33,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "3" "max": "3"
} }
} }

5
src/packs/items/armors/armor_Legendary_Chainmail_Armor_EsIN5OLKe9ZYFNXZ.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "7" "max": "7"
} }
} }

5
src/packs/items/armors/armor_Legendary_Full_Plate_Armor_SXWjUR2aUR6bYvdl.json
View file

@ -76,13 +76,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "7" "max": "7"
} }
} }

5
src/packs/items/armors/armor_Legendary_Gambeson_Armor_c6tMXz4rPf9ioQrf.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Legendary_Leather_Armor_Tptgl5WOj76TyFn7.json
View file

@ -33,13 +33,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Monett_s_Cloak_AQzU2RsqS5V5bd1v.json
View file

@ -71,13 +71,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Rosewild_Armor_tN8kAeBvNKM3EBFo.json
View file

@ -63,13 +63,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Runes_of_Fortification_P4qAEDJUoNLgVRsA.json
View file

@ -70,13 +70,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/armors/armor_Runetan_Floating_Armor_tHlBUDQC24YMZqd6.json
View file

@ -70,13 +70,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "4" "max": "4"
} }
} }

5
src/packs/items/armors/armor_Savior_Chainmail_8X16lJQ3xltTwynm.json
View file

@ -101,13 +101,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "8" "max": "8"
} }
} }

5
src/packs/items/armors/armor_Spiked_Plate_Armor_QjwsIhXKqnlvRBMv.json
View file

@ -76,13 +76,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Tyris_Soft_Armor_PSW3BxCGmtLeWOxM.json
View file

@ -63,13 +63,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "5" "max": "5"
} }
} }

5
src/packs/items/armors/armor_Veritas_Opal_Armor_OvzgUTYy2RCN85vV.json
View file

@ -63,13 +63,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "6" "max": "6"
} }
} }

5
src/packs/items/weapons/weapon_Advanced_Round_Shield_hiEOGF2reabGLUoi.json
View file

@ -118,13 +118,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier" "max": "ITEM.@system.tier"
} }
} }

5
src/packs/items/weapons/weapon_Advanced_Tower_Shield_OfOzQbs4hg6QbfTG.json
View file

@ -156,13 +156,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier + 1" "max": "ITEM.@system.tier + 1"
} }
} }

5
src/packs/items/weapons/weapon_Improved_Round_Shield_DlinEBGZfIlvreO3.json
View file

@ -118,13 +118,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier" "max": "ITEM.@system.tier"
} }
} }

5
src/packs/items/weapons/weapon_Improved_Tower_Shield_bxt3NsbMqTSdI5ab.json
View file

@ -156,13 +156,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier + 1" "max": "ITEM.@system.tier + 1"
} }
} }

5
src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json
View file

@ -118,13 +118,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier" "max": "ITEM.@system.tier"
} }
} }

5
src/packs/items/weapons/weapon_Legendary_Round_Shield_A28WL9E2lJ3iLZHW.json
View file

@ -118,13 +118,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier" "max": "ITEM.@system.tier"
} }
} }

5
src/packs/items/weapons/weapon_Legendary_Tower_Shield_MaJIROht7A9LxIZx.json
View file

@ -156,13 +156,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier + 1" "max": "ITEM.@system.tier + 1"
} }
} }

5
src/packs/items/weapons/weapon_Round_Shield_mxwWKDujgsRcZWPT.json
View file

@ -118,13 +118,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier" "max": "ITEM.@system.tier"
} }
} }

5
src/packs/items/weapons/weapon_Spiked_Shield_vzyzFwLUniWZV1rt.json
View file

@ -160,13 +160,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "1" "max": "1"
} }
} }

5
src/packs/items/weapons/weapon_Tower_Shield_C9aWpK1shVMWP4m5.json
View file

@ -156,13 +156,10 @@
"system": { "system": {
"changes": [ "changes": [
{ {
"key": "Armor",
"type": "armor", "type": "armor",
"phase": "initial", "phase": "initial",
"priority": 20, "priority": 20,
"value": 0, "value": {
"typeData": {
"type": "armor",
"max": "ITEM.@system.tier + 1" "max": "ITEM.@system.tier + 1"
} }
} }

2
styles/less/sheets/activeEffects/activeEffects.less
View file

@ -50,7 +50,7 @@
header, header,
ol { ol {
grid-template-columns: 6rem 6rem 12rem 4rem; grid-template-columns: 7rem 12rem 4rem;
} }
} }
} }

20
templates/sheets/activeEffect/armor/details.hbs
View file

@ -1,20 +0,0 @@
<section class="tab scrollable{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
{{formGroup fields.tint value=source.tint rootId=rootId placeholder="#ffffff"}}
{{formGroup fields.description value=source.description rootId=rootId}}
{{formGroup fields.disabled value=source.disabled rootId=rootId}}
{{#if isActorEffect}}
<div class="form-group">
<label>{{localize "EFFECT.FIELDS.origin.label"}}</label>
<div class="form-fields">
<input type="text" value="{{source.origin}}" disabled />
</div>
</div>
{{/if}}
{{#if isItemEffect}}
{{formGroup fields.transfer value=source.transfer rootId=rootId label=legacyTransfer.label hint=(localize "DAGGERHEART.EFFECTS.Attachments.transferHint")}}
{{/if}}
{{formGroup fields.showIcon value=source.showIcon options=showIconOptions rootId=rootId}}
</section>

3
templates/sheets/activeEffect/armor/footer.hbs
View file

@ -1,3 +0,0 @@
<section class='tab-form-footer padded'>
<button type="button" data-action="finish"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
</section>

17
templates/sheets/activeEffect/armor/settings.hbs
View file

@ -1,17 +0,0 @@
<section class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
<fieldset>
<legend>{{localize "Armor"}}</legend>
<div class="two-columns even">
{{#each source.system.changes as |change index|}}
{{formGroup @root.systemFields.changes.element.fields.value name=(concat 'system.changes.' index '.value') value=change.value localize=true}}
{{formGroup @root.systemFields.changes.element.fields.max name=(concat 'system.changes.' index '.max') value=change.max localize=true}}
{{/each}}
</div>
</fieldset>
<fieldset>
<legend>{{localize "DAGGERHEART.GENERAL.general"}}</legend>
{{formGroup @root.systemFields.armorInteraction name="system.armorInteraction" value=source.system.armorInteraction localize=true}}
</fieldset>
</section>

4
templates/sheets/activeEffect/change.hbs
View file

@ -3,7 +3,9 @@
<input type="text" class="effect-change-input" name="{{change.keyPath}}" value="{{change.key}}" /> <input type="text" class="effect-change-input" name="{{change.keyPath}}" value="{{change.key}}" />
</div> </div>
<div class="type"> <div class="type">
{{formInput fields.type name=change.typePath value=change.type localize=true}} <select name="{{change.typePath}}">
{{selectOptions types selected=change.type localize=true}}
</select>
</div> </div>
<div class="value"> <div class="value">
{{formInput fields.value name=change.valuePath value=change.value elementType="input"}} {{formInput fields.value name=change.valuePath value=change.value elementType="input"}}

5
templates/sheets/activeEffect/changes.hbs
View file

@ -18,13 +18,12 @@
<legend>{{localize "DAGGERHEART.GENERAL.armor"}} <input type="checkbox" class="armor-change-checkbox" data-index="{{typedChanges.armor.index}}" {{checked typedChanges.armor}} /></legend> <legend>{{localize "DAGGERHEART.GENERAL.armor"}} <input type="checkbox" class="armor-change-checkbox" data-index="{{typedChanges.armor.index}}" {{checked typedChanges.armor}} /></legend>
{{#if typedChanges.armor}} {{#if typedChanges.armor}}
<header> <header>
<div>{{localize "EFFECT.FIELDS.changes.element.value.label"}}</div>
<div>{{localize "DAGGERHEART.GENERAL.max"}}</div> <div>{{localize "DAGGERHEART.GENERAL.max"}}</div>
<div>{{localize "DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.armorInteraction.label"}}</div> <div>{{localize "DAGGERHEART.EFFECTS.ChangeTypes.armor.FIELDS.interaction.label"}}</div>
<div>{{localize "EFFECT.FIELDS.changes.element.priority.label"}}</div> <div>{{localize "EFFECT.FIELDS.changes.element.priority.label"}}</div>
</header> </header>
<ol class="scrollable"> <ol class="scrollable">
{{> "systems/daggerheart/templates/sheets/activeEffect/typeChanges/armorChange.hbs" typedChanges.armor fields=@root.systemFields.changes.element.fields}} {{> "systems/daggerheart/templates/sheets/activeEffect/typeChanges/armorChange.hbs" typedChanges.armor fields=@root.systemFields.changes.element.types.armor.fields}}
</ol> </ol>
{{/if}} {{/if}}
</fieldset> </fieldset>

7
templates/sheets/activeEffect/typeChanges/armorChange.hbs
View file

@ -1,10 +1,7 @@
<li data-index="{{index}}"> <li data-index="{{index}}">
<input type="hidden" name="{{concat "system.changes." index ".key"}}" value="{{key}}" />
<input type="hidden" name="{{concat "system.changes." index ".type"}}" value="{{type}}" /> <input type="hidden" name="{{concat "system.changes." index ".type"}}" value="{{type}}" />
<input type="hidden" name="{{concat "system.changes." index ".phase"}}" value="{{phase}}" /> <input type="hidden" name="{{concat "system.changes." index ".phase"}}" value="{{phase}}" />
<input type="hidden" name="{{concat "system.changes." index ".typeData.type"}}" value="{{typeData.type}}" /> {{formInput fields.value.fields.max name=(concat "system.changes." index ".value.max") value=value.max data-dtype="Number"}}
{{formInput fields.value name=(concat "system.changes." index ".value") value=value elementType="input" data-dtype="Number"}} {{formInput fields.value.fields.interaction name=(concat "system.changes." index ".value.interaction") value=value.interaction localize=true}}
{{formInput fields.typeData.types.armor.fields.max name=(concat "system.changes." index ".typeData.max") value=typeData.max data-dtype="Number"}}
{{formInput fields.typeData.types.armor.fields.armorInteraction name=(concat "system.changes." index ".typeData.armorInteraction") value=typeData.armorInteraction localize=true}}
{{formInput fields.priority name=(concat "system.changes." index ".priority") value=priority}} {{formInput fields.priority name=(concat "system.changes." index ".priority") value=priority}}
</li> </li>