diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs
index 9c37bbd..1cc3994 100644
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -338,6 +338,10 @@ export default class LethalFantasyRoll extends Roll {
     let modifier = "+0"
     let targetName
 
+    // True for any ranged attack: PC weapon (ranged type) or monster attack (ranged mode)
+    const isRangedAttack = (options.rollType === "weapon-attack" && options.rollTarget?.weapon?.system?.weaponType === "ranged")
+      || (options.rollType === "monster-attack" && options.rollTarget?.attackMode === "ranged")
+
     let dialogContext = {
       rollType: options.rollType,
       rollTarget: options.rollTarget,
@@ -362,7 +366,8 @@ export default class LethalFantasyRoll extends Roll {
       modifier,
       saveSpell: false,
       favor: "none",
-      targetName
+      targetName,
+      isRangedAttack
     }
     let rollContext
     if (options.rollContext) {
diff --git a/module/models/character.mjs b/module/models/character.mjs
index fd0b356..3a53e42 100644
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -283,23 +283,6 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
    */
   async roll(rollType, rollTarget, defenderId, defenderTokenId, extraShieldDr = 0) {
     const hasTarget = false
-
-    // Ranged weapon attacks from PCs use the ranged attack dialog (range, movement, aim modifiers)
-    if (rollType === "weapon-attack" && rollTarget?.isRangedAttack === true) {
-      let roll = await LethalFantasyRoll.promptRangedAttack({
-        rollType: "weapon-attack",
-        actorId: this.parent.id,
-        actorName: this.parent.name,
-        actorImage: this.parent.img,
-        rollTarget,
-        defenderId,
-        defenderTokenId,
-      })
-      if (!roll) return null
-      await roll.toMessage({}, { messageMode: roll.options.rollMode })
-      return
-    }
-
     let roll = await LethalFantasyRoll.prompt({
       rollType,
       rollTarget,
diff --git a/module/models/monster.mjs b/module/models/monster.mjs
index 035423c..be07716 100644
--- a/module/models/monster.mjs
+++ b/module/models/monster.mjs
@@ -167,22 +167,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
   async roll(rollType, rollTarget, defenderId = undefined, defenderTokenId = undefined, extraShieldDr = 0) {
     const hasTarget = false
 
-    // Ranged monster attacks use a specialized dialog with range/movement/size/aim modifiers
-    if (rollType === "monster-attack" && rollTarget?.attackMode === "ranged") {
-      let roll = await LethalFantasyRoll.promptRangedAttack({
-        actorId: this.parent.id,
-        actorName: this.parent.name,
-        actorImage: this.parent.img,
-        rollTarget,
-        defenderId,
-        defenderTokenId,
-      })
-      if (!roll) return null
-      await roll.toMessage({}, { messageMode: roll.options.rollMode })
-      return
-    }
-
-    // Ranged monster defense uses the same ranged defense dialog as PC characters
+    // Ranged monster defense uses the ranged defense dialog (movement, range, size modifiers)
     if (rollType === "monster-defense" && rollTarget?.isRangedDefense === true) {
       let roll = await LethalFantasyRoll.promptRangedDefense({
         actorId: this.parent.id,
diff --git a/packs-system/lf-equipment/000617.log b/packs-system/lf-equipment/000620.log
similarity index 100%
rename from packs-system/lf-equipment/000617.log
rename to packs-system/lf-equipment/000620.log
diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT
index 40fde2e..2eb6110 100644
--- a/packs-system/lf-equipment/CURRENT
+++ b/packs-system/lf-equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000615
+MANIFEST-000619
diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG
index 7fa5530..2213775 100644
--- a/packs-system/lf-equipment/LOG
+++ b/packs-system/lf-equipment/LOG
@@ -1,8 +1,3 @@
-2026/05/23-18:45:10.214922 7fa233fff6c0 Recovering log #613
-2026/05/23-18:45:10.223944 7fa233fff6c0 Delete type=3 #611
-2026/05/23-18:45:10.223997 7fa233fff6c0 Delete type=0 #613
-2026/05/23-19:09:56.190877 7fa2327fc6c0 Level-0 table #618: started
-2026/05/23-19:09:56.190922 7fa2327fc6c0 Level-0 table #618: 0 bytes OK
-2026/05/23-19:09:56.224359 7fa2327fc6c0 Delete type=0 #616
-2026/05/23-19:09:56.339160 7fa2327fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/23-19:09:56.339194 7fa2327fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.041326 7fdfa95ff6c0 Recovering log #617
+2026/05/24-09:22:43.083988 7fdfa95ff6c0 Delete type=3 #615
+2026/05/24-09:22:43.084045 7fdfa95ff6c0 Delete type=0 #617
diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old
index 69901ba..7fa5530 100644
--- a/packs-system/lf-equipment/LOG.old
+++ b/packs-system/lf-equipment/LOG.old
@@ -1,8 +1,8 @@
-2026/05/20-23:09:33.153266 7f179e7ed6c0 Recovering log #609
-2026/05/20-23:09:33.205459 7f179e7ed6c0 Delete type=3 #607
-2026/05/20-23:09:33.205507 7f179e7ed6c0 Delete type=0 #609
-2026/05/20-23:16:53.517842 7f179d7eb6c0 Level-0 table #614: started
-2026/05/20-23:16:53.517893 7f179d7eb6c0 Level-0 table #614: 0 bytes OK
-2026/05/20-23:16:53.523991 7f179d7eb6c0 Delete type=0 #612
-2026/05/20-23:16:53.536989 7f179d7eb6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/20-23:16:53.537026 7f179d7eb6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/23-18:45:10.214922 7fa233fff6c0 Recovering log #613
+2026/05/23-18:45:10.223944 7fa233fff6c0 Delete type=3 #611
+2026/05/23-18:45:10.223997 7fa233fff6c0 Delete type=0 #613
+2026/05/23-19:09:56.190877 7fa2327fc6c0 Level-0 table #618: started
+2026/05/23-19:09:56.190922 7fa2327fc6c0 Level-0 table #618: 0 bytes OK
+2026/05/23-19:09:56.224359 7fa2327fc6c0 Delete type=0 #616
+2026/05/23-19:09:56.339160 7fa2327fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/23-19:09:56.339194 7fa2327fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-equipment/MANIFEST-000615 b/packs-system/lf-equipment/MANIFEST-000619
similarity index 71%
rename from packs-system/lf-equipment/MANIFEST-000615
rename to packs-system/lf-equipment/MANIFEST-000619
index 00d583d..507b71f 100644
Binary files a/packs-system/lf-equipment/MANIFEST-000615 and b/packs-system/lf-equipment/MANIFEST-000619 differ
diff --git a/packs-system/lf-gifts/000614.log b/packs-system/lf-gifts/000617.log
similarity index 100%
rename from packs-system/lf-gifts/000614.log
rename to packs-system/lf-gifts/000617.log
diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT
index c116b38..8620eca 100644
--- a/packs-system/lf-gifts/CURRENT
+++ b/packs-system/lf-gifts/CURRENT
@@ -1 +1 @@
-MANIFEST-000612
+MANIFEST-000616
diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG
index 889e4a9..faf7e69 100644
--- a/packs-system/lf-gifts/LOG
+++ b/packs-system/lf-gifts/LOG
@@ -1,8 +1,3 @@
-2026/05/23-18:45:10.228083 7fa232ffd6c0 Recovering log #610
-2026/05/23-18:45:10.236935 7fa232ffd6c0 Delete type=3 #608
-2026/05/23-18:45:10.236958 7fa232ffd6c0 Delete type=0 #610
-2026/05/23-19:09:56.261648 7fa2327fc6c0 Level-0 table #615: started
-2026/05/23-19:09:56.261672 7fa2327fc6c0 Level-0 table #615: 0 bytes OK
-2026/05/23-19:09:56.304021 7fa2327fc6c0 Delete type=0 #613
-2026/05/23-19:09:56.339181 7fa2327fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/23-19:09:56.339208 7fa2327fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.091828 7fdfa8dfe6c0 Recovering log #614
+2026/05/24-09:22:43.131041 7fdfa8dfe6c0 Delete type=3 #612
+2026/05/24-09:22:43.131104 7fdfa8dfe6c0 Delete type=0 #614
diff --git a/packs-system/lf-gifts/LOG.old b/packs-system/lf-gifts/LOG.old
index 64aa321..889e4a9 100644
--- a/packs-system/lf-gifts/LOG.old
+++ b/packs-system/lf-gifts/LOG.old
@@ -1,8 +1,8 @@
-2026/05/20-23:09:33.234730 7f179e7ed6c0 Recovering log #606
-2026/05/20-23:09:33.288868 7f179e7ed6c0 Delete type=3 #604
-2026/05/20-23:09:33.288920 7f179e7ed6c0 Delete type=0 #606
-2026/05/20-23:16:53.524172 7f179d7eb6c0 Level-0 table #611: started
-2026/05/20-23:16:53.524219 7f179d7eb6c0 Level-0 table #611: 0 bytes OK
-2026/05/20-23:16:53.530312 7f179d7eb6c0 Delete type=0 #609
-2026/05/20-23:16:53.537003 7f179d7eb6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/20-23:16:53.537059 7f179d7eb6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/23-18:45:10.228083 7fa232ffd6c0 Recovering log #610
+2026/05/23-18:45:10.236935 7fa232ffd6c0 Delete type=3 #608
+2026/05/23-18:45:10.236958 7fa232ffd6c0 Delete type=0 #610
+2026/05/23-19:09:56.261648 7fa2327fc6c0 Level-0 table #615: started
+2026/05/23-19:09:56.261672 7fa2327fc6c0 Level-0 table #615: 0 bytes OK
+2026/05/23-19:09:56.304021 7fa2327fc6c0 Delete type=0 #613
+2026/05/23-19:09:56.339181 7fa2327fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/23-19:09:56.339208 7fa2327fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-gifts/MANIFEST-000612 b/packs-system/lf-gifts/MANIFEST-000616
similarity index 77%
rename from packs-system/lf-gifts/MANIFEST-000612
rename to packs-system/lf-gifts/MANIFEST-000616
index 10570ab..93577e6 100644
Binary files a/packs-system/lf-gifts/MANIFEST-000612 and b/packs-system/lf-gifts/MANIFEST-000616 differ
diff --git a/packs-system/lf-skills/000619.log b/packs-system/lf-skills/000622.log
similarity index 100%
rename from packs-system/lf-skills/000619.log
rename to packs-system/lf-skills/000622.log
diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT
index 7b1d768..1aff3d9 100644
--- a/packs-system/lf-skills/CURRENT
+++ b/packs-system/lf-skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000617
+MANIFEST-000621
diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG
index 82d579e..f3bb9c0 100644
--- a/packs-system/lf-skills/LOG
+++ b/packs-system/lf-skills/LOG
@@ -1,8 +1,3 @@
-2026/05/23-18:45:10.200781 7fa2337fe6c0 Recovering log #615
-2026/05/23-18:45:10.211345 7fa2337fe6c0 Delete type=3 #613
-2026/05/23-18:45:10.211416 7fa2337fe6c0 Delete type=0 #615
-2026/05/23-19:09:56.304132 7fa2327fc6c0 Level-0 table #620: started
-2026/05/23-19:09:56.304162 7fa2327fc6c0 Level-0 table #620: 0 bytes OK
-2026/05/23-19:09:56.339034 7fa2327fc6c0 Delete type=0 #618
-2026/05/23-19:09:56.339189 7fa2327fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/23-19:09:56.339203 7fa2327fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:42.993966 7fdfa8dfe6c0 Recovering log #619
+2026/05/24-09:22:43.035467 7fdfa8dfe6c0 Delete type=3 #617
+2026/05/24-09:22:43.035518 7fdfa8dfe6c0 Delete type=0 #619
diff --git a/packs-system/lf-skills/LOG.old b/packs-system/lf-skills/LOG.old
index 1ef041a..82d579e 100644
--- a/packs-system/lf-skills/LOG.old
+++ b/packs-system/lf-skills/LOG.old
@@ -1,8 +1,8 @@
-2026/05/20-23:09:33.082007 7f179dfec6c0 Recovering log #611
-2026/05/20-23:09:33.140910 7f179dfec6c0 Delete type=3 #609
-2026/05/20-23:09:33.140962 7f179dfec6c0 Delete type=0 #611
-2026/05/20-23:16:53.510592 7f179d7eb6c0 Level-0 table #616: started
-2026/05/20-23:16:53.510664 7f179d7eb6c0 Level-0 table #616: 0 bytes OK
-2026/05/20-23:16:53.517661 7f179d7eb6c0 Delete type=0 #614
-2026/05/20-23:16:53.536973 7f179d7eb6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/20-23:16:53.537037 7f179d7eb6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/23-18:45:10.200781 7fa2337fe6c0 Recovering log #615
+2026/05/23-18:45:10.211345 7fa2337fe6c0 Delete type=3 #613
+2026/05/23-18:45:10.211416 7fa2337fe6c0 Delete type=0 #615
+2026/05/23-19:09:56.304132 7fa2327fc6c0 Level-0 table #620: started
+2026/05/23-19:09:56.304162 7fa2327fc6c0 Level-0 table #620: 0 bytes OK
+2026/05/23-19:09:56.339034 7fa2327fc6c0 Delete type=0 #618
+2026/05/23-19:09:56.339189 7fa2327fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/23-19:09:56.339203 7fa2327fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-skills/MANIFEST-000617 b/packs-system/lf-skills/MANIFEST-000621
similarity index 71%
rename from packs-system/lf-skills/MANIFEST-000617
rename to packs-system/lf-skills/MANIFEST-000621
index e3b0a89..f690eb1 100644
Binary files a/packs-system/lf-skills/MANIFEST-000617 and b/packs-system/lf-skills/MANIFEST-000621 differ
diff --git a/packs-system/lf-spells-miracles/000314.log b/packs-system/lf-spells-miracles/000317.log
similarity index 100%
rename from packs-system/lf-spells-miracles/000314.log
rename to packs-system/lf-spells-miracles/000317.log
diff --git a/packs-system/lf-spells-miracles/CURRENT b/packs-system/lf-spells-miracles/CURRENT
index 16e7795..e90c1f7 100644
--- a/packs-system/lf-spells-miracles/CURRENT
+++ b/packs-system/lf-spells-miracles/CURRENT
@@ -1 +1 @@
-MANIFEST-000312
+MANIFEST-000316
diff --git a/packs-system/lf-spells-miracles/LOG b/packs-system/lf-spells-miracles/LOG
index 64ba27f..9228d7f 100644
--- a/packs-system/lf-spells-miracles/LOG
+++ b/packs-system/lf-spells-miracles/LOG
@@ -1,8 +1,3 @@
-2026/05/23-18:45:10.252202 7fa2337fe6c0 Recovering log #310
-2026/05/23-18:45:10.261300 7fa2337fe6c0 Delete type=3 #308
-2026/05/23-18:45:10.261343 7fa2337fe6c0 Delete type=0 #310
-2026/05/23-19:09:56.467263 7fa2327fc6c0 Level-0 table #315: started
-2026/05/23-19:09:56.467308 7fa2327fc6c0 Level-0 table #315: 0 bytes OK
-2026/05/23-19:09:56.509084 7fa2327fc6c0 Delete type=0 #313
-2026/05/23-19:09:56.608544 7fa2327fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/23-19:09:56.665018 7fa2327fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.194643 7fdfa8dfe6c0 Recovering log #314
+2026/05/24-09:22:43.231409 7fdfa8dfe6c0 Delete type=3 #312
+2026/05/24-09:22:43.231470 7fdfa8dfe6c0 Delete type=0 #314
diff --git a/packs-system/lf-spells-miracles/LOG.old b/packs-system/lf-spells-miracles/LOG.old
index e566b1f..64ba27f 100644
--- a/packs-system/lf-spells-miracles/LOG.old
+++ b/packs-system/lf-spells-miracles/LOG.old
@@ -1,8 +1,8 @@
-2026/05/20-23:09:33.368596 7f179e7ed6c0 Recovering log #306
-2026/05/20-23:09:33.422152 7f179e7ed6c0 Delete type=3 #304
-2026/05/20-23:09:33.422210 7f179e7ed6c0 Delete type=0 #306
-2026/05/20-23:16:53.560903 7f179d7eb6c0 Level-0 table #311: started
-2026/05/20-23:16:53.560969 7f179d7eb6c0 Level-0 table #311: 0 bytes OK
-2026/05/20-23:16:53.568455 7f179d7eb6c0 Delete type=0 #309
-2026/05/20-23:16:53.568616 7f179d7eb6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/20-23:16:53.578679 7f179d7eb6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/23-18:45:10.252202 7fa2337fe6c0 Recovering log #310
+2026/05/23-18:45:10.261300 7fa2337fe6c0 Delete type=3 #308
+2026/05/23-18:45:10.261343 7fa2337fe6c0 Delete type=0 #310
+2026/05/23-19:09:56.467263 7fa2327fc6c0 Level-0 table #315: started
+2026/05/23-19:09:56.467308 7fa2327fc6c0 Level-0 table #315: 0 bytes OK
+2026/05/23-19:09:56.509084 7fa2327fc6c0 Delete type=0 #313
+2026/05/23-19:09:56.608544 7fa2327fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/23-19:09:56.665018 7fa2327fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-spells-miracles/MANIFEST-000312 b/packs-system/lf-spells-miracles/MANIFEST-000316
similarity index 72%
rename from packs-system/lf-spells-miracles/MANIFEST-000312
rename to packs-system/lf-spells-miracles/MANIFEST-000316
index 36dab67..d63df6d 100644
Binary files a/packs-system/lf-spells-miracles/MANIFEST-000312 and b/packs-system/lf-spells-miracles/MANIFEST-000316 differ
diff --git a/packs-system/lf-vulnerabilities/000613.log b/packs-system/lf-vulnerabilities/000616.log
similarity index 100%
rename from packs-system/lf-vulnerabilities/000613.log
rename to packs-system/lf-vulnerabilities/000616.log
diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT
index d0cc76d..40fde2e 100644
--- a/packs-system/lf-vulnerabilities/CURRENT
+++ b/packs-system/lf-vulnerabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000611
+MANIFEST-000615
diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG
index 46678bc..a7e43df 100644
--- a/packs-system/lf-vulnerabilities/LOG
+++ b/packs-system/lf-vulnerabilities/LOG
@@ -1,8 +1,3 @@
-2026/05/23-18:45:10.238924 7fa233fff6c0 Recovering log #609
-2026/05/23-18:45:10.250309 7fa233fff6c0 Delete type=3 #607
-2026/05/23-18:45:10.250371 7fa233fff6c0 Delete type=0 #609
-2026/05/23-19:09:56.224507 7fa2327fc6c0 Level-0 table #614: started
-2026/05/23-19:09:56.224539 7fa2327fc6c0 Level-0 table #614: 0 bytes OK
-2026/05/23-19:09:56.261516 7fa2327fc6c0 Delete type=0 #612
-2026/05/23-19:09:56.339172 7fa2327fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/23-19:09:56.339199 7fa2327fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/24-09:22:43.141936 7fdf5bfff6c0 Recovering log #613
+2026/05/24-09:22:43.189387 7fdf5bfff6c0 Delete type=3 #611
+2026/05/24-09:22:43.189438 7fdf5bfff6c0 Delete type=0 #613
diff --git a/packs-system/lf-vulnerabilities/LOG.old b/packs-system/lf-vulnerabilities/LOG.old
index 2ea2d7e..46678bc 100644
--- a/packs-system/lf-vulnerabilities/LOG.old
+++ b/packs-system/lf-vulnerabilities/LOG.old
@@ -1,8 +1,8 @@
-2026/05/20-23:09:33.302872 7f179efee6c0 Recovering log #605
-2026/05/20-23:09:33.362229 7f179efee6c0 Delete type=3 #603
-2026/05/20-23:09:33.362319 7f179efee6c0 Delete type=0 #605
-2026/05/20-23:16:53.530498 7f179d7eb6c0 Level-0 table #610: started
-2026/05/20-23:16:53.530547 7f179d7eb6c0 Level-0 table #610: 0 bytes OK
-2026/05/20-23:16:53.536854 7f179d7eb6c0 Delete type=0 #608
-2026/05/20-23:16:53.537015 7f179d7eb6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/20-23:16:53.537048 7f179d7eb6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/23-18:45:10.238924 7fa233fff6c0 Recovering log #609
+2026/05/23-18:45:10.250309 7fa233fff6c0 Delete type=3 #607
+2026/05/23-18:45:10.250371 7fa233fff6c0 Delete type=0 #609
+2026/05/23-19:09:56.224507 7fa2327fc6c0 Level-0 table #614: started
+2026/05/23-19:09:56.224539 7fa2327fc6c0 Level-0 table #614: 0 bytes OK
+2026/05/23-19:09:56.261516 7fa2327fc6c0 Delete type=0 #612
+2026/05/23-19:09:56.339172 7fa2327fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/23-19:09:56.339199 7fa2327fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-vulnerabilities/MANIFEST-000611 b/packs-system/lf-vulnerabilities/MANIFEST-000615
similarity index 72%
rename from packs-system/lf-vulnerabilities/MANIFEST-000611
rename to packs-system/lf-vulnerabilities/MANIFEST-000615
index cec5e6c..9ca890b 100644
Binary files a/packs-system/lf-vulnerabilities/MANIFEST-000611 and b/packs-system/lf-vulnerabilities/MANIFEST-000615 differ
diff --git a/templates/roll-dialog.hbs b/templates/roll-dialog.hbs
index 2c06f98..10dd2f8 100644
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -55,35 +55,33 @@
       <div class="dialog-save">Add Granted Attack Dice
         <input type="checkbox" data-action="selectGranted" name="granted" />
       </div>
-      {{#if rollTarget.weapon}}
-        {{#if (eq rollTarget.weapon.system.weaponType "melee")}}{{else}}
-          <div class="dialog-save">Point Blank Range Attack
-            <input
-              type="checkbox"
-              data-action="selectPointBlank"
-              name="pointBlankV"
-            />
-          </div>
-          <div class="dialog-save">Beyond Skill Range Attack
-            <input
-              type="checkbox"
-              data-action="selectBeyondSkill"
-              name="beyondSkillV"
-            />
-          </div>
-          <div class="dialog-save">Let it Fly (Pure D20E)
-            <input
-              type="checkbox"
-              data-action="selectLetItFly"
-              name="letItFlyV"
-            />
-          </div>
-          <div class="dialog-save">Aiming
-            <select name="attackerAim" data-tooltip-direction="UP">
-              {{selectOptions attackerAimChoices selected=attackerAim}}
-            </select>
-          </div>
-        {{/if}}
+      {{#if isRangedAttack}}
+        <div class="dialog-save">Point Blank Range Attack
+          <input
+            type="checkbox"
+            data-action="selectPointBlank"
+            name="pointBlankV"
+          />
+        </div>
+        <div class="dialog-save">Beyond Skill Range Attack
+          <input
+            type="checkbox"
+            data-action="selectBeyondSkill"
+            name="beyondSkillV"
+          />
+        </div>
+        <div class="dialog-save">Let it Fly (Pure D20E)
+          <input
+            type="checkbox"
+            data-action="selectLetItFly"
+            name="letItFlyV"
+          />
+        </div>
+        <div class="dialog-save">Aiming
+          <select name="attackerAim" data-tooltip-direction="UP">
+            {{selectOptions attackerAimChoices selected=attackerAim}}
+          </select>
+        </div>
       {{/if}}
 
     {{/if}}