Fix #98 hindrance stuff

modules/pegasus-actor-sheet.js

@@ -61,6 +61,7 @@ export class PegasusActorSheet extends ActorSheet {
       encCapacity: this.actor.getEncumbranceCapacity(),
       levelRemainingList: this.actor.getLevelRemainingList(),
       maxLevelRemainingList: this.actor.getMaxLevelRemainingList(),
+      disabledBonus: (this.actor.system.biodata.noautobonus) ? "" : "disabled",
       containersTree: this.actor.containersTree,
       encCurrent: this.actor.encCurrent,
       encHindrance: this.actor.encHindrance,
@@ -249,13 +250,13 @@ export class PegasusActorSheet extends ActorSheet {
       this.actor.rollPool( 'def', true, "defence");
     });
     html.find('.damage-melee').click((event) => {
-      this.actor.rollPool( 'str', false, "melee-dmg");
+      this.actor.rollPool( 'str', false, "melee-dmg")
     });
     html.find('.damage-ranged').click((event) => {
       this.actor.rollPool( 'per', false, "ranged-dmg");
     });
     html.find('.damage-resistance').click((event) => {
-      this.actor.rollPool( 'phy', false, "dmg-res");
+      this.actor.rollPool( 'phy', false, "dmg-res")
     });
             
     html.find('.roll-stat').click((event) => {

modules/pegasus-roll-dialog.js

@@ -90,6 +90,9 @@ export class PegasusRollDialog extends Dialog {
     PegasusUtility.updateDamageDicePool(this.rollData)
     PegasusUtility.updateEffectsBonusDice(this.rollData)
     PegasusUtility.updateHindranceBonusDice(this.rollData)
+    if ( effect.specList) {
+      this.rollData.specList = duplicate(effect.specList)
+    }
   }
 
   /* -------------------------------------------- */

modules/pegasus-utility.js

@@ -146,10 +146,10 @@ export class PegasusUtility {
   static updateEffectsBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-bonus-dice")
     for (let effect of rollData.effectsList) {
-      if (effect && effect.applied && effect.type == "effect" && effect.effect && effect.effect.system.bonusdice) {
+      if (effect && effect.applied && effect.type == "effect" && !effect.effect?.system?.hindrance && effect.effect && effect.effect.system.bonusdice) {
         newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.effect.system.effectlevel, 0, effect.effect.name))
       }
-      if (effect && effect.applied && effect.type == "effect" && effect.value && effect.isdynamic) {
+      if (effect && effect.applied && effect.type == "effect" && effect.value && effect.isdynamic && !effect.effect?.system?.hindrance) {
         newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.value, 0, effect.name))
       }
     }
@@ -161,7 +161,9 @@ export class PegasusUtility {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-hindrance")
     for (let hindrance of rollData.effectsList) {
       if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance))) {
+        console.log("Adding Hindrance 1", hindrance, newDicePool)
         newDicePool = newDicePool.concat(this.buildDicePool("effect-hindrance", (hindrance.value) ? hindrance.value : hindrance.effect.system.effectlevel, 0, hindrance.name))
+        console.log("Adding Hindrance 2", newDicePool)
       }
     }
     rollData.dicePool = newDicePool
@@ -175,12 +177,13 @@ export class PegasusUtility {
         newDicePool = newDicePool.concat(this.buildDicePool("armor-shield", armor.value, 0))
       }
     }
-    newDicePool = rollData.dicePool.filter(dice => dice.name != "vehicle-shield")
+    newDicePool = newDicePool.filter(dice => dice.name != "vehicle-shield")
     for (let shield of rollData.vehicleShieldList) {
       if (shield.applied) {
         newDicePool = newDicePool.concat(this.buildDicePool("vehicle-shield", shield.value, 0))
       }
     }
+    console.log(">>>>Dicepoool", newDicePool)
     rollData.dicePool = newDicePool
   }
 
