Compare commits

...

59 commits
main ... 1.9.9

Author SHA1 Message Date
WBHarry
cf28e011f2 Raised version 2026-04-12 00:29:04 +02:00
WBHarry
623f62e4b9 Merge branch 'V13' of https://github.com/Foundryborne/daggerheart into V13 2026-04-11 23:13:54 +02:00
WBHarry
40109dbbe4 Fixed system.json 2026-04-11 23:13:21 +02:00
WBHarry
d12220c64f
Fixes (#1790)
* Fixes

* .
2026-04-11 22:55:41 +02:00
WBHarry
f4282429cd Fixed H4 elements in editors being hard to see in light mode 2026-04-11 22:51:46 +02:00
WBHarry
1f02795b5d Fixed Battlepoints menu being hard to see in light-mode 2026-04-11 22:46:56 +02:00
WBHarry
d7b37f8178 Fixed faulty deploy script 2026-04-03 20:17:20 +02:00
WBHarry
f8df53ed83 Updated github deploy manifest to be the latest on the V13 branch 2026-04-03 00:10:32 +02:00
WBHarry
8ee5db2832 Fixed our templates taking custom scene distance into account 2026-04-02 23:38:18 +02:00
WBHarry
bbc521ece0 Labrys axe, rain of blades fixes. Enriched Description improvement on armor and weapon 2026-04-02 22:30:49 +02:00
WBHarry
be8d7f6469 Fixed so that tokens with vision range set to Infinity doesn't make summon actions error out 2026-04-02 17:07:52 +02:00
WBHarry
3a4b66f487 Merge branch 'main' into release 2026-03-27 08:27:10 +01:00
WBHarry
cdf159b4a7 Merge branch 'main' into release 2026-03-23 01:13:44 +01:00
WBHarry
413a37483c Merge branch 'main' into release 2026-03-17 22:45:41 +01:00
WBHarry
c5e21d9d92 Merge branch 'main' into release 2026-03-16 01:32:48 +01:00
WBHarry
10c0b6b51e Merge branch 'main' into release 2026-03-15 11:44:45 +01:00
WBHarry
652a554c9a Merge branch 'main' into release 2026-03-13 01:29:02 +01:00
WBHarry
c0ed5fe697 Merge branch 'main' into release 2026-03-13 00:19:34 +01:00
WBHarry
ff65abe09b Merge branch 'main' into release 2026-03-07 01:33:55 +01:00
WBHarry
ec7a7b378d Merge branch 'main' into release 2026-02-26 12:47:44 +01:00
WBHarry
8e34356905 Merge branch 'main' into release 2026-02-12 22:30:17 +01:00
WBHarry
35bceac520 Merge branch 'main' into release 2026-02-09 12:43:51 +01:00
WBHarry
436acb0617 Merge branch 'main' into release 2026-02-04 00:24:56 +01:00
WBHarry
1d114633f5 Merge branch 'main' into release 2026-02-02 02:07:29 +01:00
WBHarry
1c70b46639 Merge branch 'main' into release 2026-02-01 01:20:57 +01:00
WBHarry
ae38245877 Merge branch 'main' into release 2026-01-28 12:57:18 +01:00
WBHarry
af5d3d4568 Merge branch 'main' into release 2026-01-25 17:07:47 +01:00
WBHarry
6b5c1ff965 Merge branch 'main' into release 2026-01-25 16:22:39 +01:00
WBHarry
42a22a49f0 Merge branch 'main' into release 2026-01-23 11:52:22 +01:00
WBHarry
da77c2a190 Merge branch 'main' into release 2026-01-17 01:42:52 +01:00
WBHarry
68decf0b57 Merge branch 'main' into release 2026-01-16 21:48:15 +01:00
WBHarry
4f0670cc35 Merge branch 'main' into release 2026-01-16 10:16:12 +01:00
WBHarry
b346ce6766 Merge branch 'main' into release 2026-01-16 10:06:17 +01:00
WBHarry
dddd0581f7 Merge branch 'main' into release 2026-01-15 10:16:38 +01:00
WBHarry
83329fac46 Merge branch 'main' into release 2026-01-10 00:23:09 +01:00
WBHarry
ee0b7b2792 Merge branch 'main' into release 2026-01-09 17:49:14 +01:00
WBHarry
4d062a6892 Merge branch 'main' into release 2025-12-31 04:52:34 +01:00
WBHarry
487c1fd9a2 Merge branch 'main' into release 2025-12-29 14:02:53 +01:00
WBHarry
3aa5cd806a Merge branch 'main' into release 2025-12-27 18:17:36 +01:00
WBHarry
2e93b79633 Merge branch 'main' into release 2025-12-24 03:06:02 +01:00
WBHarry
244dbd4902 Merge branch 'main' into release 2025-12-24 01:18:51 +01:00
WBHarry
c7aed6825a Merge branch 'main' into release 2025-12-13 23:06:23 +01:00
WBHarry
9cb5112b62 Merge branch 'main' into release 2025-12-08 02:35:06 +01:00
WBHarry
81b6f7fc51 Merge branch 'main' into release 2025-12-07 00:54:06 +01:00
WBHarry
828fffd552 Merge branch 'main' into release 2025-11-26 09:47:07 +01:00
WBHarry
fc5626ac47 Merge branch 'main' into release 2025-11-25 00:52:11 +01:00
WBHarry
2e62545aa7 Merge branch 'main' into release 2025-11-23 15:41:24 +01:00
WBHarry
b09c712dd5 Merging main 2025-11-20 11:48:58 +01:00
WBHarry
ca4336bd39 Merge branch 'main' into release 2025-11-17 16:55:14 +01:00
WBHarry
77ac11c522 Merge branch 'main' into release 2025-11-17 10:17:50 +01:00
WBHarry
50311679a5 Merge branch 'main' into release 2025-11-11 22:15:30 +01:00
WBHarry
3a7bcd1b0a Merge branch 'main' into release 2025-11-11 18:04:23 +01:00
WBHarry
511e4bd644 Merge branch 'main' into release 2025-11-11 16:23:35 +01:00
WBHarry
395820513b Merge branch 'main' into release 2025-11-11 16:06:03 +01:00
WBHarry
3566ea3fd3 Merge branch 'main' into release 2025-08-26 20:32:04 +02:00
WBHarry
29d502fb97 Merge branch 'main' into release 2025-08-24 21:11:38 +02:00
WBHarry
685a25d25a Merge branch 'main' into release 2025-08-22 01:47:03 +02:00
WBHarry
dd045b3df7 Merge branch 'main' into release 2025-08-19 20:58:05 +02:00
WBHarry
0aabcec340 Raised version 2025-08-19 18:56:30 +02:00
48 changed files with 175 additions and 157 deletions

View file

@ -35,7 +35,7 @@ jobs:
env: env:
version: ${{steps.get_version.outputs.version-without-v}} version: ${{steps.get_version.outputs.version-without-v}}
url: https://github.com/${{github.repository}} url: https://github.com/${{github.repository}}
manifest: https://github.com/${{github.repository}}/releases/latest/download/system.json manifest: https://raw.githubusercontent.com/${{github.repository}}/V13/system.json
download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip
# Create a zip file with all files required by the module to add to the release # Create a zip file with all files required by the module to add to the release

View file

@ -198,7 +198,10 @@
"type": { "label": "Type" } "type": { "label": "Type" }
}, },
"hordeDamage": "Horde Damage", "hordeDamage": "Horde Damage",
"horderHp": "Horde/HP" "horderHp": "Horde/HP",
"adversaryReactionRoll": {
"headerTitle": "Adversary Reaction Roll"
}
}, },
"Character": { "Character": {
"advantageSources": { "advantageSources": {
@ -440,6 +443,10 @@
"defaultOwnershipTooltip": "The default player ownership of countdowns", "defaultOwnershipTooltip": "The default player ownership of countdowns",
"hideNewCountdowns": "Hide New Countdowns" "hideNewCountdowns": "Hide New Countdowns"
}, },
"CreateItemDialog": {
"createItem": "Create Item",
"browseCompendium": "Browse Compendium"
},
"DaggerheartMenu": { "DaggerheartMenu": {
"title": "GM Tools", "title": "GM Tools",
"refreshFeatures": "Refresh Features" "refreshFeatures": "Refresh Features"
@ -653,6 +660,12 @@
"noPlayers": "No players to assign ownership to", "noPlayers": "No players to assign ownership to",
"default": "Default Ownership" "default": "Default Ownership"
}, },
"PendingReactionsDialog": {
"title": "Pending Reaction Rolls Found",
"unfinishedRolls": "Some Tokens still need to roll their Reaction Roll.",
"confirmation": "Are you sure you want to continue ?",
"warning": "Undone reaction rolls will be considered as failed"
},
"ReactionRoll": { "ReactionRoll": {
"title": "Reaction Roll: {trait}" "title": "Reaction Roll: {trait}"
}, },
@ -684,7 +697,13 @@
"damageNotRolled": "Damage not rolled in chat message yet", "damageNotRolled": "Damage not rolled in chat message yet",
"insufficientHope": "The initiating character doesn't have enough hope", "insufficientHope": "The initiating character doesn't have enough hope",
"createTagTeam": "Create TagTeam Roll", "createTagTeam": "Create TagTeam Roll",
"chatMessageRollTitle": "Roll" "chatMessageRollTitle": "Roll",
"cancelConfirmTitle": "Cancel Tag Team Roll",
"cancelConfirmText": "Are you sure you want to cancel the Tag Team Roll? This will close it for all other players too.",
"hints": {
"completeRolls": "Set up and complete the rolls for the characters",
"selectRoll": "Select which roll value to be used for the Tag Team"
}
}, },
"TokenConfig": { "TokenConfig": {
"actorSizeUsed": "Actor size is set, determining the dimensions" "actorSizeUsed": "Actor size is set, determining the dimensions"
@ -1215,6 +1234,11 @@
"on": "On", "on": "On",
"onWithToggle": "On With Toggle" "onWithToggle": "On With Toggle"
}, },
"SceneRangeMeasurementTypes": {
"disable": "Disable Daggerheart Range Measurement",
"default": "Default",
"custom": "Custom"
},
"SelectAction": { "SelectAction": {
"selectType": "Select Action Type", "selectType": "Select Action Type",
"selectAction": "Action Selection" "selectAction": "Action Selection"
@ -2305,6 +2329,7 @@
"multiclass": "Multiclass", "multiclass": "Multiclass",
"newCategory": "New Category", "newCategory": "New Category",
"newThing": "New {thing}", "newThing": "New {thing}",
"next": "Next",
"none": "None", "none": "None",
"noTarget": "No current target", "noTarget": "No current target",
"partner": "Partner", "partner": "Partner",
@ -2332,6 +2357,7 @@
"scalable": "Scalable", "scalable": "Scalable",
"scars": "Scars", "scars": "Scars",
"situationalBonus": "Situational Bonus", "situationalBonus": "Situational Bonus",
"searchPlaceholder": "Search...",
"spent": "Spent", "spent": "Spent",
"step": "Step", "step": "Step",
"stress": "Stress", "stress": "Stress",
@ -2915,6 +2941,9 @@
"resourceRoll": { "resourceRoll": {
"playerMessage": "{user} rerolled their {name}" "playerMessage": "{user} rerolled their {name}"
}, },
"saveRoll": {
"reactionRollAllTargets": "Reaction Roll All Targets"
},
"tagTeam": { "tagTeam": {
"title": "Tag Team", "title": "Tag Team",
"membersTitle": "Members" "membersTitle": "Members"
@ -2943,7 +2972,6 @@
"title": "Daggerheart Compendium Browser", "title": "Daggerheart Compendium Browser",
"hint": "Select a Folder in sidebar to start browsing through the compendium", "hint": "Select a Folder in sidebar to start browsing through the compendium",
"browserSettings": "Browser Settings", "browserSettings": "Browser Settings",
"searchPlaceholder": "Search...",
"columnName": "Name", "columnName": "Name",
"tooltipFilters": "Filters", "tooltipFilters": "Filters",
"tooltipErase": "Erase", "tooltipErase": "Erase",
@ -2979,7 +3007,7 @@
"weapons": "Weapons", "weapons": "Weapons",
"armors": "Armors", "armors": "Armors",
"consumables": "Consumables", "consumables": "Consumables",
"loots": "Loots" "loots": "Loot"
} }
}, },
"Notifications": { "Notifications": {
@ -3070,6 +3098,7 @@
"companion": "Level {level} - {partner}", "companion": "Level {level} - {partner}",
"companionNoPartner": "No Partner", "companionNoPartner": "No Partner",
"duplicateToNewTier": "Duplicate to New Tier", "duplicateToNewTier": "Duplicate to New Tier",
"createAdversary": "Create Adversary",
"pickTierTitle": "Pick a new tier for this adversary" "pickTierTitle": "Pick a new tier for this adversary"
}, },
"daggerheartMenu": { "daggerheartMenu": {

View file

@ -118,8 +118,13 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
break; break;
case 'footer': case 'footer':
partContext.buttons = [ partContext.buttons = [
{ type: 'button', action: 'reset', icon: 'fa-solid fa-arrow-rotate-left', label: 'Reset' }, {
{ type: 'submit', icon: 'fa-solid fa-floppy-disk', label: 'Save Changes' } type: 'button',
action: 'reset',
icon: 'fa-solid fa-arrow-rotate-left',
label: game.i18n.localize('ACTIONS.Reset')
},
{ type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('EDITOR.Save') }
]; ];
break; break;
} }

