diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index d51a1f3..f079141 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -711,11 +711,20 @@ export class Hero6Actor extends Actor { rollData.title = item.name rollData.diceFormula = Hero6Utility.convertRollHeroSyntax(item.system.damage) let myRoll = new Roll(rollData.diceFormula).roll({ async: false }) - await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) + //await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) rollData.roll = myRoll rollData.result = myRoll.total rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll) + + let mult + if (item.system.damageeffect == "killing") { // As per issue #11 + mult = new Roll("1d3").roll({ async: false }) + rollData.killingMultiplier = mult.total + rollData.stunValue = (Number(myRoll.total) * Number(mult.total)) + (Number(item.system.stunx) || 0) + } else { + rollData.stunValue = myRoll.total + } let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData) let msg = await rollData.roll.toMessage({ @@ -723,6 +732,11 @@ export class Hero6Actor extends Actor { rollMode: game.settings.get("core", "rollMode"), flavor: msgFlavor }) + + if (mult) { + await Hero6Utility.showDiceSoNice(mult, game.settings.get("core", "rollMode")) + } + rollData.roll = duplicate(rollData.roll) // Convert to object msg.setFlag("world", "rolldata", rollData) console.log("Rolldata result", rollData) diff --git a/modules/hero6-config.js b/modules/hero6-config.js index 5591dee..dacccc3 100644 --- a/modules/hero6-config.js +++ b/modules/hero6-config.js @@ -22,6 +22,13 @@ export const Hero6_CONFIG = { "pre": "Presence", "manual": "Manual", }, + damageEffect: { + "normal": "Normal", + "killing": "Killing", + "stunonly": "Stun Only", + "bodyonly": "Body Only", + "effect": "Effect" + }, skillType: { "agility": "Agility", "interaction": "Interaction", diff --git a/packs/complications/000121.log b/packs/complications/000130.log similarity index 100% rename from packs/complications/000121.log rename to packs/complications/000130.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index 30eb131..a8d9908 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000120 +MANIFEST-000128 diff --git a/packs/complications/LOG b/packs/complications/LOG index e87465a..a6dece1 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:06.792894 7f2debfff6c0 Recovering log #118 -2023/08/26-20:26:06.893142 7f2debfff6c0 Delete type=3 #116 -2023/08/26-20:26:06.893197 7f2debfff6c0 Delete type=0 #118 +2023/08/26-22:07:58.627561 7f2deaffd6c0 Recovering log #126 +2023/08/26-22:07:58.748615 7f2deaffd6c0 Delete type=3 #124 +2023/08/26-22:07:58.748679 7f2deaffd6c0 Delete type=0 #126 +2023/08/26-22:16:27.923271 7f2b69bff6c0 Level-0 table #131: started +2023/08/26-22:16:27.923312 7f2b69bff6c0 Level-0 table #131: 0 bytes OK +2023/08/26-22:16:27.929503 7f2b69bff6c0 Delete type=0 #129 +2023/08/26-22:16:27.949795 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.949837 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/LOG.old b/packs/complications/LOG.old index c11caae..70415ee 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.616025 7f2deaffd6c0 Recovering log #114 -2023/08/26-09:36:55.641371 7f2deaffd6c0 Delete type=3 #112 -2023/08/26-09:36:55.641419 7f2deaffd6c0 Delete type=0 #114 -2023/08/26-09:47:17.308368 7f2b69bff6c0 Level-0 table #119: started -2023/08/26-09:47:17.308393 7f2b69bff6c0 Level-0 table #119: 0 bytes OK -2023/08/26-09:47:17.348814 7f2b69bff6c0 Delete type=0 #117 -2023/08/26-09:47:17.377261 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.377290 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.738363 7f2dea7fc6c0 Recovering log #122 +2023/08/26-21:35:11.748913 7f2dea7fc6c0 Delete type=3 #120 +2023/08/26-21:35:11.749017 7f2dea7fc6c0 Delete type=0 #122 +2023/08/26-21:46:54.280176 7f2b69bff6c0 Level-0 table #127: started +2023/08/26-21:46:54.280220 7f2b69bff6c0 Level-0 table #127: 0 bytes OK +2023/08/26-21:46:54.287757 7f2b69bff6c0 Delete type=0 #125 +2023/08/26-21:46:54.294397 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.294492 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/MANIFEST-000120 b/packs/complications/MANIFEST-000120 deleted file mode 100644 index e0ddd68..0000000 Binary files a/packs/complications/MANIFEST-000120 and /dev/null differ diff --git a/packs/complications/MANIFEST-000128 b/packs/complications/MANIFEST-000128 new file mode 100644 index 0000000..d3a76b3 Binary files /dev/null and b/packs/complications/MANIFEST-000128 differ diff --git a/packs/equipment/000123.log b/packs/equipment/000132.log similarity index 100% rename from packs/equipment/000123.log rename to packs/equipment/000132.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index d9766b1..00d8c47 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000122 +MANIFEST-000130 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 7a2ccb2..f9e5072 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:06.721589 7f2deaffd6c0 Recovering log #120 -2023/08/26-20:26:06.788346 7f2deaffd6c0 Delete type=3 #118 -2023/08/26-20:26:06.788465 7f2deaffd6c0 Delete type=0 #120 +2023/08/26-22:07:58.520995 7f2deb7fe6c0 Recovering log #128 +2023/08/26-22:07:58.608948 7f2deb7fe6c0 Delete type=3 #126 +2023/08/26-22:07:58.609004 7f2deb7fe6c0 Delete type=0 #128 +2023/08/26-22:16:27.903755 7f2b69bff6c0 Level-0 table #133: started +2023/08/26-22:16:27.903791 7f2b69bff6c0 Level-0 table #133: 0 bytes OK +2023/08/26-22:16:27.909699 7f2b69bff6c0 Delete type=0 #131 +2023/08/26-22:16:27.916391 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.923165 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index d896c24..834efbc 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.581647 7f2dea7fc6c0 Recovering log #116 -2023/08/26-09:36:55.613104 7f2dea7fc6c0 Delete type=3 #114 -2023/08/26-09:36:55.613185 7f2dea7fc6c0 Delete type=0 #116 -2023/08/26-09:47:17.031250 7f2b69bff6c0 Level-0 table #121: started -2023/08/26-09:47:17.031303 7f2b69bff6c0 Level-0 table #121: 0 bytes OK -2023/08/26-09:47:17.068068 7f2b69bff6c0 Delete type=0 #119 -2023/08/26-09:47:17.178686 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.245324 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.724122 7f2deb7fe6c0 Recovering log #124 +2023/08/26-21:35:11.735212 7f2deb7fe6c0 Delete type=3 #122 +2023/08/26-21:35:11.735277 7f2deb7fe6c0 Delete type=0 #124 +2023/08/26-21:46:54.246960 7f2b69bff6c0 Level-0 table #129: started +2023/08/26-21:46:54.247029 7f2b69bff6c0 Level-0 table #129: 0 bytes OK +2023/08/26-21:46:54.253553 7f2b69bff6c0 Delete type=0 #127 +2023/08/26-21:46:54.253849 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.266229 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000122 b/packs/equipment/MANIFEST-000130 similarity index 72% rename from packs/equipment/MANIFEST-000122 rename to packs/equipment/MANIFEST-000130 index 8f420f2..67287f3 100644 Binary files a/packs/equipment/MANIFEST-000122 and b/packs/equipment/MANIFEST-000130 differ diff --git a/packs/maneuvers/000113.log b/packs/maneuvers/000113.log deleted file mode 100644 index 4f758ee..0000000 Binary files a/packs/maneuvers/000113.log and /dev/null differ diff --git a/packs/maneuvers/000005.ldb b/packs/maneuvers/000116.ldb similarity index 90% rename from packs/maneuvers/000005.ldb rename to packs/maneuvers/000116.ldb index 8527f40..6f7916f 100644 Binary files a/packs/maneuvers/000005.ldb and b/packs/maneuvers/000116.ldb differ diff --git a/packs/perks/000121.log b/packs/maneuvers/000123.log similarity index 100% rename from packs/perks/000121.log rename to packs/maneuvers/000123.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index b59a6ba..2b465ed 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000121 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 96b6046..5bd87b4 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:06.895976 7f2deaffd6c0 Recovering log #110 -2023/08/26-20:26:07.003837 7f2deaffd6c0 Delete type=3 #108 -2023/08/26-20:26:07.003972 7f2deaffd6c0 Delete type=0 #110 +2023/08/26-22:07:58.730640 7f2deb7fe6c0 Recovering log #119 +2023/08/26-22:07:58.841210 7f2deb7fe6c0 Delete type=3 #117 +2023/08/26-22:07:58.841288 7f2deb7fe6c0 Delete type=0 #119 +2023/08/26-22:16:27.936844 7f2b69bff6c0 Level-0 table #124: started +2023/08/26-22:16:27.936868 7f2b69bff6c0 Level-0 table #124: 0 bytes OK +2023/08/26-22:16:27.942975 7f2b69bff6c0 Delete type=0 #122 +2023/08/26-22:16:27.949818 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.949853 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index cde3019..21be1a1 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.640615 7f2dea7fc6c0 Recovering log #106 -2023/08/26-09:36:55.658513 7f2dea7fc6c0 Delete type=3 #104 -2023/08/26-09:36:55.658566 7f2dea7fc6c0 Delete type=0 #106 -2023/08/26-09:47:17.348939 7f2b69bff6c0 Level-0 table #111: started -2023/08/26-09:47:17.348972 7f2b69bff6c0 Level-0 table #111: 0 bytes OK -2023/08/26-09:47:17.377099 7f2b69bff6c0 Delete type=0 #109 -2023/08/26-09:47:17.377272 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.377305 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.751865 7f2debfff6c0 Recovering log #114 +2023/08/26-21:35:11.761906 7f2debfff6c0 Delete type=3 #112 +2023/08/26-21:35:11.761967 7f2debfff6c0 Delete type=0 #114 +2023/08/26-21:46:54.287966 7f2b69bff6c0 Level-0 table #120: started +2023/08/26-21:46:54.288007 7f2b69bff6c0 Level-0 table #120: 0 bytes OK +2023/08/26-21:46:54.294193 7f2b69bff6c0 Delete type=0 #118 +2023/08/26-21:46:54.294471 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.294512 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000112 b/packs/maneuvers/MANIFEST-000112 deleted file mode 100644 index 9c539c7..0000000 Binary files a/packs/maneuvers/MANIFEST-000112 and /dev/null differ diff --git a/packs/maneuvers/MANIFEST-000121 b/packs/maneuvers/MANIFEST-000121 new file mode 100644 index 0000000..eb998ef Binary files /dev/null and b/packs/maneuvers/MANIFEST-000121 differ diff --git a/packs/powers/000122.log b/packs/perks/000130.log similarity index 100% rename from packs/powers/000122.log rename to packs/perks/000130.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index 30eb131..a8d9908 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000120 +MANIFEST-000128 diff --git a/packs/perks/LOG b/packs/perks/LOG index 067e3a5..84f5259 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:06.914678 7f2dea7fc6c0 Recovering log #118 -2023/08/26-20:26:07.021982 7f2dea7fc6c0 Delete type=3 #116 -2023/08/26-20:26:07.022085 7f2dea7fc6c0 Delete type=0 #118 +2023/08/26-22:07:58.751122 7f2dea7fc6c0 Recovering log #126 +2023/08/26-22:07:58.864497 7f2dea7fc6c0 Delete type=3 #124 +2023/08/26-22:07:58.864580 7f2dea7fc6c0 Delete type=0 #126 +2023/08/26-22:16:27.929655 7f2b69bff6c0 Level-0 table #131: started +2023/08/26-22:16:27.929696 7f2b69bff6c0 Level-0 table #131: 0 bytes OK +2023/08/26-22:16:27.936745 7f2b69bff6c0 Delete type=0 #129 +2023/08/26-22:16:27.949807 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.949861 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/LOG.old b/packs/perks/LOG.old index 24f68f6..a41bc02 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.643370 7f2debfff6c0 Recovering log #114 -2023/08/26-09:36:55.661508 7f2debfff6c0 Delete type=3 #112 -2023/08/26-09:36:55.661568 7f2debfff6c0 Delete type=0 #114 -2023/08/26-09:47:17.415364 7f2b69bff6c0 Level-0 table #119: started -2023/08/26-09:47:17.415408 7f2b69bff6c0 Level-0 table #119: 0 bytes OK -2023/08/26-09:47:17.468404 7f2b69bff6c0 Delete type=0 #117 -2023/08/26-09:47:17.468554 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.468570 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.751864 7f2deaffd6c0 Recovering log #122 +2023/08/26-21:35:11.761866 7f2deaffd6c0 Delete type=3 #120 +2023/08/26-21:35:11.761921 7f2deaffd6c0 Delete type=0 #122 +2023/08/26-21:46:54.294564 7f2b69bff6c0 Level-0 table #127: started +2023/08/26-21:46:54.294620 7f2b69bff6c0 Level-0 table #127: 0 bytes OK +2023/08/26-21:46:54.302478 7f2b69bff6c0 Delete type=0 #125 +2023/08/26-21:46:54.309946 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.310020 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/MANIFEST-000120 b/packs/perks/MANIFEST-000120 deleted file mode 100644 index 32aa2a0..0000000 Binary files a/packs/perks/MANIFEST-000120 and /dev/null differ diff --git a/packs/perks/MANIFEST-000128 b/packs/perks/MANIFEST-000128 new file mode 100644 index 0000000..466c54c Binary files /dev/null and b/packs/perks/MANIFEST-000128 differ diff --git a/packs/skills/000121.log b/packs/powers/000131.log similarity index 100% rename from packs/skills/000121.log rename to packs/powers/000131.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index 2b465ed..ea072ca 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000121 +MANIFEST-000129 diff --git a/packs/powers/LOG b/packs/powers/LOG index f94e1bc..e1b44a2 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:06.793023 7f2deb7fe6c0 Recovering log #119 -2023/08/26-20:26:06.911684 7f2deb7fe6c0 Delete type=3 #117 -2023/08/26-20:26:06.911747 7f2deb7fe6c0 Delete type=0 #119 +2023/08/26-22:07:58.612145 7f2debfff6c0 Recovering log #127 +2023/08/26-22:07:58.728418 7f2debfff6c0 Delete type=3 #125 +2023/08/26-22:07:58.728498 7f2debfff6c0 Delete type=0 #127 +2023/08/26-22:16:27.916401 7f2b69bff6c0 Level-0 table #132: started +2023/08/26-22:16:27.916423 7f2b69bff6c0 Level-0 table #132: 0 bytes OK +2023/08/26-22:16:27.923048 7f2b69bff6c0 Delete type=0 #130 +2023/08/26-22:16:27.923174 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.923191 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/LOG.old b/packs/powers/LOG.old index 9e15fe1..fda9c84 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.615731 7f2deb7fe6c0 Recovering log #115 -2023/08/26-09:36:55.638127 7f2deb7fe6c0 Delete type=3 #113 -2023/08/26-09:36:55.638240 7f2deb7fe6c0 Delete type=0 #115 -2023/08/26-09:47:17.273897 7f2b69bff6c0 Level-0 table #120: started -2023/08/26-09:47:17.273922 7f2b69bff6c0 Level-0 table #120: 0 bytes OK -2023/08/26-09:47:17.308253 7f2b69bff6c0 Delete type=0 #118 -2023/08/26-09:47:17.377250 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.377280 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.738380 7f2deaffd6c0 Recovering log #123 +2023/08/26-21:35:11.748807 7f2deaffd6c0 Delete type=3 #121 +2023/08/26-21:35:11.748868 7f2deaffd6c0 Delete type=0 #123 +2023/08/26-21:46:54.273097 7f2b69bff6c0 Level-0 table #128: started +2023/08/26-21:46:54.273141 7f2b69bff6c0 Level-0 table #128: 0 bytes OK +2023/08/26-21:46:54.279970 7f2b69bff6c0 Delete type=0 #126 +2023/08/26-21:46:54.287948 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.294448 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/MANIFEST-000121 b/packs/powers/MANIFEST-000129 similarity index 73% rename from packs/powers/MANIFEST-000121 rename to packs/powers/MANIFEST-000129 index 801b650..f8a0b7c 100644 Binary files a/packs/powers/MANIFEST-000121 and b/packs/powers/MANIFEST-000129 differ diff --git a/packs/talents/000121.log b/packs/skills/000130.log similarity index 100% rename from packs/talents/000121.log rename to packs/skills/000130.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 30eb131..a8d9908 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000120 +MANIFEST-000128 diff --git a/packs/skills/LOG b/packs/skills/LOG index d842aae..72dc784 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:06.721598 7f2dea7fc6c0 Recovering log #118 -2023/08/26-20:26:06.788573 7f2dea7fc6c0 Delete type=3 #116 -2023/08/26-20:26:06.788747 7f2dea7fc6c0 Delete type=0 #118 +2023/08/26-22:07:58.521207 7f2dea7fc6c0 Recovering log #126 +2023/08/26-22:07:58.625202 7f2dea7fc6c0 Delete type=3 #124 +2023/08/26-22:07:58.625257 7f2dea7fc6c0 Delete type=0 #126 +2023/08/26-22:16:27.909865 7f2b69bff6c0 Level-0 table #131: started +2023/08/26-22:16:27.909908 7f2b69bff6c0 Level-0 table #131: 0 bytes OK +2023/08/26-22:16:27.916292 7f2b69bff6c0 Delete type=0 #129 +2023/08/26-22:16:27.923145 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.923202 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 0fcd2ca..d9ab7b1 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.581650 7f2deaffd6c0 Recovering log #114 -2023/08/26-09:36:55.613104 7f2deaffd6c0 Delete type=3 #112 -2023/08/26-09:36:55.613190 7f2deaffd6c0 Delete type=0 #114 -2023/08/26-09:47:17.245521 7f2b69bff6c0 Level-0 table #119: started -2023/08/26-09:47:17.245592 7f2b69bff6c0 Level-0 table #119: 0 bytes OK -2023/08/26-09:47:17.273789 7f2b69bff6c0 Delete type=0 #117 -2023/08/26-09:47:17.377230 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.377298 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.724122 7f2debfff6c0 Recovering log #122 +2023/08/26-21:35:11.735216 7f2debfff6c0 Delete type=3 #120 +2023/08/26-21:35:11.735320 7f2debfff6c0 Delete type=0 #122 +2023/08/26-21:46:54.266256 7f2b69bff6c0 Level-0 table #127: started +2023/08/26-21:46:54.266300 7f2b69bff6c0 Level-0 table #127: 0 bytes OK +2023/08/26-21:46:54.272914 7f2b69bff6c0 Delete type=0 #125 +2023/08/26-21:46:54.287925 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.294424 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000120 b/packs/skills/MANIFEST-000120 deleted file mode 100644 index fd846ca..0000000 Binary files a/packs/skills/MANIFEST-000120 and /dev/null differ diff --git a/packs/skills/MANIFEST-000128 b/packs/skills/MANIFEST-000128 new file mode 100644 index 0000000..d773789 Binary files /dev/null and b/packs/skills/MANIFEST-000128 differ diff --git a/packs/talents/000130.log b/packs/talents/000130.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index 30eb131..a8d9908 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000120 +MANIFEST-000128 diff --git a/packs/talents/LOG b/packs/talents/LOG index a57e72a..cb715d2 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,3 +1,8 @@ -2023/08/26-20:26:07.008269 7f2debfff6c0 Recovering log #118 -2023/08/26-20:26:07.084332 7f2debfff6c0 Delete type=3 #116 -2023/08/26-20:26:07.084432 7f2debfff6c0 Delete type=0 #118 +2023/08/26-22:07:58.844046 7f2debfff6c0 Recovering log #126 +2023/08/26-22:07:58.925665 7f2debfff6c0 Delete type=3 #124 +2023/08/26-22:07:58.926331 7f2debfff6c0 Delete type=0 #126 +2023/08/26-22:16:27.943060 7f2b69bff6c0 Level-0 table #131: started +2023/08/26-22:16:27.943083 7f2b69bff6c0 Level-0 table #131: 0 bytes OK +2023/08/26-22:16:27.949677 7f2b69bff6c0 Delete type=0 #129 +2023/08/26-22:16:27.949829 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-22:16:27.949845 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/LOG.old b/packs/talents/LOG.old index e722aff..287f7d3 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-09:36:55.660955 7f2deb7fe6c0 Recovering log #114 -2023/08/26-09:36:55.671184 7f2deb7fe6c0 Delete type=3 #112 -2023/08/26-09:36:55.671335 7f2deb7fe6c0 Delete type=0 #114 -2023/08/26-09:47:17.377408 7f2b69bff6c0 Level-0 table #119: started -2023/08/26-09:47:17.377442 7f2b69bff6c0 Level-0 table #119: 0 bytes OK -2023/08/26-09:47:17.415173 7f2b69bff6c0 Delete type=0 #117 -2023/08/26-09:47:17.468538 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/26-09:47:17.468563 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-21:35:11.765241 7f2dea7fc6c0 Recovering log #122 +2023/08/26-21:35:11.781642 7f2dea7fc6c0 Delete type=3 #120 +2023/08/26-21:35:11.781702 7f2dea7fc6c0 Delete type=0 #122 +2023/08/26-21:46:54.302747 7f2b69bff6c0 Level-0 table #127: started +2023/08/26-21:46:54.302821 7f2b69bff6c0 Level-0 table #127: 0 bytes OK +2023/08/26-21:46:54.309685 7f2b69bff6c0 Delete type=0 #125 +2023/08/26-21:46:54.309987 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-21:46:54.310051 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000120 b/packs/talents/MANIFEST-000120 deleted file mode 100644 index f76c7b2..0000000 Binary files a/packs/talents/MANIFEST-000120 and /dev/null differ diff --git a/packs/talents/MANIFEST-000128 b/packs/talents/MANIFEST-000128 new file mode 100644 index 0000000..e36c132 Binary files /dev/null and b/packs/talents/MANIFEST-000128 differ diff --git a/system.json b/system.json index 655a1a4..a38da1d 100644 --- a/system.json +++ b/system.json @@ -91,14 +91,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.16", + "version": "11.0.17", "compatibility": { "minimum": "11", "verified": "11" }, "title": "Hero System 6E Basic (Official)", "manifest": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/raw/branch/master/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.16.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.17.zip", "url": "https://www.uberwald.me/public/uberwald/", "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp", "id": "fvtt-hero-system-6" diff --git a/template.json b/template.json index c366716..7119e2b 100644 --- a/template.json +++ b/template.json @@ -354,7 +354,9 @@ "levels": 0, "quantity": 1, "range": "", + "damageeffect": "normal", "damage": "", + "stunx": 0, "endurance": 0, "hasroll": false, "attackvalue": "ocv", diff --git a/templates/chat/chat-damage-result.hbs b/templates/chat/chat-damage-result.hbs index 8caa223..5005ac6 100644 --- a/templates/chat/chat-damage-result.hbs +++ b/templates/chat/chat-damage-result.hbs @@ -13,10 +13,24 @@
diff --git a/templates/partials/partial-power-equipment-cost.hbs b/templates/partials/partial-power-equipment-cost.hbs index 39c9f19..e2a9649 100644 --- a/templates/partials/partial-power-equipment-cost.hbs +++ b/templates/partials/partial-power-equipment-cost.hbs @@ -38,9 +38,27 @@
  • + +
  • + +
  • +
  • + + {{#if (eq system.damageeffect "killing")}} +
  • + +
  • + {{/if}} + {{/if}}