Add initiative and ammo

modules/dark-stars-actor-sheet.js

@@ -40,6 +40,7 @@ export class DarkStarsActorSheet extends ActorSheet {
       skills: this.actor.getSkills( ),
       perks: this.actor.getPerks( ),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
+      ammos: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getAmmos()) ),
       armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
       shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
       equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
@@ -109,6 +110,11 @@ export class DarkStarsActorSheet extends ActorSheet {
       this.actor.delSubActor(actorId);
     });
 
+    html.find('.edit-weapon-ammo').change(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let weaponId = li.data("item-id")
+      this.actor.setWeaponAmmo( weaponId, ev.currentTarget.value )
+    })
     html.find('.skill-used-id').change(event => {
       const li = $(event.currentTarget).parents(".item");
       this.actor.setSkillUsed( li.data("item-id"), event.currentTarget.checked );

modules/dark-stars-actor.js

@@ -158,6 +158,13 @@ export class DarkStarsActor extends Actor {
   }
   /* -------------------------------------------- */
   checkAndPrepareEquipment(item) {
+    // Dynamic assign ammo for the weapon
+    if (item.type == "weapon" && item.system.needammo) {      
+      let ammo = this.items.find(ammo => ammo.type == "ammo" && item.system.ammoid == ammo.id)
+      if (ammo) {
+        item.ammo = duplicate(ammo)
+      }
+    }
   }
 
   /* -------------------------------------------- */
@@ -177,6 +184,12 @@ export class DarkStarsActor extends Actor {
   /* -------------------------------------------- */
   getWeapons() {
     let comp = duplicate(this.items.filter(item => item.type == 'weapon') || []);
+    DarkStarsUtility.sortArrayObjectsByName(comp)    
+    return comp;
+  }
+  /* -------------------------------------------- */
+  getAmmos() {
+    let comp = duplicate(this.items.filter(item => item.type == 'ammo') || []);
     DarkStarsUtility.sortArrayObjectsByName(comp)
     return comp;
   }
@@ -188,7 +201,13 @@ export class DarkStarsActor extends Actor {
     }
     return item;
   }
-
+  /* -------------------------------------------- */
+  setWeaponAmmo(weaponId, ammoId) {
+    let weapon = this.items.get(weaponId)
+    if(weapon) {
+      this.updateEmbeddedDocuments('Item', [ {_id: weapon.id, 'system.ammoid': ammoId} ])
+    }
+  }  
   /* -------------------------------------------- */
   setSkillUsed( skillId, checked) {
     let skill = this.items.get(skillId)
@@ -391,12 +410,14 @@ export class DarkStarsActor extends Actor {
     }
   }
   /* -------------------------------------------- */
-  getInitiativeScore(combatId, combatantId) {
-    if (this.type == 'character') {
-      this.rollMR(true, combatId, combatantId)
-    }
-    console.log("Init required !!!!")
-    return -1;
+  hasLastWord() {
+    return this.items.find(i => i.type == "perk" && i.name.toLowerCase() === "last word")
+  }
+  /* -------------------------------------------- */
+  getInitiativeScore() {
+    let initFormula = (this.system.derivated.si.value + this.system.derivated.si.bonus) + "d6"
+    let initRoll = new Roll(initFormula).roll({ async: false })
+    return initRoll.total
   }
 
   /* -------------------------------------------- */
@@ -622,6 +643,7 @@ export class DarkStarsActor extends Actor {
         rollData.mode = "weapon"
         rollData.skill = skill
         rollData.weapon = weapon
+        this.checkAndPrepareEquipment(weapon)
         rollData.img = weapon.img
         this.startRoll(rollData)
       } else {

modules/dark-stars-combat.js

@@ -2,17 +2,29 @@ import { DarkStarsUtility } from "./dark-stars-utility.js";
 
 /* -------------------------------------------- */
 export class DarkStarsCombat extends Combat {
-  
-  /* -------------------------------------------- */
-  async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
-    ids = typeof ids === "string" ? [ids] : ids;
-    for (let cId = 0; cId < ids.length; cId++) {
-      const c = this.combatants.get(ids[cId]);
-      let id = c._id || c.id;
-      let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
-      await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
-    }
 
+  /* -------------------------------------------- */
+  processOtherTurns(c, initScore) {
+    let toCreate = []
+    let token = canvas.tokens.get(c.tokenId)
+    let hasLastWord = token.actor.hasLastWord()
+    while ( (initScore > 5) || (hasLastWord && initScore >= 5)) {
+      initScore -= 5;
+      toCreate.push({tokenId: c.tokenId, sceneId: c.sceneId, actorId: c.actorId, hidden: c.hidden, initiative: initScore, isDuplicated: true});
+    }
+    this.createEmbeddedDocuments("Combatant", toCreate);
+  }
+
+  /* -------------------------------------------- */
+  async rollInitiative(ids, formula = undefined, messageOptions = {}) {
+    ids = typeof ids === "string" ? [ids] : ids;
+    for (let cId of ids) {
+      const c = this.combatants.get(cId);
+      let id = c._id || c.id;
+      let initScore = c.actor ? c.actor.getInitiativeScore(this.id, id) : -1;
+      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: initScore }]);
+      setTimeout(() => this.processOtherTurns(c, initScore), 400)
+    }
     return this;
   }
 
@@ -20,11 +32,4 @@ export class DarkStarsCombat extends Combat {
   _onUpdate(changed, options, userId) {
   }
 
-  /* -------------------------------------------- */
-  static async checkTurnPosition() {
-    while (game.combat.turn > 0) {
-      await game.combat.previousTurn()
-    }
-  }
-
 }