View file

@ -217,8 +217,8 @@ export default class AdversarySheet extends DHBaseActorSheet {
static #reactionRoll(event) { static #reactionRoll(event) {
const config = { const config = {
event, event,
title: `Reaction Roll: ${this.actor.name}`, title: game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll'),
headerTitle: 'Adversary Reaction Roll', headerTitle: game.i18n.localize('DAGGERHEART.ACTORS.Adversary.adversaryReactionRoll.headerTitle'),
roll: { roll: {
type: 'trait' type: 'trait'
}, },

View file

@ -229,7 +229,7 @@ export default class Party extends DHBaseActorSheet {
title: game.i18n.localize(`DAGGERHEART.APPLICATIONS.Downtime.${button.dataset.type}.title`), title: game.i18n.localize(`DAGGERHEART.APPLICATIONS.Downtime.${button.dataset.type}.title`),
icon: button.dataset.type === 'shortRest' ? 'fa-solid fa-utensils' : 'fa-solid fa-bed' icon: button.dataset.type === 'shortRest' ? 'fa-solid fa-utensils' : 'fa-solid fa-bed'
}, },
content: 'This will trigger a dialog to players make their downtime moves, are you sure?', content: game.i18n.localize('DAGGERHEART.ACTORS.Party.triggerRestContent'),
classes: ['daggerheart', 'dialog', 'dh-style'] classes: ['daggerheart', 'dialog', 'dh-style']
}); });

