diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index f079141..8ef9c24 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -721,7 +721,7 @@ export class Hero6Actor extends Actor { 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) + rollData.stunValue = Number(myRoll.total) * (Number(mult.total) + (Number(item.system.stunx) || 0)) } else { rollData.stunValue = myRoll.total } diff --git a/packs/complications/000130.log b/packs/complications/000134.log similarity index 100% rename from packs/complications/000130.log rename to packs/complications/000134.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index a8d9908..c39c670 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000128 +MANIFEST-000132 diff --git a/packs/complications/LOG b/packs/complications/LOG index a6dece1..3db9ef7 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -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) +2023/08/27-08:29:22.284274 7f2dea7fc6c0 Recovering log #130 +2023/08/27-08:29:22.301134 7f2dea7fc6c0 Delete type=3 #128 +2023/08/27-08:29:22.301181 7f2dea7fc6c0 Delete type=0 #130 +2023/08/27-08:39:31.996089 7f2b69bff6c0 Level-0 table #135: started +2023/08/27-08:39:31.996115 7f2b69bff6c0 Level-0 table #135: 0 bytes OK +2023/08/27-08:39:32.003139 7f2b69bff6c0 Delete type=0 #133 +2023/08/27-08:39:32.003292 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/27-08:39:32.003321 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 70415ee..a6dece1 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000128 b/packs/complications/MANIFEST-000128 deleted file mode 100644 index d3a76b3..0000000 Binary files a/packs/complications/MANIFEST-000128 and /dev/null differ diff --git a/packs/complications/MANIFEST-000132 b/packs/complications/MANIFEST-000132 new file mode 100644 index 0000000..5fdc69d Binary files /dev/null and b/packs/complications/MANIFEST-000132 differ diff --git a/packs/equipment/000132.log b/packs/equipment/000136.log similarity index 100% rename from packs/equipment/000132.log rename to packs/equipment/000136.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 00d8c47..f816b37 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000130 +MANIFEST-000134 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index f9e5072..01f8e6a 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,8 +1,8 @@ -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) +2023/08/27-08:29:22.269478 7f2deaffd6c0 Recovering log #132 +2023/08/27-08:29:22.279442 7f2deaffd6c0 Delete type=3 #130 +2023/08/27-08:29:22.279516 7f2deaffd6c0 Delete type=0 #132 +2023/08/27-08:39:31.935876 7f2b69bff6c0 Level-0 table #137: started +2023/08/27-08:39:31.935922 7f2b69bff6c0 Level-0 table #137: 0 bytes OK +2023/08/27-08:39:31.943117 7f2b69bff6c0 Delete type=0 #135 +2023/08/27-08:39:31.968194 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/27-08:39:31.968240 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 834efbc..f9e5072 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000130 b/packs/equipment/MANIFEST-000134 similarity index 72% rename from packs/equipment/MANIFEST-000130 rename to packs/equipment/MANIFEST-000134 index 67287f3..f1079f0 100644 Binary files a/packs/equipment/MANIFEST-000130 and b/packs/equipment/MANIFEST-000134 differ diff --git a/packs/maneuvers/000123.log b/packs/maneuvers/000127.log similarity index 100% rename from packs/maneuvers/000123.log rename to packs/maneuvers/000127.log diff --git a/packs/maneuvers/000116.ldb b/packs/maneuvers/000129.ldb similarity index 83% rename from packs/maneuvers/000116.ldb rename to packs/maneuvers/000129.ldb index 6f7916f..d270ace 100644 Binary files a/packs/maneuvers/000116.ldb and b/packs/maneuvers/000129.ldb differ diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 2b465ed..70936fe 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000121 +MANIFEST-000125 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 5bd87b4..c8a2f47 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,8 +1,15 @@ -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) +2023/08/27-08:29:22.300538 7f2deaffd6c0 Recovering log #123 +2023/08/27-08:29:22.317575 7f2deaffd6c0 Delete type=3 #121 +2023/08/27-08:29:22.317668 7f2deaffd6c0 Delete type=0 #123 +2023/08/27-08:39:31.985594 7f2b69bff6c0 Level-0 table #128: started +2023/08/27-08:39:31.989270 7f2b69bff6c0 Level-0 table #128: 885 bytes OK +2023/08/27-08:39:31.995966 7f2b69bff6c0 Delete type=0 #126 +2023/08/27-08:39:32.003282 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/27-08:39:32.003339 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at '!items!M7GTfolCobuXkfpd' @ 28 : 1 +2023/08/27-08:39:32.003347 7f2b69bff6c0 Compacting 1@1 + 1@2 files +2023/08/27-08:39:32.006911 7f2b69bff6c0 Generated table #129@1: 26 keys, 15634 bytes +2023/08/27-08:39:32.006934 7f2b69bff6c0 Compacted 1@1 + 1@2 files => 15634 bytes +2023/08/27-08:39:32.013790 7f2b69bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2023/08/27-08:39:32.013955 7f2b69bff6c0 Delete type=2 #116 +2023/08/27-08:39:32.014188 7f2b69bff6c0 Delete type=2 #128 +2023/08/27-08:39:32.026889 7f2b69bff6c0 Manual compaction at level-1 from '!items!M7GTfolCobuXkfpd' @ 28 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index 21be1a1..5bd87b4 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000121 b/packs/maneuvers/MANIFEST-000121 deleted file mode 100644 index eb998ef..0000000 Binary files a/packs/maneuvers/MANIFEST-000121 and /dev/null differ diff --git a/packs/maneuvers/MANIFEST-000125 b/packs/maneuvers/MANIFEST-000125 new file mode 100644 index 0000000..20bd9be Binary files /dev/null and b/packs/maneuvers/MANIFEST-000125 differ diff --git a/packs/perks/000130.log b/packs/perks/000134.log similarity index 100% rename from packs/perks/000130.log rename to packs/perks/000134.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index a8d9908..c39c670 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000128 +MANIFEST-000132 diff --git a/packs/perks/LOG b/packs/perks/LOG index 84f5259..5f32489 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,8 +1,8 @@ -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) +2023/08/27-08:29:22.302661 7f2debfff6c0 Recovering log #130 +2023/08/27-08:29:22.321361 7f2debfff6c0 Delete type=3 #128 +2023/08/27-08:29:22.321420 7f2debfff6c0 Delete type=0 #130 +2023/08/27-08:39:32.020735 7f2b69bff6c0 Level-0 table #135: started +2023/08/27-08:39:32.020763 7f2b69bff6c0 Level-0 table #135: 0 bytes OK +2023/08/27-08:39:32.026780 7f2b69bff6c0 Delete type=0 #133 +2023/08/27-08:39:32.026919 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/27-08:39:32.026945 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 a41bc02..84f5259 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000128 b/packs/perks/MANIFEST-000128 deleted file mode 100644 index 466c54c..0000000 Binary files a/packs/perks/MANIFEST-000128 and /dev/null differ diff --git a/packs/perks/MANIFEST-000132 b/packs/perks/MANIFEST-000132 new file mode 100644 index 0000000..f5d0013 Binary files /dev/null and b/packs/perks/MANIFEST-000132 differ diff --git a/packs/powers/000131.log b/packs/powers/000135.log similarity index 100% rename from packs/powers/000131.log rename to packs/powers/000135.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index ea072ca..b72c871 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000129 +MANIFEST-000133 diff --git a/packs/powers/LOG b/packs/powers/LOG index e1b44a2..50fe73b 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,8 @@ -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) +2023/08/27-08:29:22.281768 7f2deb7fe6c0 Recovering log #131 +2023/08/27-08:29:22.298260 7f2deb7fe6c0 Delete type=3 #129 +2023/08/27-08:29:22.298361 7f2deb7fe6c0 Delete type=0 #131 +2023/08/27-08:39:31.977972 7f2b69bff6c0 Level-0 table #136: started +2023/08/27-08:39:31.978008 7f2b69bff6c0 Level-0 table #136: 0 bytes OK +2023/08/27-08:39:31.985417 7f2b69bff6c0 Delete type=0 #134 +2023/08/27-08:39:32.003270 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/27-08:39:32.003309 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 fda9c84..e1b44a2 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000129 b/packs/powers/MANIFEST-000133 similarity index 73% rename from packs/powers/MANIFEST-000129 rename to packs/powers/MANIFEST-000133 index f8a0b7c..08514fb 100644 Binary files a/packs/powers/MANIFEST-000129 and b/packs/powers/MANIFEST-000133 differ diff --git a/packs/skills/000130.log b/packs/skills/000134.log similarity index 100% rename from packs/skills/000130.log rename to packs/skills/000134.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index a8d9908..c39c670 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000128 +MANIFEST-000132 diff --git a/packs/skills/LOG b/packs/skills/LOG index 72dc784..7736a42 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -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) +2023/08/27-08:29:22.269474 7f2debfff6c0 Recovering log #130 +2023/08/27-08:29:22.282410 7f2debfff6c0 Delete type=3 #128 +2023/08/27-08:29:22.282470 7f2debfff6c0 Delete type=0 #130 +2023/08/27-08:39:31.960813 7f2b69bff6c0 Level-0 table #135: started +2023/08/27-08:39:31.960840 7f2b69bff6c0 Level-0 table #135: 0 bytes OK +2023/08/27-08:39:31.968065 7f2b69bff6c0 Delete type=0 #133 +2023/08/27-08:39:31.968231 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/27-08:39:31.968249 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 d9ab7b1..72dc784 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000128 b/packs/skills/MANIFEST-000128 deleted file mode 100644 index d773789..0000000 Binary files a/packs/skills/MANIFEST-000128 and /dev/null differ diff --git a/packs/skills/MANIFEST-000132 b/packs/skills/MANIFEST-000132 new file mode 100644 index 0000000..763a3ed Binary files /dev/null and b/packs/skills/MANIFEST-000132 differ diff --git a/packs/talents/000130.log b/packs/talents/000134.log similarity index 100% rename from packs/talents/000130.log rename to packs/talents/000134.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index a8d9908..c39c670 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000128 +MANIFEST-000132 diff --git a/packs/talents/LOG b/packs/talents/LOG index cb715d2..36d87e4 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -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) +2023/08/27-08:29:22.319586 7f2deb7fe6c0 Recovering log #130 +2023/08/27-08:29:22.330371 7f2deb7fe6c0 Delete type=3 #128 +2023/08/27-08:29:22.330427 7f2deb7fe6c0 Delete type=0 #130 +2023/08/27-08:39:32.014249 7f2b69bff6c0 Level-0 table #135: started +2023/08/27-08:39:32.014276 7f2b69bff6c0 Level-0 table #135: 0 bytes OK +2023/08/27-08:39:32.020634 7f2b69bff6c0 Delete type=0 #133 +2023/08/27-08:39:32.026909 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/27-08:39:32.026927 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 287f7d3..cb715d2 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -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) +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/MANIFEST-000128 b/packs/talents/MANIFEST-000128 deleted file mode 100644 index e36c132..0000000 Binary files a/packs/talents/MANIFEST-000128 and /dev/null differ diff --git a/packs/talents/MANIFEST-000132 b/packs/talents/MANIFEST-000132 new file mode 100644 index 0000000..803dc2f Binary files /dev/null and b/packs/talents/MANIFEST-000132 differ diff --git a/system.json b/system.json index a38da1d..68b57c4 100644 --- a/system.json +++ b/system.json @@ -91,14 +91,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.17", + "version": "11.0.18", "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.17.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.18.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/templates/chat/chat-damage-result.hbs b/templates/chat/chat-damage-result.hbs index 5005ac6..bf57758 100644 --- a/templates/chat/chat-damage-result.hbs +++ b/templates/chat/chat-damage-result.hbs @@ -15,20 +15,25 @@
  • Name : {{title}}
  • Damage Effect: {{upperFirst item.system.damageeffect}}
  • Damage formula : {{diceFormula}}
    • -
  • TOTAL : {{result}}
    • - - {{#if (or (eq item.system.damageeffect "killing") (eq item.system.damageeffect "normal"))}} -
  • 1d3 result + STUNx : {{killingMultiplier}} + {{item.system.stunx}}
    • -
  • STUN : {{stunValue}}
    • +
  • Total formula : {{result}}
    • + + {{#if (eq item.system.damageeffect "normal")}}
  • BODY : {{bodyValue}}
    • {{/if}} + {{#if (eq item.system.damageeffect "killing")}} +
  • 1d3 result + STUNx : {{killingMultiplier}} + {{item.system.stunx}} = {{add killingMultiplier item.system.stunx}}
    • +
  • STUN : {{stunValue}}
    • +
  • BODY : {{result}}
    • +
  • Penetrating BODY : {{bodyValue}}
    • + {{/if}} + {{#if (eq item.system.damageeffect "stunonly")}}
  • STUN : {{stunValue}}
    • {{/if}} {{#if (eq item.system.damageeffect "bodyonly")}} -
  • BODY : {{stunValue}}
    • +
  • BODY : {{bodyValue}}
    • {{/if}}