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/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e245c7fa..553a1a17 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,7 +35,7 @@ jobs:
env:
version: ${{steps.get_version.outputs.version-without-v}}
url: https://github.com/${{github.repository}}
- manifest: https://raw.githubusercontent.com/${{github.repository}}/main/system.json
+ manifest: https://raw.githubusercontent.com/${{github.repository}}/v14/system.json
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
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 240d8704..7593d935 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -343,7 +343,20 @@ Hooks.on(CONFIG.DH.HOOKS.hooksConfig.tagTeamStart, async data => {
}
});
+Hooks.on(CONFIG.DH.HOOKS.hooksConfig.groupRollStart, async data => {
+ if (data.openForAllPlayers && data.partyId) {
+ const party = game.actors.get(data.partyId);
+ if (!party) return;
+
+ const dialog = new game.system.api.applications.dialogs.GroupRollDialog(party);
+ dialog.tabGroups.application = 'groupRoll';
+ await dialog.render({ force: true });
+ }
+});
+
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 d19dfb58..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,8 @@
"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.",
"resultBased": {
@@ -209,7 +210,13 @@
"type": { "label": "Type" }
},
"hordeDamage": "Horde Damage",
- "horderHp": "Horde/HP"
+ "horderHp": "Horde/HP",
+ "adversaryReactionRoll": {
+ "headerTitle": "Adversary Reaction Roll"
+ }
+ },
+ "Base": {
+ "CannotAddType": "Cannot add {itemType} items to {actorType} actors."
},
"Character": {
"advantageSources": {
@@ -234,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."
@@ -318,6 +327,22 @@
}
},
"newAdversary": "New Adversary"
+ },
+ "Party": {
+ "Subtitle": {
+ "character": "{community} {ancestry} | {subclass} {class}",
+ "companion": "Companion of {partner}"
+ },
+ "RemoveConfirmation": {
+ "title": "Remove member {name}",
+ "text": "Are you sure you want to remove {name} from the party?"
+ },
+ "Thresholds": {
+ "minor": "MIN",
+ "major": "MAJ",
+ "severe": "SEV"
+ },
+ "triggerRestContent": "This will trigger a dialog to players make their downtime moves. Are you sure?"
}
},
"APPLICATIONS": {
@@ -353,7 +378,7 @@
"selectSecondaryWeapon": "Select Secondary Weapon",
"selectSubclass": "Select Subclass",
"setupSkipTitle": "Skipping Character Setup",
- "setupSkipContent": "You are skipping the Character Setup by adding this manually. The character setup is the blinking arrows in the top-right. Are you sure you want to continue?",
+ "setupSkipContent": "You are skipping the Character Setup by adding this manually. The character setup is the blinking button in the top-right. Are you sure you want to continue?",
"startingItems": "Starting Items",
"story": "Story",
"storyExplanation": "Select which background and connection prompts you want to copy into your character's background.",
@@ -451,6 +476,10 @@
"defaultOwnershipTooltip": "The default player ownership of countdowns",
"hideNewCountdowns": "Hide New Countdowns"
},
+ "CreateItemDialog": {
+ "createItem": "Create Item",
+ "browseCompendium": "Browse Compendium"
+ },
"DaggerheartMenu": {
"title": "GM Tools",
"refreshFeatures": "Refresh Features",
@@ -665,6 +694,12 @@
"noPlayers": "No players to assign ownership to",
"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": {
"title": "Reaction Roll: {trait}"
},
@@ -690,7 +725,7 @@
"FIELDS": {
"initiator": {
"memberId": { "label": "Initiating Character" },
- "cost": { "label": "Initiation Cost" }
+ "cost": { "label": "Hope Cost" }
}
},
"leaderTitle": "Initiating Character",
@@ -717,6 +752,17 @@
"selectRoll": "Select which roll value to be used for the Tag Team"
}
},
+ "GroupRollSelect": {
+ "title": "Group Roll",
+ "aidingCharacters": "Aiding Characters",
+ "leader": "Leader",
+ "leaderRoll": "Leader Roll",
+ "openDialogForAll": "Open Dialog For All",
+ "startGroupRoll": "Start Group Roll",
+ "finishGroupRoll": "Finish Group Roll",
+ "cancelConfirmTitle": "Cancel Group Roll",
+ "cancelConfirmText": "Are you sure you want to cancel the Group Roll? This will close it for all other players too."
+ },
"TokenConfig": {
"actorSizeUsed": "Actor size is set, determining the dimensions"
}
@@ -737,6 +783,11 @@
"session": "Next Session",
"custom": "Custom"
},
+ "ActionAutomationChoices": {
+ "never": "Never",
+ "showDialog": "Show Dialog Only",
+ "always": "Always"
+ },
"AdversaryTrait": {
"relentless": {
"name": "Relentless",
@@ -1266,6 +1317,11 @@
"on": "On",
"onWithToggle": "On With Toggle"
},
+ "SceneRangeMeasurementTypes": {
+ "disable": "Disable Daggerheart Range Measurement",
+ "default": "Default",
+ "custom": "Custom"
+ },
"SelectAction": {
"selectType": "Select Action Type",
"selectAction": "Action Selection"
@@ -1965,6 +2021,10 @@
"hint": "Multiply any damage dealt to you by this number"
}
},
+ "Battlepoints": {
+ "full": "Battlepoints",
+ "short": "BP"
+ },
"Bonuses": {
"rest": {
"downtimeAction": "Downtime Action",
@@ -2377,8 +2437,10 @@
"multiclass": "Multiclass",
"newCategory": "New Category",
"newThing": "New {thing}",
+ "next": "Next",
"none": "None",
"noTarget": "No current target",
+ "optionalThing": "Optional {thing}",
"partner": "Partner",
"player": {
"single": "Player",
@@ -2405,9 +2467,11 @@
"rollDamage": "Roll Damage",
"rollWith": "{roll} Roll",
"save": "Save",
+ "saveSettings": "Save Settings",
"scalable": "Scalable",
"scars": "Scars",
"situationalBonus": "Situational Bonus",
+ "searchPlaceholder": "Search...",
"spent": "Spent",
"step": "Step",
"stress": "Stress",
@@ -2558,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": {
@@ -2813,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"
@@ -2857,6 +2931,7 @@
"system": "Dice Preset",
"font": "Font",
"critical": "Duality Critical Animation",
+ "muted": "Muted",
"diceAppearance": "Dice Appearance",
"animations": "Animations",
"defaultAnimations": "Set Animations As Player Defaults",
@@ -2965,18 +3040,6 @@
"immunityTo": "Immunity: {immunities}"
},
"featureTitle": "Class Feature",
- "groupRoll": {
- "title": "Group Roll",
- "leader": "Leader",
- "partyTeam": "Party Team",
- "team": "Team",
- "selectLeader": "Select a Leader",
- "selectMember": "Select a Member",
- "rerollTitle": "Reroll Group Roll",
- "rerollContent": "Are you sure you want to reroll your {trait} roll?",
- "rerollTooltip": "Reroll",
- "wholePartySelected": "The whole party is selected"
- },
"healingRoll": {
"title": "Heal - {damage}",
"heal": "Heal",
@@ -2994,6 +3057,9 @@
"resourceRoll": {
"playerMessage": "{user} rerolled their {name}"
},
+ "saveRoll": {
+ "reactionRollAllTargets": "Reaction Roll All Targets"
+ },
"tagTeam": {
"title": "Tag Team",
"membersTitle": "Members"
@@ -3022,9 +3088,9 @@
},
"ItemBrowser": {
"title": "Daggerheart Compendium Browser",
+ "windowTitle": "Compendium Browser",
"hint": "Select a Folder in sidebar to start browsing through the compendium",
"browserSettings": "Browser Settings",
- "searchPlaceholder": "Search...",
"columnName": "Name",
"tooltipFilters": "Filters",
"tooltipErase": "Erase",
@@ -3060,7 +3126,7 @@
"weapons": "Weapons",
"armors": "Armors",
"consumables": "Consumables",
- "loots": "Loots"
+ "loots": "Loot"
}
},
"Notifications": {
@@ -3142,7 +3208,8 @@
"tokenActorsMissing": "[{names}] missing Actors",
"domainTouchRequirement": "This domain card requires {nr} {domain} cards in the loadout to be used",
"knowTheTide": "Know The Tide gained a token",
- "lackingItemTransferPermission": "User {user} lacks owner permission needed to transfer items to {target}"
+ "lackingItemTransferPermission": "User {user} lacks owner permission needed to transfer items to {target}",
+ "noTokenTargeted": "No token is targeted"
},
"Progress": {
"migrationLabel": "Performing system migration. Please wait and do not close Foundry."
@@ -3154,6 +3221,9 @@
"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"
},
"daggerheartMenu": {
@@ -3165,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/_module.mjs b/module/applications/dialogs/_module.mjs
index a479100a..c866f1cd 100644
--- a/module/applications/dialogs/_module.mjs
+++ b/module/applications/dialogs/_module.mjs
@@ -13,7 +13,7 @@ export { default as OwnershipSelection } from './ownershipSelection.mjs';
export { default as RerollDamageDialog } from './rerollDamageDialog.mjs';
export { default as ResourceDiceDialog } from './resourceDiceDialog.mjs';
export { default as ActionSelectionDialog } from './actionSelectionDialog.mjs';
-export { default as GroupRollDialog } from './group-roll-dialog.mjs';
export { default as TagTeamDialog } from './tagTeamDialog.mjs';
+export { default as GroupRollDialog } from './groupRollDialog.mjs';
export { default as RiskItAllDialog } from './riskItAllDialog.mjs';
export { default as CompendiumBrowserSettingsDialog } from './CompendiumBrowserSettings.mjs';
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/damageDialog.mjs b/module/applications/dialogs/damageDialog.mjs
index 97f1c538..46d3d41f 100644
--- a/module/applications/dialogs/damageDialog.mjs
+++ b/module/applications/dialogs/damageDialog.mjs
@@ -22,6 +22,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
},
actions: {
toggleSelectedEffect: this.toggleSelectedEffect,
+ updateGroupAttack: this.updateGroupAttack,
toggleCritical: this.toggleCritical,
submitRoll: this.submitRoll
},
@@ -64,15 +65,40 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
context.hasSelectedEffects = Boolean(Object.keys(this.selectedEffects).length);
context.selectedEffects = this.selectedEffects;
+ context.damageOptions = this.config.damageOptions;
+ context.rangeOptions = CONFIG.DH.GENERAL.groupAttackRange;
+
return context;
}
static updateRollConfiguration(_event, _, formData) {
- 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.selectedMessageMode = rest.selectedMessageMode;
+ const data = foundry.utils.expandObject(formData.object);
+ foundry.utils.mergeObject(this.config.roll, data.roll);
+ foundry.utils.mergeObject(this.config.modifiers, data.modifiers);
+ this.config.selectedMessageMode = data.selectedMessageMode;
+ if (data.damageOptions) {
+ const numAttackers = data.damageOptions.groupAttack?.numAttackers;
+ if (typeof numAttackers !== 'number' || numAttackers % 1 !== 0) {
+ data.damageOptions.groupAttack.numAttackers = null;
+ }
+
+ foundry.utils.mergeObject(this.config.damageOptions, data.damageOptions);
+ }
+
+ this.render();
+ }
+
+ static updateGroupAttack() {
+ const targets = Array.from(game.user.targets);
+ if (targets.length === 0)
+ return ui.notifications.error(game.i18n.localize('DAGGERHEART.UI.Notifications.noTokenTargeted'));
+
+ const actorId = this.roll.data.parent.id;
+ const range = this.config.damageOptions.groupAttack.range;
+ const groupAttackTokens = game.system.api.fields.ActionFields.DamageField.getGroupAttackTokens(actorId, range);
+
+ this.config.damageOptions.groupAttack.numAttackers = groupAttackTokens.length;
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/group-roll-dialog.mjs b/module/applications/dialogs/group-roll-dialog.mjs
deleted file mode 100644
index 8a3c43d6..00000000
--- a/module/applications/dialogs/group-roll-dialog.mjs
+++ /dev/null
@@ -1,204 +0,0 @@
-import autocomplete from 'autocompleter';
-import { abilities } from '../../config/actorConfig.mjs';
-
-const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
-
-export default class GroupRollDialog extends HandlebarsApplicationMixin(ApplicationV2) {
- constructor(actors) {
- super();
- this.actors = actors;
- this.actorLeader = {};
- this.actorsMembers = [];
- }
-
- get title() {
- return 'Group Roll';
- }
-
- static DEFAULT_OPTIONS = {
- tag: 'form',
- classes: ['daggerheart', 'views', 'dh-style', 'dialog', 'group-roll'],
- position: { width: 'auto', height: 'auto' },
- window: {
- title: 'DAGGERHEART.UI.Chat.groupRoll.title'
- },
- actions: {
- roll: GroupRollDialog.#roll,
- removeLeader: GroupRollDialog.#removeLeader,
- removeMember: GroupRollDialog.#removeMember
- },
- form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
- };
-
- static PARTS = {
- application: {
- id: 'group-roll',
- template: 'systems/daggerheart/templates/dialogs/group-roll/group-roll.hbs'
- }
- };
-
- _attachPartListeners(partId, htmlElement, options) {
- super._attachPartListeners(partId, htmlElement, options);
- const leaderChoices = this.actors.filter(x => this.actorsMembers.every(member => member.actor?.id !== x.id));
- const memberChoices = this.actors.filter(
- x => this.actorLeader?.actor?.id !== x.id && this.actorsMembers.every(member => member.actor?.id !== x.id)
- );
-
- htmlElement.querySelectorAll('.leader-change-input').forEach(element => {
- autocomplete({
- input: element,
- fetch: function (text, update) {
- if (!text) {
- update(leaderChoices);
- } else {
- text = text.toLowerCase();
- var suggestions = leaderChoices.filter(n => n.name.toLowerCase().includes(text));
- update(suggestions);
- }
- },
- render: function (actor, search) {
- const actorName = game.i18n.localize(actor.name);
- const matchIndex = actorName.toLowerCase().indexOf(search);
-
- const beforeText = actorName.slice(0, matchIndex);
- const matchText = actorName.slice(matchIndex, matchIndex + search.length);
- const after = actorName.slice(matchIndex + search.length, actorName.length);
- const img = document.createElement('img');
- img.src = actor.img;
-
- const element = document.createElement('li');
- element.appendChild(img);
-
- const label = document.createElement('span');
- label.innerHTML =
- `${beforeText}${matchText ? `${matchText} ` : ''}${after}`.replaceAll(
- ' ',
- ' '
- );
- element.appendChild(label);
-
- return element;
- },
- renderGroup: function (label) {
- const itemElement = document.createElement('div');
- itemElement.textContent = game.i18n.localize(label);
- return itemElement;
- },
- onSelect: actor => {
- element.value = actor.uuid;
- this.actorLeader = { actor: actor, trait: 'agility', difficulty: 0 };
- this.render();
- },
- click: e => e.fetch(),
- customize: function (_input, _inputRect, container) {
- container.style.zIndex = foundry.applications.api.ApplicationV2._maxZ;
- },
- minLength: 0
- });
- });
-
- htmlElement.querySelectorAll('.team-push-input').forEach(element => {
- autocomplete({
- input: element,
- fetch: function (text, update) {
- if (!text) {
- update(memberChoices);
- } else {
- text = text.toLowerCase();
- var suggestions = memberChoices.filter(n => n.name.toLowerCase().includes(text));
- update(suggestions);
- }
- },
- render: function (actor, search) {
- const actorName = game.i18n.localize(actor.name);
- const matchIndex = actorName.toLowerCase().indexOf(search);
-
- const beforeText = actorName.slice(0, matchIndex);
- const matchText = actorName.slice(matchIndex, matchIndex + search.length);
- const after = actorName.slice(matchIndex + search.length, actorName.length);
- const img = document.createElement('img');
- img.src = actor.img;
-
- const element = document.createElement('li');
- element.appendChild(img);
-
- const label = document.createElement('span');
- label.innerHTML =
- `${beforeText}${matchText ? `${matchText} ` : ''}${after}`.replaceAll(
- ' ',
- ' '
- );
- element.appendChild(label);
-
- return element;
- },
- renderGroup: function (label) {
- const itemElement = document.createElement('div');
- itemElement.textContent = game.i18n.localize(label);
- return itemElement;
- },
- onSelect: actor => {
- element.value = actor.uuid;
- this.actorsMembers.push({ actor: actor, trait: 'agility', difficulty: 0 });
- this.render({ force: true });
- },
- click: e => e.fetch(),
- customize: function (_input, _inputRect, container) {
- container.style.zIndex = foundry.applications.api.ApplicationV2._maxZ;
- },
- minLength: 0
- });
- });
- }
-
- async _prepareContext(_options) {
- const context = await super._prepareContext(_options);
- context.leader = this.actorLeader;
- context.members = this.actorsMembers;
- context.traitList = abilities;
-
- context.allSelected = this.actorsMembers.length + (this.actorLeader?.actor ? 1 : 0) === this.actors.length;
- context.rollDisabled = context.members.length === 0 || !this.actorLeader?.actor;
-
- return context;
- }
-
- static updateData(event, _, formData) {
- const { actorLeader, actorsMembers } = foundry.utils.expandObject(formData.object);
- this.actorLeader = foundry.utils.mergeObject(this.actorLeader, actorLeader);
- this.actorsMembers = foundry.utils.mergeObject(this.actorsMembers, actorsMembers);
- this.render(true);
- }
-
- static async #removeLeader(_, button) {
- this.actorLeader = null;
- this.render();
- }
-
- static async #removeMember(_, button) {
- this.actorsMembers = this.actorsMembers.filter(m => m.actor.uuid !== button.dataset.memberUuid);
- this.render();
- }
-
- static async #roll() {
- const cls = getDocumentClass('ChatMessage');
- const systemData = {
- leader: this.actorLeader,
- members: this.actorsMembers
- };
- const msg = {
- type: 'groupRoll',
- user: game.user.id,
- speaker: cls.getSpeaker(),
- title: game.i18n.localize('DAGGERHEART.UI.Chat.groupRoll.title'),
- system: systemData,
- content: await foundry.applications.handlebars.renderTemplate(
- 'systems/daggerheart/templates/ui/chat/groupRoll.hbs',
- { system: systemData }
- )
- };
-
- cls.create(msg);
- this.close();
- }
-}
diff --git a/module/applications/dialogs/groupRollDialog.mjs b/module/applications/dialogs/groupRollDialog.mjs
new file mode 100644
index 00000000..a47dd0a8
--- /dev/null
+++ b/module/applications/dialogs/groupRollDialog.mjs
@@ -0,0 +1,527 @@
+import { ResourceUpdateMap } from '../../data/action/baseAction.mjs';
+import { emitAsGM, GMUpdateEvent, RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
+import Party from '../sheets/actors/party.mjs';
+
+const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
+
+export default class GroupRollDialog extends HandlebarsApplicationMixin(ApplicationV2) {
+ constructor(party) {
+ super();
+
+ this.party = party;
+ this.partyMembers = party.system.partyMembers
+ .filter(x => Party.DICE_ROLL_ACTOR_TYPES.includes(x.type))
+ .map(member => ({
+ ...member.toObject(),
+ uuid: member.uuid,
+ id: member.id,
+ selected: true,
+ owned: member.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
+ }));
+
+ this.leader = null;
+ this.openForAllPlayers = true;
+
+ this.tabGroups.application = Object.keys(party.system.groupRoll.participants).length
+ ? 'groupRoll'
+ : 'initialization';
+
+ Hooks.on(socketEvent.Refresh, this.groupRollRefresh.bind());
+ }
+
+ get title() {
+ return game.i18n.localize('DAGGERHEART.APPLICATIONS.GroupRollSelect.title');
+ }
+
+ static DEFAULT_OPTIONS = {
+ tag: 'form',
+ id: 'GroupRollDialog',
+ classes: ['daggerheart', 'views', 'dh-style', 'dialog', 'group-roll-dialog'],
+ position: { width: 550, height: 'auto' },
+ actions: {
+ toggleSelectMember: this.#toggleSelectMember,
+ startGroupRoll: this.#startGroupRoll,
+ makeRoll: this.#makeRoll,
+ removeRoll: this.#removeRoll,
+ rerollDice: this.#rerollDice,
+ makeLeaderRoll: this.#makeLeaderRoll,
+ removeLeaderRoll: this.#removeLeaderRoll,
+ rerollLeaderDice: this.#rerollLeaderDice,
+ markSuccessfull: this.#markSuccessfull,
+ cancelRoll: this.#onCancelRoll,
+ finishRoll: this.#finishRoll
+ },
+ form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
+ };
+
+ static PARTS = {
+ initialization: {
+ id: 'initialization',
+ template: 'systems/daggerheart/templates/dialogs/groupRollDialog/initialization.hbs'
+ },
+ leader: {
+ id: 'leader',
+ template: 'systems/daggerheart/templates/dialogs/groupRollDialog/leader.hbs'
+ },
+ groupRoll: {
+ id: 'groupRoll',
+ template: 'systems/daggerheart/templates/dialogs/groupRollDialog/groupRoll.hbs'
+ },
+ footer: {
+ id: 'footer',
+ template: 'systems/daggerheart/templates/dialogs/groupRollDialog/footer.hbs'
+ }
+ };
+
+ /** @inheritdoc */
+ static TABS = {
+ application: {
+ tabs: [{ id: 'initialization' }, { id: 'groupRoll' }]
+ }
+ };
+
+ _attachPartListeners(partId, htmlElement, options) {
+ super._attachPartListeners(partId, htmlElement, options);
+
+ htmlElement
+ .querySelector('.main-character-field')
+ ?.addEventListener('input', this.updateLeaderField.bind(this));
+ }
+
+ _configureRenderParts(options) {
+ const { initialization, leader, groupRoll, footer } = super._configureRenderParts(options);
+ const augmentedParts = { initialization };
+ for (const memberKey of Object.keys(this.party.system.groupRoll.aidingCharacters)) {
+ augmentedParts[memberKey] = {
+ id: memberKey,
+ template: 'systems/daggerheart/templates/dialogs/groupRollDialog/groupRollMember.hbs'
+ };
+ }
+
+ augmentedParts.leader = leader;
+ augmentedParts.groupRoll = groupRoll;
+ augmentedParts.footer = footer;
+
+ return augmentedParts;
+ }
+
+ /**@inheritdoc */
+ async _onRender(context, options) {
+ await super._onRender(context, options);
+
+ if (this.element.querySelector('.team-container')) return;
+
+ if (this.tabGroups.application !== this.constructor.PARTS.initialization.id) {
+ const initializationPart = this.element.querySelector('.initialization-container');
+ initializationPart.insertAdjacentHTML('afterend', '
');
+ initializationPart.insertAdjacentHTML(
+ 'afterend',
+ `${game.i18n.localize('DAGGERHEART.APPLICATIONS.GroupRollSelect.aidingCharacters')}
`
+ );
+
+ 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.isGM = game.user.isGM;
+ context.isEditable = this.getIsEditable();
+ context.fields = this.party.system.schema.fields.groupRoll.fields;
+ context.data = this.party.system.groupRoll;
+ context.traitOptions = CONFIG.DH.ACTOR.abilities;
+ context.members = {};
+ context.allHaveRolled = Object.keys(context.data.participants).every(key => {
+ const data = context.data.participants[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.groupRollFields = this.party.system.schema.fields.groupRoll.fields;
+ partContext.memberSelection = this.partyMembers;
+
+ const selectedMembers = partContext.memberSelection.filter(x => x.selected);
+
+ partContext.selectedLeader = this.leader;
+ partContext.selectedLeaderOptions = selectedMembers
+ .filter(actor => actor.owned)
+ .map(x => ({ value: x.id, label: x.name }));
+ partContext.selectedLeaderDisabled = !selectedMembers.length;
+
+ partContext.canStartGroupRoll = selectedMembers.length > 1 && this.leader?.memberId;
+ partContext.openForAllPlayers = this.openForAllPlayers;
+ break;
+ case 'leader':
+ partContext.leader = this.getRollCharacterData(this.party.system.groupRoll.leader);
+ break;
+ case 'groupRoll':
+ const leader = this.party.system.groupRoll.leader;
+ partContext.hasRolled =
+ leader?.rollData ||
+ Object.values(this.party.system.groupRoll?.aidingCharacters ?? {}).some(
+ x => x.successfull !== null
+ );
+ const { modifierTotal, modifiers } = Object.values(this.party.system.groupRoll.aidingCharacters).reduce(
+ (acc, curr) => {
+ const modifier = curr.successfull === true ? 1 : curr.successfull === false ? -1 : null;
+ if (modifier) {
+ acc.modifierTotal += modifier;
+ acc.modifiers.push(modifier);
+ }
+
+ return acc;
+ },
+ { modifierTotal: 0, modifiers: [] }
+ );
+ const leaderTotal = leader?.rollData ? leader.roll.total : null;
+ partContext.groupRoll = {
+ totalLabel: leader?.rollData
+ ? game.i18n.format('DAGGERHEART.GENERAL.withThing', {
+ thing: leader.roll.totalLabel
+ })
+ : null,
+ totalDualityClass: leader?.roll?.isCritical ? 'critical' : leader?.roll?.withHope ? 'hope' : 'fear',
+ total: leaderTotal + modifierTotal,
+ leaderTotal: leaderTotal,
+ modifiers
+ };
+ break;
+ case 'footer':
+ partContext.canFinishRoll =
+ Boolean(this.party.system.groupRoll.leader?.rollData) &&
+ Object.values(this.party.system.groupRoll.aidingCharacters).every(x => x.successfull !== null);
+ break;
+ }
+
+ if (Object.keys(this.party.system.groupRoll.aidingCharacters).includes(partId)) {
+ const characterData = this.party.system.groupRoll.aidingCharacters[partId];
+ partContext.members[partId] = this.getRollCharacterData(characterData, partId);
+ }
+
+ return partContext;
+ }
+
+ getRollCharacterData(data, partId) {
+ if (!data) return {};
+
+ const actor = game.actors.get(data.id);
+
+ return {
+ ...data,
+ roll: data.roll,
+ isEditable: actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER),
+ key: partId,
+ readyToRoll: Boolean(data.rollChoice),
+ hasRolled: Boolean(data.rollData)
+ };
+ }
+
+ static async updateData(event, _, formData) {
+ const partyData = foundry.utils.expandObject(formData.object);
+
+ this.updatePartyData(partyData, this.getUpdatingParts(event.target));
+ }
+
+ async updatePartyData(update, updatingParts, options = { render: true }) {
+ if (!game.users.activeGM)
+ return ui.notifications.error(game.i18n.localize('DAGGERHEART.UI.Notifications.gmRequired'));
+
+ const gmUpdate = async update => {
+ await this.party.update(update);
+ this.render({ parts: updatingParts });
+ game.socket.emit(`system.${CONFIG.DH.id}`, {
+ action: socketEvent.Refresh,
+ data: { refreshType: RefreshType.GroupRoll, action: 'refresh', parts: updatingParts }
+ });
+ };
+
+ await emitAsGM(
+ GMUpdateEvent.UpdateDocument,
+ gmUpdate,
+ update,
+ this.party.uuid,
+ options.render ? { refreshType: RefreshType.GroupRoll, action: 'refresh', parts: updatingParts } : undefined
+ );
+ }
+
+ getUpdatingParts(target) {
+ const { initialization, leader, groupRoll, footer } = this.constructor.PARTS;
+ const isInitialization = this.tabGroups.application === initialization.id;
+ const updatingMember = target.closest('.team-member-container')?.dataset?.memberKey;
+ const updatingLeader = target.closest('.main-character-outer-container');
+
+ return [
+ ...(isInitialization ? [initialization.id] : []),
+ ...(updatingMember ? [updatingMember] : []),
+ ...(updatingLeader ? [leader.id] : []),
+ ...(!isInitialization ? [groupRoll.id, footer.id] : [])
+ ];
+ }
+
+ getIsEditable() {
+ return this.party.system.partyMembers.some(actor => {
+ const selected = Boolean(this.party.system.groupRoll.participants[actor.id]);
+ return selected && actor.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER);
+ });
+ }
+
+ groupRollRefresh = ({ refreshType, action, parts }) => {
+ if (refreshType !== RefreshType.GroupRoll) return;
+
+ switch (action) {
+ case 'startGroupRoll':
+ this.tabGroups.application = 'groupRoll';
+ break;
+ case 'refresh':
+ this.render({ parts });
+ break;
+ case 'close':
+ this.close();
+ break;
+ }
+ };
+
+ async close(options = {}) {
+ /* Opt out of Foundry's standard behavior of closing all application windows marked as UI when Escape is pressed */
+ if (options.closeKey) return;
+
+ Hooks.off(socketEvent.Refresh, this.groupRollRefresh);
+ return super.close(options);
+ }
+
+ //#region Initialization
+ static #toggleSelectMember(_, button) {
+ const member = this.partyMembers.find(x => x.id === button.dataset.id);
+ member.selected = !member.selected;
+ this.render();
+ }
+
+ updateLeaderField(event) {
+ if (!this.leader) this.leader = {};
+ this.leader.memberId = event.target.value;
+ this.render();
+ }
+
+ static async #startGroupRoll() {
+ const leader = this.partyMembers.find(x => x.id === this.leader.memberId);
+ const aidingCharacters = this.partyMembers.reduce((acc, curr) => {
+ if (curr.selected && curr.id !== this.leader.memberId)
+ acc[curr.id] = { id: curr.id, name: curr.name, img: curr.img };
+
+ return acc;
+ }, {});
+
+ await this.party.update({
+ 'system.groupRoll': _replace(
+ new game.system.api.data.GroupRollData({
+ ...this.party.system.groupRoll.toObject(),
+ leader: { id: leader.id, name: leader.name, img: leader.img },
+ aidingCharacters
+ })
+ )
+ });
+
+ const hookData = { openForAllPlayers: this.openForAllPlayers, partyId: this.party.id };
+ Hooks.callAll(CONFIG.DH.HOOKS.hooksConfig.groupRollStart, hookData);
+ game.socket.emit(`system.${CONFIG.DH.id}`, {
+ action: socketEvent.GroupRollStart,
+ data: hookData
+ });
+
+ this.render();
+ }
+ //#endregion
+
+ async makeRoll(button, characterData, path) {
+ const actor = game.actors.find(x => x.id === characterData.id);
+ if (!actor) return;
+
+ const result = await actor.rollTrait(characterData.rollChoice, {
+ skips: {
+ createMessage: true,
+ resources: true,
+ triggers: true
+ }
+ });
+
+ if (!result) return;
+ if (!game.modules.get('dice-so-nice')?.active) foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice });
+
+ const rollData = result.messageRoll.toJSON();
+ delete rollData.options.messageRoll;
+ this.updatePartyData(
+ {
+ [path]: rollData
+ },
+ this.getUpdatingParts(button)
+ );
+ }
+
+ static async #makeRoll(_event, button) {
+ const { member } = button.dataset;
+ const character = this.party.system.groupRoll.aidingCharacters[member];
+ this.makeRoll(button, character, `system.groupRoll.aidingCharacters.${member}.rollData`);
+ }
+
+ static async #makeLeaderRoll(_event, button) {
+ const character = this.party.system.groupRoll.leader;
+ this.makeRoll(button, character, 'system.groupRoll.leader.rollData');
+ }
+
+ async removeRoll(button, path) {
+ this.updatePartyData(
+ {
+ [path]: {
+ rollData: null,
+ rollChoice: null,
+ selected: false,
+ successfull: null
+ }
+ },
+ this.getUpdatingParts(button)
+ );
+ }
+
+ static async #removeRoll(_event, button) {
+ this.removeRoll(button, `system.groupRoll.aidingCharacters.${button.dataset.member}`);
+ }
+
+ static async #removeLeaderRoll(_event, button) {
+ this.removeRoll(button, 'system.groupRoll.leader');
+ }
+
+ async rerollDice(button, data, path) {
+ const { diceType } = button.dataset;
+
+ const dieIndex = diceType === 'hope' ? 0 : diceType === 'fear' ? 1 : 2;
+ const newRoll = game.system.api.dice.DualityRoll.fromData(data.rollData);
+ const dice = newRoll.dice[dieIndex];
+ await dice.reroll(`/r1=${dice.total}`, {
+ liveRoll: {
+ roll: newRoll,
+ isReaction: true
+ }
+ });
+ const rollData = newRoll.toJSON();
+ this.updatePartyData(
+ {
+ [path]: rollData
+ },
+ this.getUpdatingParts(button)
+ );
+ }
+
+ static async #rerollDice(_, button) {
+ const { member } = button.dataset;
+ this.rerollDice(
+ button,
+ this.party.system.groupRoll.aidingCharacters[member],
+ `system.groupRoll.aidingCharacters.${member}.rollData`
+ );
+ }
+
+ static async #rerollLeaderDice(_, button) {
+ this.rerollDice(button, this.party.system.groupRoll.leader, `system.groupRoll.leader.rollData`);
+ }
+
+ static #markSuccessfull(_event, button) {
+ const previousValue = this.party.system.groupRoll.aidingCharacters[button.dataset.member].successfull;
+ const newValue = Boolean(button.dataset.successfull === 'true');
+ this.updatePartyData(
+ {
+ [`system.groupRoll.aidingCharacters.${button.dataset.member}.successfull`]:
+ previousValue === newValue ? null : newValue
+ },
+ this.getUpdatingParts(button)
+ );
+ }
+
+ static async #onCancelRoll(_event, _button, options = { confirm: true }) {
+ this.cancelRoll(options);
+ }
+
+ async cancelRoll(options = { confirm: true }) {
+ if (options.confirm) {
+ const confirmed = await foundry.applications.api.DialogV2.confirm({
+ window: {
+ title: game.i18n.localize('DAGGERHEART.APPLICATIONS.GroupRollSelect.cancelConfirmTitle')
+ },
+ content: game.i18n.localize('DAGGERHEART.APPLICATIONS.GroupRollSelect.cancelConfirmText')
+ });
+
+ if (!confirmed) return;
+ }
+
+ await this.updatePartyData(
+ {
+ 'system.groupRoll': {
+ leader: null,
+ aidingCharacters: _replace({})
+ }
+ },
+ [],
+ { render: false }
+ );
+
+ this.close();
+ game.socket.emit(`system.${CONFIG.DH.id}`, {
+ action: socketEvent.Refresh,
+ data: { refreshType: RefreshType.GroupRoll, action: 'close' }
+ });
+ }
+
+ static async #finishRoll() {
+ const totalRoll = this.party.system.groupRoll.leader.roll;
+ for (const character of Object.values(this.party.system.groupRoll.aidingCharacters)) {
+ totalRoll.terms.push(new foundry.dice.terms.OperatorTerm({ operator: character.successfull ? '+' : '-' }));
+ totalRoll.terms.push(new foundry.dice.terms.NumericTerm({ number: 1 }));
+ }
+
+ await totalRoll._evaluate();
+
+ const systemData = totalRoll.options;
+ const actor = game.actors.get(this.party.system.groupRoll.leader.id);
+
+ const cls = getDocumentClass('ChatMessage'),
+ msgData = {
+ type: 'dualityRoll',
+ user: game.user.id,
+ title: game.i18n.localize('DAGGERHEART.APPLICATIONS.GroupRollSelect.title'),
+ speaker: cls.getSpeaker({ actor }),
+ system: systemData,
+ rolls: [JSON.stringify(totalRoll)],
+ sound: null,
+ flags: { core: { RollTable: true } }
+ };
+
+ await cls.create(msgData);
+
+ const resourceMap = new ResourceUpdateMap(actor);
+ if (totalRoll.isCritical) {
+ resourceMap.addResources([
+ { key: 'stress', value: -1, total: 1 },
+ { key: 'hope', value: 1, total: 1 }
+ ]);
+ } else if (totalRoll.withHope) {
+ resourceMap.addResources([{ key: 'hope', value: 1, total: 1 }]);
+ } else {
+ resourceMap.addResources([{ key: 'fear', value: 1, total: 1 }]);
+ }
+
+ resourceMap.updateResources();
+
+ /* Fin */
+ this.cancelRoll({ confirm: false });
+ }
+}
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/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index 5236afb8..6e1654b0 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -20,7 +20,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
owned: member.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
}));
- this.initiator = null;
+ this.initiator = { cost: 3 };
this.openForAllPlayers = true;
this.tabGroups.application = Object.keys(party.system.tagTeam.members).length
@@ -366,8 +366,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
let rollIsSelected = false;
for (const member of Object.values(members)) {
const rollFinished = Boolean(member.rollData);
- const damageFinished =
- member.rollData?.options?.hasDamage !== undefined ? member.rollData.options.damage : true;
+ const damageFinished = member.rollData?.options?.hasDamage ? Boolean(member.rollData.options.damage) : true;
rollsAreFinished = rollsAreFinished && rollFinished && damageFinished;
rollIsSelected = rollIsSelected || member.selected;
diff --git a/module/applications/hud/tokenHUD.mjs b/module/applications/hud/tokenHUD.mjs
index 77caaaff..943f3506 100644
--- a/module/applications/hud/tokenHUD.mjs
+++ b/module/applications/hud/tokenHUD.mjs
@@ -122,15 +122,14 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
async toggleClowncar(actors) {
const animationDuration = 500;
- const activeTokens = actors.flatMap(member => member.getActiveTokens());
+ const scene = game.scenes.get(game.user.viewedScene);
+ /* getDependentTokens returns already removed tokens with id = null. Need to filter that until it's potentially fixed from Foundry */
+ const activeTokens = actors.flatMap(member => member.getDependentTokens({ scenes: scene }).filter(x => x._id));
const { x: actorX, y: actorY } = this.document;
if (activeTokens.length > 0) {
for (let token of activeTokens) {
- await token.document.update(
- { x: actorX, y: actorY, alpha: 0 },
- { animation: { duration: animationDuration } }
- );
- setTimeout(() => token.document.delete(), animationDuration);
+ await token.update({ x: actorX, y: actorY, alpha: 0 }, { animation: { duration: animationDuration } });
+ setTimeout(() => token.delete(), animationDuration);
}
} else {
const activeScene = game.scenes.find(x => x.id === game.user.viewedScene);
@@ -140,11 +139,16 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
tokenData.push(data.toObject());
}
+ const viewedLevel = game.scenes.get(game.user.viewedScene).levels.get(game.user.viewedLevel);
+ const elevation = this.actor.token?.elevation ?? viewedLevel.elevation.bottom;
+
const newTokens = await activeScene.createEmbeddedDocuments(
'Token',
tokenData.map(tokenData => ({
...tokenData,
alpha: 0,
+ level: viewedLevel,
+ elevation: elevation,
x: actorX,
y: actorY
}))
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 151648e1..9de9e752 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -118,8 +118,13 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
break;
case 'footer':
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('SETTINGS.UI.ACTIONS.Reset')
+ },
+ { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('EDITOR.Save') }
];
break;
}
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index d8a3df29..04be3efb 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -217,8 +217,8 @@ export default class AdversarySheet extends DHBaseActorSheet {
static #reactionRoll(event) {
const config = {
event,
- title: `Reaction Roll: ${this.actor.name}`,
- headerTitle: 'Adversary Reaction Roll',
+ title: game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll'),
+ headerTitle: game.i18n.localize('DAGGERHEART.ACTORS.Adversary.adversaryReactionRoll.headerTitle'),
roll: {
type: 'trait'
},
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: `Some Tokens still need to roll their Reaction Roll.
Are you sure you want to continue ?
Undone reaction rolls will be considered as failed
`
+ window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
+ content: `${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}
${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}
${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}
`
});
if (!confirm) return;
}
diff --git a/module/documents/collections/actorCollection.mjs b/module/documents/collections/actorCollection.mjs
index a3714b30..115dd694 100644
--- a/module/documents/collections/actorCollection.mjs
+++ b/module/documents/collections/actorCollection.mjs
@@ -1,4 +1,11 @@
export default class DhActorCollection extends foundry.documents.collections.Actors {
+ /** @returns the active party */
+ get party() {
+ const id = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.ActiveParty);
+ const actor = game.actors.get(id);
+ return actor?.type === 'party' ? actor : null;
+ }
+
/** Ensure companions are initialized after all other subtypes. */
_initialize() {
super._initialize();
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index d1a618c7..8ece56fa 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -31,8 +31,13 @@ export default class DHItem extends foundry.documents.Item {
static async createDocuments(sources, operation) {
// Ensure that items being created are valid to the actor its being added to
const actor = operation.parent;
- sources = actor?.system?.isItemValid ? sources.filter(s => actor.system.isItemValid(s)) : sources;
- return super.createDocuments(sources, operation);
+ const filtered = actor ? sources.filter(s => actor.system.isItemValid(s)) : sources;
+ if (actor && filtered.length === 0 && sources.length > 0) {
+ const itemType = _loc(`TYPES.Item.${sources[0].type}`);
+ const actorType = _loc(`TYPES.Actor.${actor.type}`);
+ ui.notifications.error('DAGGERHEART.ACTORS.Base.CannotAddType', { format: { itemType, actorType } });
+ }
+ return super.createDocuments(filtered, operation);
}
/* -------------------------------------------- */
@@ -71,6 +76,13 @@ export default class DHItem extends foundry.documents.Item {
return this.system.metadata.isInventoryItem ?? false;
}
+ /** Returns true if the item can be used */
+ get usable() {
+ const actor = this.actor;
+ const actionsList = this.system.actionsList;
+ return this.isOwner && actor?.type === 'character' && (actionsList?.size || actionsList?.length);
+ }
+
/** @inheritdoc */
static async createDialog(data = {}, createOptions = {}, options = {}) {
const { folders, types, template, context = {}, ...dialogOptions } = options;
diff --git a/module/documents/scene.mjs b/module/documents/scene.mjs
index 1c2faa34..59b8091f 100644
--- a/module/documents/scene.mjs
+++ b/module/documents/scene.mjs
@@ -1,6 +1,16 @@
import DHToken from './token.mjs';
export default class DhScene extends Scene {
+ get rangeSettings() {
+ const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
+ const sceneMeasurements = this.flags.daggerheart?.rangeMeasurement;
+ const globalMeasurements = game.settings.get(
+ CONFIG.DH.id,
+ CONFIG.DH.SETTINGS.gameSettings.variantRules
+ ).rangeMeasurement;
+ return sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
+ }
+
/** A map of `TokenDocument` IDs embedded in this scene long with new dimensions from actor size-category changes */
#sizeSyncBatch = new Map();
diff --git a/module/documents/tokenManager.mjs b/module/documents/tokenManager.mjs
index f766a677..3ccff4e2 100644
--- a/module/documents/tokenManager.mjs
+++ b/module/documents/tokenManager.mjs
@@ -1,104 +1,68 @@
/**
- * A singleton class that handles preview tokens.
+ * A singleton class that handles creating tokens.
*/
export default class DhTokenManager {
- #activePreview;
- #actor;
- #resolve;
-
/**
- * Create a template preview, deactivating any existing ones.
- * @param {object} data
+ * Create a token previer
+ * @param {Actor} actor
+ * @param {object} tokenData
*/
async createPreview(actor, tokenData) {
- this.#actor = actor;
- const token = await canvas.tokens._createPreview(
- {
- ...actor.prototypeToken,
- displayName: 50,
- ...tokenData
- },
- { renderSheet: false, actor }
+ const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+ if (actor?.system.metadata.usesSize) {
+ const tokenSize = tokenSizes[actor.system.size];
+ if (tokenSize && actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
+ tokenData.width = tokenSize;
+ tokenData.height = tokenSize;
+ }
+ }
+
+ return await canvas.tokens.placeTokens(
+ [
+ {
+ ...actor.prototypeToken.toObject(),
+ actorId: actor.id,
+ displayName: 50,
+ ...tokenData
+ }
+ ],
+ { create: false }
);
-
- this.#activePreview = {
- document: token.document,
- object: token,
- origin: { x: token.document.x, y: token.document.y }
- };
-
- this.#activePreview.events = {
- contextmenu: this.#cancelTemplate.bind(this),
- mousedown: this.#confirmTemplate.bind(this),
- mousemove: this.#onDragMouseMove.bind(this)
- };
-
- canvas.stage.on('mousemove', this.#activePreview.events.mousemove);
- canvas.stage.on('mousedown', this.#activePreview.events.mousedown);
- canvas.app.view.addEventListener('contextmenu', this.#activePreview.events.contextmenu);
- }
-
- /* Currently intended for using as a preview of where to create a token. (note the flag) */
- async createPreviewAsync(actor, tokenData = {}) {
- return new Promise(resolve => {
- this.#resolve = resolve;
- this.createPreview(actor, { ...tokenData, flags: { daggerheart: { createPlacement: true } } });
- });
}
/**
- * Handles the movement of the token preview on mousedrag.
- * @param {mousemove Event} event
+ * Creates new tokens on the canvas by placing previews.
+ * @param {object} tokenData
+ * @param {object} options
*/
- #onDragMouseMove(event) {
- event.stopPropagation();
- const { moveTime, object } = this.#activePreview;
- const update = {};
+ async createTokensWithPreview(tokensData, { elevation } = {}) {
+ const scene = game.scenes.get(game.user.viewedScene);
+ if (!scene) return;
- const now = Date.now();
- if (now - (moveTime || 0) <= 16) return;
- this.#activePreview.moveTime = now;
+ const level = scene.levels.get(game.user.viewedLevel);
+ if (!level) return;
- let cursor = event.getLocalPosition(canvas.templates);
+ const createElevation = elevation ?? level.elevation.bottom;
+ for (const tokenData of tokensData) {
+ const previewTokens = await this.createPreview(tokenData.actor, {
+ name: tokenData.tokenPreviewName,
+ level: game.user.viewedLevel,
+ elevation: createElevation,
+ flags: { daggerheart: { createPlacement: true } }
+ });
+ if (!previewTokens?.length) return null;
- Object.assign(update, canvas.grid.getTopLeftPoint(cursor));
-
- object.document.updateSource(update);
- object.renderFlags.set({ refresh: true });
- }
-
- /**
- * Cancels the preview token on right-click.
- * @param {contextmenu Event} event
- */
- #cancelTemplate(_event, resolved) {
- const { mousemove, mousedown, contextmenu } = this.#activePreview.events;
- this.#activePreview.object.destroy();
-
- canvas.stage.off('mousemove', mousemove);
- canvas.stage.off('mousedown', mousedown);
- canvas.app.view.removeEventListener('contextmenu', contextmenu);
- if (this.#resolve && !resolved) this.#resolve(false);
- }
-
- /**
- * Creates a real Actor and token at the preview location and cancels the preview.
- * @param {click Event} event
- */
- async #confirmTemplate(event) {
- event.stopPropagation();
- this.#cancelTemplate(event, true);
-
- const actor = this.#actor.inCompendium
- ? await game.system.api.documents.DhpActor.create(this.#actor.toObject())
- : this.#actor;
- const tokenData = await actor.getTokenDocument();
- const result = await canvas.scene.createEmbeddedDocuments('Token', [
- { ...tokenData.toObject(), x: this.#activePreview.document.x, y: this.#activePreview.document.y }
- ]);
-
- this.#activePreview = undefined;
- if (this.#resolve && result.length) this.#resolve(result[0]);
+ await canvas.scene.createEmbeddedDocuments(
+ 'Token',
+ previewTokens.map(x => ({
+ ...x.toObject(),
+ name: tokenData.actor.prototypeToken.name,
+ displayName: tokenData.actor.prototypeToken.displayName,
+ flags: tokenData.actor.prototypeToken.flags
+ })),
+ { controlObject: true, parent: canvas.scene }
+ );
+ }
}
}
diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs
index 1a075518..cd0e7d9c 100644
--- a/module/enrichers/TemplateEnricher.mjs
+++ b/module/enrichers/TemplateEnricher.mjs
@@ -118,13 +118,6 @@ const getTemplateDistance = range => {
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;
- return settings[range];
+ const settings = canvas.scene?.rangeSettings;
+ return settings ? settings[range] : 0;
};
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 131f94b7..4527da1a 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -189,7 +189,13 @@ export const getDeleteKeys = (property, innerProperty, innerPropertyDefaultValue
// Fix on Foundry native formula replacement for DH
const nativeReplaceFormulaData = Roll.replaceFormulaData;
-Roll.replaceFormulaData = function (formula, data = {}, { missing, warn = false } = {}) {
+Roll.replaceFormulaData = function (formula, baseData = {}, { missing, warn = false } = {}) {
+ /* Inserting global data */
+ const data = {
+ ...baseData,
+ partySize: game.actors?.party?.system.partyMembers.length ?? 0
+ };
+
const terms = Object.keys(CONFIG.DH.GENERAL.multiplierTypes).map(type => {
return { term: type, default: 1 };
});
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index 63e591c6..ebd65fa2 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -10,6 +10,7 @@ export const preloadHandlebarsTemplates = async function () {
'templates/generic/tab-navigation.hbs',
'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs',
'systems/daggerheart/templates/sheets/global/partials/action-item.hbs',
+ 'systems/daggerheart/templates/sheets/global/partials/gold.hbs',
'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/item-resource.hbs',
'systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs',
diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index 458ee6ef..b4c446b2 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@@ -1,3 +1,4 @@
+import { defaultRestOptions } from '../config/generalConfig.mjs';
import { RefreshType, socketEvent } from './socket.mjs';
export async function runMigrations() {
@@ -341,6 +342,18 @@ export async function runMigrations() {
lastMigrationVersion = '2.0.0';
}
+
+ if (foundry.utils.isNewerVersion('2.1.0', lastMigrationVersion)) {
+ const downtimeMoves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew);
+ if (downtimeMoves.restMoves.longRest.moves.repairArmor) {
+ await downtimeMoves.updateSource({
+ 'restMoves.longRest.moves.repairArmor': defaultRestOptions.longRest().repairArmor
+ });
+ game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, downtimeMoves.toObject());
+ }
+
+ lastMigrationVersion = '2.1.0';
+ }
//#endregion
await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion, lastMigrationVersion);
diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index 63611cda..41cab011 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -52,6 +52,27 @@ export const registerKeyBindings = () => {
reservedModifiers: [],
precedence: CONST.KEYBINDING_PRECEDENCE.NORMAL
});
+
+ game.keybindings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.keybindings.partySheet, {
+ name: _loc('DAGGERHEART.SETTINGS.Keybindings.partySheet.name'),
+ hint: _loc('DAGGERHEART.SETTINGS.Keybindings.partySheet.hint'),
+ editable: [{ key: 'KeyP' }],
+ onDown: () => {
+ const controlled = canvas.ready ? canvas.tokens.controlled : [];
+ const selectedParty = controlled.find(c => c.actor?.type === 'party')?.actor;
+ const party = selectedParty ?? game.actors.party;
+ if (!party) return;
+
+ const sheet = party.sheet;
+ if (!sheet.rendered) {
+ sheet.render(true);
+ } else if (sheet.minimized) {
+ sheet.maximize();
+ } else {
+ sheet.close();
+ }
+ }
+ });
};
const registerMenuSettings = () => {
@@ -189,4 +210,11 @@ const registerNonConfigSettings = () => {
config: false,
type: SpotlightTracker
});
+
+ game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.ActiveParty, {
+ scope: 'world',
+ config: false,
+ type: String,
+ default: null
+ });
};
diff --git a/module/systemRegistration/socket.mjs b/module/systemRegistration/socket.mjs
index fb152959..8fed346d 100644
--- a/module/systemRegistration/socket.mjs
+++ b/module/systemRegistration/socket.mjs
@@ -18,6 +18,8 @@ export function handleSocketEvent({ action = null, data = {} } = {}) {
case socketEvent.TagTeamStart:
Hooks.callAll(CONFIG.DH.HOOKS.hooksConfig.tagTeamStart, data);
break;
+ case socketEvent.GroupRollStart:
+ Hooks.callAll(CONFIG.DH.HOOKS.hooksConfig.groupRollStart, data);
}
}
@@ -26,7 +28,8 @@ export const socketEvent = {
Refresh: 'DhRefresh',
DhpFearUpdate: 'DhFearUpdate',
DowntimeTrigger: 'DowntimeTrigger',
- TagTeamStart: 'DhTagTeamStart'
+ TagTeamStart: 'DhTagTeamStart',
+ GroupRollStart: 'DhGroupRollStart'
};
export const GMUpdateEvent = {
@@ -41,6 +44,7 @@ export const GMUpdateEvent = {
export const RefreshType = {
Countdown: 'DhCoundownRefresh',
TagTeamRoll: 'DhTagTeamRollRefresh',
+ GroupRoll: 'DhGroupRollRefresh',
EffectsDisplay: 'DhEffectsDisplayRefresh',
Scene: 'DhSceneRefresh',
CompendiumBrowser: 'DhCompendiumBrowserRefresh'
diff --git a/package-lock.json b/package-lock.json
index 864d027c..b8fef1cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,9 @@
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"concurrently": "^8.2.2",
+ "eslint": "^10.2.1",
+ "eslint-plugin-prettier": "^5.5.5",
+ "globals": "^17.5.0",
"husky": "^9.1.5",
"lint-staged": "^15.2.10",
"postcss": "^8.4.32",
@@ -32,6 +35,152 @@
"node": ">=6.9.0"
}
},
+ "node_modules/@eslint-community/eslint-utils": {
+ "version": "4.9.1",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+ "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "eslint-visitor-keys": "^3.4.3"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+ }
+ },
+ "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/@eslint-community/regexpp": {
+ "version": "4.12.2",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+ "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+ }
+ },
+ "node_modules/@eslint/config-array": {
+ "version": "0.23.5",
+ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
+ "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@eslint/object-schema": "^3.0.5",
+ "debug": "^4.3.1",
+ "minimatch": "^10.2.4"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
+ "node_modules/@eslint/config-array/node_modules/balanced-match": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+ "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/@eslint/config-array/node_modules/minimatch": {
+ "version": "10.2.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+ "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+ "dev": true,
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "brace-expansion": "^5.0.5"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@eslint/config-helpers": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz",
+ "integrity": "sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@eslint/core": "^1.2.1"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
+ "node_modules/@eslint/core": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+ "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/json-schema": "^7.0.15"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
+ "node_modules/@eslint/object-schema": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
+ "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
+ "node_modules/@eslint/plugin-kit": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz",
+ "integrity": "sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@eslint/core": "^1.2.1",
+ "levn": "^0.4.1"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
"node_modules/@foundryvtt/foundryvtt-cli": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@foundryvtt/foundryvtt-cli/-/foundryvtt-cli-1.1.0.tgz",
@@ -72,12 +221,91 @@
"node": ">=10.13.0"
}
},
+ "node_modules/@humanfs/core": {
+ "version": "0.19.2",
+ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+ "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@humanfs/types": "^0.15.0"
+ },
+ "engines": {
+ "node": ">=18.18.0"
+ }
+ },
+ "node_modules/@humanfs/node": {
+ "version": "0.16.8",
+ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+ "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@humanfs/core": "^0.19.2",
+ "@humanfs/types": "^0.15.0",
+ "@humanwhocodes/retry": "^0.4.0"
+ },
+ "engines": {
+ "node": ">=18.18.0"
+ }
+ },
+ "node_modules/@humanfs/types": {
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+ "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": ">=18.18.0"
+ }
+ },
+ "node_modules/@humanwhocodes/module-importer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": ">=12.22"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/nzakas"
+ }
+ },
+ "node_modules/@humanwhocodes/retry": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+ "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": ">=18.18"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/nzakas"
+ }
+ },
"node_modules/@jridgewell/sourcemap-codec": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
"dev": true
},
+ "node_modules/@pkgr/core": {
+ "version": "0.2.9",
+ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+ "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/pkgr"
+ }
+ },
"node_modules/@rollup/plugin-commonjs": {
"version": "25.0.8",
"resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.8.tgz",
@@ -415,11 +643,25 @@
"node": ">=10.13.0"
}
},
+ "node_modules/@types/esrecurse": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz",
+ "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@types/estree": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
"integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
},
+ "node_modules/@types/json-schema": {
+ "version": "7.0.15",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@types/resolve": {
"version": "1.20.2",
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
@@ -458,6 +700,46 @@
"node": ">=12"
}
},
+ "node_modules/acorn": {
+ "version": "8.16.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/acorn-jsx": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/ajv": {
+ "version": "6.14.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+ "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
"node_modules/ansi-colors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -1417,6 +1699,13 @@
}
}
},
+ "node_modules/deep-is": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/deepmerge": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -1622,6 +1911,190 @@
"node": ">=6"
}
},
+ "node_modules/escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint": {
+ "version": "10.2.1",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.2.1.tgz",
+ "integrity": "sha512-wiyGaKsDgqXvF40P8mDwiUp/KQjE1FdrIEJsM8PZ3XCiniTMXS3OHWWUe5FI5agoCnr8x4xPrTDZuxsBlNHl+Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.8.0",
+ "@eslint-community/regexpp": "^4.12.2",
+ "@eslint/config-array": "^0.23.5",
+ "@eslint/config-helpers": "^0.5.5",
+ "@eslint/core": "^1.2.1",
+ "@eslint/plugin-kit": "^0.7.1",
+ "@humanfs/node": "^0.16.6",
+ "@humanwhocodes/module-importer": "^1.0.1",
+ "@humanwhocodes/retry": "^0.4.2",
+ "@types/estree": "^1.0.6",
+ "ajv": "^6.14.0",
+ "cross-spawn": "^7.0.6",
+ "debug": "^4.3.2",
+ "escape-string-regexp": "^4.0.0",
+ "eslint-scope": "^9.1.2",
+ "eslint-visitor-keys": "^5.0.1",
+ "espree": "^11.2.0",
+ "esquery": "^1.7.0",
+ "esutils": "^2.0.2",
+ "fast-deep-equal": "^3.1.3",
+ "file-entry-cache": "^8.0.0",
+ "find-up": "^5.0.0",
+ "glob-parent": "^6.0.2",
+ "ignore": "^5.2.0",
+ "imurmurhash": "^0.1.4",
+ "is-glob": "^4.0.0",
+ "json-stable-stringify-without-jsonify": "^1.0.1",
+ "minimatch": "^10.2.4",
+ "natural-compare": "^1.4.0",
+ "optionator": "^0.9.3"
+ },
+ "bin": {
+ "eslint": "bin/eslint.js"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "funding": {
+ "url": "https://eslint.org/donate"
+ },
+ "peerDependencies": {
+ "jiti": "*"
+ },
+ "peerDependenciesMeta": {
+ "jiti": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-prettier": {
+ "version": "5.5.5",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
+ "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "prettier-linter-helpers": "^1.0.1",
+ "synckit": "^0.11.12"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-plugin-prettier"
+ },
+ "peerDependencies": {
+ "@types/eslint": ">=8.0.0",
+ "eslint": ">=8.0.0",
+ "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0",
+ "prettier": ">=3.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/eslint": {
+ "optional": true
+ },
+ "eslint-config-prettier": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-scope": {
+ "version": "9.1.2",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+ "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "@types/esrecurse": "^4.3.1",
+ "@types/estree": "^1.0.8",
+ "esrecurse": "^4.3.0",
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint-visitor-keys": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+ "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/balanced-match": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/eslint/node_modules/brace-expansion": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+ "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/eslint/node_modules/glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
+ "node_modules/eslint/node_modules/minimatch": {
+ "version": "10.2.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+ "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+ "dev": true,
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "brace-expansion": "^5.0.5"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
"node_modules/esm": {
"version": "3.2.25",
"resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
@@ -1631,12 +2104,76 @@
"node": ">=6"
}
},
+ "node_modules/espree": {
+ "version": "11.2.0",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+ "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "acorn": "^8.16.0",
+ "acorn-jsx": "^5.3.2",
+ "eslint-visitor-keys": "^5.0.1"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/esquery": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+ "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "estraverse": "^5.1.0"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/esrecurse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
"node_modules/estree-walker": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
"dev": true
},
+ "node_modules/esutils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/eventemitter3": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@@ -1694,11 +2231,32 @@
"node": ">=0.10.0"
}
},
+ "node_modules/fast-deep-equal": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/fast-diff": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+ "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
"node_modules/fast-fifo": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
"integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
},
+ "node_modules/fast-json-stable-stringify": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/fast-levenshtein": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz",
@@ -1723,6 +2281,19 @@
"reusify": "^1.0.4"
}
},
+ "node_modules/file-entry-cache": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+ "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "flat-cache": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
"node_modules/fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -1734,6 +2305,23 @@
"node": ">=8"
}
},
+ "node_modules/find-up": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "locate-path": "^6.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/findup-sync": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
@@ -1771,6 +2359,27 @@
"node": ">= 10.13.0"
}
},
+ "node_modules/flat-cache": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+ "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "flatted": "^3.2.9",
+ "keyv": "^4.5.4"
+ },
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/flatted": {
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+ "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+ "dev": true,
+ "license": "ISC"
+ },
"node_modules/for-each": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
@@ -2033,6 +2642,19 @@
"which": "bin/which"
}
},
+ "node_modules/globals": {
+ "version": "17.5.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-17.5.0.tgz",
+ "integrity": "sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/glogg": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz",
@@ -2381,6 +3003,16 @@
}
]
},
+ "node_modules/ignore": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+ "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 4"
+ }
+ },
"node_modules/image-size": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -2423,6 +3055,16 @@
"node": ">=8"
}
},
+ "node_modules/imurmurhash": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.8.19"
+ }
+ },
"node_modules/inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -2769,6 +3411,37 @@
"js-yaml": "bin/js-yaml.js"
}
},
+ "node_modules/json-buffer": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/json-stable-stringify-without-jsonify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/keyv": {
+ "version": "4.5.4",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+ "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "json-buffer": "3.0.1"
+ }
+ },
"node_modules/last-run": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz",
@@ -2832,6 +3505,20 @@
"node": ">=12"
}
},
+ "node_modules/levn": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "prelude-ls": "^1.2.1",
+ "type-check": "~0.4.0"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
"node_modules/lie": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
@@ -2932,6 +3619,22 @@
"lie": "3.1.1"
}
},
+ "node_modules/locate-path": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "p-locate": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -3202,6 +3905,13 @@
"integrity": "sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==",
"dev": true
},
+ "node_modules/natural-compare": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/nedb-promises": {
"version": "6.2.3",
"resolved": "https://registry.npmjs.org/nedb-promises/-/nedb-promises-6.2.3.tgz",
@@ -3370,6 +4080,31 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/optionator": {
+ "version": "0.9.4",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+ "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "deep-is": "^0.1.3",
+ "fast-levenshtein": "^2.0.6",
+ "levn": "^0.4.1",
+ "prelude-ls": "^1.2.1",
+ "type-check": "^0.4.0",
+ "word-wrap": "^1.2.5"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/optionator/node_modules/fast-levenshtein": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -3379,6 +4114,38 @@
"node": ">=4"
}
},
+ "node_modules/p-limit": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "yocto-queue": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-locate": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "p-limit": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/p-queue": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
@@ -3442,6 +4209,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -4140,6 +4917,16 @@
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
"dev": true
},
+ "node_modules/prelude-ls": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
"node_modules/prettier": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
@@ -4155,6 +4942,19 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
+ "node_modules/prettier-linter-helpers": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
+ "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-diff": "^1.1.2"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
"node_modules/promise.series": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz",
@@ -4181,6 +4981,16 @@
"integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
"optional": true
},
+ "node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -4950,6 +5760,22 @@
"node": ">= 10"
}
},
+ "node_modules/synckit": {
+ "version": "0.11.12",
+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+ "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@pkgr/core": "^0.2.9"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/synckit"
+ }
+ },
"node_modules/teex": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
@@ -5010,6 +5836,19 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
},
+ "node_modules/type-check": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "prelude-ls": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
"node_modules/unc-path-regex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -5070,6 +5909,16 @@
"browserslist": ">= 4.21.0"
}
},
+ "node_modules/uri-js": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "punycode": "^2.1.0"
+ }
+ },
"node_modules/util": {
"version": "0.12.5",
"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
@@ -5222,6 +6071,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/word-wrap": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+ "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/wrap-ansi": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
@@ -5313,6 +6172,19 @@
"engines": {
"node": ">=12"
}
+ },
+ "node_modules/yocto-queue": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
}
}
}
diff --git a/package.json b/package.json
index 183d2de2..28c83549 100644
--- a/package.json
+++ b/package.json
@@ -17,13 +17,18 @@
"pullYMLtoLDB": "node ./tools/pullYMLtoLDB.mjs",
"pullYMLtoLDBBuild": "node ./tools/pullYMLtoLDB.mjs --build",
"createSymlink": "node ./tools/create-symlink.mjs",
- "setup:dev": "node ./tools/dev-setup.mjs"
+ "setup:dev": "node ./tools/dev-setup.mjs",
+ "lint": "eslint",
+ "lint:fix": "eslint --fix"
},
"devDependencies": {
"@foundryvtt/foundryvtt-cli": "^1.0.2",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"concurrently": "^8.2.2",
+ "eslint": "^10.2.1",
+ "eslint-plugin-prettier": "^5.5.5",
+ "globals": "^17.5.0",
"husky": "^9.1.5",
"lint-staged": "^15.2.10",
"postcss": "^8.4.32",
diff --git a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
index 4c63297d..12ec35ae 100644
--- a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
+++ b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
@@ -131,12 +131,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -187,7 +184,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -213,7 +210,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -249,33 +247,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "vgguNWz8vG8aoLXR": {
- "type": "effect",
- "_id": "vgguNWz8vG8aoLXR",
+ "SrNyZgPvCXMpbCLG": {
+ "type": "attack",
+ "_id": "SrNyZgPvCXMpbCLG",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "4"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
"type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/magic/unholy/orb-hands-pink.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
index 5cbc1f82..38e7ceab 100644
--- a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
+++ b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -242,33 +240,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "cbAvPSIhwBMBTI3D": {
- "type": "effect",
- "_id": "cbAvPSIhwBMBTI3D",
+ "FCeTuf71gCzRiO5N": {
+ "type": "attack",
+ "_id": "FCeTuf71gCzRiO5N",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "6"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
"type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
index 4f04a85a..db26605d 100644
--- a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
+++ b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -242,33 +240,95 @@
"description": "Spend a Fear to choose a target and spotlight all Cult @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "EH1preaTWBD4rOvx": {
- "type": "effect",
- "_id": "EH1preaTWBD4rOvx",
+ "4M2MvVzEgIQEQHBS": {
+ "type": "attack",
+ "_id": "4M2MvVzEgIQEQHBS",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "5"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": null,
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
index 2c2633ea..5b8fa7b2 100644
--- a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
+++ b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -242,33 +240,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "vXHZVb0Y7Hqu3uso": {
- "type": "effect",
- "_id": "vXHZVb0Y7Hqu3uso",
+ "S3dYxRclyhYINRi8": {
+ "type": "attack",
+ "_id": "S3dYxRclyhYINRi8",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "5"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/magic/unholy/orb-hands-pink.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
index 8c0d7b95..484e161a 100644
--- a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
+++ b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -320,33 +318,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "QHNRSEQmqOcaoXq4": {
- "type": "effect",
- "_id": "QHNRSEQmqOcaoXq4",
+ "G0DVft7h55pBnwJA": {
+ "type": "attack",
+ "_id": "G0DVft7h55pBnwJA",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "12"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/magic/unholy/orb-hands-pink.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
index 5ad77ab0..63d9ca2c 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
@@ -174,12 +174,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -230,7 +227,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -256,7 +253,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -496,34 +494,42 @@
"description": "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/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
index 822ee035..746806d9 100644
--- a/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
+++ b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
@@ -131,12 +131,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -187,7 +184,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -213,7 +210,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -272,8 +270,38 @@
"recovery": null
},
"damage": {
- "parts": {},
- "includeBase": false
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "1"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "groupAttack": "close"
},
"target": {
"type": "any",
@@ -300,7 +328,7 @@
"difficulty": null,
"damageMod": "none"
},
- "name": "Attack",
+ "name": "Spend Fear",
"img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
diff --git a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
index 376ebace..6611496f 100644
--- a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
+++ b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -242,35 +240,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "DjbPQowW1OdBD9Zn": {
- "type": "effect",
- "_id": "DjbPQowW1OdBD9Zn",
+ "wez1xgy9vScux9wi": {
+ "type": "attack",
+ "_id": "wez1xgy9vScux9wi",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
+ "triggers": [],
"cost": [
{
+ "consumeOnSuccess": false,
"scalable": false,
"key": "fear",
"value": 1,
- "keyIsID": false,
- "step": null,
- "consumeOnSuccess": false
+ "itemId": null,
+ "step": null
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "5"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
index 6a131c86..3e1ab854 100644
--- a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
+++ b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -297,33 +295,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "eo7J0v1B5zPHul1M": {
- "type": "effect",
- "_id": "eo7J0v1B5zPHul1M",
+ "irZGPKPpGLA6sP2y": {
+ "type": "attack",
+ "_id": "irZGPKPpGLA6sP2y",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "10"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
index cfcdea8b..076318c6 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
@@ -131,12 +131,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -187,7 +184,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -213,7 +210,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -251,33 +249,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name] within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "aoQDb2m32NDxE6ZP": {
- "type": "effect",
- "_id": "aoQDb2m32NDxE6ZP",
+ "ferZO3BuiP9zU46m": {
+ "type": "attack",
+ "_id": "ferZO3BuiP9zU46m",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
+ "triggers": [],
"cost": [
{
+ "consumeOnSuccess": false,
"scalable": false,
"key": "fear",
"value": 1,
+ "itemId": null,
"step": null
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "2"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
"type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
index b2217e66..163556e9 100644
--- a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
+++ b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -245,33 +243,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "xTMNAHcoErKuR6TZ": {
- "type": "effect",
- "_id": "xTMNAHcoErKuR6TZ",
+ "xFlhxnQWmVvDqQ55": {
+ "type": "attack",
+ "_id": "xFlhxnQWmVvDqQ55",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "4"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
index 5a7a605a..0bb3a44c 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -242,33 +240,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "tvQetauskZoHDR5y": {
- "type": "effect",
- "_id": "tvQetauskZoHDR5y",
+ "6VKv71tPUIGGIfkZ": {
+ "type": "attack",
+ "_id": "6VKv71tPUIGGIfkZ",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
+ "triggers": [],
"cost": [
{
+ "consumeOnSuccess": false,
"scalable": false,
"key": "fear",
"value": 1,
+ "itemId": null,
"step": null
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "11"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
index 6755d27f..f1c7f470 100644
--- a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
+++ b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -245,33 +243,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "DJBNtd3hWjwsjPwq": {
- "type": "effect",
- "_id": "DJBNtd3hWjwsjPwq",
+ "8wRrAWHU0xHW4zuE": {
+ "type": "attack",
+ "_id": "8wRrAWHU0xHW4zuE",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "2"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
index ed6d7775..46bed122 100644
--- a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
+++ b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -245,33 +243,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "ghgFZskDiizJDjcn": {
- "type": "effect",
- "_id": "ghgFZskDiizJDjcn",
+ "K3pF2DBnR9zJ90W8": {
+ "type": "attack",
+ "_id": "K3pF2DBnR9zJ90W8",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
+ "triggers": [],
"cost": [
{
+ "consumeOnSuccess": false,
"scalable": false,
"key": "fear",
"value": 1,
+ "itemId": null,
"step": null
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "3"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
index e4cbab5e..1a82abb8 100644
--- a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
+++ b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -245,33 +243,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "Sz55uB8xkoNytLwJ": {
- "type": "effect",
- "_id": "Sz55uB8xkoNytLwJ",
+ "6rdwJKwsSCO4R0Ty": {
+ "type": "attack",
+ "_id": "6rdwJKwsSCO4R0Ty",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "1"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
index c36502de..d635b2ca 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_XcAGOSmtCFLT1unN.json
@@ -164,12 +164,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -220,7 +217,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -246,7 +243,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -284,33 +282,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "ZC5pKIb9N82vgMWu": {
- "type": "effect",
- "_id": "ZC5pKIb9N82vgMWu",
+ "V58Ry90tvIjvfDTZ": {
+ "type": "attack",
+ "_id": "V58Ry90tvIjvfDTZ",
"systemPath": "actions",
+ "baseAction": false,
"description": "",
"chatDisplay": true,
+ "originItem": {
+ "type": "itemCollection"
+ },
"actionType": "action",
+ "triggers": [],
"cost": [
{
+ "consumeOnSuccess": false,
"scalable": false,
"key": "fear",
"value": 1,
+ "itemId": null,
"step": null
}
],
"uses": {
"value": null,
"max": "",
- "recovery": null
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "2"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/creatures/abilities/tail-strike-bone-orange.webp",
"range": ""
}
},
diff --git a/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json b/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
index c6c11d36..c03a1b52 100644
--- a/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
+++ b/src/packs/adversaries/adversary_Treant_Sapling_o63nS0k3wHu6EgKP.json
@@ -125,12 +125,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -181,7 +178,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -207,7 +204,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -242,33 +240,95 @@
"description": "Spend a Fear to choose a target and spotlight all @Lookup[@name]s within Close range of them. Those Minions move into Melee range of the target and make one shared attack roll. On a success, they deal @Lookup[@system.attack.damageFormula] physical damage each. Combine this damage.
",
"resource": null,
"actions": {
- "euP8VA4wvfsCpwN1": {
- "type": "effect",
- "_id": "euP8VA4wvfsCpwN1",
+ "Itubbr63irPJcbXG": {
+ "type": "attack",
+ "_id": "Itubbr63irPJcbXG",
"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
+ "recovery": null,
+ "consumeOnSuccess": false
+ },
+ "damage": {
+ "parts": {
+ "hitPoints": {
+ "applyTo": "hitPoints",
+ "resultBased": false,
+ "value": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": true,
+ "formula": "8"
+ }
+ },
+ "valueAlt": {
+ "multiplier": "flat",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "bonus": null,
+ "custom": {
+ "enabled": false,
+ "formula": ""
+ }
+ },
+ "base": false,
+ "type": [
+ "physical"
+ ]
+ }
+ },
+ "includeBase": false,
+ "direct": false,
+ "groupAttack": "close"
},
- "effects": [],
"target": {
- "type": "self",
+ "type": "any",
"amount": null
},
+ "effects": [],
+ "roll": {
+ "type": "attack",
+ "trait": null,
+ "difficulty": null,
+ "bonus": null,
+ "advState": "neutral",
+ "diceRolling": {
+ "multiplier": "prof",
+ "flatMultiplier": 1,
+ "dice": "d6",
+ "compare": null,
+ "treshold": null
+ },
+ "useDefault": false
+ },
+ "save": {
+ "trait": null,
+ "difficulty": null,
+ "damageMod": "none"
+ },
"name": "Spend Fear",
- "img": "icons/magic/unholy/orb-hands-pink.webp",
"range": ""
}
},
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_Bare_Bones_l5D9kq901JDESaXw.json b/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json
index 098f5f4c..7956d6eb 100644
--- a/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json
+++ b/src/packs/domains/domainCard_Bare_Bones_l5D9kq901JDESaXw.json
@@ -4,7 +4,7 @@
"type": "domainCard",
"folder": "QpOL7jPbMBzH96qR",
"system": {
- "description": "When you choose not to equip armor, you have a base Armor Score of 3 + your Strength and use the following as your base damage thresholds:
Tier 1: Tier 2: Tier 3: Tier 4: Equip the below armor to use Bare Bones.
@UUID[Compendium.daggerheart.armors.Item.ITAjcigTcUw5pMCN]{Bare Bones}
",
+ "description": "When you choose not to equip armor, you have a base Armor Score of 3 + your Strength and use the following as your base damage thresholds:
Tier 1:
Tier 2:
Tier 3:
Tier 4:
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?
- {{localize "Cancel"}}
+ {{localize "COMMON.Cancel"}}
diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs
index b2d1a895..7bcd7063 100644
--- a/templates/dialogs/dice-roll/damageSelection.hbs
+++ b/templates/dialogs/dice-roll/damageSelection.hbs
@@ -35,13 +35,31 @@
-
{{localize "DAGGERHEART.GENERAL.criticalShort"}}
{{/each}}
+
+ {{#if damageOptions.groupAttack}}
+
+ {{localize "DAGGERHEART.ACTIONS.Settings.groupAttack.label"}}
+
+
+
+
+
+
+ {{selectOptions rangeOptions selected=damageOptions.groupAttack.range localize=true}}
+
+
+
+ {{/if}}
+
{{#unless (empty @root.modifiers)}}
{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}
diff --git a/templates/dialogs/dice-roll/rollSelection.hbs b/templates/dialogs/dice-roll/rollSelection.hbs
index 64a3cdcb..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}}
@@ -175,7 +175,7 @@
{{/if}}
{{#if (eq @root.rollType 'DualityRoll')}}{{localize "DAGGERHEART.GENERAL.situationalBonus"}} {{/if}}
-
{{/if}}
{{/unless}}
diff --git a/templates/dialogs/downtime/downtime.hbs b/templates/dialogs/downtime/downtime.hbs
index 9744ffea..edaa81c1 100644
--- a/templates/dialogs/downtime/downtime.hbs
+++ b/templates/dialogs/downtime/downtime.hbs
@@ -28,7 +28,7 @@
- {{localize "Cancel"}}
+ {{localize "COMMON.Cancel"}}
{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}
\ No newline at end of file
diff --git a/templates/dialogs/groupRollDialog/footer.hbs b/templates/dialogs/groupRollDialog/footer.hbs
new file mode 100644
index 00000000..e401966b
--- /dev/null
+++ b/templates/dialogs/groupRollDialog/footer.hbs
@@ -0,0 +1,6 @@
+
+
+ {{localize "COMMON.Cancel"}}
+ {{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.finishGroupRoll"}}
+
+
\ No newline at end of file
diff --git a/templates/dialogs/groupRollDialog/groupRoll.hbs b/templates/dialogs/groupRollDialog/groupRoll.hbs
new file mode 100644
index 00000000..edf1c980
--- /dev/null
+++ b/templates/dialogs/groupRollDialog/groupRoll.hbs
@@ -0,0 +1,20 @@
+
+
+ {{localize "DAGGERHEART.GENERAL.result.single"}}
+
+
+ {{#if hasRolled}}
{{groupRoll.total}} {{groupRoll.totalLabel}} {{/if}}
+
+ {{#if groupRoll.leaderTotal includeZero=true}}{{groupRoll.leaderTotal}}{{else}}{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.leaderRoll"}}{{/if}}
+ {{#each groupRoll.modifiers as |modifier|}}
+ {{#if (gte modifier 0)}}+{{else}}-{{/if}}
+ {{positive modifier}}
+ {{/each}}
+ {{#unless groupRoll.modifiers.length}}
+ +
+ {{localize "DAGGERHEART.GENERAL.Modifier.plural"}}
+ {{/unless}}
+
+
+
\ No newline at end of file
diff --git a/templates/dialogs/groupRollDialog/groupRollMember.hbs b/templates/dialogs/groupRollDialog/groupRollMember.hbs
new file mode 100644
index 00000000..acf8e8f1
--- /dev/null
+++ b/templates/dialogs/groupRollDialog/groupRollMember.hbs
@@ -0,0 +1,85 @@
+{{#with (lookup members partId)}}
+
+
+
+
+
+
+ {{#if readyToRoll}}
+
+
+ {{localize "DAGGERHEART.GENERAL.roll"}}
+
+
+
+ {{#if roll}}
+
+
{{roll.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=roll.totalLabel}}
+
+
+ {{roll.dHope.total}}
+
+
+
+
+ {{roll.dFear.total}}
+
+ {{#if roll.advantage.type}}
+
{{#if (eq roll.advantage.type 1)}}+{{else}}-{{/if}}
+
+ {{roll.advantage.value}}
+
+ {{/if}}
+
{{#if (gte roll.modifierTotal 0)}}+{{else}}-{{/if}}
+
{{positive roll.modifierTotal}}
+
+
+ {{else}}
+
{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}
+ {{/if}}
+
+ {{/if}}
+ {{#if hasRolled}}
+
+ {{#if ../isGM}}
+
+ {{/if}}
+
+ {{localize "DAGGERHEART.GENERAL.Modifier.single"}}{{#if successfull}} + 1{{else if (isNullish successfull)}} + ?{{else}} - 1{{/if}}
+
+
+ {{/if}}
+
+{{/with}}
\ No newline at end of file
diff --git a/templates/dialogs/groupRollDialog/initialization.hbs b/templates/dialogs/groupRollDialog/initialization.hbs
new file mode 100644
index 00000000..a520b8bd
--- /dev/null
+++ b/templates/dialogs/groupRollDialog/initialization.hbs
@@ -0,0 +1,32 @@
+
\ No newline at end of file
diff --git a/templates/dialogs/groupRollDialog/leader.hbs b/templates/dialogs/groupRollDialog/leader.hbs
new file mode 100644
index 00000000..3d5db3f7
--- /dev/null
+++ b/templates/dialogs/groupRollDialog/leader.hbs
@@ -0,0 +1,73 @@
+
+ {{#with leader}}
+
+
{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.leader"}}
+
+
+
+
+
+
+
+
+ {{localize "DAGGERHEART.GENERAL.roll"}}
+
+
+
+ {{#if roll}}
+
+
{{roll.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=roll.totalLabel}}
+
+
+ {{roll.dHope.total}}
+
+
+
+
+ {{roll.dFear.total}}
+
+ {{#if roll.advantage.type}}
+
{{#if (eq roll.advantage.type 1)}}+{{else}}-{{/if}}
+
+ {{roll.advantage.value}}
+
+ {{/if}}
+
{{#if (gte roll.modifierTotal 0)}}+{{else}}-{{/if}}
+
{{positive roll.modifierTotal}}
+
+
+ {{else}}
+
{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}
+ {{/if}}
+
+
\ No newline at end of file
diff --git a/templates/dialogs/image-select/footer.hbs b/templates/dialogs/image-select/footer.hbs
index cd7d3d1a..58a60cc4 100644
--- a/templates/dialogs/image-select/footer.hbs
+++ b/templates/dialogs/image-select/footer.hbs
@@ -1,4 +1,4 @@
\ No newline at end of file
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/dialogs/multiclassChoice.hbs b/templates/dialogs/multiclassChoice.hbs
index 3c89ff1a..55365939 100644
--- a/templates/dialogs/multiclassChoice.hbs
+++ b/templates/dialogs/multiclassChoice.hbs
@@ -16,7 +16,7 @@
- {{localize "Cancel"}}
+ {{localize "COMMON.Cancel"}}
{{localize "DAGGERHEART.GENERAL.multiclass"}}
diff --git a/templates/dialogs/tagTeamDialog/initialization.hbs b/templates/dialogs/tagTeamDialog/initialization.hbs
index d25e8f6c..7ccdf566 100644
--- a/templates/dialogs/tagTeamDialog/initialization.hbs
+++ b/templates/dialogs/tagTeamDialog/initialization.hbs
@@ -1,5 +1,4 @@
- {{partId}}
{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.selectParticipants"}}
{{#each memberSelection as |member|}}
diff --git a/templates/levelup/tabs/footer.hbs b/templates/levelup/tabs/footer.hbs
index 2ee7a316..d487e657 100644
--- a/templates/levelup/tabs/footer.hbs
+++ b/templates/levelup/tabs/footer.hbs
@@ -20,7 +20,7 @@
{{/if}}
{{#unless levelupAuto}}
{{/unless}}
diff --git a/templates/settings/appearance-settings/diceSoNice.hbs b/templates/settings/appearance-settings/diceSoNice.hbs
index afe7dd5a..6cd4e52e 100644
--- a/templates/settings/appearance-settings/diceSoNice.hbs
+++ b/templates/settings/appearance-settings/diceSoNice.hbs
@@ -9,9 +9,16 @@
{{/if}}
diff --git a/templates/settings/appearance-settings/diceSoNiceTab.hbs b/templates/settings/appearance-settings/diceSoNiceTab.hbs
index a15b63ec..89b587af 100644
--- a/templates/settings/appearance-settings/diceSoNiceTab.hbs
+++ b/templates/settings/appearance-settings/diceSoNiceTab.hbs
@@ -42,9 +42,15 @@
{{#if animations}}
{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.animations"}}
-
+
{{localize "DAGGERHEART.CONFIG.DaggerheartDiceAnimationEvents.higher.name"}}
- {{formInput fields.sfx.fields.higher.fields.class value=values.sfx.higher.class blank="" localize=true}}
+
+ {{formInput fields.sfx.fields.higher.fields.class value=values.sfx.higher.class blank="" localize=true}}
+
+ {{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.muted"}}
+ {{formInput fields.sfx.fields.higher.fields.options.fields.muteSound value=values.sfx.higher.options.muteSound localize=true}}
+
+
{{/if}}
diff --git a/templates/settings/automation-settings/footer.hbs b/templates/settings/automation-settings/footer.hbs
index 54939c17..14ff5bb5 100644
--- a/templates/settings/automation-settings/footer.hbs
+++ b/templates/settings/automation-settings/footer.hbs
@@ -1,10 +1,10 @@
\ No newline at end of file
diff --git a/templates/settings/downtime-config/actions.hbs b/templates/settings/downtime-config/actions.hbs
index d197f983..feb05302 100644
--- a/templates/settings/downtime-config/actions.hbs
+++ b/templates/settings/downtime-config/actions.hbs
@@ -8,7 +8,7 @@
{{#each move.actions as |action|}}
- {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" id=action.id }}
+ {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" id=action.id type="action" }}
{{/each}}
diff --git a/templates/settings/downtime-config/footer.hbs b/templates/settings/downtime-config/footer.hbs
index 5e5f31dd..199aea15 100644
--- a/templates/settings/downtime-config/footer.hbs
+++ b/templates/settings/downtime-config/footer.hbs
@@ -1,4 +1,4 @@
\ No newline at end of file
diff --git a/templates/settings/homebrew-settings/footer.hbs b/templates/settings/homebrew-settings/footer.hbs
index 954572de..fc84fde7 100644
--- a/templates/settings/homebrew-settings/footer.hbs
+++ b/templates/settings/homebrew-settings/footer.hbs
@@ -1,10 +1,10 @@
\ No newline at end of file
diff --git a/templates/settings/metagaming-settings/footer.hbs b/templates/settings/metagaming-settings/footer.hbs
index 54939c17..14ff5bb5 100644
--- a/templates/settings/metagaming-settings/footer.hbs
+++ b/templates/settings/metagaming-settings/footer.hbs
@@ -1,10 +1,10 @@
\ No newline at end of file
diff --git a/templates/settings/variant-rules.hbs b/templates/settings/variant-rules.hbs
index df7accb3..cdaef024 100644
--- a/templates/settings/variant-rules.hbs
+++ b/templates/settings/variant-rules.hbs
@@ -32,11 +32,11 @@
\ No newline at end of file
diff --git a/templates/sheets-settings/companion-settings/attack.hbs b/templates/sheets-settings/companion-settings/attack.hbs
index f99f7d8c..41451ef0 100644
--- a/templates/sheets-settings/companion-settings/attack.hbs
+++ b/templates/sheets-settings/companion-settings/attack.hbs
@@ -18,5 +18,5 @@
{{/if}}
{{/if}}
- {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack." directField=systemFields.attack.fields.damage.fields.direct}}
+ {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack." baseFields=systemFields.attack.fields.damage.fields}}
\ No newline at end of file
diff --git a/templates/sheets/activeEffect/settings.hbs b/templates/sheets/activeEffect/settings.hbs
index 9307ff65..09b78856 100644
--- a/templates/sheets/activeEffect/settings.hbs
+++ b/templates/sheets/activeEffect/settings.hbs
@@ -26,11 +26,11 @@
{{formGroup systemFields.duration.fields.type value=source.system.duration.type localize=true }}
-
\ No newline at end of file
diff --git a/templates/sheets/actors/character/effects.hbs b/templates/sheets/actors/character/effects.hbs
index 3355d575..a2e5a420 100644
--- a/templates/sheets/actors/character/effects.hbs
+++ b/templates/sheets/actors/character/effects.hbs
@@ -7,7 +7,7 @@
type='effect'
isGlassy=true
collection=effects.actives
- canCreate=true
+ canCreate=@root.editable
hideResources=true
}}
@@ -16,7 +16,7 @@
type='effect'
isGlassy=true
collection=effects.inactives
- canCreate=true
+ canCreate=@root.editable
hideResources=true
disabled=true
}}
diff --git a/templates/sheets/actors/character/features.hbs b/templates/sheets/actors/character/features.hbs
index 3e942468..70544683 100644
--- a/templates/sheets/actors/character/features.hbs
+++ b/templates/sheets/actors/character/features.hbs
@@ -8,8 +8,8 @@
type='feature'
actorType='character'
collection=category.values
- canCreate=true
- showActions=true
+ canCreate=@root.editable
+ showActions=@root.editable
}}
{{else if category.values}}
{{> 'daggerheart.inventory-items'
@@ -18,7 +18,7 @@
actorType='character'
collection=category.values
canCreate=false
- showActions=true
+ showActions=@root.editable
}}
{{/if}}
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index 06f464fa..a75b2c2f 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -4,17 +4,29 @@
- {{#if (or document.system.needsCharacterSetup document.system.levelData.canLevelUp)}}
-
-
+ {{#if @root.editable}}
+ {{#if document.system.needsCharacterSetup}}
+
+ {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.buttonTitle"}}
+
+ {{else if document.system.levelData.canLevelUp}}
+
+
+ {{/if}}
{{/if}}
- {{localize 'DAGGERHEART.GENERAL.level'}}
-
@@ -100,12 +112,14 @@
{{/if}}
-
-
-
-
+ {{#if @root.editable}}
+
+
+
+
+ {{/if}}
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index a05fed35..c3ddb0ad 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -5,7 +5,7 @@
-
- {{#each this.inventory.currencies as |currency key|}}
- {{#if currency.enabled}}
-
-
-
-
- {{/if}}
- {{/each}}
-
@@ -33,7 +22,7 @@
type='weapon'
collection=@root.inventory.weapons
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
hideResources=true
}}
{{> 'daggerheart.inventory-items'
@@ -41,7 +30,7 @@
type='armor'
collection=@root.inventory.armor
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
hideResources=true
}}
{{> 'daggerheart.inventory-items'
@@ -49,15 +38,17 @@
type='consumable'
collection=@root.inventory.consumables
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.loot'
type='loot'
collection=@root.inventory.loot
isGlassy=true
- canCreate=true
- showActions=true
+ canCreate=@root.editable
+ showActions=@root.editable
+ isQuantifiable=true
}}
\ No newline at end of file
diff --git a/templates/sheets/actors/character/loadout.hbs b/templates/sheets/actors/character/loadout.hbs
index 0319d56f..9ba3fb04 100644
--- a/templates/sheets/actors/character/loadout.hbs
+++ b/templates/sheets/actors/character/loadout.hbs
@@ -5,7 +5,7 @@
-
{{/times}}
-
+
{{localize "DAGGERHEART.GENERAL.armorSlots"}}
{{document.system.armorScore.value}} / {{document.system.armorScore.max}}
-
@@ -64,9 +64,9 @@
value='{{document.system.armorScore.value}}'
max='{{document.system.armorScore.max}}'
>
-
+
{{localize "DAGGERHEART.GENERAL.armorSlots"}}
-
{{/if}}
diff --git a/templates/sheets/actors/companion/effects.hbs b/templates/sheets/actors/companion/effects.hbs
index cefb6e57..087e8b30 100644
--- a/templates/sheets/actors/companion/effects.hbs
+++ b/templates/sheets/actors/companion/effects.hbs
@@ -6,7 +6,7 @@
type='effect'
isGlassy=true
collection=effects.actives
- canCreate=true
+ canCreate=@root.editable
hideResources=true
}}
@@ -15,7 +15,7 @@
type='effect'
isGlassy=true
collection=effects.inactives
- canCreate=true
+ canCreate=@root.editable
hideResources=true
}}
diff --git a/templates/sheets/actors/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 3ad36023..3fd512da 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -9,8 +9,8 @@
type='feature'
collection=@root.features
hideContextMenu=true
- canCreate=true
- showActions=true
+ canCreate=@root.editable
+ showActions=@root.editable
}}
\ No newline at end of file
diff --git a/templates/sheets/actors/party/header.hbs b/templates/sheets/actors/party/header.hbs
index f39f683f..3fdb137d 100644
--- a/templates/sheets/actors/party/header.hbs
+++ b/templates/sheets/actors/party/header.hbs
@@ -3,7 +3,6 @@
\ No newline at end of file
diff --git a/templates/sheets/actors/party/inventory.hbs b/templates/sheets/actors/party/inventory.hbs
index 92371b8d..cf056608 100644
--- a/templates/sheets/actors/party/inventory.hbs
+++ b/templates/sheets/actors/party/inventory.hbs
@@ -5,7 +5,7 @@
-
- {{#each this.inventory.currencies as |currency key|}}
- {{#if currency.enabled}}
-
-
-
-
- {{/if}}
- {{/each}}
-
@@ -37,9 +26,10 @@
actorType='party'
collection=@root.inventory.weapons
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
hideResources=true
hideContextMenu=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.armor'
@@ -47,9 +37,10 @@
actorType='party'
collection=@root.inventory.armor
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
hideResources=true
hideContextMenu=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.consumable'
@@ -57,8 +48,9 @@
actorType='party'
collection=@root.inventory.consumables
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
hideContextMenu=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.loot'
@@ -66,8 +58,9 @@
actorType='party'
collection=@root.inventory.loot
isGlassy=true
- canCreate=true
+ canCreate=@root.editable
hideContextMenu=true
+ isQuantifiable=true
}}
\ No newline at end of file
diff --git a/templates/sheets/actors/party/party-members.hbs b/templates/sheets/actors/party/party-members.hbs
index b3dd53e6..aa41aeaa 100644
--- a/templates/sheets/actors/party/party-members.hbs
+++ b/templates/sheets/actors/party/party-members.hbs
@@ -7,35 +7,162 @@
Tag Team Roll
+ {{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.title"}}
-
+
Group Roll
+ {{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.title"}}
+
+
+ {{localize "DAGGERHEART.APPLICATIONS.Downtime.shortRest.title"}}
+
+
+ {{localize "DAGGERHEART.APPLICATIONS.Downtime.longRest.title"}}
- {{!-- NOT YET IMPLEMENTED --}}
- {{!--
- Help Action
- --}}
-
- {{localize tabs.partyMembers.label}}
-
- {{#each document.system.partyMembers as |actor id|}}
- {{> 'daggerheart.inventory-item'
- item=actor
- type='character'
- isActor=true
- hideContextMenu=true
- }}
- {{/each}}
-
- {{#unless document.system.partyMembers.length}}
-
- {{localize "DAGGERHEART.GENERAL.dropActorsHere"}}
-
- {{/unless}}
-
-
\ No newline at end of file
+
+ {{#each partyMembers as |member id|}}
+
+
+
+ {{#if member.weapons}}
+
+ {{#each member.weapons as |weapon|}}
+
+ {{/each}}
+
+ {{/if}}
+ {{#if member.evasion includeZero=true}}
+
{{member.evasion}}
+ {{/if}}
+ {{#if member.difficulty includeZero=true}}
+
{{member.difficulty}}
+ {{/if}}
+ {{#unless (eq member.type 'companion')}}
+
+
{{localize "DAGGERHEART.ACTORS.Party.Thresholds.minor"}}
+ {{member.damageThresholds.major}}
+ {{localize "DAGGERHEART.ACTORS.Party.Thresholds.major"}}
+ {{member.damageThresholds.severe}}
+ {{localize "DAGGERHEART.ACTORS.Party.Thresholds.severe"}}
+
+ {{/unless}}
+
+
+ {{#unless (eq member.type 'companion') }}
+
+
+
+
+
+ {{member.resources.hitPoints.value}}
+ /
+ {{member.resources.hitPoints.max}}
+
+
+
+ {{#times member.resources.hitPoints.max}}
+
+
+ {{/times}}
+
+
+
+
+
+
+ {{member.resources.stress.value}}
+ /
+ {{member.resources.stress.max}}
+
+
+
+ {{#times member.resources.stress.max}}
+
+
+ {{/times}}
+
+
+
+
+
+
+ {{member.armorScore.value}}
+ /
+ {{member.armorScore.max}}
+
+
+
+
+ {{#if member.traits}}
+
+ {{#each member.traits as |trait|}}
+
+ {{trait.label}}
+ {{trait.value}}
+
+ {{/each}}
+
+ {{/if}}
+
+
+ {{/each}}
+
+ {{#unless document.system.partyMembers.length}}
+
+ {{localize "DAGGERHEART.GENERAL.dropActorsHere"}}
+
+ {{/unless}}
+
diff --git a/templates/sheets/actors/party/resources.hbs b/templates/sheets/actors/party/resources.hbs
deleted file mode 100644
index b53282ca..00000000
--- a/templates/sheets/actors/party/resources.hbs
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
- {{localize "DAGGERHEART.APPLICATIONS.Downtime.longRest.title"}}
-
-
- {{localize "DAGGERHEART.APPLICATIONS.Downtime.shortRest.title"}}
-
-
-
-
- {{localize tabs.resources.label}}
-
- {{#each document.system.partyMembers as |actor id|}}
-
- {{actor.name}}
-
- {{#unless (eq actor.type 'companion') }}
-
-
- {{#times actor.system.resources.hitPoints.max}}
-
-
- {{/times}}
-
-
- {{localize "DAGGERHEART.GENERAL.HitPoints.short"}}
- {{actor.system.resources.hitPoints.value}} / {{actor.system.resources.hitPoints.max}}
-
-
- {{/unless}}
-
-
-
- {{#times actor.system.resources.stress.max}}
-
-
- {{/times}}
-
-
- {{localize "DAGGERHEART.GENERAL.stress"}}
- {{actor.system.resources.stress.value}} / {{actor.system.resources.stress.max}}
-
-
-
- {{#if actor.system.armorScore.max}}
-
-
-
- {{localize "DAGGERHEART.GENERAL.armorSlots"}}
- {{actor.system.armorScore.value}} / {{actor.system.armorScore.max}}
-
-
- {{/if}}
-
- {{#unless (or (eq actor.type 'companion') (eq actor.type 'adversary')) }}
-
-
{{localize "DAGGERHEART.GENERAL.hope"}}
- {{#times actor.system.resources.hope.max}}
-
- {{#if (gte actor.system.resources.hope.value (add this 1))}}
-
- {{/times}}
-
- {{/unless}}
-
- {{#if (eq actor.type 'character')}}
-
-
{{localize "DAGGERHEART.GENERAL.evasion"}}: {{actor.system.evasion}}
-
- {{/if}}
-
- {{#unless (eq actor.type 'companion')}}
-
-
{{localize "DAGGERHEART.GENERAL.DamageThresholds.minor"}}
- {{actor.system.damageThresholds.major}}
- {{localize "DAGGERHEART.GENERAL.DamageThresholds.major"}}
- {{actor.system.damageThresholds.severe}}
- {{localize "DAGGERHEART.GENERAL.DamageThresholds.severe"}}
-
- {{/unless}}
-
- {{/each}}
-
-
-
\ No newline at end of file
diff --git a/templates/sheets/global/partials/gold.hbs b/templates/sheets/global/partials/gold.hbs
new file mode 100644
index 00000000..7aba2815
--- /dev/null
+++ b/templates/sheets/global/partials/gold.hbs
@@ -0,0 +1,12 @@
+
+ {{#each currencies as |currency key|}}
+ {{#if currency.enabled}}
+
+
+
+
+ {{/if}}
+ {{/each}}
+
{{#each collection as |item|}}
-
{{> 'daggerheart.inventory-item'
item=item
type=../type
disabledEffect=../disabledEffect
- actorType=../actorType
+ actorType=(ifThen ../actorType ../actorType @root.document.type)
hideControls=../hideControls
hideContextMenu=../hideContextMenu
isActor=../isActor
@@ -66,6 +65,7 @@ Parameters:
showLabels=../showLabels
isAction=../isAction
hideResources=../hideResources
+ isQuantifiable=../isQuantifiable
showActions=../showActions
}}
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 2129b969..d76f2897 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -25,11 +25,11 @@ Parameters:
>