Add initiative and ammo

2023-10-21 14:16:06 +02:00 · 2023-10-21 14:16:06 +02:00 · ceed6efc0b
parent 06e265586b
commit ceed6efc0b
49 changed files with 159 additions and 171 deletions
--- a/modules/dark-stars-combat.js
+++ b/modules/dark-stars-combat.js
@ -10,7 +10,7 @@ export class DarkStarsCombat extends Combat {
    let hasLastWord = token.actor.hasLastWord()
    while ( (initScore > 5) || (hasLastWord && initScore >= 5)) {
      initScore -= 5;
-      toCreate.push({tokenId: c.tokenId, sceneId: c.sceneId, actorId: c.actorId, hidden: c.hidden, initiative: initScore, isDuplicated: true});
+      toCreate.push({tokenId: c.tokenId, sceneId: c.sceneId, actorId: c.actorId, hidden: c.hidden, initiative: initScore, flags: { world: { isDuplicated: true} } } );
    }
    this.createEmbeddedDocuments("Combatant", toCreate);
  }
@ -28,6 +28,18 @@ export class DarkStarsCombat extends Combat {
    return this;
  }

+  /* -------------------------------------------- */
+  nextRound() {
+    super.nextRound()
+    let toDelete = []
+    for (let c of this.combatants) {
+      if (c.flags?.world?.isDuplicated) {
+        toDelete.push(c._id)
+      }
+    }
+    this.deleteEmbeddedDocuments("Combatant", toDelete);
+  }
+
  /* -------------------------------------------- */
  _onUpdate(changed, options, userId) {
  }
