Minor fixes

images/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2022,9,12,23,3,3.4699999999999998
+Version=4
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

images/icons/feats/.directory

@@ -1,6 +1,5 @@
 [Dolphin]
 SortOrder=1
-Timestamp=2022,7,27,18,56,49.607
+Timestamp=2022,9,12,23,4,32.409
 Version=4
-ViewMode=1
 VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

modules/crucible-actor-sheet.js

@@ -158,6 +158,9 @@ export class CrucibleActorSheet extends ActorSheet {
     html.find('.roll-shield-die').click((event) => {
       this.actor.rollShieldDie()
     });
+    html.find('.roll-target-die').click((event) => {
+      this.actor.rollDefenseRanged()
+    });
     
     html.find('.roll-save').click((event) => {
       const saveKey = $(event.currentTarget).data("save-key")

modules/crucible-actor.js

@@ -63,6 +63,7 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   computeHitPoints() {
+    if (this.type == "character") {
       let hp = duplicate(this.system.secondary.hp)
       let max = (this.system.abilities.str.value + this.system.abilities.con.value) * 6
       if (max != hp.max || hp.value > max) {
@@ -71,8 +72,10 @@ export class CrucibleActor extends Actor {
         this.update({ 'system.secondary.hp': hp })
       }
     }
+  }
   /* -------------------------------------------- */
   computeEffortPoints() {
+    if (this.type == "character") {
       let effort = duplicate(this.system.secondary.effort)
       let max = (this.system.abilities.con.value + this.system.abilities.int.value) * 6
       if (max != effort.max || effort.value > max) {
@@ -81,6 +84,7 @@ export class CrucibleActor extends Actor {
         this.update({ 'system.secondary.effort': effort })
       }
     }
+  }
 
   /* -------------------------------------------- */
   prepareDerivedData() {
@@ -687,10 +691,12 @@ export class CrucibleActor extends Actor {
     let rollData = this.getCommonRollData()
     rollData.defenderTokenId = undefined // Cleanup
     rollData.mode = "rangeddefense"
+    if ( attackRollData) {
       rollData.attackRollData = duplicate(attackRollData)
-    rollData.sizeDice = CrucibleUtility.getSizeDice( this.system.biodata.size )
       rollData.effectiveRange = CrucibleUtility.getWeaponRange(attackRollData.weapon)
       rollData.tokensDistance = attackRollData.tokensDistance // QoL copy
+    }
+    rollData.sizeDice = CrucibleUtility.getSizeDice(this.system.biodata.size)
     rollData.distanceBonusDice = 0 //Math.max(0, Math.floor((rollData.tokensDistance - rollData.effectiveRange) + 0.5))
     rollData.hasCover = "none"
     rollData.situational = "none"
@@ -752,10 +758,10 @@ export class CrucibleActor extends Actor {
       let diceColor = armor.system.absorprionroll
       let armorResult = await CrucibleUtility.getRollTableFromDiceColor(diceColor, false)
       console.log("Armor log", armorResult)
-      let armorValue = (Number(armorResult.text) + reduce) * multiply
+      let armorValue = Math.max(0, (Number(armorResult.text) + reduce) * multiply)
       if (advantage || disadvantage) {
         let armorResult2 = await CrucibleUtility.getRollTableFromDiceColor(diceColor, false)
-        let armorValue2 = (Number(armorResult2.text) + reduce) * multiply
+        let armorValue2 = Math.max(0, (Number(armorResult2.text) + reduce) * multiply)
         if (advantage) {
           armorValue = (armorValue2 > armorValue) ? armorValue2 : armorValue
           messages.push(`Armor advantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)

modules/crucible-npc-sheet.js

@@ -157,6 +157,9 @@ export class CrucibleNPCSheet extends ActorSheet {
     html.find('.roll-shield-die').click((event) => {
       this.actor.rollShieldDie()
     });
+    html.find('.roll-target-die').click((event) => {
+      this.actor.rollDefenseRanged()
+    });
 
     html.find('.roll-save').click((event) => {
       const saveKey = $(event.currentTarget).data("save-key")

system.json

@@ -199,15 +199,15 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.9",
+  "version": "10.0.12",
   "compatibility": {
     "minimum": "10",
-    "verified": "10.279",
+    "verified": "10.285",
     "maximum": "10"
   },
   "title": "Crucible RPG",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/raw/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v10.0.9.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v10.0.12.zip",
   "url": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg",
   "background": "images/ui/crucible_welcome_page.webp",
   "id": "fvtt-crucible-rpg"

templates/actor-sheet.html

@@ -59,6 +59,12 @@
                   </span>
                 </li>
                 {{/if}}
+                <li class="item flexrow list-item" data-attr-key="class">              
+                  <img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
+                  <span class="ability-label " name="rollTarget">
+                    <h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
+                  </span>
+                </li>
 
               </ul>
             </div>

templates/npc-sheet.html

@@ -60,6 +60,12 @@
                   </span>
                 </li>
                 {{/if}}
+                <li class="item flexrow list-item" data-attr-key="class">              
+                  <img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
+                  <span class="ability-label " name="rollTarget">
+                    <h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
+                  </span>
+                </li>
 
               </ul>
             </div>
@@ -120,7 +126,7 @@
       <ul class="stat-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
             <span class="item-name-label-header-long">
-              <h3><label class="items-title-text">Weapons</label></h3>
+              <h3><label class="items-title-text">Combat</label></h3>
             </span>
             <span class="item-field-label-short">
               <label class="short-label">Ability</label>
@@ -191,68 +197,9 @@
               <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                   src="{{condition.img}}" /></a>
               <span class="item-name-label-long">{{condition.name}}</span>
-              <div class="item-filler">&nbsp;</div>    {{!-- Equipement Tab --}}
-              <div class="tab equipment" data-group="primary" data-tab="equipment">
-          
-                <div class="flexrow">
-                  <h3>Encumbrance</h3>
-                  <span class="small-label">Current : {{encCurrent}}</span>
-                  <span class="small-label">Capacity : {{encCapacity}}</span>
-                </div>
-          
-                <ul class="item-list alternate-list">
-                  <li class="item flexrow list-item items-title-bg">
-                    <span class="item-name-label-header">
-                      <h3><label class="items-title-text">Money</label></h3>
-                    </span>
-                    <span class="item-field-label-long">
-                      <label class="short-label">Qty</label>
-                    </span>
-                    <span class="item-field-label-medium">
-                      <label class="short-label">Weight</label>
-                    </span>
-                    <span class="item-field-label-medium">
-                      <label class="short-label">IDR</label>
-                    </span>
-                    <div class="item-filler">&nbsp;</div>
-                    <div class="item-controls item-controls-fixed">
-                      <a class="item-control item-add" data-type="money" title="Create Item"><i class="fas fa-plus"></i></a>
-                    </div>
-                  </li>
-                  {{#each moneys as |money key|}}
-                  <li class="item flexrow list-item list-item-shadow" data-item-id="{{money._id}}">
-                    <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                        src="{{money.img}}" /></a>
-                    <span class="item-name-label">{{money.name}}</span>
-          
-                    <span class="item-field-label-long"><label>
-                        {{money.system.quantity}}
-                        (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
-                      </label>
-                    </span>
-                    <span class="item-field-label-medium">
-                      <label>{{money.system.weight}}</label>
-                    </span>
-                    <span class="item-field-label-medium">
-                      {{#if money.system.idrDice}}
-                      <a class="roll-idr" data-dice-value="{{money.data.idrDice}}">{{money.system.idrDice}}</a>
-                      {{else}}
-                      &nbsp;-&nbsp;
-                      {{/if}}
-                    </span>
 
               <div class="item-filler">&nbsp;</div>              
-                    <div class="item-controls item-controls-fixed">
-                      <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                    </div>
-                  </li>
-                  {{/each}}
-                </ul>
-          
-          
-                <hr>
-          
-          
+                <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>

templates/partial-actor-status.html

@@ -3,15 +3,25 @@
     <span class="ability-label " name="hp">
       <h4 class="ability-text-white ability-margin">HP</h4>
     </span>
-    <span class="ability-label ability-margin"><input class="input-numeric-short" name="system.secondary.hp.value" value="{{data.secondary.hp.value}}"></span>
+    <span class="ability-label ability-margin">
+      <input class="input-numeric-short" name="system.secondary.hp.value" value="{{data.secondary.hp.value}}"></span>
+      {{#if (eq type "character")}}
       <span class="ability-label ability-margin"> / {{data.secondary.hp.max}}</span>
+      {{else}}
+      <span class="ability-label ability-margin">/<input class="input-numeric-short" name="system.secondary.hp.max" value="{{data.secondary.hp.max}}"></span>
+    {{/if}}
   </li>
   <li class="item flexrow list-item" data-attr-key="hp">
     <span class="ability-label " name="hp">
       <h4 class="ability-text-white ability-margin">Effort</h4>
     </span>
-    <span class="ability-label ability-margin"><input class="input-numeric-short" name="system.secondary.effort.value" value="{{data.secondary.effort.value}}"></span>
+    <span class="ability-label ability-margin">
+      <input class="input-numeric-short" name="system.secondary.effort.value" value="{{data.secondary.effort.value}}"></span>
+    {{#if (eq type "character")}}
     <span class="ability-label ability-margin"> / {{data.secondary.effort.max}}</span>
+    {{else}}
+    <span class="ability-label ability-margin">/<input class="input-numeric-short" name="system.secondary.effort.max" value="{{data.secondary.effort.max}}"></span>
+    {{/if}}
   </li>
 
   <li>&nbsp;</li>