[#342] Add race type

foundryvtt · Jul 21, 2023 · 350268d · 350268d
1 parent 64a4270
commit 350268d
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 9 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -32,6 +32,8 @@
 "ITEM.TypeFeaturePl": "Features",
 "ITEM.TypeLoot": "Loot",
 "ITEM.TypeLootPl": "Loot",
+"ITEM.TypeRace": "Race",
+"ITEM.TypeRacePl": "Races",
 "ITEM.TypeSpell": "Spell",
 "ITEM.TypeSpellPl": "Spells",
 "ITEM.TypeSubclass": "Subclass",
@@ -866,6 +868,7 @@
 "DND5E.PropertyTotal": "Total",
 "DND5E.Quantity": "Quantity",
 "DND5E.Race": "Race",
+"DND5E.RaceName": "Race Name",
 "DND5E.RacialTraits": "Racial Traits",
 "DND5E.Range": "Range",
 "DND5E.RangeDistance": "Distance",

diff --git a/module/applications/actor/character-sheet.mjs b/module/applications/actor/character-sheet.mjs
@@ -55,7 +55,7 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
     }
 
     // Partition items by category
-    let {items, spells, feats, backgrounds, classes, subclasses} = context.items.reduce((obj, item) => {
+    let {items, spells, feats, races, backgrounds, classes, subclasses} = context.items.reduce((obj, item) => {
       const {quantity, uses, recharge, target} = item.system;
 
       // Item details
@@ -89,12 +89,13 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
       // Classify items into types
       if ( item.type === "spell" ) obj.spells.push(item);
       else if ( item.type === "feat" ) obj.feats.push(item);
+      else if ( item.type === "race" ) obj.races.push(item);
       else if ( item.type === "background" ) obj.backgrounds.push(item);
       else if ( item.type === "class" ) obj.classes.push(item);
       else if ( item.type === "subclass" ) obj.subclasses.push(item);
       else if ( Object.keys(inventory).includes(item.type) ) obj.items.push(item);
       return obj;
-    }, { items: [], spells: [], feats: [], backgrounds: [], classes: [], subclasses: [] });
+    }, { items: [], spells: [], feats: [], races: [], backgrounds: [], classes: [], subclasses: [] });
 
     // Apply active item filters
     items = this._filterItems(items, this._filters.inventory);
@@ -140,6 +141,9 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
 
     // Organize Features
     const features = {
+      race: {
+        label: "ITEM.TypeRace", items: races,
+        hasActions: false, dataset: {type: "race"} },
       background: {
         label: CONFIG.Item.typeLabels.background, items: backgrounds,
         hasActions: false, dataset: {type: "background"} },
@@ -164,6 +168,7 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
     context.spellbook = spellbook;
     context.preparedSpells = nPrepared;
     context.features = Object.values(features);
+    context.labels.race = races[0]?.name;
     context.labels.background = backgrounds[0]?.name;
   }
 

diff --git a/module/data/item/_module.mjs b/module/data/item/_module.mjs
@@ -5,6 +5,7 @@ import ContainerData from "./container.mjs";
 import EquipmentData from "./equipment.mjs";
 import FeatData from "./feat.mjs";
 import LootData from "./loot.mjs";
+import RaceData from "./race.mjs";
 import SpellData from "./spell.mjs";
 import SubclassData from "./subclass.mjs";
 import ToolData from "./tool.mjs";
