Fix init creature + minor changes

module/actor/actor.js

@@ -756,6 +756,14 @@ export class BoLActor extends Actor {
     this.unsetFlag("world", "last-initiative" )
   }
 
+  /*-------------------------------------------- */
+  getSize() {
+    if (this.system.details.size.length > 0 && game.bol.config.creatureSize[this.system.details.size]) {
+      return game.bol.config.creatureSize[this.system.details.size].order
+    }
+    return game.bol.config.creatureSize["medium"].order // Medium size per default
+  }
+
   /*-------------------------------------------- */
   getInitiativeRank(rollData = undefined, isCombat = false) {
     if (!rollData) { 
@@ -787,6 +795,17 @@ export class BoLActor extends Actor {
     if ( this.getCharType() == 'tough') {
       fvttInit = 6
     }
+    if ( this.getCharType() == 'creature') {
+      let mySize = this.getSize()
+      let sizeSmall = game.bol.config.creatureSize["small"].order
+      let sizeMedium = game.bol.config.creatureSize["medium"].order
+      if ( mySize >= sizeSmall && mySize <= sizeMedium) {
+        fvttInit = 6
+      }
+      if ( mySize > sizeMedium) {
+        fvttInit = 7
+      }
+    }
     return fvttInit
   }
   

module/system/bol-combat.js

@@ -35,7 +35,7 @@ export class BoLCombatManager extends Combat {
   nextRound() {
     let combatants = this.combatants.contents
     for (let c of combatants) {
-      let actor = game.actors.get( c.data.actorId )
+      let actor = game.actors.get( c.actorId )
       actor.clearRoundModifiers()
     }
     super.nextRound()
@@ -45,7 +45,7 @@ export class BoLCombatManager extends Combat {
   _onDelete() {
     let combatants = this.combatants.contents
     for (let c of combatants) {
-      let actor = game.actors.get(c.data.actorId)
+      let actor = game.actors.get(c.actorId)
       actor.clearInitiative()
     }
     super._onDelete()

module/system/config.js

@@ -313,18 +313,18 @@ BOL.bougetteDice = {
 }
 
 BOL.creatureSize = {
-  "tiny": "BOL.size.tiny",
-  "verysmall": "BOL.size.verysmall",
-  "small": "BOL.size.small",
-  "medium": "BOL.size.medium",
-  "large": "BOL.size.large",
-  "verylarge": "BOL.size.verylarge",
-  "huge": "BOL.size.huge",
-  "massive": "BOL.size.massive",
-  "enormous": "BOL.size.enormous",
-  "gigantic": "BOL.size.gigantic",
-  "immense": "BOL.size.immense",
-  "colossal": "BOL.size.colossal"
+  "tiny": {order: 1, label: "BOL.size.tiny"},
+  "verysmall": {order: 2, label: "BOL.size.verysmall"},
+  "small": {order: 3, label: "BOL.size.small"},
+  "medium": {order: 4, label: "BOL.size.medium"},
+  "large": {order: 5, label: "BOL.size.large"},
+  "verylarge": {order: 6, label: "BOL.size.verylarge"},
+  "huge": {order: 7, label: "BOL.size.huge"},
+  "massive": {order: 8, label: "BOL.size.massive"},
+  "enormous": {order: 9, label: "BOL.size.enormous"},
+  "gigantic": {order: 10, label: "BOL.size.gigantic"},
+  "immense": {order: 11, label: "BOL.size.immense"},
+  "colossal": {order: 12, label: "BOL.size.colossal"}
 }
 
 BOL.horoscopeAnswer = {