From e5c6d3f42f460002f38bea09c2984f6797fd6bc7 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 26 Aug 2023 22:25:28 +0200 Subject: [PATCH] Fix various issues --- modules/hero6-actor.js | 16 +++++++++++++++- modules/hero6-config.js | 7 +++++++ .../complications/{000121.log => 000130.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 11 ++++++++--- packs/complications/LOG.old | 16 ++++++++-------- packs/complications/MANIFEST-000120 | Bin 120 -> 0 bytes packs/complications/MANIFEST-000128 | Bin 0 -> 139 bytes packs/equipment/{000123.log => 000132.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 11 ++++++++--- packs/equipment/LOG.old | 16 ++++++++-------- .../{MANIFEST-000122 => MANIFEST-000130} | Bin 157 -> 177 bytes packs/maneuvers/000113.log | Bin 997 -> 0 bytes packs/maneuvers/{000005.ldb => 000116.ldb} | Bin 15536 -> 15586 bytes .../000121.log => maneuvers/000123.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 11 ++++++++--- packs/maneuvers/LOG.old | 16 ++++++++-------- packs/maneuvers/MANIFEST-000112 | Bin 119 -> 0 bytes packs/maneuvers/MANIFEST-000121 | Bin 0 -> 168 bytes packs/{powers/000122.log => perks/000130.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 11 ++++++++--- packs/perks/LOG.old | 16 ++++++++-------- packs/perks/MANIFEST-000120 | Bin 119 -> 0 bytes packs/perks/MANIFEST-000128 | Bin 0 -> 138 bytes .../{skills/000121.log => powers/000131.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 11 ++++++++--- packs/powers/LOG.old | 16 ++++++++-------- .../{MANIFEST-000121 => MANIFEST-000129} | Bin 154 -> 173 bytes .../{talents/000121.log => skills/000130.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 11 ++++++++--- packs/skills/LOG.old | 16 ++++++++-------- packs/skills/MANIFEST-000120 | Bin 120 -> 0 bytes packs/skills/MANIFEST-000128 | Bin 0 -> 139 bytes packs/talents/000130.log | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 11 ++++++++--- packs/talents/LOG.old | 16 ++++++++-------- packs/talents/MANIFEST-000120 | Bin 119 -> 0 bytes packs/talents/MANIFEST-000128 | Bin 0 -> 138 bytes system.json | 4 ++-- template.json | 2 ++ templates/chat/chat-damage-result.hbs | 16 +++++++++++++++- .../partials/partial-power-equipment-cost.hbs | 18 ++++++++++++++++++ 48 files changed, 178 insertions(+), 88 deletions(-) rename packs/complications/{000121.log => 000130.log} (100%) delete mode 100644 packs/complications/MANIFEST-000120 create mode 100644 packs/complications/MANIFEST-000128 rename packs/equipment/{000123.log => 000132.log} (100%) rename packs/equipment/{MANIFEST-000122 => MANIFEST-000130} (72%) delete mode 100644 packs/maneuvers/000113.log rename packs/maneuvers/{000005.ldb => 000116.ldb} (90%) rename packs/{perks/000121.log => maneuvers/000123.log} (100%) delete mode 100644 packs/maneuvers/MANIFEST-000112 create mode 100644 packs/maneuvers/MANIFEST-000121 rename packs/{powers/000122.log => perks/000130.log} (100%) delete mode 100644 packs/perks/MANIFEST-000120 create mode 100644 packs/perks/MANIFEST-000128 rename packs/{skills/000121.log => powers/000131.log} (100%) rename packs/powers/{MANIFEST-000121 => MANIFEST-000129} (73%) rename packs/{talents/000121.log => skills/000130.log} (100%) delete mode 100644 packs/skills/MANIFEST-000120 create mode 100644 packs/skills/MANIFEST-000128 create mode 100644 packs/talents/000130.log delete mode 100644 packs/talents/MANIFEST-000120 create mode 100644 packs/talents/MANIFEST-000128 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 e0ddd6816336174fa1728bd1ccd7762abd0b8d07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{i literal 0 HcmV?d00001 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 8f420f22132cca912d1d8cbbec4ce40e09a49c51..67287f31b335e8f2e619ee8a54c560c95ce90bda 100644 GIT binary patch delta 43 scmbQsxRG%}uZnEF*dlHQMy6&)P6p-{MwahP=X0kpfJ9nAB5fcM0Plwh`2YX_ delta 23 ecmdnUIG1rkuYmBKhC`eTj7-&>49qnw-BMk>QTEY9GyYV%Zh7cL^eahtc(lgrjkDX|$$Hm_owpKLQvxi57(wD#x@J#pRHv zJU61^Rb3W>$09AFIQ2r7^zjxq4) zK^2WYd_=g@z8f>!_Z9;ebHL0$f1s(73e7)XzM{>x_Uki8XItBm2TK@ZaSAj_K^neS zb%1kJwXI4kDR=DVL8VSpDq)62udy_ZqSqTd@X1(komlVoX2ej?)7?WU^5uE+uusg;VwxeA3(NVF`wJS?9{~Iw3(S9gzqz#+)loOGx-*B^L6tXE#~G($yX5cW^fVP&c{-c&#ER; zl30|US|W6Q@-_uUsaS4~y!2wB$9yIVB^gEei6sgJrFqF2seJmAKPqUm+~Vh(J6Si;{*3_*z}B@8S~%`D7~{`qjL`Ec9i zf+Px0$}j){BM8r0vodG%6h%`hfsbVgFi{3C$Fn~s-?UCpc*r9u&JZOi&U4Ipp9qkd zBPcG@8F5vBfs;i^P=M$0az-kjB+j38{cDI{$3F-21;f&FC( zFj0n%9iOu&bK4{+tmlywXNVFM=b7TXPXx%!5fqoX9)4ATfs;i^P=IIS+jIQgKB`pgoS$2eSd>_jU&P8Nub5eqnp>`Wz(Dq)HYJW`{Q%TmkoGR=&Wio(+vMInk{@|BJu#ztY0 sVMd9b;r>q9-i#s;`M2S$M>!Z6nW{J$n5$W&Jva|og1FT{ZY_&605_d0$N&HU literal 0 HcmV?d00001 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 32aa2a02e851ec5164b1d8715c8e38d44deadc4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmX>X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HF{Qa%B_i!*UGF5Ui JFjuj#0052^AxHoK diff --git a/packs/perks/MANIFEST-000128 b/packs/perks/MANIFEST-000128 new file mode 100644 index 0000000000000000000000000000000000000000..466c54c375efb31a4d3b34fd920885970cacfff7 GIT binary patch literal 138 zcmX>X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HF{B61LrCbb*OpT13 W49rc8EG+A*o;?5wG=T(KfC2y&J|sQ> literal 0 HcmV?d00001 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 801b650e8dc51542cac946ec13ad38a6a505fe64..f8a0b7cb2ba7aada893ff1ed2f5f7d48848f4425 100644 GIT binary patch delta 41 rcmbQmxR!B3w-W2}cx^5QMy4i4P6p;?MwYZq$F&!O1e!qttv~?))w~HC delta 22 dcmZ3>IE!&YH^1-gLt8l*7@4X#8JMeC(g0X028jRw 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 fd846ca0dc3cc537ec1729746fc53635618defee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAX;G;VV+Ffvtg KGB8)M*Z=@~(jd$L diff --git a/packs/skills/MANIFEST-000128 b/packs/skills/MANIFEST-000128 new file mode 100644 index 0000000000000000000000000000000000000000..d7737895b128f9106b08bc2f1374e60b133b7772 GIT binary patch literal 139 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoBj&YYuTSFfuhV XaxySCF|ycHKU3Tf5@-Smv;YMF6l^4N literal 0 HcmV?d00001 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 f76c7b25bc70ebb0f7485f2c76c0d65e5b35fa62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmY$qR;ZK6z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|`PuBN-*7N6GF5Ui JFjukg0RW}?Aw~cI diff --git a/packs/talents/MANIFEST-000128 b/packs/talents/MANIFEST-000128 new file mode 100644 index 0000000000000000000000000000000000000000..e36c13200354984f824b44ec69c18200e64559e2 GIT binary patch literal 138 zcmY$qR;ZK6z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|`T6J6zj84!GBq-C WGB7tWvhcljnkE1eXaWhe00jU~Z6vS& literal 0 HcmV?d00001 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 @@
  • Name : {{title}}
    • +
  • Damage Effect: {{upperFirst item.system.damageeffect}}
  • Damage formula : {{diceFormula}}
  • TOTAL : {{result}}
    • -
  • BODY : {{bodyValue}}
    • + {{#if (or (eq item.system.damageeffect "killing") (eq item.system.damageeffect "normal"))}} +
  • 1d3 result + STUNx : {{killingMultiplier}} + {{item.system.stunx}}
    • +
  • STUN : {{stunValue}}
    • +
  • BODY : {{bodyValue}}
    • + {{/if}} + + {{#if (eq item.system.damageeffect "stunonly")}} +
  • STUN : {{stunValue}}
    • + {{/if}} + + {{#if (eq item.system.damageeffect "bodyonly")}} +
  • BODY : {{stunValue}}
    • + {{/if}} +
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}}