@@ -1026,7 +1029,12 @@ export class PegasusUtility {
     if (target) {
       let defenderActor = target.actor
       rollData.defenderTokenId = target.id
-      rollData.defenderSize = Number(defenderActor.system.biodata.sizenum) + Number(defenderActor.system.biodata.sizebonus)
+      rollData.defenderSize = 0
+      if ( defenderActor.type == "character") {
+        rollData.defenderSize = Number(defenderActor.system.biodata.sizenum) + Number(defenderActor.system.biodata.sizebonus)
+      } else if ( defenderActor.type == "vehicle" ){
+        rollData.defenderSize = Number(defenderActor.system.statistics.hr.size)
+      }
       //rollData.attackerId = this.id
       console.log("Target/DEFENDER", defenderActor)
       defenderActor.addHindrancesList(rollData.effectsList)
@@ -1067,31 +1075,15 @@ export class PegasusUtility {
   }
 
   /* -------------------------------------------- */
-  static glowToken(token) {
-    let params =
-      [{
-        filterType: "glow",
-        filterId: "superSpookyGlow",
-        outerStrength: 15,
-        innerStrength: 0,
-        color: 0x6AAB8E,
-        quality: 0.5,
-        padding: 40,
-        autoDestroy: true,
-        animated:
-        {
-          color:
-          {
-            active: true,
-            loopDuration: 3000,
-            loops: 2,
-            animType: "colorOscillation",
-            val1: 0x6AAB8E,
-            val2: 0x66FF33
-          }
-        }
-      }]
-    TokenMagic.addUpdateFilters(token, params)
+  static checkIsVehicleCrew(actorId) {
+    let vehicles = game.actors.filter( actor=> actor.type == "vehicle") || []
+    for(let vehicle of vehicles)  {
+      console.log("Checking", vehicle.name)
+      if ( vehicle.inCrew(actorId) ) {
+        return vehicle
+      }
+    }
+    return false
   }
 
   /* -------------------------------------------- */
@@ -1117,7 +1109,7 @@ export class PegasusUtility {
   static async processTactician() {
     // Tactician management
     let toApply = {}
-    let tacticianTokens = canvas.tokens.placeables.filter(token => token.actor.isTactician() && !newToken.document.hidden)
+    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)  
@@ -1165,7 +1157,7 @@ export class PegasusUtility {
   static async processEnhancer() {
     // Enhancer management
     let toApply = {}
-    let enhancerTokens = canvas.tokens.placeables.filter(token => token.actor.isEnhancer() && !newToken.document.hidden)
+    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)  
@@ -1215,17 +1207,21 @@ export class PegasusUtility {
   static async processAgitator() {
     // Agitator management
     let toApply = {}
-    let agitatorTokens = canvas.tokens.placeables.filter(token => token.actor.isAgitator())
+    let agitatorTokens = canvas.tokens.placeables.filter(token => token.actor.isAgitator() && !token.document.hidden)
     for (let token of agitatorTokens) {
       token.refresh()
       if (token.document.disposition == 0) {
         continue
       }
-      let disposition = ( token.document.disposition == -1) ? 1 : -1
-      let ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == disposition)  
-      let neutrals = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == 0)
-      if (neutrals ) {
-        ennemies = ennemies.concat(neutrals)
+      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 ))
+      }
+      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 ))
+      }
+      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 ))
       }
       for (let ennemy of ennemies) {
         if (ennemy.actor.id != token.actor.id) {
@@ -1257,11 +1253,11 @@ export class PegasusUtility {
         applyDef.actor.removeAgitatorHindrance()
       }
     }
-    // Delete all effects if no more tacticians (ie deleted case)
+    // Delete all effects if no more agtators (ie deleted case)
     if (agitatorTokens.length == 0) {
       let allTokens = canvas.tokens.placeables.filter(token => token.actor.type == "character")
       for (let token of allTokens) {
-        if (token.actor.addAgitatorHindrance()) {
+        if (token.actor.hasAgitatorHindrance()) {
           token.actor.removeAgitatorHindrance()
         }
       }

system.json

@@ -253,7 +253,7 @@
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.0.32",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.32.zip",
+  "version": "10.1.1",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.1.zip",
   "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
 }

template.json

@@ -37,6 +37,7 @@
           "rolename": "",
           "morality": 5,
           "bonusselection": "",
+          "noautobonus": false,
           "moralitythreshold": 0
         }
       },

