cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-21 23:13:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'v13-Dev' into effect-click-simpler

Browse source
This commit is contained in:
WBHarry 2026-03-25 10:56:24 +01:00
commit ab502d03fb
84 changed files with 622 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lang/en.json
View file

@ -2522,8 +2522,7 @@
"featuresLabel": "Community Feature"
},
"Consumable": {
"consumeOnUse": "Consume On Use",
"destroyOnEmpty": "Destroy On Empty"
"consumeOnUse": "Consume On Use"
},
"DomainCard": {
"type": "Type",

8
module/applications/dialogs/d20RollDialog.mjs
View file

@ -70,8 +70,8 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
context.rollConfig = this.config;
context.hasRoll = !!this.config.roll;
context.canRoll = true;
context.selectedRollMode = this.config.selectedRollMode ?? game.settings.get('core', 'rollMode');
context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({
context.selectedMessageMode = this.config.selectedMessageMode ?? game.settings.get('core', 'messageMode');
context.rollModes = Object.entries(CONFIG.ChatMessage.modes).map(([action, { label, icon }]) => ({
action,
label,
icon
@ -142,10 +142,10 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
}));
}
static updateRollConfiguration(event, _, formData) {
static updateRollConfiguration(_event, _, formData) {
const { ...rest } = foundry.utils.expandObject(formData.object);
this.config.selectedRollMode = rest.selectedRollMode;
this.config.selectedMessageMode = rest.selectedMessageMode;
if (this.config.costs) {
this.config.costs = foundry.utils.mergeObject(this.config.costs, rest.costs);

6
module/applications/dialogs/damageDialog.mjs
View file

@ -52,8 +52,8 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
context.formula = this.roll.constructFormula(this.config);
context.hasHealing = this.config.hasHealing;
context.directDamage = this.config.directDamage;
context.selectedRollMode = this.config.selectedRollMode;
context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({
context.selectedMessageMode = this.config.selectedMessageMode;
context.rollModes = Object.entries(CONFIG.ChatMessage.modes).map(([action, { label, icon }]) => ({
action,
label,
icon
@ -69,7 +69,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
const { ...rest } = foundry.utils.expandObject(formData.object);
foundry.utils.mergeObject(this.config.roll, rest.roll);
foundry.utils.mergeObject(this.config.modifiers, rest.modifiers);
this.config.selectedRollMode = rest.selectedRollMode;
this.config.selectedMessageMode = rest.selectedMessageMode;
this.render();
}

183
module/applications/dialogs/tagTeamDialog.mjs
View file

@ -58,6 +58,10 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
id: 'initialization',
template: 'systems/daggerheart/templates/dialogs/tagTeamDialog/initialization.hbs'
},
rollSelection: {
id: 'rollSelection',
template: 'systems/daggerheart/templates/dialogs/tagTeamDialog/rollSelection.hbs'
},
tagTeamRoll: {
id: 'tagTeamRoll',
template: 'systems/daggerheart/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs'
@ -78,15 +82,52 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
element.addEventListener('change', this.updateRollType.bind(this));
}
_configureRenderParts(options) {
const { initialization, rollSelection, tagTeamRoll } = super._configureRenderParts(options);
const augmentedParts = { initialization };
for (const memberKey of Object.keys(this.party.system.tagTeam.members)) {
augmentedParts[memberKey] = {
id: memberKey,
template: 'systems/daggerheart/templates/dialogs/tagTeamDialog/tagTeamMember.hbs'
};
}
augmentedParts.rollSelection = rollSelection;
augmentedParts.tagTeamRoll = tagTeamRoll;
return augmentedParts;
}
/**@inheritdoc */
async _onRender(context, options) {
await super._onRender(context, options);
if (this.element.querySelector('.team-container')) return;
const initializationPart = this.element.querySelector('.initialization-container');
initializationPart.insertAdjacentHTML('afterend', '<div class="team-container"></div>');
const teamContainer = this.element.querySelector('.team-container');
for (const memberContainer of this.element.querySelectorAll('.team-member-container'))
teamContainer.appendChild(memberContainer);
}
async _prepareContext(_options) {
const context = await super._prepareContext(_options);
context.isEditable = this.getIsEditable();
context.fields = this.party.system.schema.fields.tagTeam.fields;
context.data = this.party.system.tagTeam;
context.rollTypes = CONFIG.DH.GENERAL.tagTeamRollTypes;
context.traitOptions = CONFIG.DH.ACTOR.abilities;
context.members = {};
context.allHaveRolled = Object.keys(this.party.system.tagTeam.members).every(key => {
const data = this.party.system.tagTeam.members[key];
return Boolean(data.rollData);
});
return context;
}
async _preparePartContext(partId, context, options) {
const partContext = await super._preparePartContext(partId, context, options);
partContext.partId = partId;
switch (partId) {
case 'initialization':
partContext.tagTeamFields = this.party.system.schema.fields.tagTeam.fields;
@ -100,31 +141,38 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
partContext.initiatorDisabled = !selectedMembers.length;
partContext.openForAllPlayers = this.openForAllPlayers;
break;
case 'rollSelection':
partContext.members = Object.keys(this.party.system.tagTeam.members).reduce((acc, key) => {
const member = this.party.system.tagTeam.members[key];
acc[key] = { selected: member.selected };
return acc;
}, {});
break;
case 'tagTeamRoll':
partContext.fields = this.party.system.schema.fields.tagTeam.fields;
partContext.data = this.party.system.tagTeam;
partContext.rollTypes = CONFIG.DH.GENERAL.tagTeamRollTypes;
partContext.traitOptions = CONFIG.DH.ACTOR.abilities;
const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
const critSelected = !selectedRoll
? undefined
: (selectedRoll?.rollData?.options?.roll?.isCritical ?? false);
partContext.members = {};
for (const actorId in this.party.system.tagTeam.members) {
const data = this.party.system.tagTeam.members[actorId];
const actor = game.actors.get(actorId);
partContext.hintText = await this.getInfoTexts(this.party.system.tagTeam.members);
partContext.joinedRoll = await this.getJoinedRoll({
overrideIsCritical: critSelected,
displayVersion: true
});
break;
}
if (Object.keys(this.party.system.tagTeam.members).includes(partId)) {
const data = this.party.system.tagTeam.members[partId];
const actor = game.actors.get(partId);
const rollOptions = [];
const damageRollOptions = [];
for (const item of actor.items) {
if (item.system.metadata.hasActions) {
const actions = [
...item.system.actions,
...(item.system.attack ? [item.system.attack] : [])
];
const actions = [...item.system.actions, ...(item.system.attack ? [item.system.attack] : [])];
for (const action of actions) {
if (action.hasRoll) {
const actionItem = {
@ -141,52 +189,60 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
}
}
const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
const critSelected = !selectedRoll
? undefined
: (selectedRoll?.rollData?.options?.roll?.isCritical ?? false);
const damage = data.rollData?.options?.damage;
partContext.hasDamage |= Boolean(damage);
const critHitPointsDamage = await this.getCriticalDamage(damage);
partContext.members[actorId] = {
partContext.members[partId] = {
...data,
isEditable: actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER),
key: actorId,
key: partId,
readyToRoll: Boolean(data.rollChoice),
hasRolled: Boolean(data.rollData),
rollOptions,
damageRollOptions,
damage: damage,
critDamage: critHitPointsDamage,
useCritDamage:
critSelected || (critSelected === undefined && data.rollData?.options?.roll?.isCritical)
useCritDamage: critSelected || (critSelected === undefined && data.rollData?.options?.roll?.isCritical)
};
}
partContext.hintText = await this.getInfoTexts(this.party.system.tagTeam.members);
partContext.joinedRoll = await this.getJoinedRoll({
overrideIsCritical: critSelected,
displayVersion: true
});
break;
}
return partContext;
}
static async updateData(_event, _, formData) {
getUpdatingParts(target) {
const { initialization, rollSelection, tagTeamRoll } = this.constructor.PARTS;
const isInitialization = this.tabGroups.application === initialization.id;
const updatingMember = target.closest('.team-member-container')?.dataset?.memberKey;
return [
...(isInitialization ? [initialization.id] : []),
...(updatingMember ? [updatingMember] : []),
...(!isInitialization ? [rollSelection.id] : []),
...(!isInitialization ? [tagTeamRoll.id] : [])
];
}
static async updateData(event, _, formData) {
const { initiator, openForAllPlayers, ...partyData } = foundry.utils.expandObject(formData.object);
this.initiator = initiator;
this.openForAllPlayers = openForAllPlayers !== undefined ? openForAllPlayers : this.openForAllPlayers;
this.updatePartyData(partyData);
this.updatePartyData(partyData, this.getUpdatingParts(event.target));
}
async updatePartyData(update, options = { render: true }) {
async updatePartyData(update, updatingParts, options = { render: true }) {
const gmUpdate = async update => {
await this.party.update(update);
this.render();
this.render({ parts: updatingParts });
game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.Refresh,
data: { refreshType: RefreshType.TagTeamRoll, action: 'refresh' }
data: { refreshType: RefreshType.TagTeamRoll, action: 'refresh', parts: updatingParts }
});
};
@ -195,7 +251,9 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
gmUpdate,
update,
this.party.uuid,
options.render ? { refreshType: RefreshType.TagTeamRoll, action: 'refresh' } : undefined
options.render
? { refreshType: RefreshType.TagTeamRoll, action: 'refresh', parts: updatingParts }
: undefined
);
}
@ -206,7 +264,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
});
}
tagTeamRefresh = ({ refreshType, action }) => {
tagTeamRefresh = ({ refreshType, action, parts }) => {
if (refreshType !== RefreshType.TagTeamRoll) return;
switch (action) {
@ -214,7 +272,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
this.tabGroups.application = 'tagTeamRoll';
break;
case 'refresh':
this.render();
this.render({ parts });
break;
case 'close':
this.close();
@ -304,22 +362,28 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
}
async updateRollType(event) {
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members.${event.target.dataset.member}`]: {
rollType: event.target.value,
rollChoice: null
}
});
},
this.getUpdatingParts(event.target)
);
}
static async #removeRoll(_, button) {
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members.${button.dataset.member}`]: {
rollData: null,
rollChoice: null,
selected: false
}
});
},
this.getUpdatingParts(button)
);
}
static async #makeRoll(event, button) {
@ -342,9 +406,12 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
const rollData = result.messageRoll.toJSON();
delete rollData.options.messageRoll;
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members.${member}.rollData`]: rollData
});
},
this.getUpdatingParts(button)
);
}
async makeTraitRoll(memberKey) {
@ -389,7 +456,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
diceType
);
const rollData = parsedRoll.toJSON();
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members.${member}.rollData`]: {
...rollData,
options: {
@ -397,7 +465,9 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
roll: newRoll
}
}
});
},
this.getUpdatingParts(button)
);
}
static async #makeDamageRoll(event, button) {
@ -423,7 +493,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
if (!config.damage) return;
const current = this.party.system.tagTeam.members[memberKey].rollData;
await this.updatePartyData({
await this.updatePartyData(
{
[`system.tagTeam.members.${memberKey}.rollData`]: {
...current,
options: {
@ -431,13 +502,16 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
damage: config.damage
}
}
});
},
this.getUpdatingParts(button)
);
}
static async #removeDamageRoll(_, button) {
const { memberKey } = button.dataset;
const current = this.party.system.tagTeam.members[memberKey].rollData;
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members.${memberKey}.rollData`]: {
...current,
options: {
@ -445,7 +519,9 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
damage: null
}
}
});
},
this.getUpdatingParts(button)
);
}
static async #rerollDamageDice(_, button) {
@ -476,9 +552,12 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
return acc;
}, 0);
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members.${memberKey}.rollData`]: rollData
});
},
this.getUpdatingParts(button)
);
}
async getCriticalDamage(damage) {
@ -529,7 +608,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
static async #selectRoll(_, button) {
const { memberKey } = button.dataset;
this.updatePartyData({
this.updatePartyData(
{
[`system.tagTeam.members`]: Object.entries(this.party.system.tagTeam.members).reduce(
(acc, [key, member]) => {
acc[key] = { selected: key === memberKey ? !member.selected : false };
@ -537,7 +617,9 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
},
{}
)
});
},
this.getUpdatingParts(button)
);
}
async getJoinedRoll({ overrideIsCritical, displayVersion } = {}) {
@ -602,6 +684,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
members: _replace({})
}
},
[],
{ render: false }
);

