Fix stun hindrances

modules/pegasus-actor.js

@@ -1502,7 +1502,7 @@ export class PegasusActor extends Actor {
     }
     if (this.isOwner || game.user.isGM) {
       // Update current hindrance level
-      let hindrance = this.system.combat.hindrancedice
+      let hindrance = 0; //this.system.combat.hindrancedice
       if (!this.checkIgnoreHealth()) {
         if (this.system.secondary.health.status == "wounded") {
           hindrance += 1
@@ -1924,6 +1924,18 @@ export class PegasusActor extends Actor {
     await this.createEmbeddedDocuments('Item', newItems)
 
   }
+  /* -------------------------------------------- */
+  checkEFfectsHindranceDeletion(statKey) {
+    let toRem = []
+    let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.oneuse &&
+      effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
+    for (let effect of effects) {
+      toRem.push(effect.id)
+    }
+    if (toRem.length > 0) {
+      this.deleteEmbeddedDocuments('Item', toRem)
+    }
+  }
 
   /* -------------------------------------------- */
   computeCurrentHindrances(statKey) {
@@ -1935,15 +1947,9 @@ export class PegasusActor extends Actor {
       if (overCapacity > 0) {
         hindrancesDices += overCapacity
       }
-      let effects = this.items.filter(item => item.type == 'effect')
+      let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
       for (let effect of effects) {
-        if (effect.system.hindrance && ( effect.system.stataffected == statKey || effect.system.stataffected == "all")) {
         hindrancesDices += effect.system.effectlevel
-          if ( effect.system.oneuse) {
-            effect.system.isUSed = true // Ensure deletion
-            this.deleteEmbeddedDocuments('Item', [effect.id])
-          }
-        }
       }
       if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
         hindrancesDices += 1
@@ -2248,6 +2254,7 @@ export class PegasusActor extends Actor {
     }
 
     rollData.hindranceDices = this.computeCurrentHindrances(statKey)
+    rollData.minHindranceDices = rollData.hindranceDices
 
     this.processSizeBonus(rollData)
     this.addEffects(rollData, isInit, isPower, subKey == "power-dmg")

modules/pegasus-roll-dialog.js

@@ -296,6 +296,13 @@ export class PegasusRollDialog extends Dialog {
       PegasusUtility.removeFromDicePool(this.rollData, idx)
       this.refreshDialog()
     })
+    html.find('.pool-remove-hindrance-dice').click(async (event) => {
+      if (this.rollData.hindranceDices > this.rollData.minHindranceDices) { 
+        this.rollData.hindranceDices--;
+      }
+      this.refreshDialog()
+    })
+    
 
 
   }

modules/pegasus-utility.js

@@ -165,7 +165,8 @@ export class PegasusUtility {
   static getDiceList() {
     return [{ key: "d4", level: 1, img: "systems/fvtt-pegasus-rpg/images/dice/d4.webp" }, { key: "d6", level: 2, img: "systems/fvtt-pegasus-rpg/images/dice/d6.webp" },
     { key: "d8", level: 3, img: "systems/fvtt-pegasus-rpg/images/dice/d8.webp" }, { key: "d10", level: 4, img: "systems/fvtt-pegasus-rpg/images/dice/d10.webp" },
-    { key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" }]
+    { key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" }, 
+    { key: "hindrance", level: 0, img: "systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png"}]
   }
 
   /* -------------------------------------------- */
@@ -283,12 +284,16 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static addDicePool(rollData, diceKey, level) {
+    if (diceKey == "hindrance") {
+      rollData.hindranceDices +=1  
+    } else {
       let newDice = {
         name: "dice-click", key: diceKey, level: level,
         img: `systems/fvtt-pegasus-rpg/images/dice/${diceKey}.webp`
       }
       rollData.dicePool.push(newDice)
     }
+  }
 
   /*-------------------------------------------- */
   static removeFromDicePool(rollData, diceIdx) {
@@ -801,11 +806,11 @@ export class PegasusUtility {
         }
       }
     }
-    if (toRem.length > 0) {
-      //console.log("Going to remove one use effects", toRem)
     let actor = game.actors.get(rollData.actorId)
+    if (toRem.length > 0) {
       actor.deleteEmbeddedDocuments('Item', toRem)
     }
+    actor.checkEFfectsHindranceDeletion(rollData.statKey)
   }
 
   /* -------------------------------------------- */

styles/simple.css

@@ -1537,3 +1537,12 @@ Focus FOC: #ff0084
   max-height: 48px;
   flex-grow: 0;
 }
+.dice-pool-image-add {
+  border: 0;
+  margin-left: 4px;
+  min-width: 32px;
+  min-height: 32px;
+  max-width: 32px;
+  max-height: 32px;
+  flex-grow: 0;
+}

system.json

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

templates/roll-dialog-generic.html

@@ -71,12 +71,24 @@
         </span>
         <div class="flexrow dice-pool-stack">
           {{#each dicePool as |dice idx|}}
-          <span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}" data-dice-key="{{dice.key}}"><img class="dice-pool-image"
-                src="{{dice.img}}" alt="dices"></a></span>
+          <span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}"
+              data-dice-key="{{dice.key}}"><img class="dice-pool-image" src="{{dice.img}}" alt="dices"></a></span>
           {{/each}}
         </div>
       </div>
 
+      <div class="dice-pool-div">
+        <span>
+          <h3 class="dice-pool-label">Hindrance Dice</h3>
+        </span>
+        <div class="flexrow dice-pool-stack">
+          {{#for 1 hindranceDices 1}}
+          <span><a class="pool-remove-hindrance-dice" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
+                src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" alt="dices"></a></span>
+          {{/for}}
+        </div>
+      </div>
+
       {{#if noBonusDice}}
       <div class="flexrow">
         No bonus dice due to effect !
@@ -84,25 +96,12 @@
       {{else}}
       <div class="flexrow">
         {{#each diceList as |dice idx|}}
-          <span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img class="dice-pool-image"
-                src="{{dice.img}}" alt="dices"></a></span>
+        <span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img
+              class="dice-pool-image-add" src="{{dice.img}}" alt="dices"></a></span>
         {{/each}}
       </div>
       {{/if}}
 
-      {{#if hindranceDices}}
-      <div class="dice-pool-div">
-        <span>
-          <h3 class="dice-pool-label">Hindrance Dice</h3>
-        </span>
-        <div class="flexrow dice-pool-stack">
-          {{#for 1 hindranceDices 1}}
-          <span><a class="" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
-                src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" alt="dices"></a></span>
-          {{/for}}
-        </div>
-      </div>
-      {{/if}}
 
       <div class="flexrow">
 
@@ -129,18 +128,27 @@
           <option value="d6">Outnumbered 2 Extra Allies d6</option>
           <option value="d8">Outnumbered 3 Extra Allies d8</option>
           <option value="d10">Outnumbered 4 Extra Allies d10</option>
-          <option value="d12">Outnumbered 5 Extra Allies d12<option>
+          <option value="d12">Outnumbered 5 Extra Allies d12
+          <option>
           <option value="none4">===== Called DMG Shot Bonus</option>
-          <option value="d12">Eyes/head d12<option>
+          <option value="d12">Eyes/head d12
+          <option>
           <option value="none4">===== Impact DMG Bonus</option>
-          <option value="d4">Soft d4<option>
-          <option value="d6">Thin/Flimsy  d6<option>
-          <option value="d8">Solid Furniture d8<option>
-          <option value="d10">Thin Metal/Thick Wood d10<option>
-          <option value="d12">Solid Object/Concrete d12<option>
+          <option value="d4">Soft d4
+          <option>
+          <option value="d6">Thin/Flimsy d6
+          <option>
+          <option value="d8">Solid Furniture d8
+          <option>
+          <option value="d10">Thin Metal/Thick Wood d10
+          <option>
+          <option value="d12">Solid Object/Concrete d12
+          <option>
           <option value="none5">===== Other Circumstances</option>
-          <option value="d4">Concentrated<option>
-          <option value="d4">Off Hand d4<option>
+          <option value="d4">Concentrated
+          <option>
+          <option value="d4">Off Hand d4
+          <option>
           <option value="d6">Higher Ground d6</option>
           {{/select}}
         </select>