Merge pull request #151 from juanferrer/master

3.7.1 Hotfix

src/module/data/actor/CharacterDataModel.js

@@ -20,6 +20,7 @@ export default class CharacterDataModel extends foundry.abstract.DataModel {
       attributes: attributes(),
       characteristics: characteristics(type),
       isPC: makeBoolField(true),
+      fastturn: makeBoolField(),
       level: makeIntField(),
       ancestry: makeStringField(), // Unused
       religion: new foundry.data.fields.SchemaField({

src/module/data/actor/CreatureDataModel.js

@@ -19,7 +19,7 @@ export default class CreatureDataModel extends foundry.abstract.DataModel {
       enrichedDescription: makeHtmlField(),
       attributes: attributes(),
       characteristics: characteristics(type),
-
+      fastturn: makeBoolField(),
       difficulty: makeIntField(),
       frightening: makeBoolField(),
       horrifying: makeBoolField(),

src/module/data/actor/VehicleDataModel.js

@@ -4,6 +4,7 @@ import {
 } from '../common.js'
 
 import {
+  makeBoolField,
   makeIntField,
   makeStringField,
   makeHtmlField
@@ -18,7 +19,7 @@ export default class VehicleDataModel extends foundry.abstract.DataModel {
       enrichedDescription: makeHtmlField(),
       attributes: attributes(),
       characteristics: characteristics(type),
-
+      fastturn: makeBoolField(),
       descriptor: makeStringField(),
       speedtraits: makeStringField(),
       price: makeStringField(),

src/module/data/common.js

@@ -6,7 +6,7 @@ export function attributes() {
     agility: makeAttribute('agility'),
     intellect: makeAttribute('intellect'),
     will: makeAttribute('will'),
-    perception: makeAttribute('perception')
+    perception: makeAttribute('perception', 25)
   })
 }
 
@@ -19,7 +19,7 @@ export function characteristics(actorType) {
         insanity: makeInsanity(),
         corruption: makeCorruption(),
         power: makeIntField(),
-        size: makeStringField(),
+        size: makeStringField("1"),
         speed: makeIntField(10),
         fortune: makeIntField()
       })
@@ -30,7 +30,7 @@ export function characteristics(actorType) {
         insanity: makeInsanity(),
         corruption: makeCorruption(),
         power: makeIntField(),
-        size: makeStringField(),
+        size: makeStringField("1"),
         speed: makeIntField(10),
         speedtraits: makeStringField(),
         difficulty: makeIntField(),
@@ -44,7 +44,7 @@ export function characteristics(actorType) {
       return new foundry.data.fields.SchemaField({
         defense: makeIntField(),
         health: makeHealth(),
-        size: makeStringField(),
+        size: makeStringField("1"),
         speed: makeIntField(10),
         speedtraits: makeStringField(),
         descriptor: makeStringField("object (vehicle)"),

src/module/data/helpers.js

@@ -6,7 +6,7 @@ export function makeBoolField(init = false) {
   })
 }
 
-export function makeNumberField(init = 1, max = 20, min = 0) {
+export function makeNumberField(init = 1, max, min) {
   return new foundry.data.fields.NumberField({
     required: true,
     initial: init,
@@ -16,7 +16,7 @@ export function makeNumberField(init = 1, max = 20, min = 0) {
   })
 }
 
-export function makeIntField(init = 0, max = 20, min = 0) {
+export function makeIntField(init = 0, max, min) {
   return new foundry.data.fields.NumberField({
     required: true,
     initial: init,
@@ -46,22 +46,22 @@ export function makeObjectField() {
   })
 }
 
-export function makeAttribute(attribute) {
+export function makeAttribute(attribute, max = 20) {
   return new foundry.data.fields.SchemaField({
     key: makeStringField(attribute),
     label: makeStringField(game.i18n.localize(`DL.Attribute${capitalize(attribute)}`)),
-    value: makeIntField(10),
+    value: makeIntField(10, max, 1),
     modifier: makeIntField(),
     min: makeIntField(),
-    max: makeIntField(20),
+    max: makeIntField(max),
     immune: makeBoolField()
   })
 }
 
 export function makeHealth() {
   return new foundry.data.fields.SchemaField({
     max: makeIntField(),
-    value: makeIntField(),
+    value: makeIntField(0),
     injured: makeBoolField(),
     healingrate: makeIntField()
   })

src/module/data/item/AncestryDataModel.js

@@ -64,7 +64,7 @@ export default class AncestryDataModel extends foundry.abstract.DataModel {
         })
       }),
       level4: new foundry.data.fields.SchemaField({
-        healthbonuses: makeIntField(),
+        healthbonus: makeIntField(),
         option1: makeBoolField(true),
         option1text: makeStringField(),
         talent: new foundry.data.fields.ArrayField(levelItem(makeTalentSchema)),
@@ -81,8 +81,6 @@ export default class AncestryDataModel extends foundry.abstract.DataModel {
   }
 
   static migrateData(source) {
-    console.log(source)
-
     if (parseInt(source.characteristics?.insanity)) {
       const insanity = parseInt(source.characteristics.insanity)
       source.characteristics.insanity = {

src/module/data/item/EndOfTheRoundDataModel.js

@@ -1,5 +1,5 @@
 
-import { action } from '../common.js'
+import { action, activatedEffect } from '../common.js'
 
 import {
   makeHtmlField,
@@ -10,7 +10,8 @@ export default class EndOfTheRoundDataModel extends foundry.abstract.DataModel {
     return {
       description: makeHtmlField(),
       enrichedDescription: makeHtmlField(),
-      action: action()
+      action: action(),
+      activatedEffect: activatedEffect(),
     }
   }
 }
@@ -19,6 +20,7 @@ export function makeEndOfTheRoundSchema() {
   return new foundry.data.fields.SchemaField({
     description: makeHtmlField(),
     enrichedDescription: makeHtmlField(),
-    action: action()
+    action: action(),
+    activatedEffect: activatedEffect(),
   })
 }

src/module/data/item/WeaponDataModel.js

@@ -1,11 +1,12 @@
-import { action } from '../common.js'
+import { action, activatedEffect } from '../common.js'
 import { makeBoolField, makeHtmlField, makeIntField, makeStringField } from '../helpers.js'
 
 export default class WeaponDataModel extends foundry.abstract.DataModel {
   static defineSchema() {
     return {
       description: makeHtmlField(),
       action: action(),
+      activatedEffect: activatedEffect(),
       enrichedDescription: makeHtmlField(),
       hands: makeStringField(),
       properties: makeStringField(),
@@ -25,6 +26,7 @@ export function makeWeaponSchema() {
   return new foundry.data.fields.SchemaField({
     description: makeHtmlField(),
     action: action(),
+    activatedEffect: activatedEffect(),
     enrichedDescription: makeHtmlField(),
     hands: makeStringField(),
     properties: makeStringField(),

src/module/demonlord.js

@@ -207,6 +207,7 @@ Hooks.once('setup', function () {
  * Set default values for new actors' tokens
  */
 Hooks.on('createActor', async (actor, _options, _id) => {
+  if (!actor.isOwner) return
   let disposition = CONST.TOKEN_DISPOSITIONS.NEUTRAL
   if (actor.type === 'creature') disposition = CONST.TOKEN_DISPOSITIONS.HOSTILE
 
@@ -231,6 +232,7 @@ Hooks.on('createToken', async _tokenDocument => {
 })
 
 Hooks.on('updateActor', async (actor, updateData) => {
+  if (!actor.isOwner) return
   // Update the combat initiative if the actor has changed its turn speed
   const isUpdateTurn = typeof updateData?.system?.fastturn !== 'undefined' && updateData?.system?.fastturn !== null
   if (!(isUpdateTurn && (game.user.isGM || actor.isOwner) && game.combat)) return

src/module/pixi/token-manager.js

@@ -18,7 +18,7 @@ export class TokenManager {
   }
 
   getTokenByActorId(actorId) {
-    return canvas.tokens.placeables.find(token => token.actor.id === actorId)
+    return canvas.tokens.placeables.find(token => token?.actor?.id === actorId)
   }
 
   warnNotSelected() {