12
module/applications/sheets-configs/action-base-config.mjs
View file

@ -154,8 +154,13 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
context.openSection = this.openSection;
context.tabs = this._getTabs(this.constructor.TABS);
context.config = CONFIG.DH;
if (this.action.damage?.hasOwnProperty('includeBase') && this.action.type === 'attack')
if (this.action.hasDamage) {
context.allDamageTypesUsed = !getUnusedDamageTypes(this.action.damage.parts).length;
if (this.action.damage.hasOwnProperty('includeBase') && this.action.type === 'attack')
context.hasBaseDamage = !!this.action.parent.attack;
}
context.costOptions = this.getCostOptions();
context.getRollTypeOptions = this.getRollTypeOptions();
context.disableOption = this.disableOption.bind(this);
@ -173,7 +178,6 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
revealed: this.openTrigger === index
};
});
context.allDamageTypesUsed = !getUnusedDamageTypes(this.action.damage.parts).length;
const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
context.tierOptions = [
@ -312,8 +316,8 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
const callback = (_, button) => {
const data = this.action.toObject();
const type = choices[button.form.elements.type.value].value;
const part = { applyTo: type };
if (this.action.actor?.isNPC) part.value = { multiplier: 'flat' };
const part = this.action.schema.fields.damage.fields.parts.element.getInitialValue();
part.applyTo = type;
data.damage.parts[type] = part;
this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
};

13
module/data/action/baseAction.mjs
View file

@ -264,12 +264,20 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
hasSave: this.hasSave,
onSave: this.save?.damageMod,
isDirect: !!this.damage?.direct,
selectedRollMode: game.settings.get('core', 'rollMode'),
selectedMessageMode: game.settings.get('core', 'messageMode'),
data: this.getRollData(),
evaluate: this.hasRoll,
resourceUpdates: new ResourceUpdateMap(this.actor),
targetUuid: this.targetUuid,
...configOptions
...configOptions,
skips: {
resources: false,
triggers: false,
createMessage: false,
updateCountdowns: false,
reaction: false,
...(configOptions.skips ?? {})
}
};
DHBaseAction.applyKeybindings(config);
@ -329,6 +337,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
* @param {boolean} successCost
*/
async consume(config, successCost = false) {
config.resourceUpdates = new ResourceUpdateMap(config.actionActor);
await this.workflow.get('cost')?.execute(config, successCost);
await this.workflow.get('uses')?.execute(config, successCost);

3
module/data/fields/actionField.mjs
View file

@ -89,6 +89,7 @@ export class ActionField extends foundry.data.fields.ObjectField {
/** @override */
_cleanType(value, options, _state) {
if (!(typeof value === 'object')) value = {};
value = super._cleanType(value, options, _state);
const cls = this.getModel(value);
if (cls) return cls.cleanData(value, options, _state);
return value;
@ -309,7 +310,7 @@ export function ActionMixin(Base) {
}
};
ChatMessage.applyRollMode(msg, game.settings.get('core', 'rollMode'));
ChatMessage.applyMode(msg, game.settings.get('core', 'messageMode'));
cls.create(msg);
}
}

