diff --git a/lang/en.json b/lang/en.json index f6f56668..2f9790da 100755 --- a/lang/en.json +++ b/lang/en.json @@ -1007,7 +1007,8 @@ "damageThresholds": "Damage Thresholds", "vicious": "Vicious", "damageIncreased": "Damage Increased: {damage}", - "rangeIncreased": "Range Increased: {range}" + "rangeIncreased": "Range Increased: {range}", + "simpleFeature": "Feature: {feature}" }, "notifications": { "info": { @@ -1160,8 +1161,8 @@ "CharacterSetup": "Character setup isn't done yet", "Level": "Level", "LevelUp": "You can level up", - "Actions": "Actions", - "CompanionActions": "Companion Actions", + "Features": "Features", + "CompanionFeatures": "Companion Features", "Tabs": { "Features": "Features", "Inventory": "Inventory", @@ -1206,9 +1207,6 @@ "Experience": { "Title": "Experience" }, - "Features": { - "Title": "Class Features" - }, "Gold": { "Title": "Gold", "Coins": "Coins", diff --git a/module/applications/levelup/companionLevelup.mjs b/module/applications/levelup/companionLevelup.mjs index a5bfe4ce..64cbef82 100644 --- a/module/applications/levelup/companionLevelup.mjs +++ b/module/applications/levelup/companionLevelup.mjs @@ -1,5 +1,5 @@ import BaseLevelUp from './levelup.mjs'; -import { defaultCompanionTier } from '../../data/levelTier.mjs'; +import { defaultCompanionTier, LevelOptionType } from '../../data/levelTier.mjs'; import { DhLevelup } from '../../data/levelup.mjs'; import { diceTypes, range } from '../../config/generalConfig.mjs'; @@ -108,6 +108,12 @@ export default class DhCompanionLevelUp extends BaseLevelUp { : actorKey; advancement[choiceKey][checkbox.data[0]] = options[keys[Math.min(currentIndex + 1, keys.length - 1)]]; + default: + if (!advancement.simple) advancement.simple = {}; + advancement.simple[choiceKey] = game.i18n.localize( + LevelOptionType[checkbox.type].label + ); + break; } } } @@ -140,7 +146,8 @@ export default class DhCompanionLevelUp extends BaseLevelUp { new: game.i18n.localize(advancement.vicious.range.label) } : null - } + }, + simple: advancement.simple ?? {} }; context.advancements.statistics.stress.shown = diff --git a/module/applications/sheets/character.mjs b/module/applications/sheets/character.mjs index a601f99b..a8ed09c1 100644 --- a/module/applications/sheets/character.mjs +++ b/module/applications/sheets/character.mjs @@ -6,8 +6,6 @@ import DaggerheartSheet from './daggerheart-sheet.mjs'; import { abilities } from '../../config/actorConfig.mjs'; import DhCharacterlevelUp from '../levelup/characterLevelup.mjs'; import DhCharacterCreation from '../characterCreation.mjs'; -import DHActionConfig from '../config/Action.mjs'; -import { DHBaseAction } from '../../data/action/action.mjs'; const { ActorSheetV2 } = foundry.applications.sheets; const { TextEditor } = foundry.applications.ux; @@ -53,7 +51,6 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { levelManagement: this.levelManagement, editImage: this._onEditImage, triggerContextMenu: this.triggerContextMenu - // editAction: this.editAction, }, window: { resizable: true @@ -307,20 +304,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { getItem(element) { const listElement = (element.target ?? element).closest('[data-item-id]'); - if (listElement.dataset.isAction) return this.getAction(listElement); + const document = listElement.dataset.companion ? this.document.system.companion : this.document; const itemId = listElement.dataset.itemId, - item = this.document.items.get(itemId); + item = document.items.get(itemId); return item; } - getAction(listElement) { - const target = listElement.dataset.partner === 'true' ? this.document.system.companion : this.document; - if (!target) return null; - - return target.system.actions.find(x => x.id === listElement.dataset.itemId); - } - static triggerContextMenu(event, button) { return CONFIG.ux.ContextMenu.triggerContextMenu(event); } @@ -623,9 +613,15 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { static async useItem(event, button) { const item = this.getItem(button); if (!item) return; - const wasUsed = await item.use(event); - if (wasUsed && item.type === 'weapon') { - Hooks.callAll(SYSTEM.HOOKS.characterAttack, {}); + + // Should dandle its actions. Or maybe they'll be separate buttons as per an Issue on the board + if (item.type === 'feature') { + item.toChat(); + } else { + const wasUsed = await item.use(event); + if (wasUsed && item.type === 'weapon') { + Hooks.callAll(SYSTEM.HOOKS.characterAttack, {}); + } } } @@ -633,11 +629,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { const item = this.getItem(event); if (!item) return; - if (item instanceof DHBaseAction) { - new DHActionConfig(item).render({ force: true }); - } else { - item.sheet.render(true); - } + item.sheet.render(true); } editItem(event) { @@ -694,12 +686,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { const item = this.getItem(event); if (!item) return; - if (item instanceof DHBaseAction) { - const newActions = item.parent.actions.filter(x => x.id !== item.id); - await item.parent.parent.update({ ['system.actions']: newActions }); - } else { - await item.delete(); - } + await item.delete(); } static async setItemQuantity(button, value) { @@ -735,30 +722,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { } static async toChat(event, button) { - const item = event.dataset ? event : button.closest(['[data-item-id']); - if (item?.dataset.isAction) { - const action = this.getAction(item); - const cls = getDocumentClass('ChatMessage'); - const systemData = { - title: action.name, - origin: this, - img: action.img, - name: action.name, - description: action.description, - actions: [] - }; - const msg = new cls({ - type: 'abilityUse', - user: game.user.id, - system: systemData, - content: await foundry.applications.handlebars.renderTemplate( - 'systems/daggerheart/templates/chat/ability-use.hbs', - systemData - ) - }); - - cls.create(msg.toObject()); - } else if (button?.dataset?.type === 'experience') { + if (button?.dataset?.type === 'experience') { const experience = this.document.system.experiences[button.dataset.uuid]; const cls = getDocumentClass('ChatMessage'); const systemData = { diff --git a/module/applications/sheets/items/feature.mjs b/module/applications/sheets/items/feature.mjs index 655e4542..a5b8bd8f 100644 --- a/module/applications/sheets/items/feature.mjs +++ b/module/applications/sheets/items/feature.mjs @@ -6,11 +6,7 @@ export default class FeatureSheet extends DHBaseItemSheet { id: 'daggerheart-feature', classes: ['feature'], position: { height: 600 }, - window: { resizable: true }, - actions: { - addEffect: this.addEffect, - removeEffect: this.removeEffect - } + window: { resizable: true } }; /**@override */ @@ -22,27 +18,16 @@ export default class FeatureSheet extends DHBaseItemSheet { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-actions.hbs', scrollable: ['.actions'] }, - settings: { - template: 'systems/daggerheart/templates/sheets/items/feature/settings.hbs', - scrollable: ['.settings'] - }, effects: { - template: 'systems/daggerheart/templates/sheets/items/feature/effects.hbs', + template: 'systems/daggerheart/templates/sheets/global/tabs/tab-effects.hbs', scrollable: ['.effects'] } }; - /** - * Internally tracks the selected effect type from the select. - * @type {String} - * @private - */ - _selectedEffectType; - /**@override */ static TABS = { primary: { - tabs: [{ id: 'description' }, { id: 'actions' }, { id: 'settings' }, { id: 'effects' }], + tabs: [{ id: 'description' }, { id: 'actions' }, { id: 'effects' }], initial: 'description', labelPrefix: 'DAGGERHEART.Sheets.TABS' } @@ -50,68 +35,10 @@ export default class FeatureSheet extends DHBaseItemSheet { /* -------------------------------------------- */ - /**@inheritdoc*/ - _attachPartListeners(partId, htmlElement, options) { - super._attachPartListeners(partId, htmlElement, options); - if (partId === 'effects') - htmlElement.querySelector('.effect-select')?.addEventListener('change', this._effectSelect.bind(this)); - } - - /** - * Handles selection of a new effect type. - * @param {Event} event - Change Event - */ - _effectSelect(event) { - const value = event.currentTarget.value; - this._selectedEffectType = value; - this.render({ parts: ['effects'] }); - } - - /* -------------------------------------------- */ - /**@inheritdoc */ async _prepareContext(_options) { const context = await super._prepareContext(_options); - context.properties = CONFIG.daggerheart.ACTOR.featureProperties; - context.dice = CONFIG.daggerheart.GENERAL.diceTypes; - context.effectConfig = CONFIG.daggerheart.EFFECTS; - - context.selectedEffectType = this._selectedEffectType; return context; } - - /* -------------------------------------------- */ - /* Application Clicks Actions */ - /* -------------------------------------------- */ - - /** - * Adds a new effect to the item, based on the selected effect type. - * @param {PointerEvent} _event - The originating click event - * @param {HTMLElement} _target - The capturing HTML element which defines the [data-action] - * @returns - */ - static async addEffect(_event, _target) { - const type = this._selectedEffectType; - if (!type) return; - const { id, name, ...rest } = CONFIG.daggerheart.EFFECTS.effectTypes[type]; - await this.item.update({ - [`system.effects.${foundry.utils.randomID()}`]: { - type, - value: '', - ...rest - } - }); - } - - /** - * Removes an effect from the item. - * @param {PointerEvent} _event - The originating click event - * @param {HTMLElement} target - The capturing HTML element which defines the [data-action] - * @returns - */ - static async removeEffect(_event, target) { - const path = `system.effects.-=${target.dataset.effect}`; - await this.item.update({ [path]: null }); - } } diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index 6b5a0877..70981f75 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -157,15 +157,12 @@ export default class DhCharacter extends BaseDataActor { return this.parent.items.find(x => x.type === 'community') ?? null; } - // get actions() { - // const generalActions = []; // Add in things like Sprint etc - // const levelupActions = this.levelData.actions.filter(x => !x.partner).map(x => x.value); + get features() { + return this.parent.items.filter(x => x.type === 'feature') ?? []; + } - // return [...generalActions, ...levelupActions]; - // } - - get companionActions() { - return this.companion ? this.companion.system.actions : []; + get companionFeatures() { + return this.companion ? this.companion.items.filter(x => x.type === 'feature') : []; } get needsCharacterSetup() { diff --git a/module/data/item/feature.mjs b/module/data/item/feature.mjs index 0e502eb6..85a9c42f 100644 --- a/module/data/item/feature.mjs +++ b/module/data/item/feature.mjs @@ -1,4 +1,3 @@ -import { getTier } from '../../helpers/utils.mjs'; import BaseDataItem from './base.mjs'; import ActionField from '../fields/actionField.mjs'; @@ -17,135 +16,7 @@ export default class DHFeature extends BaseDataItem { const fields = foundry.data.fields; return { ...super.defineSchema(), - - //A type of feature seems unnecessary - type: new fields.StringField({ choices: SYSTEM.ITEM.featureTypes }), - - //TODO: remove actionType field - actionType: new fields.StringField({ - choices: SYSTEM.ITEM.actionTypes, - initial: SYSTEM.ITEM.actionTypes.passive.id - }), - //TODO: remove featureType field - featureType: new fields.SchemaField({ - type: new fields.StringField({ - choices: SYSTEM.ITEM.valueTypes, - initial: Object.keys(SYSTEM.ITEM.valueTypes).find(x => x === 'normal') - }), - data: new fields.SchemaField({ - value: new fields.StringField({}), - property: new fields.StringField({ - choices: SYSTEM.ACTOR.featureProperties, - initial: Object.keys(SYSTEM.ACTOR.featureProperties).find(x => x === 'spellcastingTrait') - }), - max: new fields.NumberField({ initial: 1, integer: true }), - numbers: new fields.TypedObjectField( - new fields.SchemaField({ - value: new fields.NumberField({ integer: true }), - used: new fields.BooleanField({ initial: false }) - }) - ) - }) - }), - refreshData: new fields.SchemaField( - { - type: new fields.StringField({ choices: SYSTEM.GENERAL.refreshTypes }), - uses: new fields.NumberField({ initial: 1, integer: true }), - //TODO: remove refreshed field - refreshed: new fields.BooleanField({ initial: true }) - }, - { nullable: true, initial: null } - ), - //TODO: remove refreshed field - multiclass: new fields.NumberField({ initial: null, nullable: true, integer: true }), - disabled: new fields.BooleanField({ initial: false }), - - //TODO: re do it completely or just remove it - effects: new fields.TypedObjectField( - new fields.SchemaField({ - type: new fields.StringField({ choices: SYSTEM.EFFECTS.effectTypes }), - valueType: new fields.StringField({ choices: SYSTEM.EFFECTS.valueTypes }), - parseType: new fields.StringField({ choices: SYSTEM.EFFECTS.parseTypes }), - initiallySelected: new fields.BooleanField({ initial: true }), - options: new fields.ArrayField( - new fields.SchemaField({ - name: new fields.StringField({}), - value: new fields.StringField({}) - }), - { nullable: true, initial: null } - ), - dataField: new fields.StringField({}), - appliesOn: new fields.StringField( - { - choices: SYSTEM.EFFECTS.applyLocations - }, - { nullable: true, initial: null } - ), - applyLocationChoices: new fields.TypedObjectField(new fields.StringField({}), { - nullable: true, - initial: null - }), - valueData: new fields.SchemaField({ - value: new fields.StringField({}), - fromValue: new fields.StringField({ initial: null, nullable: true }), - type: new fields.StringField({ initial: null, nullable: true }), - hopeIncrease: new fields.StringField({ initial: null, nullable: true }) - }) - }) - ), actions: new fields.ArrayField(new ActionField()) }; } - - get multiclassTier() { - return getTier(this.multiclass); - } - - async refresh() { - if (this.refreshData) { - if (this.featureType.type === SYSTEM.ITEM.valueTypes.dice.id) { - const update = { 'system.refreshData.refreshed': true }; - Object.keys(this.featureType.data.numbers).forEach( - x => (update[`system.featureType.data.numbers.-=${x}`] = null) - ); - await this.parent.update(update); - } else { - await this.parent.update({ 'system.refreshData.refreshed': true }); - } - } - } - - get effectData() { - const effectValues = Object.values(this.effects); - const effectCategories = Object.keys(SYSTEM.EFFECTS.effectTypes).reduce((acc, effectType) => { - acc[effectType] = effectValues.reduce((acc, effect) => { - if (effect.type === effectType) { - acc.push({ ...effect, valueData: this.#parseValues(effect.parseType, effect.valueData) }); - } - - return acc; - }, []); - - return acc; - }, {}); - - return effectCategories; - } - - #parseValues(parseType, values) { - return Object.keys(values).reduce((acc, prop) => { - acc[prop] = this.#parseValue(parseType, values[prop]); - - return acc; - }, {}); - } - - #parseValue(parseType, value) { - switch (parseType) { - case SYSTEM.EFFECTS.parseTypes.number.id: - return Number.parseInt(value); - default: - return value; - } - } } diff --git a/module/data/levelData.mjs b/module/data/levelData.mjs index afdfba78..265092c9 100644 --- a/module/data/levelData.mjs +++ b/module/data/levelData.mjs @@ -43,7 +43,7 @@ export default class DhLevelData extends foundry.abstract.DataModel { data: new fields.ArrayField(new fields.StringField({ required: true })), secondaryData: new fields.TypedObjectField(new fields.StringField({ required: true })), itemUuid: new fields.StringField({ required: true }), - actionIds: new fields.ArrayField(new fields.StringField()) + featureIds: new fields.ArrayField(new fields.StringField()) }) ) }) diff --git a/module/data/levelTier.mjs b/module/data/levelTier.mjs index 04012852..d29ce09e 100644 --- a/module/data/levelTier.mjs +++ b/module/data/levelTier.mjs @@ -66,12 +66,10 @@ export const CompanionLevelOptionType = { creatureComfort: { id: 'creatureComfort', label: 'Creature Comfort', - actions: [ + features: [ { name: 'DAGGERHEART.LevelUp.Actions.CreatureComfort.Name', img: 'icons/magic/life/heart-cross-purple-orange.webp', - type: 'attack', - actionType: 'passive', description: 'DAGGERHEART.LevelUp.Actions.CreatureComfort.Description' } ] @@ -79,12 +77,10 @@ export const CompanionLevelOptionType = { armored: { id: 'armored', label: 'Armored', - actions: [ + features: [ { name: 'DAGGERHEART.LevelUp.Actions.Armored.Name', img: 'icons/equipment/shield/kite-wooden-oak-glow.webp', - type: 'attack', - actionType: 'passive', description: 'DAGGERHEART.LevelUp.Actions.Armored.Description' } ] @@ -100,12 +96,10 @@ export const CompanionLevelOptionType = { bonded: { id: 'bonded', label: 'Bonded', - actions: [ + features: [ { name: 'DAGGERHEART.LevelUp.Actions.Bonded.Name', img: 'icons/magic/life/heart-red-blue.webp', - type: 'attack', - actionType: 'passive', description: 'DAGGERHEART.LevelUp.Actions.Bonded.Description' } ] diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs index d49d84cb..49282385 100644 --- a/module/documents/actor.mjs +++ b/module/documents/actor.mjs @@ -1,8 +1,8 @@ import DamageSelectionDialog from '../applications/damageSelectionDialog.mjs'; import { GMUpdateEvent, socketEvent } from '../helpers/socket.mjs'; import DamageReductionDialog from '../applications/damageReductionDialog.mjs'; -import { actionsTypes } from '../data/_module.mjs'; import { LevelOptionType } from '../data/levelTier.mjs'; +import DHFeature from '../data/item/feature.mjs'; export default class DhpActor extends Actor { async _preCreate(data, options, user) { @@ -43,6 +43,7 @@ export default class DhpActor extends Actor { return acc; }, {}); + const featureIds = []; const domainCards = []; const experiences = []; const subclassFeatureState = { class: null, multiclass: null }; @@ -55,6 +56,7 @@ export default class DhpActor extends Actor { const advancementCards = level.selections.filter(x => x.type === 'domainCard').map(x => x.itemUuid); domainCards.push(...achievementCards, ...advancementCards); experiences.push(...Object.keys(level.achievements.experiences)); + featureIds.push(...level.selections.flatMap(x => x.featureIds)); const subclass = level.selections.find(x => x.type === 'subclass'); if (subclass) { @@ -68,6 +70,10 @@ export default class DhpActor extends Actor { multiclass = level.selections.find(x => x.type === 'multiclass'); }); + for (let featureId of featureIds) { + this.items.get(featureId).delete(); + } + if (experiences.length > 0) { const getUpdate = () => ({ 'system.experiences': experiences.reduce((acc, key) => { @@ -153,7 +159,7 @@ export default class DhpActor extends Actor { } let multiclass = null; - const actionIds = []; + const featureAdditions = []; const domainCards = []; const subclassFeatureState = { class: null, multiclass: null }; const selections = []; @@ -163,27 +169,17 @@ export default class DhpActor extends Actor { const checkbox = selection[checkboxNr]; const tierOption = LevelOptionType[checkbox.type]; - for (var actionData of tierOption.actions ?? []) { - const cls = actionsTypes[actionData.type]; - const actionId = foundry.utils.randomID(); - actionIds.push(actionId); - actions.push( - new cls( - { - // ...cls.getSourceConfig(target), - ...actionData, - _id: actionId, - name: game.i18n.localize(actionData.name), - description: game.i18n.localize(actionData.description) - }, - { - parent: this - } - ) - ); - } - - if (checkbox.type === 'multiclass') { + if (tierOption.features?.length > 0) { + featureAdditions.push({ + checkbox: { + ...checkbox, + level: Number(levelKey), + optionKey: optionKey, + checkboxNr: Number(checkboxNr) + }, + features: tierOption.features + }); + } else if (checkbox.type === 'multiclass') { multiclass = { ...checkbox, level: Number(levelKey), @@ -216,6 +212,28 @@ export default class DhpActor extends Actor { } } + for (var addition of featureAdditions) { + for (var featureData of addition.features) { + const feature = new DHFeature({ + ...featureData, + description: game.i18n.localize(featureData.description) + }); + const embeddedItem = await this.createEmbeddedDocuments('Item', [ + { + ...featureData, + name: game.i18n.localize(featureData.name), + type: 'feature', + system: feature + } + ]); + addition.checkbox.featureIds = !addition.checkbox.featureIds + ? [embeddedItem[0].id] + : [...addition.checkbox.featureIds, embeddedItem[0].id]; + } + + selections.push(addition.checkbox); + } + if (multiclass) { const subclassItem = await foundry.utils.fromUuid(multiclass.secondaryData.subclass); const subclassData = subclassItem.toObject(); diff --git a/module/documents/item.mjs b/module/documents/item.mjs index 8e6dcdc3..0671e7e3 100644 --- a/module/documents/item.mjs +++ b/module/documents/item.mjs @@ -117,7 +117,9 @@ export default class DHItem extends foundry.documents.Item { ? game.i18n.localize('DAGGERHEART.Chat.FoundationCard.AncestryTitle') : this.type === 'community' ? game.i18n.localize('DAGGERHEART.Chat.FoundationCard.CommunityTitle') - : game.i18n.localize('DAGGERHEART.Chat.FoundationCard.SubclassFeatureTitle'), + : this.type === 'feature' + ? game.i18n.localize('TYPES.Item.feature') + : game.i18n.localize('DAGGERHEART.Chat.FoundationCard.SubclassFeatureTitle'), origin: origin, img: this.img, name: this.name, diff --git a/templates/sheets/actors/character/features.hbs b/templates/sheets/actors/character/features.hbs index 2cab4714..1ac18a1e 100644 --- a/templates/sheets/actors/character/features.hbs +++ b/templates/sheets/actors/character/features.hbs @@ -10,11 +10,11 @@ {{#if document.system.class.subclass}} {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(concat (localize 'TYPES.Item.subclass') ' - ' document.system.class.subclass.name) type='subclass'}} {{/if}} - {{#if document.system.actions}} - {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize "DAGGERHEART.Sheets.PC.Actions") type='actions'}} + {{#if document.system.features}} + {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize "DAGGERHEART.Sheets.PC.Features") type='features'}} {{/if}} - {{#if document.system.companionActions}} - {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize "DAGGERHEART.Sheets.PC.CompanionActions") type='companionActions'}} + {{#if document.system.companionFeatures}} + {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(localize "DAGGERHEART.Sheets.PC.CompanionFeatures") type='companionFeatures'}} {{/if}} {{#if document.system.community}} {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs' title=(concat (localize 'TYPES.Item.community') ' - ' document.system.community.name) type='community'}} diff --git a/templates/sheets/global/partials/inventory-fieldset-items.hbs b/templates/sheets/global/partials/inventory-fieldset-items.hbs index 341d694b..f9ae04e5 100644 --- a/templates/sheets/global/partials/inventory-fieldset-items.hbs +++ b/templates/sheets/global/partials/inventory-fieldset-items.hbs @@ -34,14 +34,14 @@ {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=effect type=../type}} {{/if}} {{/each}} - {{#each document.system.actions as |action|}} - {{#if (or (eq ../type 'actions'))}} - {{> 'systems/daggerheart/templates/sheets/global/partials/action-item.hbs' item=action}} + {{#each document.system.features as |feature|}} + {{#if (or (eq ../type 'features'))}} + {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=feature}} {{/if}} {{/each}} - {{#each document.system.companionActions as |action|}} - {{#if (or (eq ../type 'companionActions'))}} - {{> 'systems/daggerheart/templates/sheets/global/partials/action-item.hbs' item=action partner=true}} + {{#each document.system.companionFeatures as |feature|}} + {{#if (or (eq ../type 'companionFeatures'))}} + {{> 'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs' item=feature companion=true}} {{/if}} {{/each}} {{/unless}} diff --git a/templates/sheets/global/partials/inventory-item.hbs b/templates/sheets/global/partials/inventory-item.hbs index e712e0fb..2f9ece97 100644 --- a/templates/sheets/global/partials/inventory-item.hbs +++ b/templates/sheets/global/partials/inventory-item.hbs @@ -1,4 +1,4 @@ -
  • +
  • {{item.name}}
    diff --git a/templates/sheets/items/feature/effects.hbs b/templates/sheets/items/feature/effects.hbs deleted file mode 100755 index 52beb934..00000000 --- a/templates/sheets/items/feature/effects.hbs +++ /dev/null @@ -1,67 +0,0 @@ -
    -
    - {{localize "Effects"}} - {{localize "DAGGERHEART.Sheets.Feature.effects.addEffect"}} -
    - - - - -
    -
    - - {{#each document.system.effects as |effect key|}} -
    - - {{localize (concat 'DAGGERHEART.Effects.Types.' effect.type '.Name')}} - - - - - {{#if effect.applyLocationChoices}} - - {{localize "DAGGERHEART.Sheets.Feature.effects.applyLocation"}} - - - {{/if}} - {{#if (eq effect.valueType @root.effectConfig.valueTypes.numberString.id)}} - {{#if (eq effect.type @root.effectConfig.effectTypes.damage.id) }} - {{localize "DAGGERHEART.Sheets.Feature.effects.value"}} - - - {{localize "DAGGERHEART.Sheets.Feature.effects.initiallySelected"}} - - - {{localize "DAGGERHEART.Sheets.Feature.effects.hopeIncrease"}} - - {{else}} - {{localize "DAGGERHEART.Sheets.Feature.effects.value"}} - - {{/if}} - {{/if}} - {{#if (eq effect.valueType @root.effectConfig.valueTypes.select.id)}} - - {{localize effect.valueData.fromValue}} - - - - - {{localize effect.valueData.name}} - - - {{/if}} -
    - {{/each}} -
    \ No newline at end of file diff --git a/templates/sheets/items/feature/header.hbs b/templates/sheets/items/feature/header.hbs index 8ff99f32..e6a11503 100755 --- a/templates/sheets/items/feature/header.hbs +++ b/templates/sheets/items/feature/header.hbs @@ -4,7 +4,7 @@

    -

    {{localize (concat 'DAGGERHEART.Feature.Type.' source.system.type)}}

    +

    {{localize (concat 'TYPES.Item.feature' source.system.type)}}

    \ No newline at end of file diff --git a/templates/sheets/items/feature/settings.hbs b/templates/sheets/items/feature/settings.hbs deleted file mode 100755 index dc5cb884..00000000 --- a/templates/sheets/items/feature/settings.hbs +++ /dev/null @@ -1,43 +0,0 @@ -
    -
    - {{localize tabs.settings.label}} - {{localize "DAGGERHEART.Sheets.Feature.FeatureType"}} - {{formField systemFields.type value=source.system.type rootId=partId localize=true }} - - {{localize "DAGGERHEART.Sheets.Feature.ActionType"}} - {{formField systemFields.actionType value=source.system.actionType rootId=partId localize=true }} - - {{localize "DAGGERHEART.Sheets.Feature.RefreshType"}} -
    - - {{formField systemFields.refreshData.fields.type value=source.system.refreshData.type rootId=partId localize=true }} -
    -
    - -
    - {{localize "DAGGERHEART.Sheets.Feature.ValueType.Title"}} - {{localize "DAGGERHEART.Sheets.Feature.ValueType.Title"}} - - - {{#if (eq document.system.featureType.type "dice")}} - {{localize "DAGGERHEART.Sheets.Feature.ValueType.Dice"}} - - - {{localize "DAGGERHEART.Feature.Max"}} - - - {{localize "DAGGERHEART.Sheets.Feature.ValueType.Property"}} - - {{/if}} -
    -
    \ No newline at end of file diff --git a/templates/views/levelup/tabs/summary.hbs b/templates/views/levelup/tabs/summary.hbs index 87eddc00..128d6bec 100644 --- a/templates/views/levelup/tabs/summary.hbs +++ b/templates/views/levelup/tabs/summary.hbs @@ -169,6 +169,11 @@ {{this.advancements.vicious.range.new}} {{/if}} + {{#each this.advancements.simple}} +
    +
    {{localize "DAGGERHEART.Application.LevelUp.summary.simpleFeature" feature=this}}
    +
    + {{/each}}