This commit is contained in:
WBHarry 2026-02-06 09:59:06 +01:00
parent 593105b163
commit 7bc5ea4910
12 changed files with 198 additions and 5 deletions

View file

@ -209,10 +209,22 @@ Hooks.once('init', () => {
SYSTEM.id, SYSTEM.id,
applications.sheetConfigs.ActiveEffectConfig, applications.sheetConfigs.ActiveEffectConfig,
{ {
types: ['base', 'beastform', 'horde'],
makeDefault: true, makeDefault: true,
label: sheetLabel('DOCUMENT.ActiveEffect') label: sheetLabel('DOCUMENT.ActiveEffect')
} }
); );
DocumentSheetConfig.registerSheet(
CONFIG.ActiveEffect.documentClass,
SYSTEM.id,
applications.sheetConfigs.ArmorActiveEffectConfig,
{
types: ['armor'],
makeDefault: true,
label: () =>
`${game.i18n.localize('TYPES.ActiveEffect.armor')} ${game.i18n.localize('DAGGERHEART.GENERAL.effect')}`
}
);
game.socket.on(`system.${SYSTEM.id}`, socketRegistration.handleSocketEvent); game.socket.on(`system.${SYSTEM.id}`, socketRegistration.handleSocketEvent);

View file

@ -16,7 +16,8 @@
"ActiveEffect": { "ActiveEffect": {
"base": "Standard", "base": "Standard",
"beastform": "Beastform", "beastform": "Beastform",
"horde": "Horde" "horde": "Horde",
"armor": "Armor"
}, },
"Actor": { "Actor": {
"character": "Character", "character": "Character",
@ -2167,6 +2168,7 @@
"duality": "Duality", "duality": "Duality",
"dualityDice": "Duality Dice", "dualityDice": "Duality Dice",
"dualityRoll": "Duality Roll", "dualityRoll": "Duality Roll",
"effect": "Effect",
"enabled": "Enabled", "enabled": "Enabled",
"evasion": "Evasion", "evasion": "Evasion",
"equipment": "Equipment", "equipment": "Equipment",

View file

@ -6,6 +6,7 @@ export { default as CompanionSettings } from './companion-settings.mjs';
export { default as SettingActiveEffectConfig } from './setting-active-effect-config.mjs'; export { default as SettingActiveEffectConfig } from './setting-active-effect-config.mjs';
export { default as SettingFeatureConfig } from './setting-feature-config.mjs'; export { default as SettingFeatureConfig } from './setting-feature-config.mjs';
export { default as EnvironmentSettings } from './environment-settings.mjs'; export { default as EnvironmentSettings } from './environment-settings.mjs';
export { default as ArmorActiveEffectConfig } from './armorActiveEffectConfig.mjs';
export { default as ActiveEffectConfig } from './activeEffectConfig.mjs'; export { default as ActiveEffectConfig } from './activeEffectConfig.mjs';
export { default as DhTokenConfig } from './token-config.mjs'; export { default as DhTokenConfig } from './token-config.mjs';
export { default as DhPrototypeTokenConfig } from './prototype-token-config.mjs'; export { default as DhPrototypeTokenConfig } from './prototype-token-config.mjs';

View file

@ -0,0 +1,59 @@
const { HandlebarsApplicationMixin, DocumentSheetV2 } = foundry.applications.api;
export default class ArmorActiveEffectConfig extends HandlebarsApplicationMixin(DocumentSheetV2) {
static DEFAULT_OPTIONS = {
classes: ['daggerheart', 'sheet', 'dh-style', 'active-effect-config', 'armor-effect-config'],
form: {
handler: this.updateForm,
submitOnChange: true,
closeOnSubmit: false
},
actions: {
addEffect: ArmorActiveEffectConfig.#addEffect
}
};
static PARTS = {
header: { template: 'systems/daggerheart/templates/sheets/activeEffect/header.hbs' },
tabs: { template: 'templates/generic/tab-navigation.hbs' },
details: { template: 'systems/daggerheart/templates/sheets/activeEffect/armor/details.hbs' },
settings: { template: 'systems/daggerheart/templates/sheets/activeEffect/armor/settings.hbs' },
footer: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-form-footer.hbs' }
};
static TABS = {
sheet: {
tabs: [
{ id: 'details', icon: 'fa-solid fa-book' },
{ id: 'settings', icon: 'fa-solid fa-bars', label: 'DAGGERHEART.GENERAL.Tabs.settings' }
],
initial: 'details',
labelPrefix: 'EFFECT.TABS'
}
};
async _prepareContext(options) {
const context = await super._prepareContext(options);
context.systemFields = context.document.system.schema.fields;
return context;
}
/** @inheritDoc */
async _preparePartContext(partId, context) {
const partContext = await super._preparePartContext(partId, context);
if (partId in partContext.tabs) partContext.tab = partContext.tabs[partId];
return partContext;
}
async updateForm(_event, _form, formData) {
await this.document.update(formData.object);
this.render();
}
static #addEffect() {
this.document.update({ 'system.changes': [...this.document.system.changes, {}] });
this.render();
}
}

View file

@ -1,11 +1,13 @@
import BaseEffect from './baseEffect.mjs'; import BaseEffect from './baseEffect.mjs';
import BeastformEffect from './beastformEffect.mjs'; import BeastformEffect from './beastformEffect.mjs';
import HordeEffect from './hordeEffect.mjs'; import HordeEffect from './hordeEffect.mjs';
import ArmorEffect from './armorEffect.mjs';
export { BaseEffect, BeastformEffect, HordeEffect }; export { BaseEffect, BeastformEffect, HordeEffect, ArmorEffect };
export const config = { export const config = {
base: BaseEffect, base: BaseEffect,
beastform: BeastformEffect, beastform: BeastformEffect,
horde: HordeEffect horde: HordeEffect,
armor: ArmorEffect
}; };

View file

@ -0,0 +1,64 @@
export default class ArmorEffect extends foundry.data.ActiveEffectTypeDataModel {
static defineSchema() {
const fields = foundry.data.fields;
return {
...super.defineSchema(),
changes: new fields.ArrayField(
new fields.SchemaField({
type: new fields.StringField({
required: true,
blank: false,
choices: CONFIG.DH.GENERAL.activeEffectModes,
initial: CONFIG.DH.GENERAL.activeEffectModes.add.id,
validate: ArmorEffect.#validateType
}),
phase: new fields.StringField({ required: true, blank: false, initial: 'initial' }),
priority: new fields.NumberField(),
marked: new fields.NumberField({
required: true,
integer: true,
initial: 0,
min: 0,
label: 'DAGGERHEART.GENERAL.value'
}),
max: new fields.NumberField({
required: true,
integer: true,
initial: 1,
min: 1,
label: 'DAGGERHEART.GENERAL.max'
})
})
)
};
}
static applyChangeField(model, change, field) {
return [model, change, field];
}
prepareBaseData() {
for (const change of this.changes) {
change.key = 'system.armorTest';
change.value = Math.max(change.max - change.marked, change.max);
}
}
/**
* Validate that an {@link EffectChangeData#type} string is well-formed.
* @param {string} type The string to be validated
* @returns {true}
* @throws {Error} An error if the type string is malformed
*/
static #validateType(type) {
if (type.length < 3) throw new Error('must be at least three characters long');
if (!/^custom\.-?\d+$/.test(type) && !type.split('.').every(s => /^[a-z0-9]+$/i.test(s))) {
throw new Error(
'A change type must either be a sequence of dot-delimited, alpha-numeric substrings or of the form' +
' "custom.{number}"'
);
}
return true;
}
}