3
module/data/item/consumable.mjs
View file

@ -18,8 +18,7 @@ export default class DHConsumable extends BaseDataItem {
const fields = foundry.data.fields;
return {
...super.defineSchema(),
consumeOnUse: new fields.BooleanField({ initial: true }),
destroyOnEmpty: new fields.BooleanField({ initial: true })
consumeOnUse: new fields.BooleanField({ initial: true })
};
}

2
module/dice/damageRoll.mjs
View file

@ -33,7 +33,7 @@ export default class DamageRoll extends DHRoll {
static async buildPost(roll, config, message) {
const chatMessage = config.source?.message
? ui.chat.collection.get(config.source.message)
: getDocumentClass('ChatMessage').applyRollMode({}, config.rollMode ?? CONST.DICE_ROLL_MODES.PUBLIC);
: getDocumentClass('ChatMessage').applyMode({}, config.rollMode ?? 'public');
if (game.modules.get('dice-so-nice')?.active) {
const pool = foundry.dice.terms.PoolTerm.fromRolls(
Object.values(config.damage).flatMap(r => r.parts.map(p => p.roll))

4
module/dice/dhRoll.mjs
View file

@ -117,10 +117,10 @@ export default class DHRoll extends Roll {
rolls: [roll]
};
config.selectedRollMode ??= game.settings.get('core', 'rollMode');
config.selectedMessageMode ??= game.settings.get('core', 'messageMode');
if (roll._evaluated) {
const message = await cls.create(msgData, { rollMode: config.selectedRollMode });
const message = await cls.create(msgData, { messageMode: config.selectedMessageMode });
if (config.tagTeamSelected) {
game.system.api.applications.dialogs.TagTeamDialog.assignRoll(message.speakerActor, message);

10
module/documents/actor.mjs
View file

@ -771,20 +771,10 @@ export default class DhpActor extends Actor {
resources.forEach(r => {
if (r.itemId) {
const { path, value } = game.system.api.fields.ActionFields.CostField.getItemIdCostUpdate(r);
if (
r.key === 'quantity' &&
r.target.type === 'consumable' &&
value === 0 &&
r.target.system.destroyOnEmpty
) {
r.target.delete();
} else {
updates.items[r.key] = {
target: r.target,
resources: { [path]: value }
};
}
} else {
const valueFunc = (base, resource, baseMax) => {
if (resource.clear) return baseMax && base.inverted ? baseMax : 0;

2
module/documents/rollTable.mjs
View file

@ -76,7 +76,7 @@ export default class DhRollTable extends foundry.documents.RollTable {
}
async toMessage(results, { roll, messageData = {}, messageOptions = {} } = {}) {
messageOptions.rollMode ??= game.settings.get('core', 'rollMode');
messageOptions.rollMode ??= game.settings.get('core', 'messageMode');
// Construct chat data
messageData = foundry.utils.mergeObject(

61
module/documents/tooltipManager.mjs
View file

@ -169,70 +169,19 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
}
}
this.baseActivate(element, { ...options, html: html });
this.noOffset = options.noOffset;
super.activate(element, { ...options, html: html });
}
/* Need to pass more options to _setAnchor, so have to copy whole foundry method >_< */
async baseActivate(element, options) {
let { text, direction, cssClass, locked = false, html, content } = options;
if (content && !html) {
foundry.utils.logCompatibilityWarning(
'The content option has been deprecated in favor of the html option',
{ since: 13, until: 15, once: true }
);
html = content;
}
if (text && html) throw new Error('Cannot provide both text and html options to TooltipManager#activate.');
// Deactivate currently active element
this.deactivate();
// Check if the element still exists in the DOM.
if (!document.body.contains(element)) return;
// Mark the new element as active
this.#active = true;
this.element = element;
element.setAttribute('aria-describedby', 'tooltip');
html ||= element.dataset.tooltipHtml;
if (html) {
if (typeof html === 'string') this.tooltip.innerHTML = foundry.utils.cleanHTML(html);
else {
this.tooltip.innerHTML = ''; // Clear existing HTML
this.tooltip.appendChild(html);
}
} else {
text ||= element.dataset.tooltipText;
if (text) this.tooltip.textContent = text;
else {
text = element.dataset.tooltip;
// Localized message should be safe
if (game.i18n.has(text)) this.tooltip.innerHTML = game.i18n.localize(text);
else this.tooltip.innerHTML = foundry.utils.cleanHTML(text);
}
}
// Activate display of the tooltip
this.tooltip.removeAttribute('class');
this.tooltip.classList.add('active', 'themed', 'theme-dark');
this.tooltip.showPopover();
cssClass ??= element.closest('[data-tooltip-class]')?.dataset.tooltipClass;
if (cssClass) this.tooltip.classList.add(...cssClass.split(' '));
// Set tooltip position
direction ??= element.closest('[data-tooltip-direction]')?.dataset.tooltipDirection;
if (!direction) direction = this._determineDirection();
this._setAnchor(direction, options);
if (locked || element.dataset.hasOwnProperty('locked')) this.lockTooltip();
}
_setAnchor(direction, options = {}) {
_setAnchor(direction) {
const directions = this.constructor.TOOLTIP_DIRECTIONS;
const pad = this.constructor.TOOLTIP_MARGIN_PX;
const pos = this.element.getBoundingClientRect();
const { innerHeight, innerWidth } = this.tooltip.ownerDocument.defaultView;
const tooltipPadding = 16;
const horizontalOffset = options.noOffset ? tooltipPadding : this.tooltip.offsetWidth / 2 - pos.width / 2;
const verticalOffset = options.noOffset ? tooltipPadding : this.tooltip.offsetHeight / 2 - pos.height / 2;
const horizontalOffset = this.noOffset ? tooltipPadding : this.tooltip.offsetWidth / 2 - pos.width / 2;
const verticalOffset = this.noOffset ? tooltipPadding : this.tooltip.offsetHeight / 2 - pos.height / 2;
const style = {};
switch (direction) {

3
src/packs/beastforms/beastform_Agile_Scout_a9UoCwtrbgKk02mK.json
View file

@ -29,8 +29,7 @@
"Compendium.daggerheart.beastforms.Item.QFg1hNCEoKVDd9Zo"
],
"evolved": {
"mainTraitBonus": 0,
"maximumTier": 1
"mainTraitBonus": 0
},
"hybrid": {
"beastformOptions": 2,

1
src/packs/items/consumables/consumable_Acidpaste_cfVFmS8vT9dbq9s1.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Armor_Stitcher_VlbsCjvvLNfTzNXb.json
View file

@ -48,7 +48,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Blood_of_the_Yorgi_pDGzmczoTlKGmKgd.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Bonding_Honey_PfQvqopXgvroBklL.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Bridge_Seed_RrIasiMCt6mqVTps.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Channelstone_IKMVQ6VwtapwoUim.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Circle_of_the_Void_elsyP6VhHw1JjGSl.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Dragonbloom_Tea_wM18PWWW2Ami4fBG.json
View file

@ -89,7 +89,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Dripfang_Poison_eU8VpbWB2NHIL47n.json
View file

@ -71,7 +71,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Feast_of_Xuria_aX6NyxkNzu0LcJpt.json
View file

@ -134,7 +134,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Health_Potion_Aruc2NLutWuVIjP1.json
View file

@ -84,7 +84,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Hopehold_Flare_EhaQCPJ8oiqpRIwB.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Improved_Arcane_Shard_nQTo6mNoPTEVBtkm.json
View file

@ -91,7 +91,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Jar_of_Lost_Voices_yUol6M5b8jsbk9za.json
View file

@ -71,7 +71,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Jumping_Root_c2putn9apuurJhWX.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Knowledge_Stone_nL9IALzm9BNi5oSt.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Major_Arcane_Shard_AA7bmiwv00lshPrC.json
View file

@ -89,7 +89,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Health_Potion_cM7pHe8bBAxSZ2xR.json
View file

@ -84,7 +84,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Stamina_Potion_I4cQ03xbxnc81EGa.json
View file

@ -84,7 +84,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Minor_Health_Potion_tPfKtKRRjv8qdSqy.json
View file

@ -84,7 +84,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Minor_Stamina_Potion_b6vGSPFWOlzZZDLO.json
View file

@ -84,7 +84,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Mirror_of_Marigold_UFQVwgYOUZ88UxcH.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Replication_Parchment_yJkwz4AP6yhGo8Vj.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Sleeping_Sap_XZavUVlHEvE2srEt.json
View file

@ -85,7 +85,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Snap_Powder_cg6VtQ0eVZjDdcK0.json
View file

@ -85,7 +85,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Stamina_Potion_hf3k1POoVSooJyN2.json
View file

@ -84,7 +84,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Stardrop_y4c1jrlHrf0wBWOq.json
View file

@ -71,7 +71,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Sun_Tree_Sap_kwexUzdM9wm1Qums.json
View file

@ -64,7 +64,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Sweet_Moss_GrDrRqWgv7gvl9vn.json
View file

@ -159,7 +159,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,

1
src/packs/items/consumables/consumable_Unstable_Arcane_Shard_mUepnLbkvFk0ha4Z.json
View file

@ -91,7 +91,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Varik_Leaves_hvy5BkG3F6iOIXTx.json
View file

@ -85,7 +85,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Vial_of_Darksmoke_Nwv5ydGf0MWnzq1n.json
View file

@ -40,7 +40,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

1
src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,

1
src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
View file

@ -45,7 +45,6 @@
}
},
"consumeOnUse": true,
"destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,

45
styles/less/dialog/tag-team-dialog/sheet.less
View file

@ -1,25 +1,20 @@
.daggerheart.dialog.dh-style.views.tag-team-dialog {
.tag-team-roll-container {
display: flex;
flex-direction: column;
gap: 16px;
&.inactive {
opacity: 0.4;
pointer-events: none;
}
.team-container {
display: flex;
gap: 16px;
margin-bottom: 16px;
.member-container {
.team-member-container {
display: flex;
flex-direction: column;
justify-content: space-between;
gap: 8px;
flex: 1;
&.select-padding {
padding-bottom: 64px;
}
&.inactive {
opacity: 0.4;
pointer-events: none;
@ -180,9 +175,25 @@
padding: 3px;
}
}
}
}
.roll-selection {
position: relative;
top: -80px;
&.rendered {
margin-bottom: -56px;
}
.roll-selection-container {
display: flex;
.select-roll-button {
margin-top: 8px;
flex: 1;
display: flex;
justify-content: center;
i {
color: light-dark(@dark-blue, @golden);
@ -196,6 +207,16 @@
}
}
.tag-team-roll-container {
display: flex;
flex-direction: column;
gap: 16px;
&.inactive {
opacity: 0.4;
pointer-events: none;
}
.results-container {
display: flex;
flex-direction: column;
@ -243,9 +264,9 @@
grid-column: span 2;
}
}
}
.hint {
text-align: center;
}
}
}

28
templates/actionTypes/damage.hbs
View file

@ -16,50 +16,52 @@
{{formField directField value=source.direct name=(concat path "damage.direct") localize=true classes="checkbox"}}
{{/unless}}
</div>
{{#each source.parts as |dmg key|}}
{{!-- Handlebars uses Symbol.Iterator to produce index|key. This isn't compatible with our parts object, so we instead use applyTo, which is the same value --}}
{{#each source.parts as |dmg|}}
<div class="nest-inputs">
<fieldset{{#if dmg.base}} disabled{{/if}} class="one-column{{#if ../path}} no-style{{/if}}">
<legend class="with-icon">
{{localize (concat "DAGGERHEART.CONFIG.HealingType." key ".name")}}
{{localize (concat "DAGGERHEART.CONFIG.HealingType." dmg.applyTo ".name")}}
{{#unless (or dmg.base ../path)}}
<a data-action="removeDamage" data-key="{{key}}"><i class="fas fa-trash"></i></a>
<a data-action="removeDamage" data-key="{{dmg.applyTo}}"><i class="fas fa-trash"></i></a>
{{/unless}}
</legend>
{{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base))}}
{{formField ../fields.resultBased value=dmg.resultBased name=(concat "damage.parts." key ".resultBased") localize=true classes="checkbox"}}
{{formField ../fields.resultBased value=dmg.resultBased name=(concat "damage.parts." dmg.applyTo ".resultBased") localize=true classes="checkbox"}}
{{/if}}
{{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base) dmg.resultBased)}}
<div class="nest-inputs">
<fieldset class="one-column">
<legend>{{localize "DAGGERHEART.GENERAL.withThing" thing=(localize "DAGGERHEART.GENERAL.hope")}}</legend>
{{> formula fields=../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" key=key path=../path}}
{{> formula fields=../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" key=dmg.applyTo path=../path}}
</fieldset>
<fieldset class="one-column">
<legend>{{localize "DAGGERHEART.GENERAL.withThing" thing=(localize "DAGGERHEART.GENERAL.fear")}}</legend>
{{> formula fields=../fields.valueAlt.fields type=../fields.type dmg=dmg source=dmg.valueAlt target="valueAlt" key=key path=../path}}
{{> formula fields=../fields.valueAlt.fields type=../fields.type dmg=dmg source=dmg.valueAlt target="valueAlt" key=dmg.applyTo path=../path}}
</fieldset>
</div>
{{else}}
{{> formula fields=../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" key=key path=../path}}
{{> formula fields=../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" key=dmg.applyTo path=../path}}
{{/if}}
{{#if (and (eq dmg.applyTo 'hitPoints') (ne @root.source.type 'healing'))}}
{{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." key ".type") localize=true}}
{{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." dmg.applyTo ".type") localize=true}}
{{/if}}
{{#if ../horde}}
<fieldset class="one-column">
<legend>{{localize "DAGGERHEART.ACTORS.Adversary.hordeDamage"}}</legend>
<div class="nest-inputs">
<input type="hidden" name="{{../path}}damage.parts.{{key}}.valueAlt.multiplier" value="flat">
{{formField ../fields.valueAlt.fields.flatMultiplier value=dmg.valueAlt.flatMultiplier name=(concat ../path "damage.parts." key ".valueAlt.flatMultiplier") label="DAGGERHEART.ACTIONS.Settings.multiplier" classes="inline-child" localize=true }}
{{formField ../fields.valueAlt.fields.dice value=dmg.valueAlt.dice name=(concat ../path "damage.parts." key ".valueAlt.dice") classes="inline-child" localize=true}}
{{formField ../fields.valueAlt.fields.bonus value=dmg.valueAlt.bonus name=(concat ../path "damage.parts." key ".valueAlt.bonus") localize=true classes="inline-child"}}
<input type="hidden" name="{{../path}}damage.parts.{{dmg.applyTo}}.valueAlt.multiplier" value="flat">
{{formField ../fields.valueAlt.fields.flatMultiplier value=dmg.valueAlt.flatMultiplier name=(concat ../path "damage.parts." dmg.applyTo ".valueAlt.flatMultiplier") label="DAGGERHEART.ACTIONS.Settings.multiplier" classes="inline-child" localize=true }}
{{formField ../fields.valueAlt.fields.dice value=dmg.valueAlt.dice name=(concat ../path "damage.parts." dmg.applyTo ".valueAlt.dice") classes="inline-child" localize=true}}
{{formField ../fields.valueAlt.fields.bonus value=dmg.valueAlt.bonus name=(concat ../path "damage.parts." dmg.applyTo ".valueAlt.bonus") localize=true classes="inline-child"}}
</div>
</fieldset>
{{/if}}
<input type="hidden" name="damage.parts.{{key}}.base" value="{{dmg.base}}">
<input type="hidden" name="{{concat ../path "damage.parts." dmg.applyTo ".base"}}" value="{{dmg.base}}">
</fieldset>
</div>
{{/each}}

4
templates/dialogs/dice-roll/damageSelection.hbs
View file

@ -56,8 +56,8 @@
{{/unless}}
<div class="damage-section-controls">
{{#if directDamage}}
<select class="roll-mode-select" name="selectedRollMode">
{{selectOptions rollModes selected=selectedRollMode valueAttr="action" labelAttr="label" localize=true}}
<select class="roll-mode-select" name="selectedMessageMode">
{{selectOptions rollModes selected=selectedMessageMode valueAttr="action" labelAttr="label" localize=true}}
</select>
{{/if}}
<button class="submit-btn" data-action="submitRoll">

4
templates/dialogs/dice-roll/rollSelection.hbs
View file

@ -189,8 +189,8 @@
{{/if}}
<div class="roll-dialog-controls">
<select class="roll-mode-select" name="selectedRollMode">
{{selectOptions rollModes selected=selectedRollMode valueAttr="action" labelAttr="label" localize=true}}
<select class="roll-mode-select" name="selectedMessageMode">
{{selectOptions rollModes selected=selectedMessageMode valueAttr="action" labelAttr="label" localize=true}}
</select>
<button class="submit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
<i class="fa-solid fa-dice"></i>

1
templates/dialogs/tagTeamDialog/initialization.hbs
View file

@ -1,4 +1,5 @@
<section class="initialization-container tab {{#if tabs.initialization.active}} active{{/if}}" data-group="{{tabs.initialization.group}}" data-tab="{{tabs.initialization.id}}">
{{partId}}
<h2>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.selectParticipants"}}</h2>
<div class="members-container">
{{#each memberSelection as |member|}}

11
templates/dialogs/tagTeamDialog/rollSelection.hbs Normal file
View file

@ -0,0 +1,11 @@
<section class="roll-selection {{#if (and allHaveRolled tabs.tagTeamRoll.active)}}rendered{{/if}} tab {{#if tabs.tagTeamRoll.active}} active{{/if}}" data-group="{{tabs.tagTeamRoll.group}}">
{{#if allHaveRolled}}
<div class="roll-selection-container">
{{#each members as |member key|}}
<a class="select-roll-button" data-action="selectRoll" data-member-key="{{key}}">
<i class="{{#if member.selected}}fa-solid fa-circle-check{{else}}fa-regular fa-circle inactive{{/if}}"></i>
</a>
{{/each}}
</div>
{{/if}}
</section>

126
templates/dialogs/tagTeamDialog/tagTeamMember.hbs Normal file
View file

@ -0,0 +1,126 @@
{{#with (lookup members partId)}}
<fieldset class="team-member-container {{#if @root.allHaveRolled}}select-padding{{/if}} {{#unless isEditable}}inactive{{/unless}}" data-member-key="{{@root.partId}}">
<div class="data-container">
<div class="member-info">
<img src="{{img}}" />
<span class="member-name">{{name}}</span>
</div>
<div class="roll-setup">
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.rollType"}}</label>
<select class="roll-type-select" data-member="{{@root.partId}}" {{#if hasRolled}}disabled{{/if}}>
{{selectOptions ../rollTypes selected=rollType localize=true}}
</select>
</div>
</div>
{{#if (or (not rollType) (eq rollType 'trait'))}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
<select name="{{concat "system.tagTeam.members." @root.partId ".rollChoice"}}" {{#if hasRolled}}disabled{{/if}}>
{{selectOptions ../traitOptions selected=rollChoice localize=true blank=""}}
</select>
</div>
</div>
{{else if (eq rollType 'damageAbility')}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.CONFIG.TagTeamRollTypes.damageAbility"}}</label>
<select name="{{concat "system.tagTeam.members." @root.partId ".rollChoice"}}" {{#if hasRolled}}disabled{{/if}}>
{{selectOptions damageRollOptions selected=rollChoice localize=true blank=""}}
</select>
</div>
</div>
{{else}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.GENERAL.Ability.single"}}</label>
<select name="{{concat "system.tagTeam.members." @root.partId ".rollChoice"}}" {{#if hasRolled}}disabled{{/if}}>
{{selectOptions rollOptions selected=rollChoice localize=true blank=""}}
</select>
</div>
</div>
{{/if}}
</div>
{{#if readyToRoll}}
<div class="roll-container">
<span class="roll-title">
{{localize "DAGGERHEART.GENERAL.roll"}}
<div class="roll-tools">
<a class="roll-button" data-action="makeRoll" data-member="{{@root.partId}}">
<img src="systems/daggerheart/assets/icons/dice/hope/d12.svg" />
</a>
{{#if hasRolled}}
<a class="delete-button" data-action="removeRoll" data-member="{{@root.partId}}">
<i class="fa-solid fa-trash"></i>
</a>
{{/if}}
</div>
</span>
{{#if rollData}}
{{#with rollData.options.roll}}
<div class="roll-data {{#if this.isCritical}}critical{{else}}{{#if (eq this.result.duality 1)}}hope{{else}}fear{{/if}}{{/if}}">
<div class="duality-label">{{this.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=this.result.label}}</div>
<div class="roll-dice-container">
<a class="roll-dice" data-action="rerollDice" data-member="{{@root.partId}}" data-dice-type="hope">
<span class="dice-label">{{this.hope.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/hope/" this.hope.dice ".svg"}}" />
</a>
<span class="roll-operator">+</span>
<a class="roll-dice" data-action="rerollDice" data-member="{{@root.partId}}" data-dice-type="fear">
<span class="dice-label">{{this.fear.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/fear/" this.fear.dice ".svg"}}" />
</a>
{{#if this.advantage.type}}
<span class="roll-operator">{{#if (eq this.advantage.type 1)}}+{{else}}-{{/if}}</span>
<span class="roll-dice">
<span class="dice-label">{{this.advantage.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/" (ifThen (eq this.advantage.type 1) "adv/" "disadv/") this.advantage.dice ".svg"}}" />
</span>
{{/if}}
<span class="roll-operator">{{#if (gte this.modifierTotal 0)}}+{{else}}-{{/if}}</span>
<span class="roll-value">{{positive this.modifierTotal}}</span>
</div>
</div>
{{/with}}
{{else}}
<span class="hint">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}</span>
{{/if}}
</div>
{{/if}}
{{#if rollData.options.hasDamage}}
<div class="roll-container">
<span class="roll-title">
{{localize "DAGGERHEART.GENERAL.damage"}}
<div class="roll-tools">
<a class="roll-button" data-action="makeDamageRoll" data-member-key="{{@root.partId}}" {{#unless readyToRoll}}disabled{{/unless}}>
<img src="systems/daggerheart/assets/icons/dice/hope/d20.svg" />
</a>
{{#if damage}}
<a class="delete-button" data-action="removeDamageRoll" data-member-key="{{@root.partId}}" {{#unless rollData.options.damage}}disabled{{/unless}}>
<i class="fa-solid fa-trash"></i>
</a>
{{/if}}
</div>
</span>
{{#if damage}}
{{#if useCritDamage}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=critDamage isCritical=true }}
{{else}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=damage }}
{{/if}}
{{else}}
<span class="hint">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}</span>
{{/if}}
</div>
{{/if}}
</div>
</fieldset>
{{/with}}

135
templates/dialogs/tagTeamDialog/tagTeamRoll.hbs
View file

@ -1,140 +1,5 @@
<section class="tag-team-roll tab {{#if tabs.tagTeamRoll.active}} active{{/if}}" data-group="{{tabs.tagTeamRoll.group}}" data-tab="{{tabs.tagTeamRoll.id}}">
<div class="tag-team-roll-container {{#unless isEditable}}inactive{{/unless}}">
<div class="team-container">
{{#each members as |member key|}}
<fieldset class="member-container {{#unless member.isEditable}}inactive{{/unless}}">
<div class="data-container">
<div class="member-info">
<img src="{{member.img}}" />
<span class="member-name">{{member.name}}</span>
</div>
<div class="roll-setup">
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.rollType"}}</label>
<select class="roll-type-select" data-member="{{key}}" {{#if member.hasRolled}}disabled{{/if}}>
{{selectOptions ../rollTypes selected=member.rollType localize=true}}
</select>
</div>
</div>
{{#if (eq member.rollType 'trait')}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
<select name="{{concat "system.tagTeam.members." key ".rollChoice"}}" {{#if member.hasRolled}}disabled{{/if}}>
{{selectOptions ../traitOptions selected=member.rollChoice localize=true blank=""}}
</select>
</div>
</div>
{{else if (eq member.rollType 'damageAbility')}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.CONFIG.TagTeamRollTypes.damageAbility"}}</label>
<select name="{{concat "system.tagTeam.members." key ".rollChoice"}}" {{#if member.hasRolled}}disabled{{/if}}>
{{selectOptions member.damageRollOptions selected=member.rollChoice localize=true blank=""}}
</select>
</div>
</div>
{{else}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.GENERAL.Ability.single"}}</label>
<select name="{{concat "system.tagTeam.members." key ".rollChoice"}}" {{#if member.hasRolled}}disabled{{/if}}>
{{selectOptions member.rollOptions selected=member.rollChoice localize=true blank=""}}
</select>
</div>
</div>
{{/if}}
</div>
{{#if member.readyToRoll}}
<div class="roll-container">
<span class="roll-title">
{{localize "DAGGERHEART.GENERAL.roll"}}
<div class="roll-tools">
<a class="roll-button" data-action="makeRoll" data-member="{{key}}">
<img src="systems/daggerheart/assets/icons/dice/hope/d12.svg" />
</a>
{{#if member.hasRolled}}
<a class="delete-button" data-action="removeRoll" data-member="{{key}}">
<i class="fa-solid fa-trash"></i>
</a>
{{/if}}
</div>
</span>
{{#if member.rollData}}
{{#with member.rollData.options.roll}}
<div class="roll-data {{#if this.isCritical}}critical{{else}}{{#if (eq this.result.duality 1)}}hope{{else}}fear{{/if}}{{/if}}">
<div class="duality-label">{{this.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=this.result.label}}</div>
<div class="roll-dice-container">
<a class="roll-dice" data-action="rerollDice" data-member="{{../key}}" data-dice-type="hope">
<span class="dice-label">{{this.hope.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/hope/" this.hope.dice ".svg"}}" />
</a>
<span class="roll-operator">+</span>
<a class="roll-dice" data-action="rerollDice" data-member="{{../key}}" data-dice-type="fear">
<span class="dice-label">{{this.fear.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/fear/" this.fear.dice ".svg"}}" />
</a>
{{#if this.advantage.type}}
<span class="roll-operator">{{#if (eq this.advantage.type 1)}}+{{else}}-{{/if}}</span>
<span class="roll-dice">
<span class="dice-label">{{this.advantage.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/" (ifThen (eq this.advantage.type 1) "adv/" "disadv/") this.advantage.dice ".svg"}}" />
</span>
{{/if}}
<span class="roll-operator">{{#if (gte this.modifierTotal 0)}}+{{else}}-{{/if}}</span>
<span class="roll-value">{{positive this.modifierTotal}}</span>
</div>
</div>
{{/with}}
{{else}}
<span class="hint">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}</span>
{{/if}}
</div>
{{/if}}
{{#if member.rollData.options.hasDamage}}
<div class="roll-container">
<span class="roll-title">
{{localize "DAGGERHEART.GENERAL.damage"}}
<div class="roll-tools">
<a class="roll-button" data-action="makeDamageRoll" data-member-key="{{key}}" {{#unless member.readyToRoll}}disabled{{/unless}}>
<img src="systems/daggerheart/assets/icons/dice/hope/d20.svg" />
</a>
{{#if damage}}
<a class="delete-button" data-action="removeDamageRoll" data-member-key="{{key}}" {{#unless member.rollData.options.damage}}disabled{{/unless}}>
<i class="fa-solid fa-trash"></i>
</a>
{{/if}}
</div>
</span>
{{#if damage}}
{{#if useCritDamage}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=critDamage isCritical=true }}
{{else}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=damage }}
{{/if}}
{{else}}
<span class="hint">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}</span>
{{/if}}
</div>
{{/if}}
</div>
{{#if member.hasRolled}}
<a class="select-roll-button" data-action="selectRoll" data-member-key="{{key}}">
<i class="{{#if member.selected}}fa-solid fa-circle-check{{else}}fa-regular fa-circle inactive{{/if}}"></i>
</a>
{{/if}}
</fieldset>
{{/each}}
</div>
<div class="results-container">
<span class="result-container-label">{{localize "DAGGERHEART.GENERAL.result.plural"}}</span>
<div class="results-inner-container">

17
templates/hud/tokenHUD.hbs
View file

@ -4,13 +4,22 @@
<input type="text" name="elevation" value="{{elevation}}" {{disabled (or locked (and isGamePaused (not isGM)))}}>
</div>
<button type="button" class="control-icon" data-action="sort" data-direction="up" data-tooltip="HUD.ToFront">
<img src="{{icons.up}}">
<button type="button" class="control-icon" data-action="sort" data-tooltip="HUD.ToFrontOrBack">
<i class="fa-solid fa-arrow-down-arrow-up" inert></i>
</button>
<button type="button" class="control-icon" data-action="sort" data-direction="down" data-tooltip="HUD.ToBack">
<img src="{{icons.down}}">
{{#if canChangeLevel}}
<button type="button" class="control-icon" data-action="togglePalette" data-palette="levels"
aria-label="{{ localize "HUD.ChangeLevel" }}" data-tooltip>
<i class="fa-solid fa-stairs" inert></i>
</button>
<div class="palette palette-list" data-palette="levels">
{{#each levels as |level|}}
<a class="palette-list-entry {{level.cssClass}}" data-action="level" data-level-id="{{level.id}}"><span>{{level.name}}</span></a>
{{/each}}
</div>
{{/if}}
{{#if hasCompanion}}
<button type="button" class="control-icon clown-car" data-action="toggleCompanions" data-tooltip="{{#if companionOnCanvas}}{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.retrieveCompanionTokens"}}{{else}}{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.depositCompanionTokens"}}{{/if}}">
<img {{#if companionOnCanvas}}class="flipped"{{/if}} src="{{icons.toggleClowncar}}">

3
templates/sheets/items/consumable/settings.hbs
View file

@ -10,8 +10,5 @@
<span>{{localize "DAGGERHEART.ITEMS.Consumable.consumeOnUse"}}</span>
{{formField systemFields.consumeOnUse value=source.system.consumeOnUse}}
<span>{{localize "DAGGERHEART.ITEMS.Consumable.destroyOnEmpty"}}</span>
{{formField systemFields.destroyOnEmpty value=source.system.destroyOnEmpty}}
</fieldset>
</section>