templates/actor-sheet.html

@@ -869,6 +869,12 @@
               <label class="generic-label">Hair</label>
               <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
             </li>
+            {{#if isGM}}
+              <li class="item flexrow">
+                <label class="generic-label">Manual bonuses only ?</label>
+                <input type="checkbox" class="change-worstfear" name="system.biodata.noautobonus" {{checked data.biodata.noautobonus}} />
+              </li>
+            {{/if}}
           </ul>
         </div>
        <div>

templates/item-effect-sheet.html

@@ -34,6 +34,27 @@
               </select> 
             </li>            
 
+            <li class="flexrow"><label class="generic-label">Effect Level is a Stat?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.effectstatlevel" {{checked data.effectstatlevel}}/></label>
+            </li>
+            {{#if data.effectstatlevel}}
+              <li class="flexrow"><label class="generic-label">Stat to use for Effect Level</label>
+                <select class="competence-base flexrow" type="text" name="system.effectstat" value="{{data.effectstat}}" data-dtype="String">
+                  {{#select data.effectstat}}
+                  {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=true all=false}}
+                  {{/select}}
+                </select> 
+              </li>
+            {{else}}
+              <li class="flexrow"><label class="generic-label">Effect Level</label>
+                <input type="text" class="input-numeric-short padd-right" name="system.effectlevel" value="{{data.effectlevel}}" data-dtype="Number"/>
+              </li>
+              <li class="flexrow"><label class="generic-label">Affect size ?</label>
+                <label class="attribute-value checkbox"><input type="checkbox" name="system.affectsize" {{checked data.affectsize}}/></label>
+              </li>              
+            {{/if}}
+
+            
             <li class="flexrow"><label class="generic-label">One use?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.oneuse" {{checked data.oneuse}}/></label>
             </li>
@@ -65,26 +86,6 @@
               <label class="attribute-value checkbox"><input type="checkbox" name="system.locked" {{checked data.locked}}/></label>
             </li>
 
-            <li class="flexrow"><label class="generic-label">Effect Level is a Stat?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.effectstatlevel" {{checked data.effectstatlevel}}/></label>
-            </li>
-            {{#if data.effectstatlevel}}
-              <li class="flexrow"><label class="generic-label">Stat to use for Effect Level</label>
-                <select class="competence-base flexrow" type="text" name="system.effectstat" value="{{data.effectstat}}" data-dtype="String">
-                  {{#select data.effectstat}}
-                  {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=true all=false}}
-                  {{/select}}
-                </select> 
-              </li>
-            {{else}}
-              <li class="flexrow"><label class="generic-label">Effect Level</label>
-                <input type="text" class="input-numeric-short padd-right" name="system.effectlevel" value="{{data.effectlevel}}" data-dtype="Number"/>
-              </li>
-              <li class="flexrow"><label class="generic-label">Affect size ?</label>
-                <label class="attribute-value checkbox"><input type="checkbox" name="system.affectsize" {{checked data.affectsize}}/></label>
-              </li>              
-            {{/if}}
-
             <li class="flexrow"><label class="generic-label">Affect Status?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.affectstatus" {{checked data.affectstatus}}/></label>
             </li>

templates/partial-actor-status.html

@@ -18,7 +18,7 @@
         </label>
       </span>
       <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number" disabled/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number" {{@root.disabledBonus}}/>
       <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
     </li>
   {{/each}}
@@ -27,7 +27,7 @@
       <label class="status-small-label"><strong>{{data.nrg.label}}</strong></label>               
     </span>
     <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number" disabled/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number" {{@root.disabledBonus}}/>
     <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
     <span class="small-label status-small-label">&nbsp;/ {{data.nrg.absolutemax}}</span>
   </li>