diff --git a/module/applications/config/Action.mjs b/module/applications/config/Action.mjs index 54c39b52..af169959 100644 --- a/module/applications/config/Action.mjs +++ b/module/applications/config/Action.mjs @@ -7,13 +7,8 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) { this.action = action; this.openSection = null; - // console.log(this.action) } - // get title(){ - // return `Action - ${this.action.name}`; - // } - static DEFAULT_OPTIONS = { tag: 'form', id: 'daggerheart-action', @@ -67,8 +62,6 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) { if(!!this.action.effects) context.effects = this.action.effects.map(e => this.action.item.effects.get(e._id)); if(this.action.damage?.hasOwnProperty('includeBase')) context.hasBaseDamage = !!this.action.parent.damage; context.getRealIndex = this.getRealIndex.bind(this); - - console.log(context, this.action) return context; } @@ -101,15 +94,6 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) { this.render(); } - /* cleanData(data) { - for(let k in data) { - if(typeof data[k] === 'object' && !Array.isArray(data[k])) { - if(!isNaN(Object.keys(data[k])[0])) data[k] = Object.values(data[k]); - } - } - return data; - } */ - static addElement(event) { const data = this.action.toObject(), key = $(event.target).closest('.action-category-data').data('key'); @@ -143,7 +127,6 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) { static async addEffect(event) { if ( !this.action.effects ) return; - // console.log(this, this.action.item) const effectData = this._addEffectData.bind(this)(), [created] = await this.action.item.createEmbeddedDocuments("ActiveEffect", [effectData], { render: false }), data = this.action.toObject(); diff --git a/module/applications/sheets/items/weapon.mjs b/module/applications/sheets/items/weapon.mjs index 228b0614..66a8f413 100644 --- a/module/applications/sheets/items/weapon.mjs +++ b/module/applications/sheets/items/weapon.mjs @@ -99,11 +99,9 @@ export default class WeaponSheet extends DaggerheartSheet(ItemSheetV2) { } static async addAction() { - // const actionType = await WeaponSheet.selectActionType(); const actionType = await WeaponSheet.selectActionType(), actionIndexes = this.document.system.actions.map(x => x._id.split('-')[2]).sort((a, b) => a - b) try { - // const cls = DHAction, const cls = actionsTypes[actionType?.type] ?? actionsTypes.attack, action = new cls( { diff --git a/module/data/action/action.mjs b/module/data/action/action.mjs index ca28aeb6..03db4298 100644 --- a/module/data/action/action.mjs +++ b/module/data/action/action.mjs @@ -43,6 +43,9 @@ const fields = foundry.data.fields; - Add Drag & Drop for documentUUID field (Macro & Summon) - Add optionnal Role for Healing ? - Handle Roll result as part of formula if needed + - Target Check + - Cost Check + - Range Check */ export class DHBaseAction extends foundry.abstract.DataModel { diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs index 6634102f..2dea1153 100644 --- a/module/data/fields/actionField.mjs +++ b/module/data/fields/actionField.mjs @@ -2,13 +2,7 @@ import { actionsTypes } from "../action/_module.mjs"; // Temporary Solution export default class ActionField extends foundry.data.fields.ObjectField { - /** @override */ - // initialize(value, model, options={}) { - // console.log('initialize', value.type) - // this.model = actionsTypes[value?.type] ?? actionsTypes.attack; - // this.fields = this._initialize(this.model.defineSchema()); - // return super.initialize(value, model, options) - // } + getModel(value) { return actionsTypes[value.type] ?? actionsTypes.attack; } diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs index 8b15dfac..78116f1c 100644 --- a/module/documents/actor.mjs +++ b/module/documents/actor.mjs @@ -255,7 +255,6 @@ export default class DhpActor extends Actor { ), rolls: [roll] }); - console.log(systemData) await cls.create(msg.toObject()); } diff --git a/module/documents/item.mjs b/module/documents/item.mjs index 4961a88c..dc8beea7 100644 --- a/module/documents/item.mjs +++ b/module/documents/item.mjs @@ -7,7 +7,6 @@ export default class DhpItem extends Item { prepareEmbeddedDocuments() { super.prepareEmbeddedDocuments(); for ( const action of this.system.actions ?? [] ) action.prepareData(); - // for ( const action of this.system.actions ?? [] ) console.log(action); } /**