View file

@ -652,12 +652,12 @@ export default function DHApplicationMixin(Base) {
buttons: [ buttons: [
{ {
action: 'create', action: 'create',
label: 'Create Item', label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.createItem'),
icon: 'fa-solid fa-plus' icon: 'fa-solid fa-plus'
}, },
{ {
action: 'browse', action: 'browse',
label: 'Browse Compendium', label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.browseCompendium'),
icon: 'fa-solid fa-book' icon: 'fa-solid fa-book'
} }
] ]

View file

@ -76,7 +76,7 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' }, window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
content, content,
ok: { ok: {
label: 'Create Adversary', label: 'DAGGERHEART.UI.Sidebar.actorDirectory.createAdversary',
callback: (event, button, dialog) => Number(button.form.elements.tier.value) callback: (event, button, dialog) => Number(button.form.elements.tier.value)
} }
}); });

View file

@ -22,7 +22,7 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV
tag: 'div', tag: 'div',
window: { window: {
frame: true, frame: true,
title: 'Fear', title: 'DAGGERHEART.GENERAL.fear',
positioned: true, positioned: true,
resizable: true, resizable: true,
minimizable: false minimizable: false

View file

@ -207,8 +207,23 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
label: game.i18n.localize(col.label) label: game.i18n.localize(col.label)
})); }));
const splitPath = folderId?.split('.') ?? [];
const { pathLabels } = splitPath.reduce(
(acc, curr) => {
acc.currentPath = !acc.currentPath ? curr : [acc.currentPath, curr].join('.');
if (curr === 'folder') return acc;
const label = foundry.utils.getProperty(this.config, acc.currentPath)?.label;
if (label) acc.pathLabels.push(game.i18n.localize(label));
return acc;
},
{ pathLabels: [], currentPath: '' }
);
this.selectedMenu = { this.selectedMenu = {
path: folderId?.split('.') ?? [], path: splitPath,
pathLabels: pathLabels,
data: { data: {
...folderData, ...folderData,
columns: columns columns: columns

View file

@ -188,7 +188,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
})); }));
const damageTypeFilter = Object.values(CONFIG.DH.GENERAL.damageTypes).map(({ id, abbreviation }) => ({ const damageTypeFilter = Object.values(CONFIG.DH.GENERAL.damageTypes).map(({ id, abbreviation }) => ({
group: 'Damage Type', //TODO localize group: game.i18n.localize('DAGGERHEART.GENERAL.damageType'),
name: game.i18n.localize(abbreviation), name: game.i18n.localize(abbreviation),
filter: { filter: {
field: 'system.damage.type', field: 'system.damage.type',

View file

@ -18,7 +18,7 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
static getRangeLabels(distanceValue, settings) { static getRangeLabels(distanceValue, settings) {
let result = { distance: distanceValue, units: '' }; let result = { distance: distanceValue, units: '' };
if (!settings.enabled) return result; if (!settings.enabled || !canvas.scene) return result;
const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement; const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting; const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;

View file

@ -943,14 +943,14 @@ export const countdownAppMode = {
export const sceneRangeMeasurementSetting = { export const sceneRangeMeasurementSetting = {
disable: { disable: {
id: 'disable', id: 'disable',
label: 'Disable Daggerheart Range Measurement' label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.disable'
}, },
default: { default: {
id: 'default', id: 'default',
label: 'Default' label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.default'
}, },
custom: { custom: {
id: 'custom', id: 'custom',
label: 'Custom' label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.custom'
} }
}; };

View file

@ -7,7 +7,12 @@ export const typeConfig = {
}, },
{ {
key: 'system.type', key: 'system.type',
label: 'DAGGERHEART.GENERAL.type' label: 'DAGGERHEART.GENERAL.type',
format: type => {
if (!type) return '-';
return CONFIG.DH.ACTOR.allAdversaryTypes()[type].label;
}
} }
], ],
filters: [ filters: [
@ -318,7 +323,14 @@ export const typeConfig = {
}, },
{ {
key: 'system.domains', key: 'system.domains',
label: 'DAGGERHEART.GENERAL.Domain.plural' label: 'DAGGERHEART.GENERAL.Domain.plural',
format: domains => {
const config = CONFIG.DH.DOMAIN.allDomains();
return domains
.map(x => (x ? game.i18n.localize(config[x].label) : null))
.filter(x => x)
.join(', ');
}
} }
], ],
filters: [ filters: [
@ -367,7 +379,8 @@ export const typeConfig = {
}, },
{ {
key: 'system.spellcastingTrait', key: 'system.spellcastingTrait',
label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait' label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait',
format: trait => (trait ? `DAGGERHEART.CONFIG.Traits.${trait}.name` : '-')
} }
], ],
filters: [ filters: [

View file

@ -46,18 +46,14 @@ export const gameSettings = {
export const actionAutomationChoices = { export const actionAutomationChoices = {
never: { never: {
id: 'never', id: 'never',
label: 'Never' label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.never'
}, },
showDialog: { showDialog: {
id: 'showDialog', id: 'showDialog',
label: 'Show Dialog only' label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.showDialog'
}, },
// npcOnly: {
// id: "npcOnly",
// label: "Always for non-characters"
// },
always: { always: {
id: 'always', id: 'always',
label: 'Always' label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.always'
} }
}; };

View file

@ -295,7 +295,7 @@ export class DHDamageData extends DHResourceData {
required: true required: true
}), }),
{ {
label: 'Type' label: game.i18n.localize('DAGGERHEART.GENERAL.type')
} }
) )
}; };

View file

@ -197,8 +197,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
const pendingingSaves = targets.filter(t => t.saved.success === null); const pendingingSaves = targets.filter(t => t.saved.success === null);
if (pendingingSaves.length) { if (pendingingSaves.length) {
const confirm = await foundry.applications.api.DialogV2.confirm({ const confirm = await foundry.applications.api.DialogV2.confirm({
window: { title: 'Pending Reaction Rolls found' }, window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
content: `<p>Some Tokens still need to roll their Reaction Roll.</p><p>Are you sure you want to continue ?</p><p><i>Undone reaction rolls will be considered as failed</i></p>` content: `<p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p><p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p><p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>`
}); });
if (!confirm) return; if (!confirm) return;
} }

View file

@ -95,7 +95,7 @@ export default class DhTokenManager {
: this.#actor; : this.#actor;
const tokenData = await actor.getTokenDocument(); const tokenData = await actor.getTokenDocument();
const result = await canvas.scene.createEmbeddedDocuments('Token', [ const result = await canvas.scene.createEmbeddedDocuments('Token', [
{ ...tokenData, x: this.#activePreview.document.x, y: this.#activePreview.document.y } { ...tokenData.toObject(), x: this.#activePreview.document.x, y: this.#activePreview.document.y }
]); ]);
this.#activePreview = undefined; this.#activePreview = undefined;

View file

@ -65,13 +65,7 @@ export const renderMeasuredTemplate = async event => {
? '180' ? '180'
: undefined; : undefined;
let baseDistance = range; const distance = getTemplateDistance(range, type);
if (Number.isNaN(Number(range))) {
baseDistance = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement[
range
];
}
const distance = type === CONFIG.DH.GENERAL.templateTypes.EMANATION ? baseDistance + 2.5 : baseDistance;
const { width, height } = game.canvas.scene.dimensions; const { width, height } = game.canvas.scene.dimensions;
const data = { const data = {
@ -86,3 +80,23 @@ export const renderMeasuredTemplate = async event => {
CONFIG.ux.TemplateManager.createPreview(data); CONFIG.ux.TemplateManager.createPreview(data);
}; };
const getTemplateDistance = (range, type) => {
const rangeNumber = Number(range);
if (!Number.isNaN(rangeNumber)) return rangeNumber;
const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
const sceneMeasurements = canvas.scene?.flags.daggerheart?.rangeMeasurement;
const globalMeasurements = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.variantRules
).rangeMeasurement;
const settings = sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
const baseDistance = settings[range];
if (type !== CONFIG.DH.GENERAL.templateTypes.EMANATION) return baseDistance;
const emanationAddDistance = settings.melee / 2;
return baseDistance + emanationAddDistance;
};

View file

@ -36,7 +36,8 @@
"resultBased": false, "resultBased": false,
"value": { "value": {
"custom": { "custom": {
"enabled": false "enabled": false,
"formula": ""
}, },
"multiplier": "prof", "multiplier": "prof",
"dice": "d8", "dice": "d8",
@ -44,7 +45,9 @@
"flatMultiplier": 1 "flatMultiplier": 1
}, },
"applyTo": "hitPoints", "applyTo": "hitPoints",
"type": [], "type": [
"magical"
],
"base": false, "base": false,
"valueAlt": { "valueAlt": {
"multiplier": "prof", "multiplier": "prof",
@ -52,7 +55,8 @@
"dice": "d6", "dice": "d6",
"bonus": null, "bonus": null,
"custom": { "custom": {
"enabled": false "enabled": false,
"formula": ""
} }
} }
} }
@ -87,57 +91,6 @@
"name": "Cast", "name": "Cast",
"img": "icons/skills/melee/spear-tips-three-green.webp", "img": "icons/skills/melee/spear-tips-three-green.webp",
"range": "veryClose" "range": "veryClose"
},
"CUKoYyDxQhNc0pLs": {
"type": "damage",
"_id": "CUKoYyDxQhNc0pLs",
"systemPath": "actions",
"description": "<p>If a target you hit is <em>Vulnerable</em>, they take an extra <strong>1d8</strong> damage.</p>",
"chatDisplay": true,
"actionType": "action",
"cost": [],
"uses": {
"value": null,
"max": "",
"recovery": null
},
"damage": {
"parts": [
{
"value": {
"custom": {
"enabled": false
},
"multiplier": "flat",
"flatMultiplier": 1,
"dice": "d8",
"bonus": null
},
"applyTo": "hitPoints",
"type": [],
"base": false,
"resultBased": false,
"valueAlt": {
"multiplier": "prof",
"flatMultiplier": 1,
"dice": "d6",
"bonus": null,
"custom": {
"enabled": false
}
}
}
],
"includeBase": false
},
"target": {
"type": "any",
"amount": null
},
"effects": [],
"name": "Damage Against Vulnerable",
"img": "icons/skills/melee/spear-tips-three-purple.webp",
"range": ""
} }
}, },
"attribution": { "attribution": {

View file

@ -5,22 +5,14 @@
"_id": "ijWppQzSOqVCb3rE", "_id": "ijWppQzSOqVCb3rE",
"img": "icons/weapons/axes/axe-battle-jagged.webp", "img": "icons/weapons/axes/axe-battle-jagged.webp",
"system": { "system": {
"description": "", "description": "<strong>Protective</strong>: +1 to Armor Score",
"actions": {}, "actions": {},
"attached": [], "attached": [],
"tier": 3, "tier": 3,
"equipped": false, "equipped": false,
"secondary": false, "secondary": false,
"burden": "twoHanded", "burden": "twoHanded",
"weaponFeatures": [ "weaponFeatures": [],
{
"value": "protective",
"effectIds": [
"qTxADRsQnKiYfOiQ"
],
"actionIds": []
}
],
"attack": { "attack": {
"name": "Attack", "name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp", "img": "icons/skills/melee/blood-slash-foam-red.webp",
@ -111,13 +103,13 @@
"effects": [ "effects": [
{ {
"name": "Protective", "name": "Protective",
"description": "Add your character's Tier to your Armor Score", "description": "+1 to Armor Score",
"img": "icons/skills/melee/shield-block-gray-orange.webp", "img": "icons/magic/defensive/shield-barrier-deflect-teal.webp",
"changes": [ "changes": [
{ {
"key": "system.armorScore", "key": "system.armorScore",
"mode": 2, "mode": 2,
"value": "ITEM.@system.tier" "value": "1"
} }
], ],
"_id": "qTxADRsQnKiYfOiQ", "_id": "qTxADRsQnKiYfOiQ",

View file

@ -24,7 +24,7 @@
} }
h4 { h4 {
font-size: var(--font-size-16); font-size: var(--font-size-16);
color: @beige; color: light-dark(@dark, @beige);
font-weight: 600; font-weight: 600;
} }

View file

@ -10,6 +10,7 @@
.encounter-battlepoints { .encounter-battlepoints {
display: flex; display: flex;
cursor: help; cursor: help;
color: light-dark(@dark, @beige);
} }
.inner-controls { .inner-controls {

View file

@ -2,12 +2,15 @@
"id": "daggerheart", "id": "daggerheart",
"title": "Daggerheart", "title": "Daggerheart",
"description": "An unofficial implementation of the Daggerheart system", "description": "An unofficial implementation of the Daggerheart system",
"version": "1.9.6", "version": "1.9.9",
"compatibility": { "compatibility": {
"minimum": "13.346", "minimum": "13.346",
"verified": "13.351", "verified": "13.351",
"maximum": "13" "maximum": "13"
}, },
"url": "https://github.com/Foundryborne/daggerheart",
"manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/V13/system.json",
"download": "https://github.com/Foundryborne/daggerheart/releases/download/1.9.9/system.zip",
"authors": [ "authors": [
{ {
"name": "WBHarry" "name": "WBHarry"
@ -296,8 +299,5 @@
}, },
"background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png", "background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
"primaryTokenAttribute": "resources.hitPoints", "primaryTokenAttribute": "resources.hitPoints",
"secondaryTokenAttribute": "resources.stress", "secondaryTokenAttribute": "resources.stress"
"url": "https://your/hosted/system/repo/",
"manifest": "https://your/hosted/system/repo/system.json",
"download": "https://your/packaged/download/archive.zip"
} }

View file

@ -1,8 +1,8 @@
<section class="creation-action-footer"> <section class="creation-action-footer">
<button data-action="close">{{localize "Cancel"}}</button> <button data-action="close">{{localize "COMMON.Cancel"}}</button>
{{#if isLastTab}} {{#if isLastTab}}
<button data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button> <button data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button>
{{else}} {{else}}
<button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "Next"}}</button> <button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "DAGGERHEART.GENERAL.next"}}</button>
{{/if}} {{/if}}
</section> </section>

View file

@ -28,6 +28,6 @@
</div> </div>
</fieldset> </fieldset>
<button type="button" data-action="finishSelection">{{localize "Reset"}}</button> <button type="button" data-action="finishSelection">{{localize "ACTIONS.Reset"}}</button>
</div> </div>
</div> </div>

View file

@ -17,7 +17,7 @@
</div> </div>
<footer class="flexrow"> <footer class="flexrow">
<button data-action="close"> <button data-action="close">
<span>{{localize "Cancel"}}</span> <span>{{localize "COMMON.Cancel"}}</span>
</button> </button>
<button data-action="takeMove" {{#if (not this.selectedMove)}}disabled{{/if}}> <button data-action="takeMove" {{#if (not this.selectedMove)}}disabled{{/if}}>
<span> <span>

View file

@ -35,7 +35,7 @@
</span> </span>
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus"> <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="{{localize "DAGGERHEART.GENERAL.situationalBonus"}}">
</div> </div>
{{/each}} {{/each}}
{{#unless (empty @root.modifiers)}} {{#unless (empty @root.modifiers)}}

View file

@ -175,7 +175,7 @@
</select> </select>
{{/if}} {{/if}}
{{#if (eq @root.rollType 'DualityRoll')}}<span class="formula-label">{{localize "DAGGERHEART.GENERAL.situationalBonus"}}</span>{{/if}} {{#if (eq @root.rollType 'DualityRoll')}}<span class="formula-label">{{localize "DAGGERHEART.GENERAL.situationalBonus"}}</span>{{/if}}
<input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}Situational Bonus{{/if}}"> <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}{{localize "DAGGERHEART.GENERAL.situationalBonus"}}{{/if}}">
</fieldset> </fieldset>
{{/if}} {{/if}}
{{/unless}} {{/unless}}

View file

@ -28,7 +28,7 @@
</fieldset> </fieldset>
<footer> <footer>
<button type="button" data-action="close">{{localize "Cancel"}}</button> <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
<button type="button" data-action="takeDowntime" {{#if disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}</button> <button type="button" data-action="takeDowntime" {{#if disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}</button>
</footer> </footer>
</div> </div>

View file

@ -1,4 +1,4 @@
<div class="footer"> <div class="footer">
<button data-action="close">{{localize "Cancel"}}</button> <button data-action="close">{{localize "COMMON.Cancel"}}</button>
<button type="button" data-action="finishSelection">{{localize "DAGGERHEART.APPLICATIONS.ImageSelect.selectImage"}}</button> <button type="button" data-action="finishSelection">{{localize "DAGGERHEART.APPLICATIONS.ImageSelect.selectImage"}}</button>
</div> </div>

View file

@ -16,7 +16,7 @@
</div> </div>
<footer> <footer>
<button data-action="close">{{localize "Cancel"}}</button> <button data-action="close">{{localize "COMMON.Cancel"}}</button>
<button data-action="save" {{disabled multiclassDisabled}}>{{localize "DAGGERHEART.GENERAL.multiclass"}}</button> <button data-action="save" {{disabled multiclassDisabled}}>{{localize "DAGGERHEART.GENERAL.multiclass"}}</button>
</footer> </footer>
</div> </div>

View file

@ -20,7 +20,7 @@
{{/if}} {{/if}}
{{#unless levelupAuto}} {{#unless levelupAuto}}
<div class="levelup-footer"> <div class="levelup-footer">
<button type="button" data-action="close">{{localize "Cancel"}}</button> <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
<button type="button" data-action="save">{{localize "Save"}}</button> <button type="button" data-action="save">{{localize "Save"}}</button>
</div> </div>
{{/unless}} {{/unless}}

View file

@ -1,10 +1,10 @@
<footer class="form-footer"> <footer class="form-footer">
<button data-action="reset"> <button data-action="reset">
<i class="fa-solid fa-arrow-rotate-left"></i> <i class="fa-solid fa-arrow-rotate-left"></i>
<span>{{localize "Reset"}}</span> <span>{{localize "ACTIONS.Reset"}}</span>
</button> </button>
<button data-action="save" > <button data-action="save" >
<i class="fa-solid fa-floppy-disk"></i> <i class="fa-solid fa-floppy-disk"></i>
<span>{{localize "Save Changes"}}</span> <span>{{localize "EDITOR.Save"}}</span>
</button> </button>
</footer> </footer>

View file

@ -1,4 +1,4 @@
<section class='tab-form-footer spaced'> <section class='tab-form-footer spaced'>
<button data-action="close">{{localize "Cancel"}}</button> <button data-action="close">{{localize "COMMON.Cancel"}}</button>
<button data-action="saveForm"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button> <button data-action="saveForm"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
</section> </section>

View file

@ -1,10 +1,10 @@
<footer class="form-footer"> <footer class="form-footer">
<button type="button" data-action="reset"> <button type="button" data-action="reset">
<i class="fa-solid fa-arrow-rotate-left"></i> <i class="fa-solid fa-arrow-rotate-left"></i>
<span>{{localize "Reset"}}</span> <span>{{localize "ACTIONS.Reset"}}</span>
</button> </button>
<button type="button" data-action="save" > <button type="button" data-action="save" >
<i class="fa-solid fa-floppy-disk"></i> <i class="fa-solid fa-floppy-disk"></i>
<span>{{localize "Save Changes"}}</span> <span>{{localize "EDITOR.Save"}}</span>
</button> </button>
</footer> </footer>

View file

@ -1,10 +1,10 @@
<footer class="form-footer"> <footer class="form-footer">
<button data-action="reset"> <button data-action="reset">
<i class="fa-solid fa-arrow-rotate-left"></i> <i class="fa-solid fa-arrow-rotate-left"></i>
<span>{{localize "Reset"}}</span> <span>{{localize "ACTIONS.Reset"}}</span>
</button> </button>
<button data-action="save" > <button data-action="save" >
<i class="fa-solid fa-floppy-disk"></i> <i class="fa-solid fa-floppy-disk"></i>
<span>{{localize "Save Changes"}}</span> <span>{{localize "EDITOR.Save"}}</span>
</button> </button>
</footer> </footer>

View file

@ -32,11 +32,11 @@
<footer class="form-footer"> <footer class="form-footer">
<button data-action="reset"> <button data-action="reset">
<i class="fa-solid fa-arrow-rotate-left"></i> <i class="fa-solid fa-arrow-rotate-left"></i>
<span>{{localize "Reset"}}</span> <span>{{localize "ACTIONS.ResetReset"}}</span>
</button> </button>
<button data-action="save" > <button data-action="save" >
<i class="fa-solid fa-floppy-disk"></i> <i class="fa-solid fa-floppy-disk"></i>
<span>{{localize "Save Changes"}}</span> <span>{{localize "EDITOR.Save"}}</span>
</button> </button>
</footer> </footer>
</div> </div>

View file

@ -5,7 +5,7 @@
<div class="icon"> <div class="icon">
<i class="fa-solid fa-magnifying-glass"></i> <i class="fa-solid fa-magnifying-glass"></i>
</div> </div>
<input type="search" name="search" class="search-inventory" placeholder="Search..."> <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
</div> </div>
<a class="filter-button"> <a class="filter-button">
<i class="fa-solid fa-filter"></i> <i class="fa-solid fa-filter"></i>

View file

@ -5,7 +5,7 @@
<div class="icon"> <div class="icon">
<i class="fa-solid fa-magnifying-glass"></i> <i class="fa-solid fa-magnifying-glass"></i>
</div> </div>
<input type="search" name="search" class="search-loadout" placeholder="Search..."> <input type="search" name="search" class="search-loadout" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
</div> </div>
<a class="filter-button"> <a class="filter-button">
<i class="fa-solid fa-filter"></i> <i class="fa-solid fa-filter"></i>

View file

@ -5,7 +5,7 @@
<div class="icon"> <div class="icon">
<i class="fa-solid fa-magnifying-glass"></i> <i class="fa-solid fa-magnifying-glass"></i>
</div> </div>
<input type="search" name="search" class="search-inventory" placeholder="Search..."> <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
</div> </div>
<a class="filter-button"> <a class="filter-button">
<i class="fa-solid fa-filter"></i> <i class="fa-solid fa-filter"></i>

View file

@ -7,11 +7,11 @@
<div class="actions-section"> <div class="actions-section">
<button data-action="tagTeamRoll"> <button data-action="tagTeamRoll">
<i class="fa-solid fa-user-group"></i> <i class="fa-solid fa-user-group"></i>
<span>Tag Team Roll</span> <span>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.title"}}</span>
</button> </button>
<button data-action="groupRoll"> <button data-action="groupRoll">
<i class="fa-solid fa-users"></i> <i class="fa-solid fa-users"></i>
<span>Group Roll</span> <span>{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.title"}}</span>
</button> </button>
{{!-- NOT YET IMPLEMENTED --}} {{!-- NOT YET IMPLEMENTED --}}
{{!-- <button> {{!-- <button>

View file

@ -1,9 +1,9 @@
<div class="item-description-outer-container">
{{#if features.length}} {{#if features.length}}
<div class="item-description-outer-container">
<div class="item-description-container"> <div class="item-description-container">
{{#each features as | feature |}} {{#each features as | feature |}}
<div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div> <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
{{/each}} {{/each}}
</div> </div>
{{/if}}
</div> </div>
{{/if}}

View file

@ -1,9 +1,9 @@
<div class="item-description-outer-container">
{{#if features.length}} {{#if features.length}}
<div class="item-description-outer-container">
<div class="item-description-container"> <div class="item-description-container">
{{#each features as | feature |}} {{#each features as | feature |}}
<div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div> <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
{{/each}} {{/each}}
</div> </div>
{{/if}}
</div> </div>
{{/if}}

View file

@ -24,7 +24,7 @@
<div class="roll-part-header"><div></div></div> <div class="roll-part-header"><div></div></div>
</div> </div>
{{/if}} {{/if}}
{{#if (and hasSave currentTargets.length)}}<div class="roll-part-extra roll-all-save-button">Reaction Roll All Targets<i class="fa-solid fa-shield fa-lg"></i></div>{{/if}} {{#if (and hasSave currentTargets.length)}}<div class="roll-part-extra roll-all-save-button">{{localize "DAGGERHEART.UI.Chat.saveRoll.reactionRollAllTargets"}}<i class="fa-solid fa-shield fa-lg"></i></div>{{/if}}
{{#each currentTargets}} {{#each currentTargets}}
<div class="roll-target" data-token="{{id}}"> <div class="roll-target" data-token="{{id}}">
<img class="target-img" src="{{img}}"> <img class="target-img" src="{{img}}">

View file

@ -1,14 +1,14 @@
<div class="compendium-results"> <div class="compendium-results">
{{#if menu.path.length }} {{#if menu.path.length }}
<div class="menu-path"> <div class="menu-path">
{{#each menu.path}} {{#each menu.pathLabels}}
{{#if (eq this "folders")}} {{#unless @first}}
<span class="path-link"> <span class="path-link">
/ /
</span> </span>
{{else}} {{/unless}}
<span class="item-path">{{this}}</span> <span class="item-path">{{this}}</span>
{{/if}}
{{/each}} {{/each}}
</div> </div>
<div class="item-filter"> <div class="item-filter">
@ -17,7 +17,7 @@
<div class="icon"> <div class="icon">
<i class="fa-solid fa-magnifying-glass"></i> <i class="fa-solid fa-magnifying-glass"></i>
</div> </div>
<input type="search" name="search" class="search-input" placeholder="{{localize 'DAGGERHEART.UI.ItemBrowser.searchPlaceholder'}}"> <input type="search" name="search" class="search-input" placeholder="{{localize 'DAGGERHEART.GENERAL.searchPlaceholder'}}">
</div> </div>
<a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipFilters'}}" data-action="expandContent" disabled><i class="fa-solid fa-filter"></i></a> <a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipFilters'}}" data-action="expandContent" disabled><i class="fa-solid fa-filter"></i></a>
<a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipErase'}}" data-action="resetFilters"><i class="fa-solid fa-eraser"></i></a> <a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipErase'}}" data-action="resetFilters"><i class="fa-solid fa-eraser"></i></a>

View file

@ -16,7 +16,7 @@
{{#if (gt item.cost.length 0)}} {{#if (gt item.cost.length 0)}}
{{#each item.cost as | cost |}} {{#each item.cost as | cost |}}
<div class="tag"> <div class="tag">
<span>{{localize "Type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span> <span>{{localize "DAGGERHEART.GENERAL.type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span>
</div> </div>
<div class="tag"> <div class="tag">
<span>{{localize "DAGGERHEART.GENERAL.value"}} {{cost.value}}</span> <span>{{localize "DAGGERHEART.GENERAL.value"}} {{cost.value}}</span>

View file

@ -11,7 +11,7 @@
{{/with}} {{/with}}
</div> </div>
<div class="tooltip-information"> <div class="tooltip-information">
<label>{{localize "Type"}}</label> <label>{{localize "DAGGERHEART.GENERAL.type"}}</label>
{{#with (lookup adversaryTypes item.system.type) as | type |}} {{#with (lookup adversaryTypes item.system.type) as | type |}}
<div>{{localize type.label}}</div> <div>{{localize type.label}}</div>
{{/with}} {{/with}}

View file

@ -1,6 +1,6 @@
<div class="daggerheart dh-style tooltip"> <div class="daggerheart dh-style tooltip">
<div class="tooltip-header"><h2>{{localize "Adversaries"}} ({{currentBP}}/{{maxBP}})</h2></div> <div class="tooltip-header"><h2>{{localize "DAGGERHEART.GENERAL.Adversary.plural"}} ({{currentBP}}/{{maxBP}})</h2></div>
<div class="battlepoint-categories-container"> <div class="battlepoint-categories-container">
<div class="battlepoint-categories-inner-container"> <div class="battlepoint-categories-inner-container">
{{#each categories as |category key|}} {{#each categories as |category key|}}
@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div class="tooltip-header"><h2>{{localize "Modifiers"}}</h2></div> <div class="tooltip-header"><h2>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</h2></div>
<div class="battlepoint-toggles-container"> <div class="battlepoint-toggles-container">
{{#each toggles as |toggle|}} {{#each toggles as |toggle|}}
<div class="battlepoint-toggle-container {{#if (and toggle.disabled (not toggle.checked))}}inactive{{/if}}"> <div class="battlepoint-toggle-container {{#if (and toggle.disabled (not toggle.checked))}}inactive{{/if}}">