Enhance styling

modules/pegasus-actor.js

@@ -116,39 +116,39 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   getShields() {
-    let comp = this.data.items.filter(item => item.type == 'shield');
+    let comp = this.data.items.filter(item => item.type == 'shield')
     return comp;
   }
   getRace() {
-    let race = this.data.items.filter(item => item.type == 'race');
+    let race = this.data.items.filter(item => item.type == 'race')
     return race[0] ?? [];
   }
   getRole() {
-    let role = this.data.items.filter(item => item.type == 'role');
+    let role = this.data.items.filter(item => item.type == 'role')
     return role[0] ?? [];
   }
   /* -------------------------------------------- */
-  checkAndPrepareArmor(armor) {
-    armor.data.resistanceDice = PegasusUtility.getDiceFromLevel(armor.data.resistance);
-  }
-  /* -------------------------------------------- */
-  checkAndPrepareArmors(armors) {
-    for (let item of armors) {
-      this.checkAndPrepareArmor(item);
+  checkAndPrepareEquipment(item) {
+    if ( item.data.resistance ) { 
+      item.data.resistanceDice = PegasusUtility.getDiceFromLevel(item.data.resistance)
+    }
+    if ( item.data.idr ) { 
+      item.data.idrDice = PegasusUtility.getDiceFromLevel(item.data.idr)
+    }
+    if ( item.data.damage) {
+      item.data.damageDice = PegasusUtility.getDiceFromLevel(item.data.damage)
+    }
+    if( item.data.level) {
+      item.data.levelDice = PegasusUtility.getDiceFromLevel(item.data.level)
     }
-    return armors;
   }
 
   /* -------------------------------------------- */
-  checkAndPrepareWeapon(weapon) {
-    weapon.data.damageDice = PegasusUtility.getDiceFromLevel(weapon.data.damage);
-  }
-  /* -------------------------------------------- */
-  checkAndPrepareWeapons(weapons) {
-    for (let item of weapons) {
-      this.checkAndPrepareWeapon(item);
+  checkAndPrepareEquipments(listItem) {
+    for (let item of listItem) {
+      this.checkAndPrepareEquipment(item)
     }
-    return weapons;
+    return listItem
   }
 
   /* -------------------------------------------- */
@@ -314,10 +314,11 @@ export class PegasusActor extends Actor {
     // Compute whole enc
     let enc = 0
     for (let item of equipments) {
+      item.data.idrDice = PegasusUtility.getDiceFromLevel( Number(item.data.idr))
       if (item.data.equipped) {
         if (item.data.iscontainer) {
           enc += item.data.contentsEnc
-        } else {
+        } else if (item.data.containerid == "") {
           enc += item.data.weight
         }
       }
@@ -789,7 +790,7 @@ export class PegasusActor extends Actor {
         updates['data.secondary.socialhealth.value'] = socDiceValue
       }
 
-      let nrgValue = PegasusUtility.getDiceValue(this.data.data.statistics.foc.value) + this.data.data.nrg.mod + this.data.data.statistics.foc.mod;
+      let nrgValue = PegasusUtility.getDiceValue(this.data.data.statistics.foc.value) + this.data.data.nrg.mod + this.data.data.statistics.foc.mod
       if (nrgValue != this.data.data.nrg.absolutemax) {
         updates['data.nrg.absolutemax'] = nrgValue
       }
@@ -823,7 +824,7 @@ export class PegasusActor extends Actor {
       if (role && role.name && (role.name != this.data.data.biodata.rolename)) {
         updates['data.biodata.rolename'] = role.name
       }
-      console.log("UPD", updates, this.data.data.biodata)
+      //console.log("UPD", updates, this.data.data.biodata)
       await this.update(updates)
     }
 
@@ -878,6 +879,16 @@ export class PegasusActor extends Actor {
       const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.quantity': newQ }]); // pdates one EmbeddedEntity
     }
   }
+  /* -------------------------------------------- */
+  async incDecAmmo(objetId, incDec = 0) {
+    let objetQ = this.data.items.get(objetId)
+    if (objetQ) {
+      let newQ = objetQ.data.data.ammocurrent + incDec;
+      if ( newQ >= 0 && newQ <= objetQ.data.data.ammomax) { 
+        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.ammocurrent': newQ }]); // pdates one EmbeddedEntity
+      }
+    }
+  }
 
   /* -------------------------------------------- */
   async applyAbility(ability, updates = [], directUpdate = false) {
@@ -1082,7 +1093,11 @@ export class PegasusActor extends Actor {
       rollData.statMod = rollData.stat.mod
       rollData.specList = this.getRelevantSpec(statKey)
       rollData.selectedSpec = "0"
-      rollData.img = `systems/fvtt-pegasus-rpg/images/icons/${rollData.stat.abbrev}.webp`
+      if (statKey.toLowerCase() == "mr") {
+        rollData.img = "systems/fvtt-pegasus-rpg/images/icons/MR.webp"
+      } else {
+        rollData.img = `systems/fvtt-pegasus-rpg/images/icons/${rollData.stat.abbrev}.webp`        
+      }
     }
 
     this.addEffects(rollData)
@@ -1119,6 +1134,7 @@ export class PegasusActor extends Actor {
       let rollData = this.getCommonRollData(statKey, useShield)
       rollData.mode = "stat"
       rollData.title = `Roll : ${stat.label} `
+      rollData.img = "icons/dice/d12black.svg"
 
       this.startRoll(rollData)
     } else {
@@ -1181,10 +1197,11 @@ export class PegasusActor extends Actor {
 
       let rollData = this.getCommonRollData("mr")
       rollData.mode = "MR"
+      rollData.img = "systems/fvtt-pegasus-rpg/images/icons/MR.webp"
       rollData.isInit = isInit
       rollData.combatId = combatId
       rollData.combatantId = combatantId
-
+      console.log("MR ROLL", rollData)
       this.startRoll(rollData);
     } else {
       ui.notifications.warn("MR not found !");
@@ -1199,7 +1216,7 @@ export class PegasusActor extends Actor {
       let rollData = this.getCommonRollData(armor.data.statistic)
 
       armor = duplicate(armor);
-      this.checkAndPrepareArmor(armor);
+      this.checkAndPrepareEquipment(armor);
 
       rollData.mode = "armor"
       rollData.armor = armor