Merge branch 'main' into feature/159-Companion

module/config/actionConfig.mjs

@@ -4,21 +4,21 @@ export const actionTypes = {
         name: 'DAGGERHEART.Actions.Types.Attack.Name',
         icon: 'fa-swords'
     },
-    spellcast: {
-        id: 'spellcast',
-        name: 'DAGGERHEART.Actions.Types.Spellcast.Name',
-        icon: 'fa-book-sparkles'
-    },
+    // spellcast: {
+    //     id: 'spellcast',
+    //     name: 'DAGGERHEART.Actions.Types.Spellcast.Name',
+    //     icon: 'fa-book-sparkles'
+    // },
     healing: {
         id: 'healing',
         name: 'DAGGERHEART.Actions.Types.Healing.Name',
         icon: 'fa-kit-medical'
     },
-    resource: {
-        id: 'resource',
-        name: 'DAGGERHEART.Actions.Types.Resource.Name',
-        icon: 'fa-honey-pot'
-    },
+    // resource: {
+    //     id: 'resource',
+    //     name: 'DAGGERHEART.Actions.Types.Resource.Name',
+    //     icon: 'fa-honey-pot'
+    // },
     damage: {
         id: 'damage',
         name: 'DAGGERHEART.Actions.Types.Damage.Name',
@@ -46,8 +46,34 @@ export const targetTypes = {
         id: 'self',
         label: 'Self'
     },
-    other: {
-        id: 'other',
-        label: 'Other'
+    friendly: {
+        id: 'friendly',
+        label: 'Friendly'
+    },
+    hostile: {
+        id: 'hostile',
+        label: 'Hostile'
+    },
+    any: {
+        id: 'any',
+        label: 'Any'
     }
 };
+
+export const damageOnSave = {
+    none: {
+        id: 'none',
+        label: 'None',
+        mod: 0
+    },
+    half: {
+        id: 'half',
+        label: 'Half Damage',
+        mod: 0.5
+    },
+    full: {
+        id: 'full',
+        label: 'Full damage',
+        mod: 1
+    }
+}

module/config/flagsConfig.mjs

@@ -0,0 +1 @@
+export const displayDomainCardsAsList = 'displayDomainCardsAsList';

module/config/generalConfig.mjs

@@ -68,8 +68,8 @@ export const damageTypes = {
 };
 
 export const healingTypes = {
-    health: {
-        id: 'health',
+    hitPoints: {
+        id: 'hitPoints',
         label: 'DAGGERHEART.HealingType.HitPoints.Name',
         abbreviation: 'DAGGERHEART.HealingType.HitPoints.Abbreviation'
     },
@@ -77,6 +77,16 @@ export const healingTypes = {
         id: 'stress',
         label: 'DAGGERHEART.HealingType.Stress.Name',
         abbreviation: 'DAGGERHEART.HealingType.Stress.Abbreviation'
+    },
+    hope: {
+        id: 'hope',
+        label: 'DAGGERHEART.HealingType.Hope.Name',
+        abbreviation: 'DAGGERHEART.HealingType.Hope.Abbreviation'
+    },
+    armorStack: {
+        id: 'armorStack',
+        label: 'DAGGERHEART.HealingType.ArmorStack.Name',
+        abbreviation: 'DAGGERHEART.HealingType.ArmorStack.Abbreviation'
     }
 };
 
@@ -248,13 +258,15 @@ export const diceTypes = {
     d4: 'd4',
     d6: 'd6',
     d8: 'd8',
+    d10: 'd10',
     d12: 'd12',
     d20: 'd20'
 };
 
 export const multiplierTypes = {
     proficiency: 'Proficiency',
-    spellcast: 'Spellcast'
+    spellcast: 'Spellcast',
+    flat: 'Flat'
 };
 
 export const getDiceSoNicePresets = () => {
@@ -318,7 +330,35 @@ export const abilityCosts = {
     },
     stress: {
         id: 'stress',
-        label: 'Stress'
+        label: 'DAGGERHEART.HealingType.Stress.Name'
+    },
+    armor: {
+        id: 'armor',
+        label: 'Armor Stack'
+    },
+    hp: {
+        id: 'hp',
+        label: 'DAGGERHEART.HealingType.HitPoints.Name'
+    },
+    prayer: {
+        id: 'prayer',
+        label: 'Prayer Dice'
+    },
+    favor: {
+        id: 'favor',
+        label: 'Favor Points'
+    },
+    slayer: {
+        id: 'slayer',
+        label: 'Slayer Dice'
+    },
+    tide: {
+        id: 'tide',
+        label: 'Tide'
+    },
+    chaos: {
+        id: 'chaos',
+        label: 'Chaos'
     }
 };
 

module/config/system.mjs

@@ -6,6 +6,7 @@ import * as SETTINGS from './settingsConfig.mjs';
 import { hooks as HOOKS } from './hooksConfig.mjs';
 import * as EFFECTS from './effectConfig.mjs';
 import * as ACTIONS from './actionConfig.mjs';
+import * as FLAGS from './flagsConfig.mjs';
 
 export const SYSTEM_ID = 'daggerheart';
 
@@ -18,5 +19,6 @@ export const SYSTEM = {
     SETTINGS,
     HOOKS,
     EFFECTS,
-    ACTIONS
+    ACTIONS,
+    FLAGS
 };