From 1f8275e153b5d619dffaf85855715fc4e2a55600 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 23 Oct 2023 16:38:34 +0200 Subject: [PATCH] Fix HP location and damages --- modules/dark-stars-actor.js | 5 +++++ packs/armor/{000104.log => 000116.log} | 0 packs/armor/CURRENT | 2 +- packs/armor/LOG | 16 ++++++++-------- packs/armor/LOG.old | 16 ++++++++-------- packs/armor/MANIFEST-000102 | Bin 134 -> 0 bytes packs/armor/MANIFEST-000114 | Bin 0 -> 134 bytes packs/conditions/{000104.log => 000116.log} | 0 packs/conditions/CURRENT | 2 +- packs/conditions/LOG | 14 +++++++------- packs/conditions/LOG.old | 14 +++++++------- packs/conditions/MANIFEST-000102 | Bin 65 -> 0 bytes packs/conditions/MANIFEST-000114 | Bin 0 -> 65 bytes packs/currency/{000104.log => 000116.log} | 0 packs/currency/CURRENT | 2 +- packs/currency/LOG | 14 +++++++------- packs/currency/LOG.old | 14 +++++++------- packs/currency/MANIFEST-000102 | Bin 65 -> 0 bytes packs/currency/MANIFEST-000114 | Bin 0 -> 65 bytes packs/cybernetics/{000032.log => 000044.log} | 0 packs/cybernetics/CURRENT | 2 +- packs/cybernetics/LOG | 16 ++++++++-------- packs/cybernetics/LOG.old | 16 ++++++++-------- packs/cybernetics/MANIFEST-000030 | Bin 137 -> 0 bytes packs/cybernetics/MANIFEST-000042 | Bin 0 -> 137 bytes packs/equipment/{000104.log => 000116.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +++++++------- packs/equipment/LOG.old | 14 +++++++------- packs/equipment/MANIFEST-000102 | Bin 65 -> 0 bytes packs/equipment/MANIFEST-000114 | Bin 0 -> 65 bytes packs/perks/{000104.log => 000116.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 16 ++++++++-------- packs/perks/LOG.old | 16 ++++++++-------- packs/perks/MANIFEST-000102 | Bin 135 -> 0 bytes packs/perks/MANIFEST-000114 | Bin 0 -> 135 bytes packs/shields/{000104.log => 000116.log} | 0 packs/shields/CURRENT | 2 +- packs/shields/LOG | 14 +++++++------- packs/shields/LOG.old | 14 +++++++------- packs/shields/MANIFEST-000102 | Bin 65 -> 0 bytes packs/shields/MANIFEST-000114 | Bin 0 -> 65 bytes packs/skills/{000104.log => 000116.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 ++++++++-------- packs/skills/LOG.old | 16 ++++++++-------- packs/skills/MANIFEST-000102 | Bin 134 -> 0 bytes packs/skills/MANIFEST-000114 | Bin 0 -> 134 bytes packs/weapons/{000105.log => 000117.log} | 0 packs/weapons/CURRENT | 2 +- packs/weapons/LOG | 16 ++++++++-------- packs/weapons/LOG.old | 16 ++++++++-------- .../{MANIFEST-000103 => MANIFEST-000115} | Bin 171 -> 171 bytes styles/simple.css | 17 +++++++++++++---- system.json | 4 ++-- template.json | 7 +++++++ templates/actors/actor-sheet.hbs | 17 +++++++++++++++-- templates/chat/chat-generic-result.hbs | 8 ++++---- 59 files changed, 191 insertions(+), 157 deletions(-) rename packs/armor/{000104.log => 000116.log} (100%) delete mode 100644 packs/armor/MANIFEST-000102 create mode 100644 packs/armor/MANIFEST-000114 rename packs/conditions/{000104.log => 000116.log} (100%) delete mode 100644 packs/conditions/MANIFEST-000102 create mode 100644 packs/conditions/MANIFEST-000114 rename packs/currency/{000104.log => 000116.log} (100%) delete mode 100644 packs/currency/MANIFEST-000102 create mode 100644 packs/currency/MANIFEST-000114 rename packs/cybernetics/{000032.log => 000044.log} (100%) delete mode 100644 packs/cybernetics/MANIFEST-000030 create mode 100644 packs/cybernetics/MANIFEST-000042 rename packs/equipment/{000104.log => 000116.log} (100%) delete mode 100644 packs/equipment/MANIFEST-000102 create mode 100644 packs/equipment/MANIFEST-000114 rename packs/perks/{000104.log => 000116.log} (100%) delete mode 100644 packs/perks/MANIFEST-000102 create mode 100644 packs/perks/MANIFEST-000114 rename packs/shields/{000104.log => 000116.log} (100%) delete mode 100644 packs/shields/MANIFEST-000102 create mode 100644 packs/shields/MANIFEST-000114 rename packs/skills/{000104.log => 000116.log} (100%) delete mode 100644 packs/skills/MANIFEST-000102 create mode 100644 packs/skills/MANIFEST-000114 rename packs/weapons/{000105.log => 000117.log} (100%) rename packs/weapons/{MANIFEST-000103 => MANIFEST-000115} (74%) diff --git a/modules/dark-stars-actor.js b/modules/dark-stars-actor.js index f952b3b..a857ef3 100644 --- a/modules/dark-stars-actor.js +++ b/modules/dark-stars-actor.js @@ -87,6 +87,11 @@ export class DarkStarsActor extends Actor { deriv.si.value = Math.round( ((attr.dex.value + attr.sel.value) / 5) + 0.5) + deriv.si.bonus secondary.hp.max = ((attr.con.value + attr.siz.value ) * 2) + secondary.hp.bonus + for(let key in this.system.hitlocations) { + let loc = this.system.hitlocations[key] + loc.max = Math.floor(secondary.hp.max * loc.ratio) + } + secondary.fp.max = 10 + attr.str.value + attr.con.value + secondary.fp.bonus } diff --git a/packs/armor/000104.log b/packs/armor/000116.log similarity index 100% rename from packs/armor/000104.log rename to packs/armor/000116.log diff --git a/packs/armor/CURRENT b/packs/armor/CURRENT index e333c89..3182b19 100644 --- a/packs/armor/CURRENT +++ b/packs/armor/CURRENT @@ -1 +1 @@ -MANIFEST-000102 +MANIFEST-000114 diff --git a/packs/armor/LOG b/packs/armor/LOG index 54b7cef..c9c5156 100644 --- a/packs/armor/LOG +++ b/packs/armor/LOG @@ -1,8 +1,8 @@ -2023/10/21-12:57:48.590897 7f8105ffb6c0 Recovering log #100 -2023/10/21-12:57:48.601577 7f8105ffb6c0 Delete type=3 #98 -2023/10/21-12:57:48.601642 7f8105ffb6c0 Delete type=0 #100 -2023/10/21-14:16:12.221910 7f7e677006c0 Level-0 table #105: started -2023/10/21-14:16:12.221948 7f7e677006c0 Level-0 table #105: 0 bytes OK -2023/10/21-14:16:12.228790 7f7e677006c0 Delete type=0 #103 -2023/10/21-14:16:12.242411 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) -2023/10/21-14:16:12.242453 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/23-16:21:18.818735 7fc51b7fe6c0 Recovering log #112 +2023/10/23-16:21:18.828413 7fc51b7fe6c0 Delete type=3 #110 +2023/10/23-16:21:18.828468 7fc51b7fe6c0 Delete type=0 #112 +2023/10/23-16:38:21.235245 7fc299bff6c0 Level-0 table #117: started +2023/10/23-16:38:21.235287 7fc299bff6c0 Level-0 table #117: 0 bytes OK +2023/10/23-16:38:21.288685 7fc299bff6c0 Delete type=0 #115 +2023/10/23-16:38:21.402896 7fc299bff6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/23-16:38:21.445657 7fc299bff6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) diff --git a/packs/armor/LOG.old b/packs/armor/LOG.old index 148d235..fa88450 100644 --- a/packs/armor/LOG.old +++ b/packs/armor/LOG.old @@ -1,8 +1,8 @@ -2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96 -2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94 -2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96 -2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) -2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/23-16:10:20.406453 7fc51bfff6c0 Recovering log #108 +2023/10/23-16:10:20.455315 7fc51bfff6c0 Delete type=3 #106 +2023/10/23-16:10:20.455416 7fc51bfff6c0 Delete type=0 #108 +2023/10/23-16:21:11.331176 7fc299bff6c0 Level-0 table #113: started +2023/10/23-16:21:11.331203 7fc299bff6c0 Level-0 table #113: 0 bytes OK +2023/10/23-16:21:11.340134 7fc299bff6c0 Delete type=0 #111 +2023/10/23-16:21:11.358495 7fc299bff6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/23-16:21:11.367303 7fc299bff6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) diff --git a/packs/armor/MANIFEST-000102 b/packs/armor/MANIFEST-000102 deleted file mode 100644 index 566460a1ffee7d1712a47a3578e0e0399876548b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmWeu=MYI`U}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfn6U8pOsm|2pVTdZj8 zZ|s{DlwFh?Vd9aR7!b+G$N&Z~`9e!C_i!JRN|Vx*$fBw;7e;=FeEa6p$2b@mnbJ8K Um@`=Tcizd|2jXS`xmhgy0QOHKmH+?% diff --git a/packs/armor/MANIFEST-000114 b/packs/armor/MANIFEST-000114 new file mode 100644 index 0000000000000000000000000000000000000000..6b4b5409b281a23acd134ff03825ef790f5e78f9 GIT binary patch literal 134 zcmWeu=MYI`U}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfn6U8pOsm|2pVTdZj8 zZ|s{DlwFh?Vd9aR7!b+G$N&Z~`9e!C_i!JRN|Vx*$fBw;7e;=Fd=%3JGY$qureaP8 U<`NeE{J9;ULEI7`w~U1!0LAwq=l}o! literal 0 HcmV?d00001 diff --git a/packs/conditions/000104.log b/packs/conditions/000116.log similarity index 100% rename from packs/conditions/000104.log rename to packs/conditions/000116.log diff --git a/packs/conditions/CURRENT b/packs/conditions/CURRENT index e333c89..3182b19 100644 --- a/packs/conditions/CURRENT +++ b/packs/conditions/CURRENT @@ -1 +1 @@ -MANIFEST-000102 +MANIFEST-000114 diff --git a/packs/conditions/LOG b/packs/conditions/LOG index 36d3925..e7bb656 100644 --- a/packs/conditions/LOG +++ b/packs/conditions/LOG @@ -1,7 +1,7 @@ -2023/10/21-12:57:48.639550 7f8105ffb6c0 Recovering log #100 -2023/10/21-12:57:48.652746 7f8105ffb6c0 Delete type=3 #98 -2023/10/21-12:57:48.652801 7f8105ffb6c0 Delete type=0 #100 -2023/10/21-14:16:12.242612 7f7e677006c0 Level-0 table #105: started -2023/10/21-14:16:12.242645 7f7e677006c0 Level-0 table #105: 0 bytes OK -2023/10/21-14:16:12.248782 7f7e677006c0 Delete type=0 #103 -2023/10/21-14:16:12.269739 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/23-16:21:18.866233 7fc51b7fe6c0 Recovering log #112 +2023/10/23-16:21:18.876627 7fc51b7fe6c0 Delete type=3 #110 +2023/10/23-16:21:18.876726 7fc51b7fe6c0 Delete type=0 #112 +2023/10/23-16:38:21.562992 7fc299bff6c0 Level-0 table #117: started +2023/10/23-16:38:21.563052 7fc299bff6c0 Level-0 table #117: 0 bytes OK +2023/10/23-16:38:21.606768 7fc299bff6c0 Delete type=0 #115 +2023/10/23-16:38:21.649491 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/LOG.old b/packs/conditions/LOG.old index 5e54d65..300b7b7 100644 --- a/packs/conditions/LOG.old +++ b/packs/conditions/LOG.old @@ -1,7 +1,7 @@ -2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96 -2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94 -2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96 -2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/23-16:10:20.672216 7fc51bfff6c0 Recovering log #108 +2023/10/23-16:10:20.732577 7fc51bfff6c0 Delete type=3 #106 +2023/10/23-16:10:20.732730 7fc51bfff6c0 Delete type=0 #108 +2023/10/23-16:21:11.375247 7fc299bff6c0 Level-0 table #113: started +2023/10/23-16:21:11.375301 7fc299bff6c0 Level-0 table #113: 0 bytes OK +2023/10/23-16:21:11.384595 7fc299bff6c0 Delete type=0 #111 +2023/10/23-16:21:11.403049 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/MANIFEST-000102 b/packs/conditions/MANIFEST-000102 deleted file mode 100644 index 4a8beae879cb9d0fa8c29ccf4d48ee4d234ab7fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAeoyhUy@`{-yskz09 z23|Q~US;VOfq~(X7C8m}jEoFm0F$rEst7a5O?LGuPl^h)a4li{4v{~|-&w`Uz{n)e W$-u0@@}2RyQrdG6UjfKh0`dVt#V7gz diff --git a/packs/cybernetics/MANIFEST-000042 b/packs/cybernetics/MANIFEST-000042 new file mode 100644 index 0000000000000000000000000000000000000000..1161bcfe14d8505635a69a4fc31ccb74e65dd422 GIT binary patch literal 137 zcmZoa`1)rO10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1tp>yhUy@`{-yskz09 z23|Q~US;VOfq~(X7C8m}jEoFm0F$rEst7a5O?LGuPl^h)a4li{4v{|tN9B9?W`{?X_&WPlSf(+CLF6ObexBf9U}Q?? VWMIx<30vM9y$8h20CKZf!T@}{Ca(Yh diff --git a/packs/perks/MANIFEST-000114 b/packs/perks/MANIFEST-000114 new file mode 100644 index 0000000000000000000000000000000000000000..e30411d3dc1bd4207d1af97a77ef6b429c2a3af7 GIT binary patch literal 135 zcmaFg)p#w5fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ_3U{jdBx0<)ZAi4 z10P58bYCZz{B(a)Gsh@zMn(oOfXP>tN9B9?W`{?X_&WPlSf(+CLF8NXw^?v7FftW$ WGBB60giSoN?<(0W{SnG5`Po diff --git a/packs/skills/MANIFEST-000114 b/packs/skills/MANIFEST-000114 new file mode 100644 index 0000000000000000000000000000000000000000..dea5e3e6e26e7a0000640f4fda9eb395ccc95bd9 GIT binary patch literal 134 zcmaErvd}S+fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb+5C$VrEHdZn2_i zq*r*UdtzdGZl+;MdQur9BLf(~01mArng9R* literal 0 HcmV?d00001 diff --git a/packs/weapons/000105.log b/packs/weapons/000117.log similarity index 100% rename from packs/weapons/000105.log rename to packs/weapons/000117.log diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT index 1fb45e8..4843639 100644 --- a/packs/weapons/CURRENT +++ b/packs/weapons/CURRENT @@ -1 +1 @@ -MANIFEST-000103 +MANIFEST-000115 diff --git a/packs/weapons/LOG b/packs/weapons/LOG index abae579..fabb680 100644 --- a/packs/weapons/LOG +++ b/packs/weapons/LOG @@ -1,8 +1,8 @@ -2023/10/21-12:57:48.627611 7f8106ffd6c0 Recovering log #101 -2023/10/21-12:57:48.637461 7f8106ffd6c0 Delete type=3 #99 -2023/10/21-12:57:48.637525 7f8106ffd6c0 Delete type=0 #101 -2023/10/21-14:16:12.215327 7f7e677006c0 Level-0 table #106: started -2023/10/21-14:16:12.215350 7f7e677006c0 Level-0 table #106: 0 bytes OK -2023/10/21-14:16:12.221803 7f7e677006c0 Delete type=0 #104 -2023/10/21-14:16:12.242395 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) -2023/10/21-14:16:12.242444 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/23-16:21:18.853136 7fc51affd6c0 Recovering log #113 +2023/10/23-16:21:18.864323 7fc51affd6c0 Delete type=3 #111 +2023/10/23-16:21:18.864379 7fc51affd6c0 Delete type=0 #113 +2023/10/23-16:38:21.445678 7fc299bff6c0 Level-0 table #118: started +2023/10/23-16:38:21.445739 7fc299bff6c0 Level-0 table #118: 0 bytes OK +2023/10/23-16:38:21.519996 7fc299bff6c0 Delete type=0 #116 +2023/10/23-16:38:21.606911 7fc299bff6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/23-16:38:21.649518 7fc299bff6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/LOG.old b/packs/weapons/LOG.old index b61e304..b6ae7cd 100644 --- a/packs/weapons/LOG.old +++ b/packs/weapons/LOG.old @@ -1,8 +1,8 @@ -2023/10/21-09:46:53.214012 7f8105ffb6c0 Recovering log #97 -2023/10/21-09:46:53.225802 7f8105ffb6c0 Delete type=3 #95 -2023/10/21-09:46:53.225949 7f8105ffb6c0 Delete type=0 #97 -2023/10/21-10:25:16.639905 7f7e677006c0 Level-0 table #102: started -2023/10/21-10:25:16.639966 7f7e677006c0 Level-0 table #102: 0 bytes OK -2023/10/21-10:25:16.646212 7f7e677006c0 Delete type=0 #100 -2023/10/21-10:25:16.646343 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) -2023/10/21-10:25:16.646390 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/23-16:10:20.585116 7fc51affd6c0 Recovering log #109 +2023/10/23-16:10:20.661600 7fc51affd6c0 Delete type=3 #107 +2023/10/23-16:10:20.661671 7fc51affd6c0 Delete type=0 #109 +2023/10/23-16:21:11.367314 7fc299bff6c0 Level-0 table #114: started +2023/10/23-16:21:11.367340 7fc299bff6c0 Level-0 table #114: 0 bytes OK +2023/10/23-16:21:11.374984 7fc299bff6c0 Delete type=0 #112 +2023/10/23-16:21:11.394227 7fc299bff6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/23-16:21:11.403131 7fc299bff6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/MANIFEST-000103 b/packs/weapons/MANIFEST-000115 similarity index 74% rename from packs/weapons/MANIFEST-000103 rename to packs/weapons/MANIFEST-000115 index 33757210e0568e33f4b4e7cc78d30c0480636d7f..e4f3d8e2016fc17c73486745fc16da2139696167 100644 GIT binary patch delta 39 qcmZ3@xSDZ7x5AHuRogfj7@0~q8JJ61rZMKJ*#?66r9gf;kPiUxCkfgB delta 39 qcmZ3@xSDZ7w?fPw
-
    +
      {{#each system.attributes as |attr key|}}
    • @@ -38,7 +38,7 @@
    -
      +
        {{#each system.derivated as |deriv key|}}
      • @@ -60,6 +60,19 @@ {{/if}} + + {{#if (eq key "hp")}} +
          + {{#each @root.system.hitlocations as |loc key|}} +
        • + + + +
          • + {{/each}} +
        + {{/if}} + {{/each}}
      • diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index 672f204..cf068cc 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -24,7 +24,6 @@ {{/if}} {{#if weapon}}
      • Weapon : {{weapon.name}}
        • -
      • Location hit : {{upperFirst weaponAiming}} ({{locationMalus}})
        • {{/if}} {{#if isAboveEffectiveRange}}
      • Above effective range: yes, -30% applied
        • @@ -50,16 +49,17 @@ {{/if}} {{#if (and weapon isSuccess)}} +
      • Location hit : {{upperFirst weaponAiming}} ({{locationMalus}})
        • {{#if weapon.ammo}} -
      • Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]
        • +
      • Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}]]
      • BR: {{weapon.ammo.system.br}}
        • {{else}} {{#if weapon.system.hashpdamage}} -
      • Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]
        • +
      • Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}]]
        • {{/if}} {{#if weapon.system.hasfatiguedamage}} -
      • Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}*{{locationMultiplier}}]]
        • +
      • Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}]]
        • {{/if}}
      • BR: [[/r {{weapon.system.br}}]]
        • {{/if}}