From 50f5992f55bc6c27fb620fd0b0dfecfc179139cb Mon Sep 17 00:00:00 2001 From: IrkTheImp Date: Thu, 22 May 2025 19:04:21 -0500 Subject: [PATCH 1/4] allow blank for features on Weapon and Armor Items --- module/data/armor.mjs | 2 +- module/data/weapon.mjs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/data/armor.mjs b/module/data/armor.mjs index fefe9785..27fc83c4 100644 --- a/module/data/armor.mjs +++ b/module/data/armor.mjs @@ -3,7 +3,7 @@ export default class DhpArmor extends foundry.abstract.TypeDataModel { const fields = foundry.data.fields; return { baseScore: new fields.NumberField({ initial: 1, integer: true }), - feature: new fields.StringField({ choices: SYSTEM.ITEM.armorFeatures, integer: false }), + feature: new fields.StringField({ choices: SYSTEM.ITEM.armorFeatures, integer: false, blank:true}), marks: new fields.SchemaField({ max: new fields.NumberField({ initial: 6, integer: true }), value: new fields.NumberField({ initial: 0, integer: true }), diff --git a/module/data/weapon.mjs b/module/data/weapon.mjs index aab5e79b..904fe97b 100644 --- a/module/data/weapon.mjs +++ b/module/data/weapon.mjs @@ -12,13 +12,14 @@ export default class DhpWeapon extends foundry.abstract.TypeDataModel { type: new fields.StringField({ choices: SYSTEM.GENERAL.damageTypes, integer: false }), }), burden: new fields.StringField({ choices: SYSTEM.GENERAL.burden, integer: false }), - feature: new fields.StringField({ choices: SYSTEM.ITEM.weaponFeatures, integer: false }), + feature: new fields.StringField({ choices: SYSTEM.ITEM.weaponFeatures, integer: false, blank:true }), quantity: new fields.NumberField({ initial: 1, integer: true }), description: new fields.HTMLField({}), } } - prepareDerivedData(){ + prepareDerivedData() { + console.log('weapon', this); if(this.parent.parent){ this.applyEffects(); } From cc50b2e392240179f5e39109a0fe7bd6d7ed75fc Mon Sep 17 00:00:00 2001 From: IrkTheImp Date: Thu, 22 May 2025 19:06:45 -0500 Subject: [PATCH 2/4] remove console log --- module/data/weapon.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/module/data/weapon.mjs b/module/data/weapon.mjs index 904fe97b..01b1b74b 100644 --- a/module/data/weapon.mjs +++ b/module/data/weapon.mjs @@ -19,7 +19,6 @@ export default class DhpWeapon extends foundry.abstract.TypeDataModel { } prepareDerivedData() { - console.log('weapon', this); if(this.parent.parent){ this.applyEffects(); } From 41f5c34d0ad8dab6f8d35a81b3bf3afb827d8011 Mon Sep 17 00:00:00 2001 From: IrkTheImp Date: Thu, 22 May 2025 19:09:12 -0500 Subject: [PATCH 3/4] formatting --- module/data/weapon.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/data/weapon.mjs b/module/data/weapon.mjs index 01b1b74b..452fe847 100644 --- a/module/data/weapon.mjs +++ b/module/data/weapon.mjs @@ -18,7 +18,7 @@ export default class DhpWeapon extends foundry.abstract.TypeDataModel { } } - prepareDerivedData() { + prepareDerivedData() { if(this.parent.parent){ this.applyEffects(); } From 06ae26b72a52499d6737488e596252e485195ef1 Mon Sep 17 00:00:00 2001 From: IrkTheImp Date: Thu, 22 May 2025 19:10:25 -0500 Subject: [PATCH 4/4] space removal --- module/data/weapon.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/data/weapon.mjs b/module/data/weapon.mjs index 452fe847..2d8b58eb 100644 --- a/module/data/weapon.mjs +++ b/module/data/weapon.mjs @@ -18,7 +18,7 @@ export default class DhpWeapon extends foundry.abstract.TypeDataModel { } } - prepareDerivedData() { + prepareDerivedData(){ if(this.parent.parent){ this.applyEffects(); }