View file

@ -62,7 +62,7 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
throw new Error('The array of sub-types to restrict to must not be empty.'); throw new Error('The array of sub-types to restrict to must not be empty.');
} }
const creatableEffects = ['base']; const creatableEffects = ['base', 'armor'];
const documentTypes = this.TYPES.filter(type => creatableEffects.includes(type)).map(type => { const documentTypes = this.TYPES.filter(type => creatableEffects.includes(type)).map(type => {
const labelKey = `TYPES.ActiveEffect.${type}`; const labelKey = `TYPES.ActiveEffect.${type}`;
const label = game.i18n.has(labelKey) ? game.i18n.localize(labelKey) : type; const label = game.i18n.has(labelKey) ? game.i18n.localize(labelKey) : type;
@ -140,6 +140,9 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
/**@inheritdoc*/ /**@inheritdoc*/
static applyChangeField(model, change, field) { static applyChangeField(model, change, field) {
if (this.system?.applyChangeField)
super.applyChangeField(...this.system.applyChangeField(model, change, field));
change.value = Number.isNumeric(change.value) change.value = Number.isNumeric(change.value)
? change.value ? change.value
: DhActiveEffect.getChangeValue(model, change, change.effect); : DhActiveEffect.getChangeValue(model, change, change.effect);

View file

@ -0,0 +1,16 @@
.application.sheet.daggerheart.dh-style.armor-effect-config {
.armor-effects-container {
display: flex;
flex-direction: column;
gap: 8px;
.armor-effect-container {
display: flex;
gap: 4px;
* {
flex: 1;
}
}
}
}

View file

@ -44,3 +44,4 @@
@import './actions/actions.less'; @import './actions/actions.less';
@import './activeEffects/activeEffects.less'; @import './activeEffects/activeEffects.less';
@import './activeEffects/armorEffects.less';

View file

@ -278,7 +278,8 @@
}, },
"ActiveEffect": { "ActiveEffect": {
"beastform": {}, "beastform": {},
"horde": {} "horde": {},
"armor": {}
}, },
"Combat": { "Combat": {
"combat": {} "combat": {}

View file

@ -0,0 +1,20 @@
<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>

View file

@ -0,0 +1,12 @@
<section class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
<button data-action="addEffect">Add Effect</button>
<div class="armor-effects-container">
{{#each source.system.changes as |change index|}}
<div class="armor-effect-container">
{{formGroup @root.systemFields.changes.element.fields.marked value=change.marked localize=true}}
{{formGroup @root.systemFields.changes.element.fields.max value=change.max localize=true}}
</div>
{{/each}}
</div>
</section>