--- a/modules/dark-stars-utility.js
+++ b/modules/dark-stars-utility.js
@ -42,7 +42,7 @@ export class DarkStarsUtility {
    Handlebars.registerHelper('locationLabel', function (key) {
      return __locationNames[key]
    })
-    
+

    this.gameSettings()

@ -240,14 +240,14 @@ export class DarkStarsUtility {
  }

  /* -------------------------------------------- */
-  static getAimingMalus(location)  {
+  static getAimingMalus(location) {
    if (location == "arm" || location == "head") {
      return -50
    }
    if (location == "torso" || location == "leg") {
      return -30
    }
-    if (location == "hand" ) {
+    if (location == "hand") {
      return -70
    }
    return 0
@ -255,14 +255,22 @@ export class DarkStarsUtility {
  /* -------------------------------------------- */
  static getAimingLocation(roll) {
    if (roll == 1) return "head"
-    if (roll >=2 && roll <=4 ) return "chest"
-    if (roll >=5 && roll <=6 ) return "abdomen"
-    if (roll == 7 ) return "leftarm"
-    if (roll == 8 ) return "rightarm"
-    if (roll == 9 ) return "rightleg"
-    if (roll == 10 ) return "leftleg"
+    if (roll >= 2 && roll <= 4) return "chest"
+    if (roll >= 5 && roll <= 6) return "abdomen"
+    if (roll == 7) return "leftarm"
+    if (roll == 8) return "rightarm"
+    if (roll == 9) return "rightleg"
+    if (roll == 10) return "leftleg"
    return "abdomen"
  }
+  /* -------------------------------------------- */
+  static locationMultiplier(location) {
+    if (location == "head") return 0.3
+    if (location.includes("arm")) return 0.2
+    if (location.includes("leg")) return 0.4
+    if (location == "chest") return 0.5
+    return 0.3 // Abdomen case
+  }

  /* -------------------------------------------- */
  static async rollDarkStars(rollData) {
@ -271,13 +279,13 @@ export class DarkStarsUtility {

    // ability/save/size => 0
    rollData.percentValue = 0
-    if ( rollData.skill ) {
+    if (rollData.skill) {
      rollData.percentValue = rollData.skill.total
    }
-    rollData.percentValue += rollData.bonusMalus 
+    rollData.percentValue += rollData.bonusMalus
    rollData.diceFormula = "1d100"

-    if (rollData.isAboveEffectiveRange)  {
+    if (rollData.isAboveEffectiveRange) {
      rollData.percentValue -= 30
      rollData.percentValue = Math.max(0, rollData.percentValue)
    }
@ -299,18 +307,23 @@ export class DarkStarsUtility {
    rollData.isCriticalFailure = rollData.diceResult == 100
    rollData.isSuccess = rollData.diceResult == 1 || rollData.diceResult <= rollData.percentValue
    rollData.isFailure = rollData.diceResult == 100 || rollData.diceResult > rollData.percentValue
-    rollData.degrees = Math.floor(rollData.percentValue/10) - Math.floor(rollData.diceResult/10)
-    
+    rollData.degrees = Math.floor(rollData.percentValue / 10) - Math.floor(rollData.diceResult / 10)
+    rollData.damageMultiplier = rollData.isCriticalSuccess ? 2 : 1
+
    if (rollData.reroll) {
      actor.modifyRerolls(-1)
      rollData.rerolls = 0 // DIsable rerolls
    }

-    if (rollData.weaponAiming == "none" ) {
-      let rollLoc = new Roll("1d10").roll({async: false})
-      rollData.weaponAiming = this.getAimingLocation(rollLoc.total)
+    if (rollData.mode == "weapon") {
+      if (rollData.weaponAiming == "none") {
+        let rollLoc = new Roll("1d10").roll({ async: false })
+        rollData.weaponAiming = this.getAimingLocation(rollLoc.total)
+      }
+      // Compute
+      rollData.locationMultiplier = this.locationMultiplier(rollData.weaponAiming)
    }
-
+    
    let msg = await this.createChatWithRollMode(rollData.alias, {
      content: await renderTemplate(`systems/fvtt-dark-stars/templates/chat/chat-generic-result.hbs`, rollData)
    })
@ -418,7 +431,7 @@ export class DarkStarsUtility {
    let rollData = {
      rollId: randomID(16),
      rollMode: game.settings.get("core", "rollMode"),
-      bonusMalus : 0,
+      bonusMalus: 0,
      isAboveEffectiveRange: false,
      weaponAiming: "none"
    }
--- a/packs/armor/000100.log
+++ b/packs/armor/000100.log
--- a/packs/armor/CURRENT
+++ b/packs/armor/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/armor/LOG
+++ b/packs/armor/LOG
@ -1,8 +1,3 @@
-2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96
-2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94
-2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96
-2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.590897 7f8105ffb6c0 Recovering log #100
+2023/10/21-12:57:48.601577 7f8105ffb6c0 Delete type=3 #98
+2023/10/21-12:57:48.601642 7f8105ffb6c0 Delete type=0 #100
--- a/packs/armor/LOG.old
+++ b/packs/armor/LOG.old
@ -1,8 +1,8 @@
-2023/10/21-09:05:36.542041 7f8105ffb6c0 Recovering log #92
-2023/10/21-09:05:36.602565 7f8105ffb6c0 Delete type=3 #90
-2023/10/21-09:05:36.602727 7f8105ffb6c0 Delete type=0 #92
-2023/10/21-09:46:38.900681 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.900730 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.908919 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.909203 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/21-09:46:38.909242 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96
+2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94
+2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96
+2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
--- a/packs/armor/MANIFEST-000098
+++ b/packs/armor/MANIFEST-000098
--- a/packs/conditions/000100.log
+++ b/packs/conditions/000100.log
--- a/packs/conditions/CURRENT
+++ b/packs/conditions/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/conditions/LOG
+++ b/packs/conditions/LOG
@ -1,7 +1,3 @@
-2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96
-2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94
-2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96
-2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.639550 7f8105ffb6c0 Recovering log #100
+2023/10/21-12:57:48.652746 7f8105ffb6c0 Delete type=3 #98
+2023/10/21-12:57:48.652801 7f8105ffb6c0 Delete type=0 #100
--- a/packs/conditions/LOG.old
+++ b/packs/conditions/LOG.old
@ -1,7 +1,7 @@
-2023/10/21-09:05:36.797969 7f8105ffb6c0 Recovering log #92
-2023/10/21-09:05:36.849645 7f8105ffb6c0 Delete type=3 #90
-2023/10/21-09:05:36.849750 7f8105ffb6c0 Delete type=0 #92
-2023/10/21-09:46:38.929884 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.929933 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.937826 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.938170 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96
+2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94
+2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96
+2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
--- a/packs/conditions/MANIFEST-000098
+++ b/packs/conditions/MANIFEST-000098
--- a/packs/currency/000100.log
+++ b/packs/currency/000100.log
--- a/packs/currency/CURRENT
+++ b/packs/currency/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/currency/LOG
+++ b/packs/currency/LOG
@ -1,7 +1,3 @@
-2023/10/21-09:46:53.241977 7f81067fc6c0 Recovering log #96
-2023/10/21-09:46:53.252607 7f81067fc6c0 Delete type=3 #94
-2023/10/21-09:46:53.252753 7f81067fc6c0 Delete type=0 #96
-2023/10/21-10:25:16.654235 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.654260 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.660290 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.674565 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.654499 7f81077fe6c0 Recovering log #100
+2023/10/21-12:57:48.665788 7f81077fe6c0 Delete type=3 #98
+2023/10/21-12:57:48.665868 7f81077fe6c0 Delete type=0 #100
--- a/packs/currency/LOG.old
+++ b/packs/currency/LOG.old
@ -1,7 +1,7 @@
-2023/10/21-09:05:36.852656 7f81067fc6c0 Recovering log #92
-2023/10/21-09:05:36.913271 7f81067fc6c0 Delete type=3 #90
-2023/10/21-09:05:36.913385 7f81067fc6c0 Delete type=0 #92
-2023/10/21-09:46:38.952342 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.952387 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.959129 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.966401 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.241977 7f81067fc6c0 Recovering log #96
+2023/10/21-09:46:53.252607 7f81067fc6c0 Delete type=3 #94
+2023/10/21-09:46:53.252753 7f81067fc6c0 Delete type=0 #96
+2023/10/21-10:25:16.654235 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.654260 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.660290 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.674565 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
--- a/packs/currency/MANIFEST-000098
+++ b/packs/currency/MANIFEST-000098
--- a/packs/cybernetics/000028.log
+++ b/packs/cybernetics/000028.log
--- a/packs/cybernetics/CURRENT
+++ b/packs/cybernetics/CURRENT
@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000030
--- a/packs/cybernetics/LOG
+++ b/packs/cybernetics/LOG
@ -1,8 +1,3 @@
-2023/10/21-09:46:53.283509 7f8106ffd6c0 Recovering log #24
-2023/10/21-09:46:53.293910 7f8106ffd6c0 Delete type=3 #22
-2023/10/21-09:46:53.294097 7f8106ffd6c0 Delete type=0 #24
-2023/10/21-10:25:16.674800 7f7e677006c0 Level-0 table #29: started
-2023/10/21-10:25:16.674835 7f7e677006c0 Level-0 table #29: 0 bytes OK
-2023/10/21-10:25:16.680984 7f7e677006c0 Delete type=0 #27
-2023/10/21-10:25:16.681147 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.681203 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.693267 7f8105ffb6c0 Recovering log #28
+2023/10/21-12:57:48.706472 7f8105ffb6c0 Delete type=3 #26
+2023/10/21-12:57:48.706580 7f8105ffb6c0 Delete type=0 #28
--- a/packs/cybernetics/LOG.old
+++ b/packs/cybernetics/LOG.old
@ -1,8 +1,8 @@
-2023/10/21-09:05:37.030189 7f8105ffb6c0 Recovering log #20
-2023/10/21-09:05:37.086732 7f8105ffb6c0 Delete type=3 #18
-2023/10/21-09:05:37.086828 7f8105ffb6c0 Delete type=0 #20
-2023/10/21-09:46:38.959328 7f7e677006c0 Level-0 table #25: started
-2023/10/21-09:46:38.959384 7f7e677006c0 Level-0 table #25: 0 bytes OK
-2023/10/21-09:46:38.966078 7f7e677006c0 Delete type=0 #23
-2023/10/21-09:46:38.966424 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
-2023/10/21-09:46:38.966478 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.283509 7f8106ffd6c0 Recovering log #24
+2023/10/21-09:46:53.293910 7f8106ffd6c0 Delete type=3 #22
+2023/10/21-09:46:53.294097 7f8106ffd6c0 Delete type=0 #24
+2023/10/21-10:25:16.674800 7f7e677006c0 Level-0 table #29: started
+2023/10/21-10:25:16.674835 7f7e677006c0 Level-0 table #29: 0 bytes OK
+2023/10/21-10:25:16.680984 7f7e677006c0 Delete type=0 #27
+2023/10/21-10:25:16.681147 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/21-10:25:16.681203 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
--- a/packs/cybernetics/MANIFEST-000026
+++ b/packs/cybernetics/MANIFEST-000026
--- a/packs/equipment/000100.log
+++ b/packs/equipment/000100.log
--- a/packs/equipment/CURRENT
+++ b/packs/equipment/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/equipment/LOG
+++ b/packs/equipment/LOG
@ -1,7 +1,3 @@
-2023/10/21-09:46:53.186412 7f81067fc6c0 Recovering log #96
-2023/10/21-09:46:53.197532 7f81067fc6c0 Delete type=3 #94
-2023/10/21-09:46:53.197674 7f81067fc6c0 Delete type=0 #96
-2023/10/21-10:25:16.619385 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.619433 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.626151 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.646310 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.603481 7f81077fe6c0 Recovering log #100
+2023/10/21-12:57:48.613256 7f81077fe6c0 Delete type=3 #98
+2023/10/21-12:57:48.613399 7f81077fe6c0 Delete type=0 #100
--- a/packs/equipment/LOG.old
+++ b/packs/equipment/LOG.old
@ -1,7 +1,7 @@
-2023/10/21-09:05:36.606696 7f81067fc6c0 Recovering log #92
-2023/10/21-09:05:36.670021 7f81067fc6c0 Delete type=3 #90
-2023/10/21-09:05:36.670242 7f81067fc6c0 Delete type=0 #92
-2023/10/21-09:46:38.909319 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.909373 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.916048 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.938073 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.186412 7f81067fc6c0 Recovering log #96
+2023/10/21-09:46:53.197532 7f81067fc6c0 Delete type=3 #94
+2023/10/21-09:46:53.197674 7f81067fc6c0 Delete type=0 #96
+2023/10/21-10:25:16.619385 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.619433 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.626151 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.646310 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
--- a/packs/equipment/MANIFEST-000098
+++ b/packs/equipment/MANIFEST-000098
--- a/packs/perks/000100.log
+++ b/packs/perks/000100.log
--- a/packs/perks/CURRENT
+++ b/packs/perks/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/perks/LOG
+++ b/packs/perks/LOG
@ -1,8 +1,3 @@
-2023/10/21-09:46:53.269089 7f8105ffb6c0 Recovering log #96
-2023/10/21-09:46:53.280127 7f8105ffb6c0 Delete type=3 #94
-2023/10/21-09:46:53.280264 7f8105ffb6c0 Delete type=0 #96
-2023/10/21-10:25:16.667464 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.667505 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.674303 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.674595 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.674627 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.680492 7f8106ffd6c0 Recovering log #100
+2023/10/21-12:57:48.690739 7f8106ffd6c0 Delete type=3 #98
+2023/10/21-12:57:48.690798 7f8106ffd6c0 Delete type=0 #100
--- a/packs/perks/LOG.old
+++ b/packs/perks/LOG.old
@ -1,8 +1,8 @@
-2023/10/21-09:05:36.976673 7f81077fe6c0 Recovering log #92
-2023/10/21-09:05:37.026203 7f81077fe6c0 Delete type=3 #90
-2023/10/21-09:05:37.026297 7f81077fe6c0 Delete type=0 #92
-2023/10/21-09:46:38.945662 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.945728 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.952174 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.966374 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/21-09:46:38.966462 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.269089 7f8105ffb6c0 Recovering log #96
+2023/10/21-09:46:53.280127 7f8105ffb6c0 Delete type=3 #94
+2023/10/21-09:46:53.280264 7f8105ffb6c0 Delete type=0 #96
+2023/10/21-10:25:16.667464 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.667505 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.674303 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.674595 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/21-10:25:16.674627 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
--- a/packs/perks/MANIFEST-000098
+++ b/packs/perks/MANIFEST-000098
--- a/packs/shields/000100.log
+++ b/packs/shields/000100.log
--- a/packs/shields/CURRENT
+++ b/packs/shields/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/shields/LOG
+++ b/packs/shields/LOG
@ -1,7 +1,3 @@
-2023/10/21-09:46:53.199962 7f81077fe6c0 Recovering log #96
-2023/10/21-09:46:53.211394 7f81077fe6c0 Delete type=3 #94
-2023/10/21-09:46:53.211491 7f81077fe6c0 Delete type=0 #96
-2023/10/21-10:25:16.626403 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.626435 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.633066 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.646322 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.614993 7f81067fc6c0 Recovering log #100
+2023/10/21-12:57:48.625621 7f81067fc6c0 Delete type=3 #98
+2023/10/21-12:57:48.625711 7f81067fc6c0 Delete type=0 #100
--- a/packs/shields/LOG.old
+++ b/packs/shields/LOG.old
@ -1,7 +1,7 @@
-2023/10/21-09:05:36.672950 7f8106ffd6c0 Recovering log #92
-2023/10/21-09:05:36.722365 7f8106ffd6c0 Delete type=3 #90
-2023/10/21-09:05:36.722463 7f8106ffd6c0 Delete type=0 #92
-2023/10/21-09:46:38.916263 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.916316 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.923082 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.938109 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.199962 7f81077fe6c0 Recovering log #96
+2023/10/21-09:46:53.211394 7f81077fe6c0 Delete type=3 #94
+2023/10/21-09:46:53.211491 7f81077fe6c0 Delete type=0 #96
+2023/10/21-10:25:16.626403 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.626435 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.633066 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.646322 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
--- a/packs/shields/MANIFEST-000098
+++ b/packs/shields/MANIFEST-000098
--- a/packs/skills/000100.log
+++ b/packs/skills/000100.log
--- a/packs/skills/CURRENT
+++ b/packs/skills/CURRENT
@ -1 +1 @@
-MANIFEST-000098
+MANIFEST-000102
--- a/packs/skills/LOG
+++ b/packs/skills/LOG
@ -1,8 +1,3 @@
-2023/10/21-09:46:53.254913 7f81077fe6c0 Recovering log #96
-2023/10/21-09:46:53.266376 7f81077fe6c0 Delete type=3 #94
-2023/10/21-09:46:53.266469 7f81077fe6c0 Delete type=0 #96
-2023/10/21-10:25:16.660405 7f7e677006c0 Level-0 table #101: started
-2023/10/21-10:25:16.660579 7f7e677006c0 Level-0 table #101: 0 bytes OK
-2023/10/21-10:25:16.667324 7f7e677006c0 Delete type=0 #99
-2023/10/21-10:25:16.674581 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.674617 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.667993 7f81067fc6c0 Recovering log #100
+2023/10/21-12:57:48.678231 7f81067fc6c0 Delete type=3 #98
+2023/10/21-12:57:48.678292 7f81067fc6c0 Delete type=0 #100
--- a/packs/skills/LOG.old
+++ b/packs/skills/LOG.old
@ -1,8 +1,8 @@
-2023/10/21-09:05:36.915510 7f8106ffd6c0 Recovering log #92
-2023/10/21-09:05:36.973675 7f8106ffd6c0 Delete type=3 #90
-2023/10/21-09:05:36.973827 7f8106ffd6c0 Delete type=0 #92
-2023/10/21-09:46:38.938371 7f7e677006c0 Level-0 table #97: started
-2023/10/21-09:46:38.938498 7f7e677006c0 Level-0 table #97: 0 bytes OK
-2023/10/21-09:46:38.945449 7f7e677006c0 Delete type=0 #95
-2023/10/21-09:46:38.966340 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/21-09:46:38.966443 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.254913 7f81077fe6c0 Recovering log #96
+2023/10/21-09:46:53.266376 7f81077fe6c0 Delete type=3 #94
+2023/10/21-09:46:53.266469 7f81077fe6c0 Delete type=0 #96
+2023/10/21-10:25:16.660405 7f7e677006c0 Level-0 table #101: started
+2023/10/21-10:25:16.660579 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/21-10:25:16.667324 7f7e677006c0 Delete type=0 #99
+2023/10/21-10:25:16.674581 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/21-10:25:16.674617 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
--- a/packs/skills/MANIFEST-000098
+++ b/packs/skills/MANIFEST-000098
--- a/packs/weapons/000101.log
+++ b/packs/weapons/000101.log
--- a/packs/weapons/CURRENT
+++ b/packs/weapons/CURRENT
@ -1 +1 @@
-MANIFEST-000099
+MANIFEST-000103
--- a/packs/weapons/LOG
+++ b/packs/weapons/LOG
@ -1,8 +1,3 @@
-2023/10/21-09:46:53.214012 7f8105ffb6c0 Recovering log #97
-2023/10/21-09:46:53.225802 7f8105ffb6c0 Delete type=3 #95
-2023/10/21-09:46:53.225949 7f8105ffb6c0 Delete type=0 #97
-2023/10/21-10:25:16.639905 7f7e677006c0 Level-0 table #102: started
-2023/10/21-10:25:16.639966 7f7e677006c0 Level-0 table #102: 0 bytes OK
-2023/10/21-10:25:16.646212 7f7e677006c0 Delete type=0 #100
-2023/10/21-10:25:16.646343 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.646390 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/21-12:57:48.627611 7f8106ffd6c0 Recovering log #101
+2023/10/21-12:57:48.637461 7f8106ffd6c0 Delete type=3 #99
+2023/10/21-12:57:48.637525 7f8106ffd6c0 Delete type=0 #101
--- a/packs/weapons/LOG.old
+++ b/packs/weapons/LOG.old
@ -1,8 +1,8 @@
-2023/10/21-09:05:36.724936 7f81077fe6c0 Recovering log #93
-2023/10/21-09:05:36.794933 7f81077fe6c0 Delete type=3 #91
-2023/10/21-09:05:36.795073 7f81077fe6c0 Delete type=0 #93
-2023/10/21-09:46:38.923258 7f7e677006c0 Level-0 table #98: started
-2023/10/21-09:46:38.923308 7f7e677006c0 Level-0 table #98: 0 bytes OK
-2023/10/21-09:46:38.929697 7f7e677006c0 Delete type=0 #96
-2023/10/21-09:46:38.938140 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/21-09:46:38.938202 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/21-09:46:53.214012 7f8105ffb6c0 Recovering log #97
+2023/10/21-09:46:53.225802 7f8105ffb6c0 Delete type=3 #95
+2023/10/21-09:46:53.225949 7f8105ffb6c0 Delete type=0 #97
+2023/10/21-10:25:16.639905 7f7e677006c0 Level-0 table #102: started
+2023/10/21-10:25:16.639966 7f7e677006c0 Level-0 table #102: 0 bytes OK
+2023/10/21-10:25:16.646212 7f7e677006c0 Delete type=0 #100
+2023/10/21-10:25:16.646343 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/21-10:25:16.646390 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
--- a/packs/weapons/MANIFEST-000099
+++ b/packs/weapons/MANIFEST-000099
--- a/system.json
+++ b/system.json
@ -109,14 +109,14 @@
  "styles": [
    "styles/simple.css"
  ],
-  "version": "11.0.8",
+  "version": "11.0.9",
  "compatibility": {
    "minimum": "11",
    "verified": "11"
  },
  "title": "Dark Stars RPG",
  "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.8.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.9.zip",
  "url": "https://www.uberwald.me/gitea/uberwald/",
  "background": "images/ui/dark_stars_welcome_page.webp",
  "id": "fvtt-dark-stars"
--- a/templates/chat/chat-generic-result.hbs
+++ b/templates/chat/chat-generic-result.hbs
@ -31,7 +31,7 @@
        {{/if}}

        <li>Bonus/Malus: {{bonusMalus}}% </li>
-        <li>Final score: {{percentValue}}% </li>
+        <li>Target Number: {{percentValue}}% </li>
        <li>Result: {{diceResult}} </li>
        <li>Degrees: {{degrees}} </li>
        
@ -51,15 +51,19 @@

      {{#if (and weapon isSuccess)}}
        {{#if weapon.ammo}}
-          <li>Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}]]</li>
+          <li>Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
+          <li>BR: {{weapon.ammo.system.br}}</li>          
+
        {{else}}
          {{#if weapon.system.hashpdamage}}
-            <li>Roll HP Damage: [[/r {{weapon.system.damage}}]]</li>
+            <li>Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
          {{/if}}
          {{#if weapon.system.hasfatiguedamage}}
-            <li>Roll Fatigue Damage: [[/r {{weapon.system.fatiguedamage}}]]</li>
+            <li>Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
          {{/if}}
+          <li>BR: [[/r {{weapon.system.br}}]]</li>          
        {{/if}}
+          <li>Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}</li>          
      {{/if}}

      {{#if (and (not isSuccess) rerolls)}}