Minor changes

modules/pegasus-actor.js

@@ -2057,7 +2057,7 @@ export class PegasusActor extends Actor {
     if (statKey == 'phy' && subKey == "dmg-res") {
       let armors = this.getArmors()
       for (let armor of armors) {
-        rollData.armorsList.push({ label: `Armor ${armor.name}`, type: "armor", applied: false, value: armor.system.resistance })
+        rollData.armorsList.push({ label: `Armor ${armor.name}`, type: "armor", applied: false, value: armor.system.resistance, adrl:armor.system.adrl  })
       }
     }
     if (useShield) {

modules/pegasus-combat.js

@@ -19,6 +19,11 @@ export class PegasusCombatTracker extends CombatTracker {
       let combatantId = $(ev.currentTarget).data("combatant-id")
       game.combat.revealTIC(ticNum, combatantId)
     })
+
+    html.find('.reset-npc-initiative').click(ev => {
+      game.combat.resetNPCInitiative()
+    })
+
   }
 
 }
@@ -39,48 +44,70 @@ export class PegasusCombat extends Combat {
     return this;
   }
 
+  /* -------------------------------------------- */
+  async resetNPCInitiative() {
+    for(let c of this.combatants) {
+      if (c.actor && c.actor.type == "npc") {
+        await this.updateEmbeddedDocuments("Combatant", [{ _id: c.id, initiative: -1 }]);
+      }
+    } 
+  }
+
   /* -------------------------------------------- */
   isCharacter(combatantId) {
     const combatant = game.combat.combatants.get(combatantId)
     if (combatant) {
       return combatant.actor.type == "character"
-    } 
+    }
     return false
   }
 
   /* -------------------------------------------- */
   async setTic(combatantId, rollData) {
-    if ( !combatantId) {
+    if (!combatantId) {
       return
     }
     const combatant = game.combat.combatants.get(combatantId)
     if (combatant) {
-      await combatant.setFlag("world", "tic1", { revealed: false, text: rollData.tic1 })
-      await combatant.setFlag("world", "tic2", { revealed: false, text: rollData.tic2 })
+      await combatant.setFlag("world", "tic1", { revealed: false, text: rollData.tic1, displayed: false })
+      await combatant.setFlag("world", "tic2", { revealed: false, text: rollData.tic2, displayed: false })
     }
   }
 
   /* -------------------------------------------- */
   getTIC(num, combatantId) {
-    if ( !combatantId) {
+    if (!combatantId) {
       return ""
     }
     const combatant = game.combat.combatants.get(combatantId)
     if (combatant) {
       let ticData = combatant.getFlag("world", "tic" + num)
       if (ticData) {
-        let ticText = "TIC" + num + ":" + ticData.text
-        /* returns if revealed or if GM and NPC or if player and owner */
-        if (ticData.revealed || (game.user.isGM && combatant.isNPC) || (!game.user.isGM && combatant.isOwner)) {
-          return ticText
+        /* returns if revealed */
+        if (ticData.revealed && ticData.displayed) {
+          return "ACTED"
+        }
+        if (ticData.revealed && !ticData.displayed) {
+          ticData.displayed = true
+          combatant.setFlag("world", "tic" + num, ticData ).then(() => {
+            let chatData = {
+              user: game.user.id,
+              alias: combatant.actor.name,
+              rollMode: game.settings.get("core", "rollMode"),
+              whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
+              content: `<div>${combatant.actor.name} is performing ${ticData.text}</div`
+            };
+            ChatMessage.create(chatData);
+            return "ACTED"
+          })
         }
       }
     }
-    return "TIC" + num + ":???"
+    return "TIC " + num
   }
   /* -------------------------------------------- */
   async revealTIC(num, combatantId) {
-    if ( !num || !combatantId) {
+    if (!num || !combatantId) {
       return
     }
     const combatant = game.combat.combatants.get(combatantId)
@@ -92,7 +119,15 @@ export class PegasusCombat extends Combat {
       }
     }
   }
-
+  /* -------------------------------------------- */
+  nextRound() {
+    for(let c of this.combatants) {
+      c.setFlag("world", "tic1", { revealed: false, text: "", displayed: false })
+      c.setFlag("world", "tic2", { revealed: false, text: "", displayed: false })
+    }
+    super.nextRound()
+  }
+  
   /* -------------------------------------------- */
   _onUpdate(changed, options, userId) {
   }

modules/pegasus-hindrance-die.js

@@ -0,0 +1,25 @@
+export class PegasusHindranceDie extends Die {
+  constructor(termData ) {
+      termData.faces=6;
+      super(termData);
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  static DENOMINATION = "h";
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  getResultLabel(result) {
+      return {
+          "1": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "2": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "3": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "4": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "5": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "6": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" />'
+      }[result.result];
+  }
+}

modules/pegasus-main.js

@@ -15,6 +15,7 @@ import { PegasusVehicleSheet } from "./pegasus-vehicle-sheet.js";
 import { PegasusUtility } from "./pegasus-utility.js";
 import { PegasusCombatTracker,PegasusCombat } from "./pegasus-combat.js";
 import { PegasusItem } from "./pegasus-item.js";
+import { PegasusHindranceDie } from "./pegasus-hindrance-die.js";
 import { PEGASUS_CONFIG } from "./pegasus-config.js"
 
 /* -------------------------------------------- */
@@ -57,6 +58,7 @@ Hooks.once("init", async function () {
   CONFIG.Actor.documentClass = PegasusActor
   CONFIG.Item.documentClass = PegasusItem
   CONFIG.ui.combat = PegasusCombatTracker
+  CONFIG.Dice.terms["h"] = PegasusHindranceDie
   game.system.pegasus = { 
     utility: PegasusUtility,
     config: PEGASUS_CONFIG
@@ -74,7 +76,6 @@ Hooks.once("init", async function () {
 
   PegasusUtility.init()
 
-
 });
 
 /* -------------------------------------------- */

modules/pegasus-utility.js

@@ -26,6 +26,29 @@ export class PegasusUtility {
     /* Deprecated, no more used in rules Hooks.on("getCombatTrackerEntryContext", (html, options) => {
       PegasusUtility.pushInitiativeOptions(html, options);
     });*/
+    Hooks.once('diceSoNiceReady', (dice3d) => {
+      dice3d.addSystem({ id: "pegasus-hindrance", name: "Hindrance Die" }, "preferred");
+      dice3d.addDicePreset({
+        type: "dh",
+        labels: [
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png'
+        ],
+        bumpMaps: [
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png'
+        ],
+        system: "pegasus-hindrance"
+      }, "d6")
+    })
     Hooks.on("dropCanvasData", (canvas, data) => {
       PegasusUtility.dropItemOnToken(canvas, data)
     });
@@ -224,9 +247,9 @@ export class PegasusUtility {
       for (let weapon of rollData.vehicleWeapons) {
         if (weapon.applied) {
           newDicePool = newDicePool.concat(this.buildDicePool("damage", weapon.value, 0))
-          if( weapon.weapon.system.extradamage) {
-            for(let i=0; i < weapon.weapon.system.extradamagevalue; i++) {
-              newDicePool = newDicePool.concat(this.buildDicePool("damage", 5, 0) )
+          if (weapon.weapon.system.extradamage) {
+            for (let i = 0; i < weapon.weapon.system.extradamagevalue; i++) {
+              newDicePool = newDicePool.concat(this.buildDicePool("damage", 5, 0))
             }
           }
         }
@@ -567,7 +590,7 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static getDiceFromLevel(level = 0) {
-    level = Math.max( Number(level), 0)
+    level = Math.max(Number(level), 0)
     return this.diceList[level];
   }
   /* -------------------------------------------- */
@@ -846,8 +869,8 @@ export class PegasusUtility {
       myRoll = new Roll(diceFormula).roll({ async: false })
       rollData.roll = myRoll
     }
-    if ( rollData.hindranceDices > 0) {
-      rollData.hindranceRoll = new Roll(rollData.hindranceDices + "d6").roll({ async: false })
+    if (rollData.hindranceDices > 0) {
+      rollData.hindranceRoll = new Roll(rollData.hindranceDices + "dh").roll({ async: false })
       this.showDiceSoNice(rollData.hindranceRoll, game.settings.get("core", "rollMode"))
       for (let res of rollData.hindranceRoll.terms[0].results) {
         if (res.result == 6) {
@@ -855,7 +878,7 @@ export class PegasusUtility {
           rollData.img = `systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png`
         }
       }
-    } 
+    }
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
 
     // Final score and keep data
@@ -876,7 +899,7 @@ export class PegasusUtility {
     if (rollData.isInit) {
       let combat = game.combats.get(rollData.combatId)
       await combat.setTic(rollData.combatantId, rollData)
-      combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore  }])
+      combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
     }
 
     // Stun specific -> Suffer a stun level when dmg-res for character
@@ -1071,9 +1094,9 @@ export class PegasusUtility {
       let defenderActor = target.actor
       rollData.defenderTokenId = target.id
       rollData.defenderSize = 0
-      if ( defenderActor.type == "character") {
+      if (defenderActor.type == "character") {
         rollData.defenderSize = Number(defenderActor.system.biodata.sizenum) + Number(defenderActor.system.biodata.sizebonus)
-      } else if ( defenderActor.type == "vehicle" ){
+      } else if (defenderActor.type == "vehicle") {
         rollData.defenderSize = Number(defenderActor.system.statistics.hr.size)
       }
       //rollData.attackerId = this.id
@@ -1117,10 +1140,10 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static checkIsVehicleCrew(actorId) {
-    let vehicles = game.actors.filter( actor=> actor.type == "vehicle") || []
-    for(let vehicle of vehicles)  {
+    let vehicles = game.actors.filter(actor => actor.type == "vehicle") || []
+    for (let vehicle of vehicles) {
       console.log("Checking", vehicle.name)
-      if ( vehicle.inCrew(actorId) ) {
+      if (vehicle.inCrew(actorId)) {
         return vehicle
       }
     }
@@ -1153,7 +1176,7 @@ export class PegasusUtility {
     let tacticianTokens = canvas.tokens.placeables.filter(token => token.actor.isTactician() && !token.document.hidden)
     for (let token of tacticianTokens) {
       token.refresh()
-      let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)  
+      let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
       for (let friend of friends) {
         if (friend.actor.id != token.actor.id) {
           let existing = toApply[friend.id] || { token: friend, add: false, level: 0, names: [] }
@@ -1201,7 +1224,7 @@ export class PegasusUtility {
     let enhancerTokens = canvas.tokens.placeables.filter(token => token.actor.isEnhancer() && !token.document.hidden)
     for (let token of enhancerTokens) {
       token.refresh()
-      let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)  
+      let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
       for (let friend of friends) {
         if (friend.actor.id != token.actor.id) {
           let existing = toApply[friend.id] || { token: friend, add: false, level: 0, names: [] }
@@ -1253,13 +1276,13 @@ export class PegasusUtility {
       token.refresh()
       let ennemies = []
       if (token.document.disposition == -1) {
-        ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0 ))
+        ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0))
       }
       if (token.document.disposition == 1) {
-        ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 0 ))
+        ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 0))
       }
       if (token.document.disposition == 0) {
-        ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 1 ))
+        ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 1))
       }
       console.log("Ennemies for token", token.actor.name, ennemies)
       for (let ennemy of ennemies) {

styles/simple.css

@@ -1142,7 +1142,6 @@ ul, li {
   position: relative;
   margin:4px;
 }
-
 .chat-card-button {
   box-shadow: inset 0px 1px 0px 0px #a6827e;
   background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%);
@@ -1352,6 +1351,20 @@ Focus FOC: #ff0084
   max-height: 26px;
   margin-top: 4px;
 }
+.combat-tracker-tic-section {
+  max-width: 5rem;
+  min-width: 5rem;
+  align-content: center;
+}
+.combat-tracker-tic {
+  text-align: center;
+  background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%);
+  border-radius: 3px;
+  border: 2px ridge #846109;
+  color: #ffffff;
+  font-size: 0.8rem;
+  margin:2px;
+}
 .no-grow {
   flex-grow: 1;
   max-width: 32px;

system.json

@@ -252,7 +252,7 @@
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "11.0.5",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.5.zip",
+  "version": "11.0.8",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.8.zip",
   "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
 }

templates/chat-generic-result.html

@@ -51,6 +51,15 @@
           <li>Damage type : {{weapon.weapon.system.damagetype}} {{weapon.weapon.system.damagetypelevel}}</li>
           {{/if}}
         {{/if}}
+        
+        {{#if (eq subKey "dmg-res")}}
+        <li>Damage Resistance</li>
+        {{#each armorsList as |armor idx|}}
+          {{#if armor.applied}}
+            <li>ADRL: {{armor.adrl}}</li>
+          {{/if}}
+        {{/each}}
+        {{/if}}
 
         {{#if power}}  
           <li>Power Damage type : {{power.system.powerdamagetype}} {{power.system.powerdamagetypelevel}}</li>

templates/pegasus-combat-tracker.html

@@ -30,7 +30,10 @@
           <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.RollNPC'}}" role="button" data-tooltip="COMBAT.RollNPC" data-control="rollNPC" {{#unless turns}}disabled{{/unless}}>
               <i class="fas fa-users-cog"></i>
           </a>
-          {{/if}}
+          <a class="combat-button reset-npc-initiative" aria-label="Reset NPC" role="button" data-tooltip="Reset NPC Initiative" data-control="resetNPC" {{#unless turns}}disabled{{/unless}}>
+            <i class="fas fa-pickaxe"></i>
+        </a>
+        {{/if}}
 
           {{#if combatCount}}
           {{#if combat.round}}
@@ -92,7 +95,7 @@
           </div>
           {{/if}}
           
-          <div class="token-resource" id="{{this.id}}">
+          <div class="combat-tracker-tic-section flexcol" id="{{this.id}}">
             <a class="combat-tracker-tic" data-tic-num="1" data-combatant-id="{{this.id}}">{{getTIC 1 this.id}}</a>
             {{#if (isCharacter this.id)}}
             <a class="combat-tracker-tic" data-tic-num="2" data-combatant-id="{{this.id}}">{{getTIC 2 this.id}}</a>