From ab587740d8affa22f8b8f2b6ced486f13ea0e964 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 30 Aug 2023 09:46:43 +0200 Subject: [PATCH] Fix #25 --- changelog.md | 6 ++++ modules/hero6-actor.js | 31 +++++++++++----- modules/hero6-roll-dialog.js | 4 +-- modules/hero6-utility.js | 9 ----- .../complications/{000150.log => 000158.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 16 ++++----- packs/complications/LOG.old | 16 ++++----- packs/complications/MANIFEST-000148 | Bin 139 -> 0 bytes packs/complications/MANIFEST-000156 | Bin 0 -> 139 bytes packs/equipment/{000152.log => 000160.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 16 ++++----- packs/equipment/LOG.old | 16 ++++----- .../{MANIFEST-000150 => MANIFEST-000158} | Bin 177 -> 177 bytes packs/{skills => maneuvers}/000152.log | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 16 ++++----- packs/maneuvers/LOG.old | 16 ++++----- .../{MANIFEST-000142 => MANIFEST-000150} | Bin 173 -> 173 bytes .../000144.log => perks/000158.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 16 ++++----- packs/perks/LOG.old | 16 ++++----- packs/perks/MANIFEST-000148 | Bin 138 -> 0 bytes packs/perks/MANIFEST-000156 | Bin 0 -> 138 bytes packs/{perks/000150.log => powers/000159.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 16 ++++----- packs/powers/LOG.old | 16 ++++----- .../{MANIFEST-000149 => MANIFEST-000157} | Bin 173 -> 173 bytes .../{powers/000151.log => skills/000160.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 ++++----- packs/skills/LOG.old | 16 ++++----- packs/skills/MANIFEST-000150 | Bin 139 -> 0 bytes packs/skills/MANIFEST-000158 | Bin 0 -> 139 bytes packs/talents/{000150.log => 000158.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 16 ++++----- packs/talents/LOG.old | 16 ++++----- packs/talents/MANIFEST-000148 | Bin 138 -> 0 bytes packs/talents/MANIFEST-000156 | Bin 0 -> 138 bytes styles/simple.css | 5 ++- system.json | 4 +-- templates/apps/roll-dialog-generic.hbs | 33 ++++++++++-------- templates/chat/chat-generic-result.hbs | 12 +++++-- 47 files changed, 183 insertions(+), 159 deletions(-) rename packs/complications/{000150.log => 000158.log} (100%) delete mode 100644 packs/complications/MANIFEST-000148 create mode 100644 packs/complications/MANIFEST-000156 rename packs/equipment/{000152.log => 000160.log} (100%) rename packs/equipment/{MANIFEST-000150 => MANIFEST-000158} (72%) rename packs/{skills => maneuvers}/000152.log (100%) rename packs/maneuvers/{MANIFEST-000142 => MANIFEST-000150} (73%) rename packs/{maneuvers/000144.log => perks/000158.log} (100%) delete mode 100644 packs/perks/MANIFEST-000148 create mode 100644 packs/perks/MANIFEST-000156 rename packs/{perks/000150.log => powers/000159.log} (100%) rename packs/powers/{MANIFEST-000149 => MANIFEST-000157} (73%) rename packs/{powers/000151.log => skills/000160.log} (100%) delete mode 100644 packs/skills/MANIFEST-000150 create mode 100644 packs/skills/MANIFEST-000158 rename packs/talents/{000150.log => 000158.log} (100%) delete mode 100644 packs/talents/MANIFEST-000148 create mode 100644 packs/talents/MANIFEST-000156 diff --git a/changelog.md b/changelog.md index 9543894..265f1e1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,9 @@ +v11.0.20 + +- Enhance chat message output (cf #25) +- Enhance roll window +- Code simplification + v11.0.19 - Fix killing damage computation (again) diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index 8ef9c24..d4e7796 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -223,8 +223,10 @@ export class Hero6Actor extends Actor { /* -------------------------------------------- */ prepareManeuver(maneuver) { + let subMode = "normal" if (maneuver.system.maneuvertype == "mental") { - maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + subMode = "omcv" if (Number(maneuver.system.omcv)) { maneuver.roll += (Number(maneuver.system.omcv) || 0) } else { @@ -232,12 +234,14 @@ export class Hero6Actor extends Actor { } } else { maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + subMode = "ocv" if (Number(maneuver.system.ocv)) { maneuver.roll += (Number(maneuver.system.ocv) || 0) } else { maneuver.noOCV = true } } + return subMode } /* -------------------------------------------- */ @@ -637,6 +641,9 @@ export class Hero6Actor extends Actor { rollData.actorImg = this.img rollData.actorId = this.id rollData.img = this.img + rollData.title = this.name + rollData.subMode = "normal" + rollData.characteristics = duplicate(this.system.characteristics) if (chKey) { rollData.charac = duplicate(this.system.characteristics[chKey]) this.prepareCharacValues(rollData.charac) @@ -669,6 +676,7 @@ export class Hero6Actor extends Actor { rollPerception() { let rollData = this.getCommonRollData("int") rollData.isPerception = true + rollData.title = "Perception roll" rollData.charac.roll = Number(rollData.charac.perceptionroll) rollData.mode = "perception" if (rollData.target) { @@ -682,6 +690,7 @@ export class Hero6Actor extends Actor { rollCharac(chKey) { let rollData = this.getCommonRollData(chKey) rollData.mode = "charac" + rollData.title = "Characteristic roll" if (rollData.target) { ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.") return @@ -693,12 +702,13 @@ export class Hero6Actor extends Actor { let item = this.items.get(itemId) let rollData = this.getCommonRollData() rollData.mode = "item" + rollData.title = Hero6Utility.upperFirst(item.type) + " - " + item.name rollData.item = duplicate(item) if (item.type == "skill") { this.prepareSkill(rollData.item) } if (item.type == "maneuver") { - this.prepareManeuver(rollData.item) + rollData.subMode = this.prepareManeuver(rollData.item) } this.startRoll(rollData) } @@ -792,9 +802,10 @@ export class Hero6Actor extends Actor { if (weapon) { weapon = duplicate(weapon) let rollData = this.getCommonRollData() - rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0) + rollData.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0) + rollData.subMode = "ocv" rollData.mode = "weapon" - rollData.weapon = weapon + rollData.item = weapon rollData.img = weapon.img this.startRoll(rollData) } else { @@ -807,9 +818,9 @@ export class Hero6Actor extends Actor { if (maneuver) { maneuver = duplicate(maneuver) let rollData = this.getCommonRollData() - rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0) + rollData.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0) rollData.mode = "mentalmaneuver" - rollData.maneuver = maneuver + rollData.item = maneuver rollData.img = maneuver.img this.startRoll(rollData) } else { @@ -823,12 +834,14 @@ export class Hero6Actor extends Actor { power = duplicate(power) let rollData = this.getCommonRollData() if (power.system.attackvalue == "ocv") { - rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0) + rollData.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0) + rollData.subMode = "ocv" } else { - rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0) + rollData.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0) + rollData.subMode = "omcv" } rollData.mode = "powerattack" - rollData.power = power + rollData.item = power rollData.img = power.img this.startRoll(rollData) } else { diff --git a/modules/hero6-roll-dialog.js b/modules/hero6-roll-dialog.js index 457cf8f..6011fbb 100644 --- a/modules/hero6-roll-dialog.js +++ b/modules/hero6-roll-dialog.js @@ -5,7 +5,7 @@ export class Hero6RollDialog extends Dialog { /* -------------------------------------------- */ static async create(actor, rollData) { - let options = { classes: ["Hero6Dialog"], width: 460, height: 'fit-content', 'z-index': 99999 }; + let options = { classes: ["Hero6Dialog"], width: 320, height: 'fit-content', 'z-index': 99999 }; let html = await renderTemplate('systems/fvtt-hero-system-6/templates/apps/roll-dialog-generic.hbs', rollData); return new Hero6RollDialog(actor, rollData, html, options); @@ -14,7 +14,7 @@ export class Hero6RollDialog extends Dialog { /* -------------------------------------------- */ constructor(actor, rollData, html, options, close = undefined) { let conf = { - title: (rollData.mode == "skill") ? "Skill" : "Attribute", + title: "Roll window", content: html, buttons: { roll: { diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index 473fe8a..17e2ad7 100644 --- a/modules/hero6-utility.js +++ b/modules/hero6-utility.js @@ -350,15 +350,6 @@ export class Hero6Utility { let diceFormula = "3d6" let target = 10 - if(rollData.weapon) { - target = rollData.weaponRoll - } - if(rollData.maneuver) { - target = rollData.maneuverRoll - } - if(rollData.power) { - target = rollData.powerRoll - } if (rollData.charac) { target = rollData.charac.roll } diff --git a/packs/complications/000150.log b/packs/complications/000158.log similarity index 100% rename from packs/complications/000150.log rename to packs/complications/000158.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index 89e2564..c16f179 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000148 +MANIFEST-000156 diff --git a/packs/complications/LOG b/packs/complications/LOG index b9c8dbe..fc5d40e 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -2023/08/29-09:15:42.357191 7f2deb7fe6c0 Recovering log #146 -2023/08/29-09:15:42.368292 7f2deb7fe6c0 Delete type=3 #144 -2023/08/29-09:15:42.368357 7f2deb7fe6c0 Delete type=0 #146 -2023/08/29-09:15:56.203048 7f2b69bff6c0 Level-0 table #151: started -2023/08/29-09:15:56.203075 7f2b69bff6c0 Level-0 table #151: 0 bytes OK -2023/08/29-09:15:56.210550 7f2b69bff6c0 Delete type=0 #149 -2023/08/29-09:15:56.210858 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/29-09:15:56.210888 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/29-16:25:42.990569 7f2deaffd6c0 Recovering log #154 +2023/08/29-16:25:43.182272 7f2deaffd6c0 Delete type=3 #152 +2023/08/29-16:25:43.182363 7f2deaffd6c0 Delete type=0 #154 +2023/08/29-16:40:28.792648 7f2b69bff6c0 Level-0 table #159: started +2023/08/29-16:40:28.792681 7f2b69bff6c0 Level-0 table #159: 0 bytes OK +2023/08/29-16:40:28.800879 7f2b69bff6c0 Delete type=0 #157 +2023/08/29-16:40:28.808756 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/29-16:40:28.808800 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 2e95675..99ed347 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/28-17:21:57.663426 7f2deb7fe6c0 Recovering log #142 -2023/08/28-17:21:57.682985 7f2deb7fe6c0 Delete type=3 #140 -2023/08/28-17:21:57.683054 7f2deb7fe6c0 Delete type=0 #142 -2023/08/28-17:29:29.211967 7f2b69bff6c0 Level-0 table #147: started -2023/08/28-17:29:29.211992 7f2b69bff6c0 Level-0 table #147: 0 bytes OK -2023/08/28-17:29:29.220711 7f2b69bff6c0 Delete type=0 #145 -2023/08/28-17:29:29.243399 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/28-17:29:29.243448 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/29-16:09:59.520040 7f2deb7fe6c0 Recovering log #150 +2023/08/29-16:09:59.534549 7f2deb7fe6c0 Delete type=3 #148 +2023/08/29-16:09:59.534629 7f2deb7fe6c0 Delete type=0 #150 +2023/08/29-16:24:59.318786 7f2b69bff6c0 Level-0 table #155: started +2023/08/29-16:24:59.318844 7f2b69bff6c0 Level-0 table #155: 0 bytes OK +2023/08/29-16:24:59.325770 7f2b69bff6c0 Delete type=0 #153 +2023/08/29-16:24:59.342348 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/29-16:24:59.342392 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-000148 b/packs/complications/MANIFEST-000148 deleted file mode 100644 index 900443b3addb07e0e0be2821fac90369d0b55115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{xR!B3w-UpSy;)ogj7-xRIT@H|FtW(Zuvj(&BrpRcFbgOE0O<}1UH||9 delta 41 rcmZ3>xR!B3x01%Pm-$=_j7X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HF{5?ZqXD$Xtrm2ja X49wFQSy+sI=llZ+Oalqb015yA0;(gX diff --git a/packs/perks/MANIFEST-000156 b/packs/perks/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..b9bf14ef335df066a630b276b7dc980e7862b290 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=HFyyLO2DqIYVOmi7I X8JOoWvas~setrccFb^cK04M+eBxxlM literal 0 HcmV?d00001 diff --git a/packs/perks/000150.log b/packs/powers/000159.log similarity index 100% rename from packs/perks/000150.log rename to packs/powers/000159.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index 1dec270..5df89bd 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000149 +MANIFEST-000157 diff --git a/packs/powers/LOG b/packs/powers/LOG index 5710815..962b5da 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,8 @@ -2023/08/29-09:15:42.357219 7f2dea7fc6c0 Recovering log #147 -2023/08/29-09:15:42.368318 7f2dea7fc6c0 Delete type=3 #145 -2023/08/29-09:15:42.368432 7f2dea7fc6c0 Delete type=0 #147 -2023/08/29-09:15:56.195769 7f2b69bff6c0 Level-0 table #152: started -2023/08/29-09:15:56.195793 7f2b69bff6c0 Level-0 table #152: 0 bytes OK -2023/08/29-09:15:56.202903 7f2b69bff6c0 Delete type=0 #150 -2023/08/29-09:15:56.210821 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/29-09:15:56.210877 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/29-16:25:42.990448 7f2deb7fe6c0 Recovering log #155 +2023/08/29-16:25:43.154128 7f2deb7fe6c0 Delete type=3 #153 +2023/08/29-16:25:43.154225 7f2deb7fe6c0 Delete type=0 #155 +2023/08/29-16:40:28.776406 7f2b69bff6c0 Level-0 table #160: started +2023/08/29-16:40:28.776459 7f2b69bff6c0 Level-0 table #160: 0 bytes OK +2023/08/29-16:40:28.785118 7f2b69bff6c0 Delete type=0 #158 +2023/08/29-16:40:28.808720 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/29-16:40:28.808771 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 78b021b..3cd4aeb 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/28-17:21:57.662535 7f2debfff6c0 Recovering log #143 -2023/08/28-17:21:57.680123 7f2debfff6c0 Delete type=3 #141 -2023/08/28-17:21:57.680184 7f2debfff6c0 Delete type=0 #143 -2023/08/28-17:29:29.230042 7f2b69bff6c0 Level-0 table #148: started -2023/08/28-17:29:29.230073 7f2b69bff6c0 Level-0 table #148: 0 bytes OK -2023/08/28-17:29:29.236045 7f2b69bff6c0 Delete type=0 #146 -2023/08/28-17:29:29.243423 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/28-17:29:29.243467 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/29-16:09:59.520160 7f2debfff6c0 Recovering log #151 +2023/08/29-16:09:59.534547 7f2debfff6c0 Delete type=3 #149 +2023/08/29-16:09:59.534665 7f2debfff6c0 Delete type=0 #151 +2023/08/29-16:24:59.305197 7f2b69bff6c0 Level-0 table #156: started +2023/08/29-16:24:59.305251 7f2b69bff6c0 Level-0 table #156: 0 bytes OK +2023/08/29-16:24:59.312157 7f2b69bff6c0 Delete type=0 #154 +2023/08/29-16:24:59.312296 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/29-16:24:59.312312 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-000149 b/packs/powers/MANIFEST-000157 similarity index 73% rename from packs/powers/MANIFEST-000149 rename to packs/powers/MANIFEST-000157 index 658b9d9c50cebdff493dfeefc809e2924d794b85..ab8bce70785e1968d8f8d479a4cc47e0e5ba5221 100644 GIT binary patch delta 41 scmZ3>xR!B3x01Zw-&I@;j7;+wIT@JeGqR*j?lW2s5||GXSO^pV0Q1!fCjbBd delta 41 scmZ3>xR!B3w-UoH>9br6j7-xQIT@IzGqR-V>n&ji2}}nG%mfMm0M@Dqs{jB1 diff --git a/packs/powers/000151.log b/packs/skills/000160.log similarity index 100% rename from packs/powers/000151.log rename to packs/skills/000160.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 939d9b8..9bad6d5 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000150 +MANIFEST-000158 diff --git a/packs/skills/LOG b/packs/skills/LOG index 8dba2a4..7d6dfd4 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/08/29-09:15:42.343665 7f2deb7fe6c0 Recovering log #148 -2023/08/29-09:15:42.353489 7f2deb7fe6c0 Delete type=3 #146 -2023/08/29-09:15:42.353571 7f2deb7fe6c0 Delete type=0 #148 -2023/08/29-09:15:56.189045 7f2b69bff6c0 Level-0 table #153: started -2023/08/29-09:15:56.189069 7f2b69bff6c0 Level-0 table #153: 0 bytes OK -2023/08/29-09:15:56.195646 7f2b69bff6c0 Delete type=0 #151 -2023/08/29-09:15:56.210796 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/29-09:15:56.210867 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/29-16:25:42.891392 7f2dea7fc6c0 Recovering log #156 +2023/08/29-16:25:42.986777 7f2dea7fc6c0 Delete type=3 #154 +2023/08/29-16:25:42.986886 7f2dea7fc6c0 Delete type=0 #156 +2023/08/29-16:40:28.763206 7f2b69bff6c0 Level-0 table #161: started +2023/08/29-16:40:28.763254 7f2b69bff6c0 Level-0 table #161: 0 bytes OK +2023/08/29-16:40:28.775955 7f2b69bff6c0 Delete type=0 #159 +2023/08/29-16:40:28.776250 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/29-16:40:28.776293 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 4afe411..e173467 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/08/28-17:21:57.646376 7f2dea7fc6c0 Recovering log #144 -2023/08/28-17:21:57.660740 7f2dea7fc6c0 Delete type=3 #142 -2023/08/28-17:21:57.660805 7f2dea7fc6c0 Delete type=0 #144 -2023/08/28-17:29:29.220843 7f2b69bff6c0 Level-0 table #149: started -2023/08/28-17:29:29.220875 7f2b69bff6c0 Level-0 table #149: 0 bytes OK -2023/08/28-17:29:29.229929 7f2b69bff6c0 Delete type=0 #147 -2023/08/28-17:29:29.243414 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/28-17:29:29.243438 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/29-16:09:59.496231 7f2deb7fe6c0 Recovering log #152 +2023/08/29-16:09:59.514870 7f2deb7fe6c0 Delete type=3 #150 +2023/08/29-16:09:59.515006 7f2deb7fe6c0 Delete type=0 #152 +2023/08/29-16:24:59.297215 7f2b69bff6c0 Level-0 table #157: started +2023/08/29-16:24:59.297268 7f2b69bff6c0 Level-0 table #157: 0 bytes OK +2023/08/29-16:24:59.304916 7f2b69bff6c0 Delete type=0 #155 +2023/08/29-16:24:59.312266 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/29-16:24:59.312303 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-000150 b/packs/skills/MANIFEST-000150 deleted file mode 100644 index 1ebeec4d60f5d8d1ca5ebec33784069342376c5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAMfoE2OQj7-xR YIT@H|FtXT8{;t>u5|{xJm<1F700BHB{Qv*} diff --git a/packs/skills/MANIFEST-000158 b/packs/skills/MANIFEST-000158 new file mode 100644 index 0000000000000000000000000000000000000000..fe6475cf9693825500e8d5c4aa28031f5bf20af6 GIT binary patch literal 139 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoA10yW_YR7@6iX YaxyS4U}Ujz+Z);o5?BBdSOgRR02HqzeE`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|`B~M;lerienWi#w XGB8hLWZ^5@B)bkIFbyOy11JChMJgns diff --git a/packs/talents/MANIFEST-000156 b/packs/talents/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..c819cbe4327b8369d3bd42ae3e5d447d3e3285ea 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|`PT0(C0q=QOmi7I X8JOoWvhaBcO=kfK%mWE5015yAMTsOY literal 0 HcmV?d00001 diff --git a/styles/simple.css b/styles/simple.css index 123fb27..96db9b3 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -821,10 +821,13 @@ ul, li { .roll-dialog-header { height: 52px; } - +.dialog-roll-title { + margin-left: 8px; +} .actor-icon { float: left; width: 48px; + max-width: 48px; height: 48px; padding: 2px 6px 2px 2px; } diff --git a/system.json b/system.json index e769add..98dc4a1 100644 --- a/system.json +++ b/system.json @@ -91,14 +91,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.19", + "version": "11.0.20", "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.19.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.20.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/apps/roll-dialog-generic.hbs b/templates/apps/roll-dialog-generic.hbs index 1645b01..0c644cc 100644 --- a/templates/apps/roll-dialog-generic.hbs +++ b/templates/apps/roll-dialog-generic.hbs @@ -1,9 +1,11 @@
- {{#if img}} - - {{/if}} -

{{title}}

+
+ {{#if img}} + + {{/if}} +

{{title}}

+
@@ -15,24 +17,25 @@
{{/if}} - {{#if weapon}} + {{#if (eq subMode "ocv")}}
- {{weapon.name}} : - {{weaponRoll}}- + OCV : + {{characteristics.ocv.value}} +
+
+ {{upperFirst item.type}} OCV : + {{fixNum item.system.ocv}}
{{/if}} - {{#if maneuver}} + {{#if (eq subMode "omcv")}}
- {{maneuver.name}} : - {{maneuverRoll}}- + OMCV : + {{characteristics.omcv.value}}
- {{/if}} - - {{#if power}}
- {{power.name}} : - {{powerRoll}}- + {{upperFirst item.type}} OMCV : + {{fixNum item.system.omcv}}
{{/if}} diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index 113ac9d..63cc031 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -57,7 +57,7 @@
  • TOTAL : {{result}} {{#if (exists margin)}} - ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}}) + ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}}) {{/if}}
    • @@ -66,7 +66,15 @@ {{/if}} {{#if (exists margin)}} -
  • Margin : {{margin}} + {{#if (eq subMode "normal")}} +
  • Margin : {{margin}} + {{/if}} + {{#if (eq subMode "ocv")}} +
  • Margin (DCV Hit): {{margin}} + {{/if}} + {{#if (eq subMode "omcv")}} +
  • Margin (DMCV Hit): {{margin}} + {{/if}} {{/if}}