Merge pull request #456 from vttred/fix/attribute-bars

fix: hp/encumbrance attribute bars restored

Author: anthonyronda

src/module/actor/data-model-character.js

@@ -61,7 +61,7 @@ export default class OseDataModelCharacter extends foundry.abstract.DataModel {
 
   // @todo define schema options; stuff like min/max values and so on.
   static defineSchema() {
-    const { StringField, NumberField, BooleanField, ObjectField } =
+    const { StringField, NumberField, BooleanField, ObjectField, SchemaField } =
       foundry.data.fields;
 
     return {
@@ -70,33 +70,36 @@ export default class OseDataModelCharacter extends foundry.abstract.DataModel {
       details: new ObjectField(),
       ac: new ObjectField(),
       aac: new ObjectField(),
-      encumbrance: new ObjectField(),
+      encumbrance: new SchemaField({
+        value: new NumberField({ integer: false }),
+        max: new NumberField({ integer: false }),
+      }),
       movement: new ObjectField(),
       config: new ObjectField(),
       initiative: new ObjectField(),
-      hp: new ObjectField({
+      hp: new SchemaField({
         hd: new StringField(),
         value: new NumberField({ integer: true }),
         max: new NumberField({ integer: true }),
       }),
       thac0: new ObjectField(),
       languages: new ObjectField(),
-      saves: new ObjectField({
-        breath: new ObjectField({ value: new NumberField({ integer: true }) }),
-        death: new ObjectField({ value: new NumberField({ integer: true }) }),
-        paralysis: new ObjectField({
+      saves: new SchemaField({
+        breath: new SchemaField({ value: new NumberField({ integer: true }) }),
+        death: new SchemaField({ value: new NumberField({ integer: true }) }),
+        paralysis: new SchemaField({
           value: new NumberField({ integer: true }),
         }),
-        spell: new ObjectField({ value: new NumberField({ integer: true }) }),
-        wand: new ObjectField({ value: new NumberField({ integer: true }) }),
+        spell: new SchemaField({ value: new NumberField({ integer: true }) }),
+        wand: new SchemaField({ value: new NumberField({ integer: true }) }),
       }),
-      exploration: new ObjectField({
+      exploration: new SchemaField({
         ft: new NumberField({ integer: true, positive: true }),
         ld: new NumberField({ integer: true, positive: true }),
         od: new NumberField({ integer: true, positive: true }),
         sd: new NumberField({ integer: true, positive: true }),
       }),
-      retainer: new ObjectField({
+      retainer: new SchemaField({
         enabled: new BooleanField(),
         loyalty: new NumberField({ integer: true }),
         wage: new StringField(),

src/module/actor/data-model-monster.js

@@ -24,35 +24,38 @@ export default class OseDataModelMonster extends foundry.abstract.DataModel {
 
   // @todo define schema options; stuff like min/max values and so on.
   static defineSchema() {
-    const { StringField, NumberField, BooleanField, ObjectField } =
+    const { StringField, NumberField, BooleanField, ObjectField, SchemaField } =
       foundry.data.fields;
 
     return {
       spells: new ObjectField(),
       details: new ObjectField(),
       ac: new ObjectField(),
       aac: new ObjectField(),
-      encumbrance: new ObjectField(),
+      encumbrance: new SchemaField({
+        value: new NumberField({ integer: false }),
+        max: new NumberField({ integer: false }),
+      }),
       movement: new ObjectField(),
       config: new ObjectField(),
       initiative: new ObjectField(),
-      hp: new ObjectField({
+      hp: new SchemaField({
         hd: new StringField(),
         value: new NumberField({ integer: true }),
         max: new NumberField({ integer: true }),
       }),
       thac0: new ObjectField(),
       languages: new ObjectField(),
-      saves: new ObjectField({
-        breath: new ObjectField({ value: new NumberField({ integer: true }) }),
-        death: new ObjectField({ value: new NumberField({ integer: true }) }),
-        paralysis: new ObjectField({
+      saves: new SchemaField({
+        breath: new SchemaField({ value: new NumberField({ integer: true }) }),
+        death: new SchemaField({ value: new NumberField({ integer: true }) }),
+        paralysis: new SchemaField({
           value: new NumberField({ integer: true }),
         }),
-        spell: new ObjectField({ value: new NumberField({ integer: true }) }),
-        wand: new ObjectField({ value: new NumberField({ integer: true }) }),
+        spell: new SchemaField({ value: new NumberField({ integer: true }) }),
+        wand: new SchemaField({ value: new NumberField({ integer: true }) }),
       }),
-      retainer: new ObjectField({
+      retainer: new SchemaField({
         enabled: new BooleanField(),
         loyalty: new NumberField({ integer: true }),
         wage: new StringField(),