Add crafting skills

modules/avd12-actor-sheet.js

@@ -134,8 +134,11 @@ export class Avd12ActorSheet extends ActorSheet {
       const li = $(event.currentTarget).parents(".item");
       this.actor.rollCrafting( li.data("item-id") )
     });    
-
-
+    html.find('.roll-universal').click((event) => {
+      let skillKey = $(event.currentTarget).data("skill-key")
+      this.actor.rollUniversal(skillKey)
+    });    
+    
     html.find('.roll-weapon').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const weponId = li.data("item-id")

modules/avd12-actor.js

@@ -494,12 +494,21 @@ export class Avd12Actor extends Actor {
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
+
+  /* -------------------------------------------- */
+  clearInitiative(){
+    this.getFlag("world", "initiative", -1)
+  }
   /* -------------------------------------------- */
   getInitiativeScore(combatId, combatantId) {
     if (this.type == 'character') {
-      this.rollMR(true, combatId, combatantId)
+      let init = this.getFlag("world", "initiative" )
+      console.log("INIT", init)
+      if (!init || init == -1) {
+        ChatMessage.create( { content: "Roll your initiative for this combat"} )
+      }
+      return init
     }
-    console.log("Init required !!!!")
     return -1;
   }
 
@@ -667,13 +676,30 @@ export class Avd12Actor extends Actor {
       skill.attr = duplicate(attr)
       let rollData = this.getCommonRollData()
       rollData.mode = "skill"
+      rollMode.skillKey = skillKey
       rollData.skill = skill
-      rollData.title = "Roll Skill " + skill.name
+      rollData.title = "Roll Skill " + skill.name 
       rollData.img = skill.img
       this.startRoll(rollData)
     }
   }
 
+  /* -------------------------------------------- */
+  rollUniversal(skillKey) {
+    let skill = this.system.universal.skills[skillKey]
+    if (skill) {
+      skill = duplicate(skill)
+      skill.name = Avd12Utility.upperFirst(skillKey)
+      let rollData = this.getCommonRollData()
+      rollData.mode = "universal"
+      rollData.skillKey = skillKey
+      rollData.skill = skill
+      rollData.title = "Roll Skill " + skill.name 
+      rollData.img = skill.img
+      this.startRoll(rollData)
+    }
+  }
+  
   /* -------------------------------------------- */
   async rollSpell(spellId) {
     let spell = this.items.get(spellId)

modules/avd12-combat.js

@@ -27,4 +27,14 @@ export class Avd12Combat extends Combat {
     }
   }
 
+  /* -------------------------------------------- */
+  _onDelete() {
+    let combatants = this.combatants.contents
+    for (let c of combatants) {
+      let actor = game.actors.get(c.actorId)
+      actor.clearInitiative()
+    }
+    super._onDelete()
+  }
+
 }

modules/avd12-utility.js

@@ -568,6 +568,10 @@ export class Avd12Utility {
       content: await renderTemplate(`systems/fvtt-avd12/templates/chat/chat-generic-result.hbs`, rollData)
     })
     msg.setFlag("world", "rolldata", rollData)
+    if (rollData.skillKey == "initiative") {
+      console.log("REGISTERED")
+      actor.setFlag("world", "initiative", myRoll.total) 
+    }
 
     console.log("Rolldata result", rollData)
   }