@@ -18,6 +19,7 @@ export {
   EquipmentData,
   FeatData,
   LootData,
+  RaceData,
   SpellData,
   SubclassData,
   ToolData,
@@ -38,6 +40,7 @@ export const config = {
   equipment: EquipmentData,
   feat: FeatData,
   loot: LootData,
+  race: RaceData,
   spell: SpellData,
   subclass: SubclassData,
   tool: ToolData,

diff --git a/module/data/item/race.mjs b/module/data/item/race.mjs
@@ -0,0 +1,20 @@
+import SystemDataModel from "../abstract.mjs";
+import { AdvancementField, IdentifierField } from "../fields.mjs";
+import ItemDescriptionTemplate from "./templates/item-description.mjs";
+
+/**
+ * Data definition for Race items.
+ * @mixes ItemDescriptionTemplate
+ *
+ * @property {string} identifier        Identifier slug for this race.
+ * @property {object[]} advancement     Advancement objects for this race.
+ */
+export default class RaceData extends SystemDataModel.mixin(ItemDescriptionTemplate) {
+  /** @inheritdoc */
+  static defineSchema() {
+    return this.mergeSchema(super.defineSchema(), {
+      identifier: new IdentifierField({required: true, label: "DND5E.Identifier"}),
+      advancement: new foundry.data.fields.ArrayField(new AdvancementField(), {label: "DND5E.AdvancementTitle"})
+    });
+  }
+}
diff --git a/module/documents/advancement/advancement.mjs b/module/documents/advancement/advancement.mjs
@@ -81,7 +81,7 @@ export default class Advancement extends BaseAdvancement {
       title: game.i18n.localize("DND5E.AdvancementTitle"),
       hint: "",
       multiLevel: false,
-      validItemTypes: new Set(["background", "class", "subclass"]),
+      validItemTypes: new Set(["background", "class", "race", "subclass"]),
       apps: {
         config: AdvancementConfig,
         flow: AdvancementFlow

diff --git a/module/documents/advancement/item-choice.mjs b/module/documents/advancement/item-choice.mjs
@@ -33,7 +33,7 @@ export default class ItemChoiceAdvancement extends ItemGrantAdvancement {
 
   /** @inheritdoc */
   get levels() {
-    return Array.from(Object.keys(this.configuration.choices));
+    return Array.from(Object.keys(this.configuration.choices).map(l => Number(l)));
   }
 
   /* -------------------------------------------- */

diff --git a/template.json b/template.json
@@ -502,7 +502,7 @@
     }
   },
   "Item": {
-    "types": ["weapon", "equipment", "consumable", "tool", "loot", "background", "class", "subclass", "spell", "feat", "backpack"],
+    "types": ["weapon", "equipment", "consumable", "tool", "loot", "race", "background", "class", "subclass", "spell", "feat", "backpack"],
     "templates": {
       "itemDescription": {
         "description": {
@@ -676,6 +676,11 @@
       "proficient": null,
       "bonus": ""
     },
+    "race": {
+      "templates": ["itemDescription"],
+      "identifier": "",
+      "advancement": []
+    },
     "spell": {
       "templates": ["itemDescription", "activatedEffect", "action"],
       "level": 1,

diff --git a/templates/actors/character-sheet.hbs b/templates/actors/character-sheet.hbs
@@ -32,13 +32,19 @@
             {{!-- Character Summary --}}
             <ul class="summary flexrow">
                 <li class="race">
-                    <input type="text" name="system.details.race" value="{{system.details.race}}" placeholder="{{ localize 'DND5E.Race' }}"/>
+                    {{#if labels.race}}
+                        <span data-tooltip="DND5E.Race">{{labels.race}}</span>
+                    {{else}}
+                        <input type="text" name="system.details.race" value="{{system.details.race}}"
+                               placeholder="{{ localize 'DND5E.Race' }}"/>
+                    {{/if}}
                 </li>
                 <li class="background">
                     {{#if labels.background}}
                         <span data-tooltip="DND5E.Background">{{labels.background}}</span>
                     {{else}}
-                        <input type="text" name="system.details.background" value="{{system.details.background}}" placeholder="{{ localize 'DND5E.Background' }}"/>
+                        <input type="text" name="system.details.background" value="{{system.details.background}}"
+                               placeholder="{{ localize 'DND5E.Background' }}"/>
                     {{/if}}
                 </li>
                 <li class="alignment">

diff --git a/templates/advancement/item-choice-config.hbs b/templates/advancement/item-choice-config.hbs
@@ -91,9 +91,9 @@
 
   <div class="right-column level-list">
     <p class="hint">{{localize "DND5E.AdvancementItemChoiceLevelsHint"}}</p>
-    {{#each levels as |level|}}
+    {{#each levels as |label level|}}
       <div class="form-group">
-        <label>{{level}}</label>
+        <label>{{label}}</label>
         <div class="form-fields">
           {{numberInput (lookup ../configuration.choices level) placeholder="0"
             name=(concat "configuration.choices." level) min=1 step=1}}

diff --git a/templates/items/race.hbs b/templates/items/race.hbs
@@ -0,0 +1,43 @@
+<form class="{{cssClass}} flexcol" autocomplete="off">
+  {{!-- Item Sheet Header --}}
+  <header class="sheet-header flexrow">
+    <img class="profile" src="{{item.img}}" title="{{item.name}}" data-edit="img">
+
+    <div class="header-details flexrow">
+      <h1 class="charname">
+        <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DND5E.RaceName'}}">
+      </h1>
+
+      <div class="item-subtitle">
+        <h4 class="item-type">{{itemType}}</h4>
+        <span class="item-status">{{itemStatus}}</span>
+      </div>
+
+      <ul class="summary flexrow">
+        <li>
+          <input type="text" name="system.source" value="{{system.source}}" placeholder="{{localize 'DND5E.Source'}}">
+        </li>
+      </ul>
+    </div>
+  </header>
+
+  {{!-- Item Sheet Navigation --}}
+  <nav class="sheet-navigation tabs" data-group="primary">
+    <a class="item active" data-tab="description">{{localize "DND5E.Description"}}</a>
+    <a class="item" data-tab="advancement">{{localize "DND5E.AdvancementTitle"}}</a>
+  </nav>
+
+  {{!-- Item Sheet Body --}}
+  <section class="sheet-body">
+
+    {{!-- Description Tab --}}
+    <div class="tab flexrow active" data-group="primary" data-tab="description">
+      {{editor descriptionHTML target="system.description.value" button=true editable=editable
+               engine="prosemirror" collaborate=false}}
+    </div>
+
+    {{!-- Advancement Tab --}}
+    {{> "dnd5e.item-advancement"}}
+
+  </section>
+</form>