diff --git a/.editorconfig b/.editorconfig
index 8bbc2b52..6cfef2fc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,5 @@
[*]
indent_size = 4
indent_style = spaces
+[*.yml]
+indent_size = 2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..fd9b922e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,42 @@
+name: Project CI
+
+on:
+ pull_request:
+ branches: [main]
+ push:
+ branches: [main]
+ workflow_dispatch:
+ branches: [main]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ node-version: [24.x]
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - uses: actions/setup-node@v4
+ with:
+ node-version: ${{ matrix.node-version }}
+
+ - uses: pnpm/action-setup@v4
+ with:
+ version: 10
+
+ - name: Cache NPM Deps
+ id: cache-npm
+ uses: actions/cache@v3
+ with:
+ path: node_modules/
+ key: npm-${{ hashFiles('package-lock.json') }}
+
+ - name: Install NPM Deps
+ if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
+ run: npm ci
+
+ - name: Lint
+ run: npm run lint
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9099005..261c26bd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,78 +1,9 @@
-# Contributing to Foundryborne
+# Contributing to Daggerheart
-Welcome! This is a community-driven project to bring [Daggerheart](https://www.daggerheart.com/) to [FoundryVTT](https://foundryvtt.com/) as a full system. We're excited to have you here and appreciate your interest in contributing.
+Thank you for your interest in contributing to the Foundryborne project!
----
+To ensure that all contributions align with our project goals and architectural standards, we ask that you **do not submit outside contributions without first receiving feedback from the development team.**
-## π€ How to Contribute
+If you have an idea or a fix you'd like to contribute, please start a discussion or open an issue first. We'd love to hear from you and collaborate on the best way to move forward!
-We welcome contributions of all kinds:
-
-- Bug reports
-- Feature suggestions
-- Code contributions
-- UI/UX mockups
-- Documentation improvements
-- Questions and discussions
-
-Please be respectful and collaborative β weβre all here to build something great together.
-
-### Community Translations
-
-Please note that we are not accepting community translations in the main project. Instead, community translations should be published as a module.
-
----
-
-## π§ General Guidelines
-
-- **Use GitHub Issues** to report bugs or propose features
-- **Start a Discussion** for larger ideas or questions
-- **Open a Pull Request** once you've confirmed your work aligns with project direction
-- **Keep things modular and maintainable** β if you're not sure how to structure something, ask!
-- **Orient your code on existing examples**, and feel free to suggest a standard if it makes things clearer
-
----
-
-## ποΈ Project Structure
-
-Please try to follow the general logic of the existing code when submitting PRs.
-
-We encourage contributors to leave comments or open Discussions when proposing structural or organizational changes.
-
----
-
-## π§Ύ Issue & PR Best Practices
-
-**For Issues:**
-
-- Use clear, descriptive titles
-- Provide a concise explanation of the problem or idea
-- Include reproduction steps or example scenarios if it's a bug
-- Add screenshots or logs if helpful
-
-**For Pull Requests:**
-
-- Use a clear title summarizing the change
-- Provide a brief description of what your code does and why
-- Link to any related Issues
-- Keep PRs focused β smaller is better
-
----
-
-## π Labels and Boards
-
-We use GitHub labels to help organize contributions. If your issue or PR relates to a specific category, feel free to tag it. There is also a GitHub Project Board to help track active work and priorities.
-
----
-
-## π£ Communication
-
-Discussions are currently happening on GitHub β in Issues, PRs, and [GitHub Discussions](https://github.com/Foundryborne/daggerheart/discussions). You're welcome to use any of these, though we may consolidate to one in the future.
-
----
-
-## π€ Thank You!
-
-Whether you're fixing a typo or designing entire mechanics β every contribution matters. Thank you for helping bring _Daggerheart_ to life in FoundryVTT through **Foundryborne**!
-
-πΈπ οΈ
+Thank you for your understanding and support.
diff --git a/daggerheart.mjs b/daggerheart.mjs
index 43aafce4..7593d935 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -355,6 +355,8 @@ Hooks.on(CONFIG.DH.HOOKS.hooksConfig.groupRollStart, async data => {
});
const updateActorsRangeDependentEffects = async token => {
+ if (!token) return;
+
const rangeMeasurement = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.variantRules
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..ce2bb86f
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,14 @@
+import globals from 'globals';
+import { defineConfig } from 'eslint/config';
+import prettier from 'eslint-plugin-prettier';
+
+export default defineConfig([
+ { files: ['**/*.{js,mjs,cjs}'], languageOptions: { globals: globals.browser } },
+ { plugins: { prettier } },
+ {
+ files: ['**/*.{js,mjs,cjs}'],
+ rules: {
+ 'prettier/prettier': 'error'
+ }
+ }
+]);
diff --git a/lang/en.json b/lang/en.json
index a2c3dc79..a824d379 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -74,9 +74,7 @@
"name": "Summon",
"tooltip": "Create tokens in the scene.",
"error": "You do not have permission to summon tokens or there is no active scene.",
- "invalidDrop": "You can only drop Actor entities to summon.",
- "chatMessageTitle": "Test2",
- "chatMessageHeaderTitle": "Summoning"
+ "invalidDrop": "You can only drop Actor entities to summon."
},
"transform": {
"name": "Transform",
@@ -115,7 +113,9 @@
"deleteTriggerTitle": "Delete Trigger",
"deleteTriggerContent": "Are you sure you want to delete the {trigger} trigger?",
"advantageState": "Advantage State",
- "damageOnSave": "Damage on Save"
+ "damageOnSave": "Damage on Save",
+ "useDefaultItemValues": "Use default Item values",
+ "itemDamageIsUsed": "Item Damage Is Used"
},
"RollField": {
"diceRolling": {
@@ -130,7 +130,7 @@
"attackModifier": "Attack Modifier",
"attackName": "Attack Name",
"criticalThreshold": "Critical Threshold",
- "includeBase": { "label": "Include Item Damage" },
+ "includeBase": { "label": "Use Item Damage" },
"groupAttack": { "label": "Group Attack" },
"multiplier": "Multiplier",
"saveHint": "Set a default Trait to enable Reaction Roll. It can be changed later in Reaction Roll Dialog.",
@@ -215,6 +215,9 @@
"headerTitle": "Adversary Reaction Roll"
}
},
+ "Base": {
+ "CannotAddType": "Cannot add {itemType} items to {actorType} actors."
+ },
"Character": {
"advantageSources": {
"label": "Advantage Sources",
@@ -238,6 +241,8 @@
},
"defaultHopeDice": "Default Hope Dice",
"defaultFearDice": "Default Fear Dice",
+ "defaultAdvantageDice": "Default Advantage Dice",
+ "defaultDisadvantageDice": "Default Disadvantage Dice",
"disadvantageSources": {
"label": "Disadvantage Sources",
"hint": "Add single words or short text as reminders and hints of what a character has disadvantage on."
@@ -2016,6 +2021,10 @@
"hint": "Multiply any damage dealt to you by this number"
}
},
+ "Battlepoints": {
+ "full": "Battlepoints",
+ "short": "BP"
+ },
"Bonuses": {
"rest": {
"downtimeAction": "Downtime Action",
@@ -2431,6 +2440,7 @@
"next": "Next",
"none": "None",
"noTarget": "No current target",
+ "optionalThing": "Optional {thing}",
"partner": "Partner",
"player": {
"single": "Player",
@@ -2457,6 +2467,7 @@
"rollDamage": "Roll Damage",
"rollWith": "{roll} Roll",
"save": "Save",
+ "saveSettings": "Save Settings",
"scalable": "Scalable",
"scars": "Scars",
"situationalBonus": "Situational Bonus",
@@ -2611,8 +2622,14 @@
},
"Weapon": {
"weaponType": "Weapon Type",
- "primaryWeapon": "Primary Weapon",
- "secondaryWeapon": "Secondary Weapon"
+ "primaryWeapon": {
+ "full": "Primary Weapon",
+ "short": "Primary"
+ },
+ "secondaryWeapon": {
+ "full": "Secondary Weapon",
+ "short": "Secondary"
+ }
}
},
"MACROS": {
@@ -2866,6 +2883,10 @@
}
},
"Keybindings": {
+ "partySheet": {
+ "name": "Toggle Party Sheet",
+ "hint": "Open or close the active party's sheet"
+ },
"spotlight": {
"name": "Spotlight Combatant",
"hint": "Move the spotlight to a hovered or selected token that's present in an active encounter"
@@ -3067,6 +3088,7 @@
},
"ItemBrowser": {
"title": "Daggerheart Compendium Browser",
+ "windowTitle": "Compendium Browser",
"hint": "Select a Folder in sidebar to start browsing through the compendium",
"browserSettings": "Browser Settings",
"columnName": "Name",
@@ -3199,6 +3221,8 @@
"companion": "Level {level} - {partner}",
"companionNoPartner": "No Partner",
"duplicateToNewTier": "Duplicate to New Tier",
+ "activateParty": "Make Active Party",
+ "partyIsActive": "Active",
"createAdversary": "Create Adversary",
"pickTierTitle": "Pick a new tier for this adversary"
},
@@ -3211,6 +3235,7 @@
"Tooltip": {
"disableEffect": "Disable Effect",
"enableEffect": "Enable Effect",
+ "edit": "Edit",
"openItemWorld": "Open Item World",
"openActorWorld": "Open Actor World",
"sendToChat": "Send to Chat",
diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index e6c0f299..936bb79d 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -11,7 +11,10 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
this.character = character;
this.setup = {
- traits: this.character.system.traits,
+ traits: Object.keys(this.character.system.traits).reduce((acc, key) => {
+ acc[key] = { value: null };
+ return acc;
+ }, {}),
ancestryName: {
primary: '',
secondary: ''
@@ -377,8 +380,10 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
];
return Object.values(this.setup.traits).reduce((acc, x) => {
const index = traitCompareArray.indexOf(x.value);
+ if (index === -1) return acc;
+
traitCompareArray.splice(index, 1);
- acc += index !== -1;
+ acc += 1;
return acc;
}, 0);
}
diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 64fa168a..067aa473 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -123,6 +123,10 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
context.advantage = this.config.roll?.advantage;
context.disadvantage = this.config.roll?.disadvantage;
context.diceOptions = CONFIG.DH.GENERAL.diceTypes;
+ context.dieFaces = CONFIG.DH.GENERAL.dieFaces.reduce((acc, face) => {
+ acc[face] = `d${face}`;
+ return acc;
+ }, {});
context.isLite = this.config.roll?.lite;
context.extraFormula = this.config.extraFormula;
context.formula = this.roll.constructFormula(this.config);
@@ -152,9 +156,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
}
if (this.config.uses) this.config.uses = foundry.utils.mergeObject(this.config.uses, rest.uses);
if (rest.roll?.dice) {
- Object.entries(rest.roll.dice).forEach(([key, value]) => {
- this.roll[key] = value;
- });
+ this.roll = foundry.utils.mergeObject(this.roll, rest.roll.dice);
}
if (rest.hasOwnProperty('trait')) {
this.config.roll.trait = rest.trait;
@@ -173,6 +175,15 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
this.disadvantage = advantage === -1;
this.config.roll.advantage = this.config.roll.advantage === advantage ? 0 : advantage;
+
+ if (this.config.roll.advantage === 1 && this.config.data.rules.roll.defaultAdvantageDice) {
+ const faces = Number.parseInt(this.config.data.rules.roll.defaultAdvantageDice);
+ this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
+ } else if (this.config.roll.advantage === -1 && this.config.data.rules.roll.defaultDisadvantageDice) {
+ const faces = Number.parseInt(this.config.data.rules.roll.defaultDisadvantageDice);
+ this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
+ }
+
this.render();
}
diff --git a/module/applications/dialogs/downtime.mjs b/module/applications/dialogs/downtime.mjs
index 3475dee7..989e4625 100644
--- a/module/applications/dialogs/downtime.mjs
+++ b/module/applications/dialogs/downtime.mjs
@@ -259,8 +259,9 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
const resetValue = increasing
? 0
: feature.system.resource.max
- ? Roll.replaceFormulaData(feature.system.resource.max, this.actor)
+ ? new Roll(Roll.replaceFormulaData(feature.system.resource.max, this.actor)).evaluateSync().total
: 0;
+
await feature.update({ 'system.resource.value': resetValue });
}
diff --git a/module/applications/dialogs/itemTransfer.mjs b/module/applications/dialogs/itemTransfer.mjs
index ad3cf103..42e3a727 100644
--- a/module/applications/dialogs/itemTransfer.mjs
+++ b/module/applications/dialogs/itemTransfer.mjs
@@ -38,13 +38,15 @@ export default class ItemTransferDialog extends HandlebarsApplicationMixin(Appli
originActor ??= item?.actor;
const homebrewKey = CONFIG.DH.SETTINGS.gameSettings.Homebrew;
const currencySetting = game.settings.get(CONFIG.DH.id, homebrewKey).currency?.[currency] ?? null;
+ const max = item?.system.quantity ?? originActor.system.gold[currency] ?? 0;
return {
originActor,
targetActor,
itemImage: item?.img,
currencyIcon: currencySetting?.icon,
- max: item?.system.quantity ?? originActor.system.gold[currency] ?? 0,
+ max,
+ initial: targetActor.system.metadata.quantifiable?.includes(item.type) ? max : 1,
title: item?.name ?? currencySetting?.label
};
}
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 64e5a076..9de9e752 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -122,7 +122,7 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
type: 'button',
action: 'reset',
icon: 'fa-solid fa-arrow-rotate-left',
- label: game.i18n.localize('ACTIONS.Reset')
+ label: game.i18n.localize('SETTINGS.UI.ACTIONS.Reset')
},
{ type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('EDITOR.Save') }
];
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index f2686fdd..c59dd64e 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -12,8 +12,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
static DEFAULT_OPTIONS = {
classes: ['character'],
position: { width: 850, height: 800 },
- /* Foundry adds disabled to all buttons and inputs if editPermission is missing. This is not desired. */
- editPermission: CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
actions: {
toggleVault: CharacterSheet.#toggleVault,
rollAttribute: CharacterSheet.#rollAttribute,
@@ -68,7 +66,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
}
},
{
- handler: CharacterSheet.#getEquipamentContextOptions,
+ handler: CharacterSheet.#getEquipmentContextOptions,
selector: '[data-item-uuid][data-type="armor"], [data-item-uuid][data-type="weapon"]',
options: {
parentClassHooks: false,
@@ -170,6 +168,16 @@ export default class CharacterSheet extends DHBaseActorSheet {
return applicationOptions;
}
+ /** @inheritdoc */
+ _toggleDisabled(disabled) {
+ // Overriden to only disable text inputs by default.
+ // Everything else is done by checking @root.editable in the sheet
+ const form = this.form;
+ for (const input of form.querySelectorAll('input:not([type=search]), .editor.prosemirror')) {
+ input.disabled = disabled;
+ }
+ }
+
/** @inheritDoc */
async _onRender(context, options) {
await super._onRender(context, options);
@@ -315,11 +323,11 @@ export default class CharacterSheet extends DHBaseActorSheet {
/**@type {import('@client/applications/ux/context-menu.mjs').ContextMenuEntry[]} */
const options = [
{
- name: 'toLoadout',
+ label: 'toLoadout',
icon: 'fa-solid fa-arrow-up',
- condition: target => {
+ visible: target => {
const doc = getDocFromElementSync(target);
- return doc && doc.system.inVault;
+ return doc?.isOwner && doc.system.inVault;
},
callback: async target => {
const doc = await getDocFromElement(target);
@@ -329,11 +337,11 @@ export default class CharacterSheet extends DHBaseActorSheet {
}
},
{
- name: 'recall',
+ label: 'recall',
icon: 'fa-solid fa-bolt-lightning',
- condition: target => {
+ visible: target => {
const doc = getDocFromElementSync(target);
- return doc && doc.system.inVault;
+ return doc?.isOwner && doc.system.inVault;
},
callback: async (target, event) => {
const doc = await getDocFromElement(target);
@@ -368,17 +376,17 @@ export default class CharacterSheet extends DHBaseActorSheet {
}
},
{
- name: 'toVault',
+ label: 'toVault',
icon: 'fa-solid fa-arrow-down',
- condition: target => {
+ visible: target => {
const doc = getDocFromElementSync(target);
- return doc && !doc.system.inVault;
+ return doc?.isOwner && !doc.system.inVault;
},
callback: async target => (await getDocFromElement(target)).update({ 'system.inVault': true })
}
].map(option => ({
...option,
- name: `DAGGERHEART.APPLICATIONS.ContextMenu.${option.name}`,
+ label: `DAGGERHEART.APPLICATIONS.ContextMenu.${option.label}`,
icon: `Spend a Fear to summon a number of @UUID[Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9]{Fallen Shock Troops} equal to twice the number of PCs. The Shock Troops appear at Far range.
",
"resource": null,
"actions": {
- "hGMzqw00JTlYfHYy": {
- "type": "effect",
- "_id": "hGMzqw00JTlYfHYy",
+ "SrU7qbh8LcOgfozT": {
+ "type": "summon",
+ "_id": "SrU7qbh8LcOgfozT",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
+ "triggers": [],
"cost": [
{
"scalable": false,
"key": "fear",
"value": 1,
- "step": null
+ "itemId": null,
+ "step": null,
+ "consumeOnSuccess": false
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
- },
- "effects": [],
- "target": {
- "type": "self",
- "amount": null
+ "recovery": null,
+ "consumeOnSuccess": false
},
+ "summon": [
+ {
+ "actorUUID": "Compendium.daggerheart.adversaries.Actor.OsLG2BjaEdTZUJU9",
+ "count": "@partySize*2"
+ }
+ ],
"name": "Spend Fear",
- "img": "icons/magic/death/undead-skeleton-worn-blue.webp",
- "range": ""
+ "range": "far"
}
},
"originItemType": null,
diff --git a/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json b/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json
index b17cd7da..eb9696b2 100644
--- a/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json
+++ b/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json
@@ -68,31 +68,33 @@
"type": "withinRange",
"target": "hostile",
"range": "melee"
+ },
+ "changes": [
+ {
+ "key": "system.resistance.physical.resistance",
+ "type": "override",
+ "value": 1,
+ "priority": null,
+ "phase": "initial"
+ },
+ {
+ "key": "system.disadvantageSources",
+ "type": "add",
+ "value": "Action rolls",
+ "priority": null,
+ "phase": "initial"
+ }
+ ],
+ "duration": {
+ "type": ""
}
},
- "changes": [
- {
- "key": "system.resistance.physical.resistance",
- "mode": 5,
- "value": "1",
- "priority": null
- },
- {
- "key": "system.disadvantageSources",
- "mode": 2,
- "value": "Retract",
- "priority": null
- }
- ],
"disabled": true,
"duration": {
- "startTime": null,
- "combat": null,
- "seconds": null,
- "rounds": null,
- "turns": null,
- "startRound": null,
- "startTurn": null
+ "value": null,
+ "units": "seconds",
+ "expiry": null,
+ "expired": false
},
"description": "While in your shell, you have resistance to physical damage, you have disadvantage on action rolls, and you canβt move.
",
"tint": "#ffffff",
@@ -102,6 +104,16 @@
"_stats": {
"compendiumSource": null
},
+ "start": {
+ "time": 0,
+ "combat": null,
+ "combatant": null,
+ "initiative": null,
+ "round": null,
+ "turn": null
+ },
+ "showIcon": 1,
+ "folder": null,
"_key": "!items.effects!UFR67BUOhNGLFyg9.3V4FPoyjJUnFP9WS"
}
],
diff --git a/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json b/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json
index f1ed3ace..c95d9132 100644
--- a/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json
+++ b/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json
@@ -29,39 +29,28 @@
"type": "withinRange",
"target": "hostile",
"range": "melee"
+ },
+ "changes": [
+ {
+ "key": "system.advantageSources",
+ "type": "add",
+ "value": "Rolls to hide, investigate, or perceive details in low light",
+ "priority": null,
+ "phase": "initial"
+ }
+ ],
+ "duration": {
+ "type": ""
}
},
- "changes": [
- {
- "key": "system.advantageSources",
- "mode": 2,
- "value": "In an area with low light or heavy shadow: hide, investigate, or perceive",
- "priority": null
- },
- {
- "key": "system.advantageSources",
- "mode": 2,
- "value": "",
- "priority": null
- },
- {
- "key": "",
- "mode": 2,
- "value": "",
- "priority": null
- }
- ],
"disabled": false,
"duration": {
- "startTime": null,
- "combat": null,
- "seconds": null,
- "rounds": null,
- "turns": null,
- "startRound": null,
- "startTurn": null
+ "value": null,
+ "units": "seconds",
+ "expiry": null,
+ "expired": false
},
- "description": "",
+ "description": "When youβre in an area with low light or heavy shadow, you have advantage on rolls to hide, investigate, or perceive details within that area.
",
"origin": null,
"tint": "#ffffff",
"transfer": true,
@@ -71,6 +60,16 @@
"_stats": {
"compendiumSource": null
},
+ "start": {
+ "time": 0,
+ "combat": null,
+ "combatant": null,
+ "initiative": null,
+ "round": null,
+ "turn": null
+ },
+ "showIcon": 1,
+ "folder": null,
"_key": "!items.effects!aMla3xQuCHEwORGD.pCp32u7UwqxCI4WW"
}
],
diff --git a/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json b/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json
index c9ae6071..1fde286d 100644
--- a/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json
+++ b/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json
@@ -132,27 +132,29 @@
"type": "withinRange",
"target": "hostile",
"range": "melee"
+ },
+ "changes": [
+ {
+ "key": "system.advantageSources",
+ "type": "add",
+ "value": "On Attacks",
+ "priority": null,
+ "phase": "initial"
+ }
+ ],
+ "duration": {
+ "type": "temporary",
+ "description": "Until you or an ally rolls a failure with Fear.
"
}
},
- "changes": [
- {
- "key": "system.advantageSources",
- "mode": 2,
- "value": "1",
- "priority": null
- }
- ],
"disabled": false,
"duration": {
- "startTime": null,
- "combat": null,
- "seconds": null,
- "rounds": null,
- "turns": null,
- "startRound": null,
- "startTurn": null
+ "value": null,
+ "units": "seconds",
+ "expiry": null,
+ "expired": false
},
- "description": "",
+ "description": "You gain advantage on attack rolls until you or an ally rolls a failure with Fear.
",
"tint": "#ffffff",
"statuses": [],
"sort": 0,
@@ -160,6 +162,16 @@
"_stats": {
"compendiumSource": null
},
+ "start": {
+ "time": 0,
+ "combat": null,
+ "combatant": null,
+ "initiative": null,
+ "round": null,
+ "turn": null
+ },
+ "showIcon": 1,
+ "folder": null,
"_key": "!items.effects!Ef1JsUG50LIoKx2F.s7ma4TNgAvt0ZgEW"
}
],
diff --git a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
index 75fc932f..0cab16a2 100644
--- a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
+++ b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
@@ -52,12 +52,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/forest.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -108,7 +105,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -134,7 +131,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -323,7 +321,42 @@
"system": {
"description": "A @UUID[Compendium.daggerheart.adversaries.Actor.8yUj2Mzvnifhxegm]{Young Dryad}, two @UUID[Compendium.daggerheart.adversaries.Actor.VtFBt9XBE0WrGGxP]{Sylvan Soldiers}, and a number of @UUID[Compendium.daggerheart.adversaries.Actor.G62k4oSkhkoXEs2D]{Minor Treants} equal to the number of PCs appear to confront the party for their intrusion.
What are the grove guardians concealing? What threat to the forest could the PCs confront to appease the Dryad?
- Roll
- {{#if @root.hasBaseDamage}}{{formInput fields.useDefault name="roll.useDefault" value=source.useDefault dataset=(object tooltip="Use default Item values" tooltipDirection="UP")}}{{/if}}
+ {{localize "DAGGERHEART.GENERAL.roll"}}
+ {{#if @root.hasBaseDamage}}{{formInput fields.useDefault name="roll.useDefault" value=source.useDefault dataset=(object tooltip=(localize "DAGGERHEART.ACTIONS.Config.useDefaultItemValues") tooltipDirection="UP")}}{{/if}}
{{formField fields.type label="DAGGERHEART.GENERAL.type" name="roll.type" value=source.type localize=true choices=@root.getRollTypeOptions localize=true}}
diff --git a/templates/characterCreation/tabs/experience.hbs b/templates/characterCreation/tabs/experience.hbs
index 3eb92834..66363084 100644
--- a/templates/characterCreation/tabs/experience.hbs
+++ b/templates/characterCreation/tabs/experience.hbs
@@ -4,17 +4,25 @@
data-group='{{tabs.experience.group}}'
>
-
+
{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.initialExperiences"}} {{experience.nrSelected}}/{{experience.nrTotal}}
{{#each experience.values as |experience id|}}
-
-
-
-
{{numberFormat this.value sign=true}}
+
{{/each}}
diff --git a/templates/dialogs/characterReset.hbs b/templates/dialogs/characterReset.hbs
index 59f88437..0bd54f7c 100644
--- a/templates/dialogs/characterReset.hbs
+++ b/templates/dialogs/characterReset.hbs
@@ -28,6 +28,6 @@
-
{{localize "ACTIONS.Reset"}}
+
{{localize "SETTINGS.UI.ACTIONS.Reset"}}
- {{localize "Save Settings"}}
+ {{localize "DAGGERHEART.GENERAL.saveSettings"}}
\ No newline at end of file
diff --git a/templates/dialogs/dice-roll/rollSelection.hbs b/templates/dialogs/dice-roll/rollSelection.hbs
index 2deccaf2..2c1a21b6 100644
--- a/templates/dialogs/dice-roll/rollSelection.hbs
+++ b/templates/dialogs/dice-roll/rollSelection.hbs
@@ -157,8 +157,8 @@
{{add this 1}}
{{/times}}
-
- {{selectOptions diceOptions selected=(concat 'd' @root.roll.advantageFaces)}}
+
+ {{selectOptions dieFaces selected=@root.roll.advantageFaces}}
{{#if abilities}}
diff --git a/templates/dialogs/item-transfer.hbs b/templates/dialogs/item-transfer.hbs
index 0e7df3dc..63972ed8 100644
--- a/templates/dialogs/item-transfer.hbs
+++ b/templates/dialogs/item-transfer.hbs
@@ -14,7 +14,7 @@
diff --git a/templates/settings/automation-settings/footer.hbs b/templates/settings/automation-settings/footer.hbs
index 7e9d1991..14ff5bb5 100644
--- a/templates/settings/automation-settings/footer.hbs
+++ b/templates/settings/automation-settings/footer.hbs
@@ -1,7 +1,7 @@
diff --git a/templates/settings/homebrew-settings/footer.hbs b/templates/settings/homebrew-settings/footer.hbs
index ba1b5ada..fc84fde7 100644
--- a/templates/settings/homebrew-settings/footer.hbs
+++ b/templates/settings/homebrew-settings/footer.hbs
@@ -1,7 +1,7 @@