cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-18 07:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts

Browse source
This commit is contained in:
Dapoolp 2025-07-15 13:46:55 +02:00
commit fbfc954564
74 changed files with 1906 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/config/flagsConfig.mjs
View file

@ -8,4 +8,4 @@ export const encounterCountdown = {
position: 'countdown-encounter-position'
};
export const itemAttachmentSource = 'attachmentSource';
export const itemAttachmentSource = 'attachmentSource';

25
module/config/generalConfig.mjs
View file

@ -366,31 +366,6 @@ export const abilityCosts = {
label: 'Armor Stack',
group: 'TYPES.Actor.character'
},
prayer: {
id: 'prayer',
label: 'Prayer Dice',
group: 'TYPES.Actor.character'
},
favor: {
id: 'favor',
label: 'Favor Points',
group: 'TYPES.Actor.character'
},
slayer: {
id: 'slayer',
label: 'Slayer Dice',
group: 'TYPES.Actor.character'
},
tide: {
id: 'tide',
label: 'Tide',
group: 'TYPES.Actor.character'
},
chaos: {
id: 'chaos',
label: 'Chaos',
group: 'TYPES.Actor.character'
},
fear: {
id: 'fear',
label: 'Fear',

16
module/config/itemConfig.mjs
View file

@ -1320,6 +1320,11 @@ export const featureTypes = {
}
};
export const featureSubTypes = {
primary: 'primary',
secondary: 'secondary'
};
export const actionTypes = {
passive: {
id: 'passive',
@ -1334,3 +1339,14 @@ export const actionTypes = {
label: 'DAGGERHEART.CONFIG.ActionType.reaction'
}
};
export const itemResourceTypes = {
simple: {
id: 'simple',
label: 'DAGGERHEART.CONFIG.ItemResourceType.simple'
},
diceValue: {
id: 'diceValue',
label: 'DAGGERHEART.CONFIG.ItemResourceType.diceValue'
}
};