diff --git a/daggerheart.mjs b/daggerheart.mjs
index 48f4a615..802c9d29 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -2,6 +2,7 @@ import { SYSTEM } from './module/config/system.mjs';
import * as applications from './module/applications/_module.mjs';
import * as data from './module/data/_module.mjs';
import * as models from './module/data/_module.mjs';
+import * as canvas from './module/canvas/_module.mjs';
import * as documents from './module/documents/_module.mjs';
import * as dice from './module/dice/_module.mjs';
import * as fields from './module/data/fields/_module.mjs';
@@ -19,6 +20,7 @@ import {
import { placeables } from './module/canvas/_module.mjs';
import './node_modules/@yaireo/tagify/dist/tagify.css';
import TemplateManager from './module/documents/templateManager.mjs';
+import TokenManager from './module/documents/tokenManager.mjs';
CONFIG.DH = SYSTEM;
CONFIG.TextEditor.enrichers.push(...enricherConfig);
@@ -51,6 +53,8 @@ CONFIG.ChatMessage.template = 'systems/daggerheart/templates/ui/chat/chat-messag
CONFIG.Canvas.rulerClass = placeables.DhRuler;
CONFIG.Canvas.layers.templates.layerClass = placeables.DhTemplateLayer;
+CONFIG.Canvas.layers.tokens.layerClass = canvas.DhTokenLayer;
+
CONFIG.MeasuredTemplate.objectClass = placeables.DhMeasuredTemplate;
CONFIG.Scene.documentClass = documents.DhScene;
@@ -73,6 +77,7 @@ CONFIG.ui.countdowns = applications.ui.DhCountdowns;
CONFIG.ux.ContextMenu = applications.ux.DHContextMenu;
CONFIG.ux.TooltipManager = documents.DhTooltipManager;
CONFIG.ux.TemplateManager = new TemplateManager();
+CONFIG.ux.TokenManager = new TokenManager();
Hooks.once('init', () => {
game.system.api = {
diff --git a/lang/en.json b/lang/en.json
index a78ed588..04c4ab24 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -69,7 +69,11 @@
},
"summon": {
"name": "Summon",
- "tooltip": "Create tokens in the scene."
+ "tooltip": "Create tokens in the scene.",
+ "error": "You do not have permission to summon tokens or there is no active scene.",
+ "invalidDrop": "You can only drop Actor entities to summon.",
+ "chatMessageTitle": "Test2",
+ "chatMessageHeaderTitle": "Summoning"
}
},
"Config": {
@@ -120,6 +124,9 @@
},
"cost": {
"stepTooltip": "+{step} per step"
+ },
+ "summon": {
+ "dropSummonsHere": "Drop Summons Here"
}
}
},
@@ -2179,6 +2186,10 @@
"stress": "Stress",
"subclasses": "Subclasses",
"success": "Success",
+ "summon": {
+ "single": "Summon",
+ "plural": "Summons"
+ },
"take": "Take",
"Target": {
"single": "Target",
@@ -2828,7 +2839,8 @@
"deleteItem": "Delete Item",
"immune": "Immune",
"middleClick": "[Middle Click] Keep tooltip view",
- "tokenSize": "The token size used on the canvas"
+ "tokenSize": "The token size used on the canvas",
+ "previewTokenHelp": "Left-click to place, right-click to cancel"
}
}
}
diff --git a/module/applications/dialogs/downtime.mjs b/module/applications/dialogs/downtime.mjs
index f03524f0..9a9a9ddb 100644
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@@ -93,27 +93,29 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
}
getRefreshables() {
- const actionItems = this.actor.items.filter(x => this.actor.system.isItemAvailable(x)).reduce((acc, x) => {
- if (x.system.actions) {
- const recoverable = x.system.actions.reduce((acc, action) => {
- if (refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], action.uses.recovery)) {
- acc.push({
- title: x.name,
- name: action.name,
- uuid: action.uuid
- });
+ const actionItems = this.actor.items
+ .filter(x => this.actor.system.isItemAvailable(x))
+ .reduce((acc, x) => {
+ if (x.system.actions) {
+ const recoverable = x.system.actions.reduce((acc, action) => {
+ if (refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], action.uses.recovery)) {
+ acc.push({
+ title: x.name,
+ name: action.name,
+ uuid: action.uuid
+ });
+ }
+
+ return acc;
+ }, []);
+
+ if (recoverable) {
+ acc.push(...recoverable);
}
-
- return acc;
- }, []);
-
- if (recoverable) {
- acc.push(...recoverable);
}
- }
- return acc;
- }, []);
+ return acc;
+ }, []);
const resourceItems = this.actor.items.reduce((acc, x) => {
if (
x.system.resource &&
@@ -189,7 +191,8 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
}));
});
});
- const characters = game.actors.filter(x => x.type === 'character')
+ const characters = game.actors
+ .filter(x => x.type === 'character')
.filter(x => x.testUserPermission(game.user, 'LIMITED'))
.filter(x => x.uuid !== this.actor.uuid);
diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs
index 96790a5b..7224bd72 100644
--- a/module/applications/sheets-configs/action-base-config.mjs
+++ b/module/applications/sheets-configs/action-base-config.mjs
@@ -15,7 +15,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
static DEFAULT_OPTIONS = {
tag: 'form',
- classes: ['daggerheart', 'dh-style', 'dialog', 'max-800'],
+ classes: ['daggerheart', 'dh-style', 'dialog', 'action-config', 'max-800'],
window: {
icon: 'fa-solid fa-wrench',
resizable: false
@@ -29,13 +29,15 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
removeElement: this.removeElement,
editEffect: this.editEffect,
addDamage: this.addDamage,
- removeDamage: this.removeDamage
+ removeDamage: this.removeDamage,
+ editDoc: this.editDoc
},
form: {
handler: this.updateForm,
submitOnChange: true,
closeOnSubmit: false
- }
+ },
+ dragDrop: [{ dragSelector: null, dropSelector: '#summon-drop-zone', handlers: ['_onDrop'] }]
};
static PARTS = {
@@ -85,7 +87,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
}
};
- static CLEAN_ARRAYS = ['damage.parts', 'cost', 'effects'];
+ static CLEAN_ARRAYS = ['damage.parts', 'cost', 'effects', 'summon'];
_getTabs(tabs) {
for (const v of Object.values(tabs)) {
@@ -96,9 +98,24 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
return tabs;
}
+ _attachPartListeners(partId, htmlElement, options) {
+ super._attachPartListeners(partId, htmlElement, options);
+
+ htmlElement.querySelectorAll('.summon-count-wrapper input').forEach(element => {
+ element.addEventListener('change', this.updateSummonCount.bind(this));
+ });
+ }
+
async _prepareContext(_options) {
const context = await super._prepareContext(_options, 'action');
context.source = this.action.toObject(true);
+
+ context.summons = [];
+ for (const summon of context.source.summon ?? []) {
+ const actor = await foundry.utils.fromUuid(summon.actorUUID);
+ context.summons.push({ actor, count: summon.count });
+ }
+
context.openSection = this.openSection;
context.tabs = this._getTabs(this.constructor.TABS);
context.config = CONFIG.DH;
@@ -181,8 +198,9 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
}
static async updateForm(event, _, formData) {
- const submitData = this._prepareSubmitData(event, formData),
- data = foundry.utils.mergeObject(this.action.toObject(), submitData);
+ const submitData = this._prepareSubmitData(event, formData);
+
+ const data = foundry.utils.mergeObject(this.action.toObject(), submitData);
this.action = await this.action.update(data);
this.sheetUpdate?.(this.action);
@@ -201,12 +219,26 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
static removeElement(event, button) {
event.stopPropagation();
const data = this.action.toObject(),
- key = event.target.closest('[data-key]').dataset.key,
- index = button.dataset.index;
+ key = event.target.closest('[data-key]').dataset.key;
+
+ // Prefer explicit index, otherwise find by uuid
+ let index = button?.dataset.index;
+ if (index === undefined || index === null || index === '') {
+ const uuid = button?.dataset.uuid ?? button?.dataset.itemUuid;
+ index = data[key].findIndex(e => (e?.actorUUID ?? e?.uuid) === uuid);
+ if (index === -1) return;
+ } else index = Number(index);
+
data[key].splice(index, 1);
this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
}
+ static async editDoc(_event, target) {
+ const element = target.closest('[data-item-uuid]');
+ const doc = (await foundry.utils.fromUuid(element.dataset.itemUuid)) ?? null;
+ if (doc) return doc.sheet.render({ force: true });
+ }
+
static addDamage(_event) {
if (!this.action.damage.parts) return;
const data = this.action.toObject(),
@@ -224,6 +256,15 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
}
+ updateSummonCount(event) {
+ event.stopPropagation();
+ const wrapper = event.target.closest('.summon-count-wrapper');
+ const index = wrapper.dataset.index;
+ const data = this.action.toObject();
+ data.summon[index].count = event.target.value;
+ this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+ }
+
/** Specific implementation in extending classes **/
static async addEffect(_event) {}
static removeEffect(_event, _button) {}
@@ -233,4 +274,29 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
this.tabGroups.primary = 'base';
await super.close(options);
}
+
+ async _onDrop(event) {
+ const data = foundry.applications.ux.TextEditor.getDragEventData(event);
+ const item = await foundry.utils.fromUuid(data.uuid);
+ if (!(item instanceof game.system.api.documents.DhpActor)) {
+ ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.summon.invalidDrop'));
+ return;
+ }
+
+ const actionData = this.action.toObject();
+ let countvalue = 1;
+ for (const entry of actionData.summon) {
+ if (entry.actorUUID === data.uuid) {
+ entry.count += 1;
+ countvalue = entry.count;
+ await this.constructor.updateForm.bind(this)(null, null, {
+ object: foundry.utils.flattenObject(actionData)
+ });
+ return;
+ }
+ }
+
+ actionData.summon.push({ actorUUID: data.uuid, count: countvalue });
+ await this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(actionData) });
+ }
}
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 98282d9f..d8a3df29 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -31,7 +31,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
dropSelector: null
}
- ],
+ ]
};
static PARTS = {
@@ -185,7 +185,6 @@ export default class AdversarySheet extends DHBaseActorSheet {
super._onDragStart(event);
}
-
/* -------------------------------------------- */
/* Application Clicks Actions */
/* -------------------------------------------- */
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 594269be..a7455036 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -33,7 +33,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
advanceResourceDie: CharacterSheet.#advanceResourceDie,
cancelBeastform: CharacterSheet.#cancelBeastform,
useDowntime: this.useDowntime,
- viewParty: CharacterSheet.#viewParty,
+ viewParty: CharacterSheet.#viewParty
},
window: {
resizable: true,
@@ -338,15 +338,20 @@ export default class CharacterSheet extends DHBaseActorSheet {
}
const type = 'effect';
const cls = game.system.api.models.actions.actionsTypes[type];
- const action = new cls({
- ...cls.getSourceConfig(doc.system),
- type: type,
- chatDisplay: false,
- cost: [{
- key: 'stress',
- value: doc.system.recallCost
- }]
- }, { parent: doc.system });
+ const action = new cls(
+ {
+ ...cls.getSourceConfig(doc.system),
+ type: type,
+ chatDisplay: false,
+ cost: [
+ {
+ key: 'stress',
+ value: doc.system.recallCost
+ }
+ ]
+ },
+ { parent: doc.system }
+ );
const config = await action.use(event);
if (config) {
return doc.update({ 'system.inVault': false });
@@ -900,32 +905,32 @@ export default class CharacterSheet extends DHBaseActorSheet {
return;
}
- const buttons = parties.map((p) => {
- const button = document.createElement("button");
- button.type = "button";
- button.classList.add("plain");
- const img = document.createElement("img");
+ const buttons = parties.map(p => {
+ const button = document.createElement('button');
+ button.type = 'button';
+ button.classList.add('plain');
+ const img = document.createElement('img');
img.src = p.img;
button.append(img);
- const name = document.createElement("span");
+ const name = document.createElement('span');
name.textContent = p.name;
button.append(name);
- button.addEventListener("click", () => {
+ button.addEventListener('click', () => {
p.sheet?.render({ force: true });
game.tooltip.dismissLockedTooltips();
});
return button;
});
- const html = document.createElement("div");
- html.classList.add("party-list");
+ const html = document.createElement('div');
+ html.classList.add('party-list');
html.append(...buttons);
-
+
game.tooltip.dismissLockedTooltips();
game.tooltip.activate(target, {
html,
- locked: true,
- })
+ locked: true
+ });
}
/**
diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index cc42df2f..20dfea8d 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -135,7 +135,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
async actionUseButton(event, message) {
const { moveIndex, actionIndex, movePath } = event.currentTarget.dataset;
const targetUuid = event.currentTarget.closest('.action-use-button-parent').querySelector('select')?.value;
- const parent = await foundry.utils.fromUuid(targetUuid || message.system.actor)
+ const parent = await foundry.utils.fromUuid(targetUuid || message.system.actor);
const actionType = message.system.moves[moveIndex].actions[actionIndex];
const cls = game.system.api.models.actions.actionsTypes[actionType.type];
diff --git a/module/canvas/_module.mjs b/module/canvas/_module.mjs
index 6b8885f4..c211b549 100644
--- a/module/canvas/_module.mjs
+++ b/module/canvas/_module.mjs
@@ -1 +1,2 @@
export * as placeables from './placeables/_module.mjs';
+export { default as DhTokenLayer } from './tokens.mjs';
diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs
index e8b85938..d8acb73a 100644
--- a/module/canvas/placeables/token.mjs
+++ b/module/canvas/placeables/token.mjs
@@ -1,4 +1,12 @@
export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
+ /** @inheritdoc */
+ async _draw(options) {
+ await super._draw(options);
+
+ if (this.document.flags.daggerheart?.createPlacement)
+ this.previewHelp ||= this.addChild(this.#drawPreviewHelp());
+ }
+
/** @inheritDoc */
async _drawEffects() {
this.effects.renderable = false;
@@ -34,7 +42,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
this.renderFlags.set({ refreshEffects: true });
}
- /**
+ /**
* Returns the distance from this token to another token object.
* This value is corrected to handle alternate token sizes and other grid types
* according to the diagonal rules.
@@ -47,11 +55,11 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
const destinationPoint = target.center;
// Compute for gridless. This version returns circular edge to edge + grid distance,
- // so that tokens that are touching return 5.
+ // so that tokens that are touching return 5.
if (canvas.grid.type === CONST.GRID_TYPES.GRIDLESS) {
const boundsCorrection = canvas.grid.distance / canvas.grid.size;
- const originRadius = this.bounds.width * boundsCorrection / 2;
- const targetRadius = target.bounds.width * boundsCorrection / 2;
+ const originRadius = (this.bounds.width * boundsCorrection) / 2;
+ const targetRadius = (target.bounds.width * boundsCorrection) / 2;
const distance = canvas.grid.measurePath([originPoint, destinationPoint]).distance;
return distance - originRadius - targetRadius + canvas.grid.distance;
}
@@ -61,11 +69,11 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
const targetEdge = this.#getEdgeBoundary(target.bounds, originPoint, destinationPoint);
const adjustedOriginPoint = canvas.grid.getTopLeftPoint({
x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
- y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
+ y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
});
const adjustDestinationPoint = canvas.grid.getTopLeftPoint({
x: targetEdge.x + Math.sign(destinationPoint.x - targetEdge.x),
- y: targetEdge.y + Math.sign(destinationPoint.y - targetEdge.y)
+ y: targetEdge.y + Math.sign(destinationPoint.y - targetEdge.y)
});
return canvas.grid.measurePath([adjustedOriginPoint, adjustDestinationPoint]).distance;
}
@@ -94,7 +102,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
/** Tests if the token is at least adjacent with another, with some leeway for diagonals */
isAdjacentWith(token) {
- return this.distanceTo(token) <= (canvas.grid.distance * 1.5);
+ return this.distanceTo(token) <= canvas.grid.distance * 1.5;
}
/** @inheritDoc */
@@ -132,4 +140,25 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
bar.position.set(0, posY);
return true;
}
+
+ /**
+ * Draw a helptext for previews as a text object
+ * @returns {PreciseText} The Text object for the preview helper
+ */
+ #drawPreviewHelp() {
+ const { uiScale } = canvas.dimensions;
+
+ const textStyle = CONFIG.canvasTextStyle.clone();
+ textStyle.fontSize = 18;
+ textStyle.wordWrapWidth = this.w * 2.5;
+ textStyle.fontStyle = 'italic';
+
+ const helpText = new PreciseText(
+ `(${game.i18n.localize('DAGGERHEART.UI.Tooltip.previewTokenHelp')})`,
+ textStyle
+ );
+ helpText.anchor.set(helpText.width / 900, 1);
+ helpText.scale.set(uiScale, uiScale);
+ return helpText;
+ }
}
diff --git a/module/canvas/tokens.mjs b/module/canvas/tokens.mjs
new file mode 100644
index 00000000..9813cd48
--- /dev/null
+++ b/module/canvas/tokens.mjs
@@ -0,0 +1,16 @@
+export default class DhTokenLayer extends foundry.canvas.layers.TokenLayer {
+ async _createPreview(createData, options) {
+ if (options.actor) {
+ const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+ if (options.actor?.system.metadata.usesSize) {
+ const tokenSize = tokenSizes[options.actor.system.size];
+ if (tokenSize && options.actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
+ createData.width = tokenSize;
+ createData.height = tokenSize;
+ }
+ }
+ }
+
+ return super._createPreview(createData, options);
+ }
+}
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index 18a09904..fce2f50b 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -164,7 +164,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
*/
getRollData(data = {}) {
const actorData = this.actor ? this.actor.getRollData(false) : {};
-
actorData.result = data.roll?.total ?? 1;
actorData.scale = data.costs?.length // Right now only return the first scalable cost.
? (data.costs.find(c => c.scalable)?.total ?? 1)
diff --git a/module/data/action/summonAction.mjs b/module/data/action/summonAction.mjs
index b06f1d38..1505ce2d 100644
--- a/module/data/action/summonAction.mjs
+++ b/module/data/action/summonAction.mjs
@@ -1,19 +1,5 @@
import DHBaseAction from './baseAction.mjs';
export default class DHSummonAction extends DHBaseAction {
- static defineSchema() {
- const fields = foundry.data.fields;
- return {
- ...super.defineSchema(),
- documentUUID: new fields.DocumentUUIDField({ type: 'Actor' })
- };
- }
-
- async trigger(event, ...args) {
- if (!this.canSummon || !canvas.scene) return;
- }
-
- get canSummon() {
- return game.user.can('TOKEN_CREATE');
- }
+ static extraSchemas = [...super.extraSchemas, 'summon'];
}
diff --git a/module/data/fields/action/_module.mjs b/module/data/fields/action/_module.mjs
index ef69394a..0bdffca2 100644
--- a/module/data/fields/action/_module.mjs
+++ b/module/data/fields/action/_module.mjs
@@ -9,3 +9,4 @@ export { default as BeastformField } from './beastformField.mjs';
export { default as DamageField } from './damageField.mjs';
export { default as RollField } from './rollField.mjs';
export { default as MacroField } from './macroField.mjs';
+export { default as SummonField } from './summonField.mjs';
diff --git a/module/data/fields/action/summonField.mjs b/module/data/fields/action/summonField.mjs
new file mode 100644
index 00000000..6ecb7296
--- /dev/null
+++ b/module/data/fields/action/summonField.mjs
@@ -0,0 +1,89 @@
+import FormulaField from '../formulaField.mjs';
+
+const fields = foundry.data.fields;
+
+export default class DHSummonField extends fields.ArrayField {
+ /**
+ * Action Workflow order
+ */
+ static order = 120;
+
+ constructor(options = {}, context = {}) {
+ const summonFields = new fields.SchemaField({
+ actorUUID: new fields.DocumentUUIDField({
+ type: 'Actor',
+ required: true
+ }),
+ count: new FormulaField({
+ required: true,
+ default: '1'
+ })
+ });
+ super(summonFields, options, context);
+ }
+
+ static async execute() {
+ if (!canvas.scene) {
+ ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.summon.error'));
+ return;
+ }
+
+ if (this.summon.length === 0) {
+ ui.notifications.warn('No actors configured for this Summon action.');
+ return;
+ }
+
+ const rolls = [];
+ const summonData = [];
+ for (const summon of this.summon) {
+ let count = summon.count;
+ const roll = new Roll(summon.count);
+ if (!roll.isDeterministic) {
+ await roll.evaluate();
+ if (game.modules.get('dice-so-nice')?.active) rolls.push(roll);
+ count = roll.total;
+ }
+
+ const actor = DHSummonField.getWorldActor(await foundry.utils.fromUuid(summon.actorUUID));
+ /* Extending summon data in memory so it's available in actionField.toChat. Think it's harmless, but ugly. Could maybe find a better way. */
+ summon.rolledCount = count;
+ summon.actor = actor.toObject();
+
+ summonData.push({ actor, count: count });
+ }
+
+ if (rolls.length) await Promise.all(rolls.map(roll => game.dice3d.showForRoll(roll, game.user, true)));
+
+ this.actor.sheet?.minimize();
+ DHSummonField.handleSummon(summonData, this.actor);
+ }
+
+ /* Check for any available instances of the actor present in the world if we're missing artwork in the compendium */
+ static getWorldActor(baseActor) {
+ const dataType = game.system.api.data.actors[`Dh${baseActor.type.capitalize()}`];
+ if (baseActor.inCompendium && dataType && baseActor.img === dataType.DEFAULT_ICON) {
+ const worldActorCopy = game.actors.find(x => x.name === baseActor.name);
+ return worldActorCopy ?? baseActor;
+ }
+
+ return baseActor;
+ }
+
+ static async handleSummon(summonData, actionActor, summonIndex = 0) {
+ const summon = summonData[summonIndex];
+ const result = await CONFIG.ux.TokenManager.createPreviewAsync(summon.actor, {
+ name: `${summon.actor.prototypeToken.name}${summon.count > 1 ? ` (${summon.count}x)` : ''}`
+ });
+
+ if (!result) return actionActor.sheet?.maximize();
+ summon.actor = result.actor;
+
+ summon.count--;
+ if (summon.count === 0) {
+ summonIndex++;
+ if (summonIndex === summonData.length) return actionActor.sheet?.maximize();
+ }
+
+ DHSummonField.handleSummon(summonData, actionActor, summonIndex);
+ }
+}
diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs
index d0d04721..0d71ab86 100644
--- a/module/data/fields/actionField.mjs
+++ b/module/data/fields/actionField.mjs
@@ -267,7 +267,8 @@ export function ActionMixin(Base) {
action: {
name: this.name,
img: this.baseAction ? this.parent.parent.img : this.img,
- tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10']
+ tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10'],
+ summon: this.summon
},
itemOrigin: this.item,
description: this.description || (this.item instanceof Item ? this.item.system.description : '')
diff --git a/module/documents/_module.mjs b/module/documents/_module.mjs
index 22718bea..8073cfe1 100644
--- a/module/documents/_module.mjs
+++ b/module/documents/_module.mjs
@@ -8,3 +8,4 @@ export { default as DhScene } from './scene.mjs';
export { default as DhToken } from './token.mjs';
export { default as DhTooltipManager } from './tooltipManager.mjs';
export { default as DhTemplateManager } from './templateManager.mjs';
+export { default as DhTokenManager } from './tokenManager.mjs';
diff --git a/module/documents/tokenManager.mjs b/module/documents/tokenManager.mjs
new file mode 100644
index 00000000..be5467da
--- /dev/null
+++ b/module/documents/tokenManager.mjs
@@ -0,0 +1,104 @@
+/**
+ * A singleton class that handles preview tokens.
+ */
+
+export default class DhTokenManager {
+ #activePreview;
+ #actor;
+ #resolve;
+
+ /**
+ * Create a template preview, deactivating any existing ones.
+ * @param {object} data
+ */
+ async createPreview(actor, tokenData) {
+ this.#actor = actor;
+ const token = await canvas.tokens._createPreview(
+ {
+ ...actor.prototypeToken,
+ displayName: 50,
+ ...tokenData
+ },
+ { renderSheet: false, actor }
+ );
+
+ this.#activePreview = {
+ document: token.document,
+ object: token,
+ origin: { x: token.document.x, y: token.document.y }
+ };
+
+ this.#activePreview.events = {
+ contextmenu: this.#cancelTemplate.bind(this),
+ mousedown: this.#confirmTemplate.bind(this),
+ mousemove: this.#onDragMouseMove.bind(this)
+ };
+
+ canvas.stage.on('mousemove', this.#activePreview.events.mousemove);
+ canvas.stage.on('mousedown', this.#activePreview.events.mousedown);
+ canvas.app.view.addEventListener('contextmenu', this.#activePreview.events.contextmenu);
+ }
+
+ /* Currently intended for using as a preview of where to create a token. (note the flag) */
+ async createPreviewAsync(actor, tokenData = {}) {
+ return new Promise(resolve => {
+ this.#resolve = resolve;
+ this.createPreview(actor, { ...tokenData, flags: { daggerheart: { createPlacement: true } } });
+ });
+ }
+
+ /**
+ * Handles the movement of the token preview on mousedrag.
+ * @param {mousemove Event} event
+ */
+ #onDragMouseMove(event) {
+ event.stopPropagation();
+ const { moveTime, object } = this.#activePreview;
+ const update = {};
+
+ const now = Date.now();
+ if (now - (moveTime || 0) <= 16) return;
+ this.#activePreview.moveTime = now;
+
+ let cursor = event.getLocalPosition(canvas.templates);
+
+ Object.assign(update, canvas.grid.getTopLeftPoint(cursor));
+
+ object.document.updateSource(update);
+ object.renderFlags.set({ refresh: true });
+ }
+
+ /**
+ * Cancels the preview token on right-click.
+ * @param {contextmenu Event} event
+ */
+ #cancelTemplate(_event, resolved) {
+ const { mousemove, mousedown, contextmenu } = this.#activePreview.events;
+ this.#activePreview.object.destroy();
+
+ canvas.stage.off('mousemove', mousemove);
+ canvas.stage.off('mousedown', mousedown);
+ canvas.app.view.removeEventListener('contextmenu', contextmenu);
+ if (this.#resolve && !resolved) this.#resolve(false);
+ }
+
+ /**
+ * Creates a real Actor and token at the preview location and cancels the preview.
+ * @param {click Event} event
+ */
+ async #confirmTemplate(event) {
+ event.stopPropagation();
+ this.#cancelTemplate(event, true);
+
+ const actor = this.#actor.inCompendium
+ ? await game.system.api.documents.DhpActor.create(this.#actor.toObject())
+ : this.#actor;
+ const tokenData = await actor.getTokenDocument();
+ const result = await canvas.scene.createEmbeddedDocuments('Token', [
+ { ...tokenData, x: this.#activePreview.document.x, y: this.#activePreview.document.y }
+ ]);
+
+ this.#activePreview = undefined;
+ if (this.#resolve && result.length) this.#resolve(result[0]);
+ }
+}
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index 32e047fd..97769181 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -32,6 +32,7 @@ export const preloadHandlebarsTemplates = async function () {
'systems/daggerheart/templates/actionTypes/effect.hbs',
'systems/daggerheart/templates/actionTypes/beastform.hbs',
'systems/daggerheart/templates/actionTypes/countdown.hbs',
+ 'systems/daggerheart/templates/actionTypes/summon.hbs',
'systems/daggerheart/templates/settings/components/settings-item-line.hbs',
'systems/daggerheart/templates/ui/tooltip/parts/tooltipChips.hbs',
'systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs',
diff --git a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
index 4fc58990..d4e506cb 100644
--- a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
+++ b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
@@ -533,33 +533,31 @@
"description": "Spend a Fear to summon a @UUID[Compendium.daggerheart.adversaries.Actor.YhJrP7rTBiRdX5Fp]{Zombie Legion}, which appears at Close range and immediately takes the spotlight.
",
"resource": null,
"actions": {
- "gZg3AkzCYUTExjE6": {
- "type": "effect",
- "_id": "gZg3AkzCYUTExjE6",
+ "qSuWxC8xQOhnbBx9": {
+ "type": "summon",
+ "_id": "qSuWxC8xQOhnbBx9",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
- "cost": [
- {
- "scalable": false,
- "key": "fear",
- "value": 1,
- "step": null
- }
- ],
+ "cost": [],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.YhJrP7rTBiRdX5Fp",
+ "count": "1"
+ }
+ ],
"name": "Spend Fear",
- "img": "icons/magic/death/undead-zombie-grave-green.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
index 9e838d6d..800e7305 100644
--- a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
+++ b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
@@ -457,11 +457,12 @@
"img": "icons/creatures/unholy/demon-fire-horned-clawed.webp",
"range": ""
},
- "7G6uWlFEeOLsJIWY": {
- "type": "effect",
- "_id": "7G6uWlFEeOLsJIWY",
+ "FlE6i0tbKEguF9wz": {
+ "type": "summon",
+ "_id": "FlE6i0tbKEguF9wz",
"systemPath": "actions",
- "description": "Summon [[/r 1d4]]@UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demons}, who appear at Close range.
",
+ "baseAction": false,
+ "description": "",
"chatDisplay": true,
"originItem": {
"type": "itemCollection"
@@ -474,13 +475,13 @@
"recovery": null,
"consumeOnSuccess": false
},
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
- },
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb",
+ "count": "1d4"
+ }
+ ],
"name": "Summon",
- "img": "icons/creatures/unholy/demon-fire-horned-clawed.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
index f0a5d81c..ca9ce647 100644
--- a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
+++ b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
@@ -363,33 +363,31 @@
"description": "Spend a Fear to grow three @UUID[Compendium.daggerheart.adversaries.Actor.o63nS0k3wHu6EgKP]{Treant Sapling Minions}, who appear at Close range and immediately take the spotlight.
",
"resource": null,
"actions": {
- "84Q2b0zIY9c7Yhho": {
- "type": "effect",
- "_id": "84Q2b0zIY9c7Yhho",
+ "R84DdS0OIx2cUt1w": {
+ "type": "summon",
+ "_id": "R84DdS0OIx2cUt1w",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
- "cost": [
- {
- "scalable": false,
- "key": "fear",
- "value": 1,
- "step": null
- }
- ],
+ "cost": [],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "self",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.o63nS0k3wHu6EgKP",
+ "count": "3"
+ }
+ ],
"name": "Spend Fear",
- "img": "icons/magic/unholy/orb-hands-pink.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
index c7446a11..b03b5495 100644
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@@ -510,34 +510,41 @@
"description": "When the @Lookup[@name] has 3 or more HP marked, you can spend a Fear to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.aLkLFuVoKz2NLoBK]{Tiny Green Oozes} (with no marked HP or Stress). Immediately spotlight both of them.
",
"resource": null,
"actions": {
- "s5mLw6DRGd76MLcC": {
- "type": "effect",
- "_id": "s5mLw6DRGd76MLcC",
+ "J8U7dw3cDSsEirr5": {
+ "type": "summon",
+ "_id": "J8U7dw3cDSsEirr5",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
"cost": [
{
"scalable": false,
"key": "fear",
"value": 1,
- "step": null
+ "itemId": null,
+ "step": null,
+ "consumeOnSuccess": false
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "self",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.aLkLFuVoKz2NLoBK",
+ "count": "2"
+ }
+ ],
"name": "Spend Fear",
- "img": "icons/creatures/slimes/slime-movement-pseudopods-green.webp",
- "range": ""
+ "range": "self"
}
},
"originItemType": null,
diff --git a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
index 9e948594..d5891359 100644
--- a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
+++ b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
@@ -474,33 +474,31 @@
"description": "Spend 2 Fear to summon [[/r 1d4]] @UUID[Compendium.daggerheart.adversaries.Actor.WWyUp6Mxl1S3KYUG]{Vampires}, who appear at Far range and immediately take the spotlight.
",
"resource": null,
"actions": {
- "5Q6RMUTiauKw0tDj": {
- "type": "effect",
- "_id": "5Q6RMUTiauKw0tDj",
+ "jGFOnU6PNdWU6iF4": {
+ "type": "summon",
+ "_id": "jGFOnU6PNdWU6iF4",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
- "cost": [
- {
- "scalable": false,
- "key": "fear",
- "value": 2,
- "step": null
- }
- ],
+ "cost": [],
"uses": {
"value": null,
"max": "",
- "recovery": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
- },
- "name": "Summon Vampires",
- "img": "icons/creatures/mammals/bat-giant-tattered-purple.webp",
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.WWyUp6Mxl1S3KYUG",
+ "count": "1d4"
+ }
+ ],
+ "name": "Spend Fear",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index 6f64f883..3bb8ae96 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -479,33 +479,31 @@
"description": "When the @Lookup[@name] has 4 or more HP marked, you can spend a Fear to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.SHXedd9zZPVfUgUa]{Green Oozes}(with no marked HP or Stress). Immediately spotlight both of them.
",
"resource": null,
"actions": {
- "iQsYAqpUFvJslRDr": {
- "type": "effect",
- "_id": "iQsYAqpUFvJslRDr",
+ "aeRdkiRsDNagTKhp": {
+ "type": "summon",
+ "_id": "aeRdkiRsDNagTKhp",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
- "cost": [
- {
- "scalable": false,
- "key": "fear",
- "value": 1,
- "step": null
- }
- ],
+ "cost": [],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.SHXedd9zZPVfUgUa",
+ "count": "2"
+ }
+ ],
"name": "Spend Fear",
- "img": "icons/creatures/slimes/slime-movement-pseudopods-green.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
index 165bb160..c139d76f 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
@@ -287,7 +287,35 @@
"system": {
"description": "Summon three @Compendium[daggerheart.adversaries.Actor.C0OMQqV7pN6t7ouR], who appear at Far range.
",
"resource": null,
- "actions": {},
+ "actions": {
+ "MCTBsw9lusUdubj0": {
+ "type": "summon",
+ "_id": "MCTBsw9lusUdubj0",
+ "systemPath": "actions",
+ "baseAction": false,
+ "description": "",
+ "chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
+ "actionType": "action",
+ "cost": [],
+ "uses": {
+ "value": null,
+ "max": "",
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.C0OMQqV7pN6t7ouR",
+ "count": "3"
+ }
+ ],
+ "name": "Summon",
+ "range": ""
+ }
+ },
"originItemType": null,
"subType": null,
"originId": null,
diff --git a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
index 4ac7e746..db284f40 100644
--- a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
+++ b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
@@ -258,57 +258,40 @@
"description": "Once per scene, mark a Stress to summon 1d4 @UUID[Compendium.daggerheart.adversaries.Actor.B4LZcGuBAHzyVdzy]{Bladed Guards}, who appear at Far range to enforce the @Lookup[@name]’s will.
",
"resource": null,
"actions": {
- "cUKwhq1imsTVru8D": {
- "type": "attack",
- "_id": "cUKwhq1imsTVru8D",
+ "tioTtYfIGFIXRITN": {
+ "type": "summon",
+ "_id": "tioTtYfIGFIXRITN",
"systemPath": "actions",
- "description": "Once per scene, mark a Stress to summon 1d4 @UUID[Compendium.daggerheart.adversaries.Actor.B4LZcGuBAHzyVdzy]{Bladed Guards}, who appear at Far range to enforce the Noble’s will.
",
+ "baseAction": false,
+ "description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
"cost": [
{
"scalable": false,
"key": "stress",
"value": 1,
- "step": null
+ "itemId": null,
+ "step": null,
+ "consumeOnSuccess": false
}
],
"uses": {
"value": null,
- "max": "",
- "recovery": null
- },
- "damage": {
- "parts": [],
- "includeBase": false
- },
- "target": {
- "type": "any",
- "amount": null
- },
- "effects": [],
- "roll": {
- "type": "diceSet",
- "trait": null,
- "difficulty": null,
- "bonus": null,
- "advState": "neutral",
- "diceRolling": {
- "multiplier": "prof",
- "flatMultiplier": 1,
- "dice": "d4",
- "compare": null,
- "treshold": null
- },
- "useDefault": false
- },
- "save": {
- "trait": null,
- "difficulty": null,
- "damageMod": "none"
+ "max": "1",
+ "recovery": "scene",
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.B4LZcGuBAHzyVdzy",
+ "count": "1d4"
+ }
+ ],
"name": "Summon Guards",
- "img": "icons/environment/people/infantry-armored.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
index 409d7698..5b00ec60 100644
--- a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
+++ b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
@@ -313,36 +313,43 @@
"_id": "WGEGO0DSOs5cF0EL",
"img": "icons/environment/people/charge.webp",
"system": {
- "description": "Once per scene, mark a Stress to summon a Pirate Raiders Horde, which appears at Far range.
",
+ "description": "Once per scene, mark a Stress to summon a @UUID[Compendium.daggerheart.adversaries.Actor.5YgEajn0wa4i85kC]{Pirate Raider Horde}, which appears at Far range.
",
"resource": null,
"actions": {
- "NlgIp0KrmZoS27Xy": {
- "type": "effect",
- "_id": "NlgIp0KrmZoS27Xy",
+ "nuYk5WeLLpIKa69q": {
+ "type": "summon",
+ "_id": "nuYk5WeLLpIKa69q",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
"cost": [
{
"scalable": false,
"key": "stress",
"value": 1,
- "step": null
+ "itemId": null,
+ "step": null,
+ "consumeOnSuccess": false
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.5YgEajn0wa4i85kC",
+ "count": "1"
+ }
+ ],
"name": "Mark Stress",
- "img": "icons/environment/people/charge.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
index 320b71af..2c10ae3f 100644
--- a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
+++ b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
@@ -454,33 +454,40 @@
"description": "When the @Lookup[@name] has 3 or more HP marked, you can spend a Fear to split them into two @UUID[Compendium.daggerheart.adversaries.Actor.1fkLQXVtmILqfJ44]{Tiny Red Oozes} (with no marked HP or Stress). Immediately spotlight both of them.
",
"resource": null,
"actions": {
- "dw6Juw8mriH7sg0e": {
- "type": "effect",
- "_id": "dw6Juw8mriH7sg0e",
+ "BMEr77hDxaQyYBna": {
+ "type": "summon",
+ "_id": "BMEr77hDxaQyYBna",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
"cost": [
{
"scalable": false,
"key": "fear",
"value": 1,
- "step": null
+ "itemId": null,
+ "step": null,
+ "consumeOnSuccess": false
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.1fkLQXVtmILqfJ44",
+ "count": "2"
+ }
+ ],
"name": "Spend Fear",
- "img": "icons/creatures/slimes/slime-movement-splashing-red.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
index 0c8757c5..d17c3f86 100644
--- a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
+++ b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
@@ -416,28 +416,6 @@
"description": "Countdown (6) . When the @Lookup[@name] is in the spotlight for the first time, activate the countdown. When they mark HP, tick down this countdown by the number of HP marked. When it triggers, summon a @UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demon} who appears at Close range.
",
"resource": null,
"actions": {
- "0rixG6jLRynAYNqA": {
- "type": "effect",
- "_id": "0rixG6jLRynAYNqA",
- "systemPath": "actions",
- "description": "Summon a @UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demon} who appears at Close range.
",
- "chatDisplay": true,
- "actionType": "action",
- "cost": [],
- "uses": {
- "value": null,
- "max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
- },
- "name": "Summon",
- "img": "icons/magic/unholy/silhouette-light-fire-blue.webp",
- "range": "close"
- },
"ZVXHY2fpomoKV7jG": {
"type": "countdown",
"_id": "ZVXHY2fpomoKV7jG",
@@ -474,6 +452,33 @@
"name": "Start Countdown",
"img": "icons/magic/unholy/silhouette-light-fire-blue.webp",
"range": ""
+ },
+ "YReYG6DrWp4QGSij": {
+ "type": "summon",
+ "_id": "YReYG6DrWp4QGSij",
+ "systemPath": "actions",
+ "baseAction": false,
+ "description": "",
+ "chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
+ "actionType": "action",
+ "cost": [],
+ "uses": {
+ "value": null,
+ "max": "",
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb",
+ "count": "1"
+ }
+ ],
+ "name": "Summon",
+ "range": ""
}
},
"originItemType": null,
@@ -502,33 +507,31 @@
"description": "Once per scene, when the @Lookup[@name] marks 2 or more HP, you can mark a Stress to summon a @UUID[Compendium.daggerheart.adversaries.Actor.NoRZ1PqB8N5wcIw0]{Demonic Hound Pack}, which appears at Close range and is immediately spotlighted.
",
"resource": null,
"actions": {
- "JBuQUJhif2A7IlJd": {
- "type": "effect",
- "_id": "JBuQUJhif2A7IlJd",
+ "tfmY6HYkkY27NBaF": {
+ "type": "summon",
+ "_id": "tfmY6HYkkY27NBaF",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
- "cost": [
- {
- "scalable": false,
- "key": "stress",
- "value": 1,
- "step": null
- }
- ],
+ "cost": [],
"uses": {
"value": null,
- "max": "1",
- "recovery": "scene"
- },
- "effects": [],
- "target": {
- "type": "self",
- "amount": null
+ "max": "",
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.NoRZ1PqB8N5wcIw0",
+ "count": "1"
+ }
+ ],
"name": "Mark Stress",
- "img": "icons/creatures/unholy/demon-fire-horned-clawed.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
index a6e5ca17..0f1ba28f 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
@@ -340,7 +340,35 @@
"system": {
"description": "When an attack from the @Lookup[@name] causes a target to mark HP and there are three or more @Lookup[@name] Minions within Close range, you can combine the Minions into a @UUID[Compendium.daggerheart.adversaries.Actor.PKSXFuaIHUCoH63A]{Tangle Bramble Swarm Horde}. The Horde’s HP is equal to the number of Minions combined.
",
"resource": null,
- "actions": {},
+ "actions": {
+ "g1OQ5xlMHFWsoktd": {
+ "type": "summon",
+ "_id": "g1OQ5xlMHFWsoktd",
+ "systemPath": "actions",
+ "baseAction": false,
+ "description": "",
+ "chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
+ "actionType": "action",
+ "cost": [],
+ "uses": {
+ "value": null,
+ "max": "",
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.PKSXFuaIHUCoH63A",
+ "count": "1"
+ }
+ ],
+ "name": "Summon",
+ "range": ""
+ }
+ },
"originItemType": null,
"subType": null,
"originId": null,
diff --git a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
index dc42fb07..ea4f1951 100644
--- a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
+++ b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
@@ -314,7 +314,7 @@
"name": "Charcoal Constructs",
"type": "feature",
"system": {
- "description": "Warped animals wreathed in indigo f l ame trample through a point of your choice. All targets within Close range of that point must make an Agility Reaction Roll. Targets who fail take 3d12+3 physical damage. Targets who succeed take half damage instead.
@Template[type:emanation|range:c]
Are these real animals consumed by the fl ame or merely constructs of the corrupting magic?
Warped animals wreathed in indigo flame trample through a point of your choice. All targets within Close range of that point must make an Agility Reaction Roll. Targets who fail take 3d12+3 physical damage. Targets who succeed take half damage instead.
@Template[type:emanation|range:c]
Are these real animals consumed by the fl ame or merely constructs of the corrupting magic?
Spend a Fear to summon an @UUID[Compendium.daggerheart.adversaries.Actor.A0SeeDzwjvqOsyof]{Outer Realms Abomination}, an@UUID[Compendium.daggerheart.adversaries.Actor.ms6nuOl3NFkhPj1k]{Outer Realms Corrupter}, and [[/r 2d6]] @UUID[Compendium.daggerheart.adversaries.Actor.moJhHgKqTKPS2WYS]{Outer Realms Thrall}, who appear at Close range of a chosen PC in defiance of logic and causality. Immediately spotlight one of these adversaries, and you can spend an additional Fear to automatically succeed on that adversary’s standard attack.
What halfconsumed remnants of the shattered world do these monstrosities cast aside in pursuit of living flesh? What jagged refl ections of former personhood do you catch between moments of unquestioning malice?
Spend a Fear to summon an @UUID[Compendium.daggerheart.adversaries.Actor.A0SeeDzwjvqOsyof]{Outer Realms Abomination}, an@UUID[Compendium.daggerheart.adversaries.Actor.ms6nuOl3NFkhPj1k]{Outer Realms Corrupter}, and [[/r 2d6]] @UUID[Compendium.daggerheart.adversaries.Actor.moJhHgKqTKPS2WYS]{Outer Realms Thrall}, who appear at Close range of a chosen PC in defiance of logic and causality. Immediately spotlight one of these adversaries, and you can spend an additional Fear to automatically succeed on that adversary’s standard attack.
What halfconsumed remnants of the shattered world do these monstrosities cast aside in pursuit of living flesh? What jagged refl ections of former personhood do you catch between moments of unquestioning malice?
Summon a @UUID[Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb]{Minor Demon} within Very Close range of the ritual’s leader.
",
+ "baseAction": false,
+ "description": "",
"chatDisplay": true,
"originItem": {
"type": "itemCollection"
@@ -360,13 +361,13 @@
"recovery": null,
"consumeOnSuccess": false
},
- "effects": [],
- "target": {
- "type": "any",
- "amount": null
- },
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.3tqCjDwJAQ7JKqMb",
+ "count": "1"
+ }
+ ],
"name": "Summon Demon",
- "img": "icons/magic/unholy/barrier-fire-pink.webp",
"range": ""
}
},
diff --git a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
index aacf87e9..d8e9cded 100644
--- a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
+++ b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
@@ -248,33 +248,31 @@
"description": "Spend 2 Fear to summon [[/r 1d4+2]] @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troop} that appear within Close range of the Usurper to assist their divine siege. Immediately spotlight the Shock Troops to use a “Group Attack” action.
Which High Fallen do these troops serve? Which god’s fl esh do they wish to feast upon?
Spend 2 Fear to summon [[/r 1d4+2]] @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troop} that appear within Close range of the Usurper to assist their divine siege. Immediately spotlight the Shock Troops to use a “Group Attack” action.
Which High Fallen do these troops serve? Which god’s fl esh do they wish to feast upon?
When the PCs enter the raptors’ hunting grounds, two @UUID[Compendium.daggerheart.adversaries.Actor.OMQ0v6PE8s1mSU0K]{Giant Eagles} appear at Very Far range of a chosen PC, identifying the PCs as likely prey.
How long has it been since the eagles last found prey? Do they have eggs in their nest or unfl edged young?
Spend a Fear to summon a @UUID[Compendium.daggerheart.adversaries.Actor.8KWVLWXFhlY2kYx0]{Glass Snake} within Close range of a chosen PC. The Snake appears in or near the river and immediately takes the spotlight to use their “Spinning Serpent” action.
What treasures does the beast have in their burrow? What travelers have already fallen victim to this predator?
Spend a Fear to summon a @UUID[Compendium.daggerheart.adversaries.Actor.8KWVLWXFhlY2kYx0]{Glass Snake} within Close range of a chosen PC. The Snake appears in or near the river and immediately takes the spotlight to use their “Spinning Serpent” action.
What treasures does the beast have in their burrow? What travelers have already fallen victim to this predator?
+
+ {{localize "DAGGERHEART.ACTIONS.TYPES.summon.name"}}
+
+
+
+
\ No newline at end of file
diff --git a/templates/sheets-settings/action-settings/configuration.hbs b/templates/sheets-settings/action-settings/configuration.hbs
index 51b2a72b..5bd29e39 100644
--- a/templates/sheets-settings/action-settings/configuration.hbs
+++ b/templates/sheets-settings/action-settings/configuration.hbs
@@ -2,7 +2,7 @@
class="tab {{this.tabs.config.cssClass}}"
data-group="primary"
data-tab="config"
->
+>
{{> 'systems/daggerheart/templates/actionTypes/uses.hbs' fields=fields.uses.fields source=source.uses}}
{{> 'systems/daggerheart/templates/actionTypes/cost.hbs' fields=fields.cost.element.fields source=source.cost costOptions=costOptions}}
{{> 'systems/daggerheart/templates/actionTypes/range-target.hbs' fields=(object range=fields.range target=fields.target.fields) source=(object target=source.target range=source.range)}}
diff --git a/templates/sheets-settings/action-settings/effect.hbs b/templates/sheets-settings/action-settings/effect.hbs
index bf2f3aa1..e94f4328 100644
--- a/templates/sheets-settings/action-settings/effect.hbs
+++ b/templates/sheets-settings/action-settings/effect.hbs
@@ -9,5 +9,6 @@
{{#if fields.macro}}{{> 'systems/daggerheart/templates/actionTypes/macro.hbs' fields=fields.macro source=source.macro}}{{/if}}
{{#if fields.effects}}{{> 'systems/daggerheart/templates/actionTypes/effect.hbs' fields=fields.effects.element.fields source=source.effects}}{{/if}}
{{#if fields.beastform}}{{> 'systems/daggerheart/templates/actionTypes/beastform.hbs' fields=fields.beastform.fields source=source.beastform}}{{/if}}
+ {{#if fields.summon}}{{> 'systems/daggerheart/templates/actionTypes/summon.hbs' fields=fields.summon.element.fields source=source.summon}}{{/if}}
{{#if fields.countdown}}{{> 'systems/daggerheart/templates/actionTypes/countdown.hbs' fields=fields.countdown.element.fields source=source.countdown}}{{/if}}
\ No newline at end of file
diff --git a/templates/ui/chat/action.hbs b/templates/ui/chat/action.hbs
index 6b505164..65bb0762 100644
--- a/templates/ui/chat/action.hbs
+++ b/templates/ui/chat/action.hbs
@@ -8,6 +8,22 @@
{{{description}}}
+
+ {{{description}}}
+ {{#if action.summon}}
+
+
+ {{#each action.summon}}
+
+
+
+
{{this.actor.name}}
+
+
# {{this.rolledCount}}
+
+ {{/each}}
+
+ {{/if}}
+