Merge branch 'master' into 037-actor-type-creature

src/module/actor/actor-sheet.ts

@@ -32,7 +32,7 @@ export class DS4ActorSheet extends ActorSheet<DS4ActorDataType, DS4Actor, DS4Ite
             template: "systems/ds4/templates/actor/actor-sheet.hbs",
             width: 745,
             height: 600,
-            tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
+            tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "inventory" }],
         });
     }
 

src/module/config.ts

@@ -26,6 +26,14 @@ export const DS4 = {
         ranged: "systems/ds4/assets/official/DS4-RAT.png",
     },
 
+    /**
+     * Define the file paths to icon images
+     */
+    spellTypesIcons: {
+        spellcasting: "systems/ds4/assets/official/DS4-SPC.png",
+        targetedSpellcasting: "systems/ds4/assets/official/DS4-TSC.png",
+    },
+
     /**
      * Define the set of item availabilties
      */
@@ -46,6 +54,7 @@ export const DS4 = {
         weapon: "DS4.ItemTypeWeapon",
         armor: "DS4.ItemTypeArmor",
         shield: "DS4.ItemTypeShield",
+        spell: "DS4.ItemTypeSpell",
         trinket: "DS4.ItemTypeTrinket",
         equipment: "DS4.ItemTypeEquipment",
         talent: "DS4.ItemTypeTalent",
@@ -96,6 +105,21 @@ export const DS4 = {
         plate: "DS4.ArmorMaterialTypePlateAbbr",
     },
 
+    spellTypes: {
+        spellcasting: "DS4.SpellTypeSpellcasting",
+        targetedSpellcasting: "DS4.SpellTypeTargetedSpellcasting",
+    },
+
+    spellCategories: {
+        healing: "DS4.SpellCategoryHealing",
+        fire: "DS4.SpellCategoryFire",
+        ice: "DS4.SpellCategoryIce",
+        light: "DS4.SpellCategoryLight",
+        darkness: "DS4.SpellCategoryDarkness",
+        mindAffecting: "DS4.SpellCategoryMindAffecting",
+        electricity: "DS4.SpellCategoryElectricity",
+    },
+
     /**
      * Define the set of attributes an actor has
      */
@@ -223,4 +247,43 @@ export const DS4 = {
         sizeCategory: "DS4.CreatureBaseInfoSizeCategory",
         experiencePoints: "DS4.CreatureBaseInfoExperiencePoints",
     },
+
+    /**
+     * Define translations for available distance units
+     */
+    distanceUnits: {
+        meter: "DS4.UnitMeters",
+        kilometer: "DS4.UnitKilometers",
+        custom: "DS4.UnitCustom",
+    },
+    /**
+     * Define abbreviations for available distance units
+     */
+    distanceUnitsAbbr: {
+        meter: "DS4.UnitMetersAbbr",
+        kilometer: "DS4.UnitKilometersAbbr",
+        custom: "DS4.UnitCustomAbbr",
+    },
+
+    /**
+     * Define translations for available distance units
+     */
+    temporalUnits: {
+        rounds: "DS4.UnitRounds",
+        minutes: "DS4.UnitMinutes",
+        hours: "DS4.UnitHours",
+        days: "DS4.UnitDays",
+        custom: "DS4.UnitCustom",
+    },
+
+    /**
+     * Define abbreviations for available units
+     */
+    temporalUnitsAbbr: {
+        rounds: "DS4.UnitRoundsAbbr",
+        minutes: "DS4.UnitMinutesAbbr",
+        hours: "DS4.UnitHoursAbbr",
+        days: "DS4.UnitDaysAbbr",
+        custom: "DS4.UnitCustomAbbr",
+    },
 };

src/module/ds4.ts

@@ -48,6 +48,7 @@ async function registerHandlebarsPartials() {
         "systems/ds4/templates/item/partials/body.hbs",
         "systems/ds4/templates/actor/partials/items-overview.hbs",
         "systems/ds4/templates/actor/partials/talents-overview.hbs",
+        "systems/ds4/templates/actor/partials/spells-overview.hbs",
         "systems/ds4/templates/actor/partials/overview-add-button.hbs",
         "systems/ds4/templates/actor/partials/overview-control-buttons.hbs",
         "systems/ds4/templates/actor/partials/attributes-traits.hbs",
@@ -76,6 +77,8 @@ Hooks.once("setup", function () {
         "armorMaterialTypes",
         "armorMaterialTypesAbbr",
         "armorMaterialTypes",
+        "spellTypes",
+        "spellCategories",
         "attributes",
         "traits",
         "combatValues",
@@ -86,6 +89,10 @@ Hooks.once("setup", function () {
         "creatureTypes",
         "creatureSizeCategories",
         "creatureBaseInfo",
+        "temporalUnits",
+        "temporalUnitsAbbr",
+        "distanceUnits",
+        "distanceUnitsAbbr",
     ];
 
     // Exclude some from sorting where the default order matters

src/module/item/item-data.ts

@@ -4,6 +4,7 @@ export type DS4ItemDataType =
     | DS4Weapon
     | DS4Armor
     | DS4Shield
+    | DS4Spell
     | DS4Trinket
     | DS4Equipment
     | DS4Talent
@@ -32,6 +33,26 @@ interface DS4TalentRank extends ModifiableData<number> {
     max: number;
 }
 
+interface DS4Spell extends DS4ItemBase, DS4ItemEquipable {
+    spellType: "spellcasting" | "targetedSpellcasting";
+    bonus: string;
+    spellCategory:
+        | "healing"
+        | "fire"
+        | "ice"
+        | "light"
+        | "darkness"
+        | "mindAffecting"
+        | "electricity"
+        | "none"
+        | "unset";
+    maxDistance: UnitData<DistanceUnit>;
+    effectRadius: UnitData<DistanceUnit>;
+    duration: UnitData<TemporalUnit>;
+    cooldownDuration: UnitData<TemporalUnit>;
+    scrollPrice: number;
+}
+
 interface DS4Shield extends DS4ItemBase, DS4ItemPhysical, DS4ItemEquipable, DS4ItemProtective {}
 interface DS4Trinket extends DS4ItemBase, DS4ItemPhysical, DS4ItemEquipable {}
 interface DS4Equipment extends DS4ItemBase, DS4ItemPhysical {}
@@ -62,3 +83,10 @@ interface DS4ItemEquipable {
 interface DS4ItemProtective {
     armorValue: number;
 }
+
+interface UnitData<UnitType> {
+    value: string;
+    unit: UnitType;
+}
+type TemporalUnit = "rounds" | "minutes" | "hours" | "days" | "custom";
+type DistanceUnit = "meter" | "kilometer" | "custom";