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

Merge branch 'main' into feature/granular-action-outcomes

Browse source
This commit is contained in:
WBHarry 2026-06-30 20:49:37 +02:00
commit 2e9dede678
207 changed files with 2666 additions and 1798 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/config/flagsConfig.mjs
View file

@ -24,7 +24,8 @@ export const itemAttachmentSource = 'attachmentSource';
export const userFlags = {
welcomeMessage: 'welcome-message',
countdownMode: 'countdown-mode'
countdownMode: 'countdown-mode',
countdownTypeModes: 'countdown-type-modes'
};
export const combatToggle = 'combat-toggle-origin';

36
module/config/generalConfig.mjs
View file

@ -867,27 +867,27 @@ export const abilityCosts = {
export const countdownProgressionTypes = {
actionRoll: {
id: 'actionRoll',
label: 'DAGGERHEART.CONFIG.CountdownType.actionRoll'
label: 'DAGGERHEART.CONFIG.CountdownProgressType.actionRoll'
},
characterAttack: {
id: 'characterAttack',
label: 'DAGGERHEART.CONFIG.CountdownType.characterAttack'
label: 'DAGGERHEART.CONFIG.CountdownProgressType.characterAttack'
},
characterSpotlight: {
id: 'characterSpotlight',
label: 'DAGGERHEART.CONFIG.CountdownType.characterSpotlight'
label: 'DAGGERHEART.CONFIG.CountdownProgressType.characterSpotlight'
},
custom: {
id: 'custom',
label: 'DAGGERHEART.CONFIG.CountdownType.custom'
label: 'DAGGERHEART.CONFIG.CountdownProgressType.custom'
},
fear: {
id: 'fear',
label: 'DAGGERHEART.CONFIG.CountdownType.fear'
label: 'DAGGERHEART.CONFIG.CountdownProgressType.fear'
},
spotlight: {
id: 'spotlight',
label: 'DAGGERHEART.CONFIG.CountdownType.spotlight'
label: 'DAGGERHEART.CONFIG.CountdownProgressType.spotlight'
}
};
export const rollTypes = {
@ -935,17 +935,6 @@ export const simpleOwnershiplevels = {
...basicOwnershiplevels
};
export const countdownBaseTypes = {
narrative: {
id: 'narrative',
label: 'DAGGERHEART.APPLICATIONS.Countdown.types.narrative'
},
encounter: {
id: 'encounter',
label: 'DAGGERHEART.APPLICATIONS.Countdown.types.encounter'
}
};
export const countdownLoopingTypes = {
noLooping: {
id: 'noLooping',
@ -970,6 +959,19 @@ export const countdownAppMode = {
iconOnly: 'icon-only'
};
export const countdownTypes = {
encounter: {
id: 'encounter',
label: 'DAGGERHEART.CONFIG.CountdownType.encounter.label',
shortLabel: 'DAGGERHEART.CONFIG.CountdownType.encounter.shortLabel'
},
narrative: {
id: 'narrative',
label: 'DAGGERHEART.CONFIG.CountdownType.narrative.label',
shortLabel: 'DAGGERHEART.CONFIG.CountdownType.narrative.shortLabel'
}
};
export const sceneRangeMeasurementSetting = {
disable: {
id: 'disable',

4
module/config/itemBrowserConfig.mjs
View file

@ -127,8 +127,8 @@ export const typeConfig = {
isSecondary
? 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.short'
: isSecondary === false
? 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short'
: '-'
? 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short'
: '-'
},
{
key: 'system.tier',