public/fvtt-hero-system-6
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 40 Wiki Activity

Fix #25

Browse Source
This commit is contained in:
LeRatierBretonnien 2023-08-30 09:46:43 +02:00
parent 0f4fe253e0
commit ab587740d8
47 changed files with 183 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelog.md
View File

@ -1,3 +1,9 @@
v11.0.20
- Enhance chat message output (cf #25)
- Enhance roll window
- Code simplification
v11.0.19 v11.0.19
- Fix killing damage computation (again) - Fix killing damage computation (again)

31
modules/hero6-actor.js
View File

@ -223,8 +223,10 @@ export class Hero6Actor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
prepareManeuver(maneuver) { prepareManeuver(maneuver) {
let subMode = "normal"
if (maneuver.system.maneuvertype == "mental") { 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)) { if (Number(maneuver.system.omcv)) {
maneuver.roll += (Number(maneuver.system.omcv) || 0) maneuver.roll += (Number(maneuver.system.omcv) || 0)
} else { } else {
@ -232,12 +234,14 @@ export class Hero6Actor extends Actor {
} }
} else { } else {
maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
subMode = "ocv"
if (Number(maneuver.system.ocv)) { if (Number(maneuver.system.ocv)) {
maneuver.roll += (Number(maneuver.system.ocv) || 0) maneuver.roll += (Number(maneuver.system.ocv) || 0)
} else { } else {
maneuver.noOCV = true maneuver.noOCV = true
} }
} }
return subMode
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -637,6 +641,9 @@ export class Hero6Actor extends Actor {
rollData.actorImg = this.img rollData.actorImg = this.img
rollData.actorId = this.id rollData.actorId = this.id
rollData.img = this.img rollData.img = this.img
rollData.title = this.name
rollData.subMode = "normal"
rollData.characteristics = duplicate(this.system.characteristics)
if (chKey) { if (chKey) {
rollData.charac = duplicate(this.system.characteristics[chKey]) rollData.charac = duplicate(this.system.characteristics[chKey])
this.prepareCharacValues(rollData.charac) this.prepareCharacValues(rollData.charac)
@ -669,6 +676,7 @@ export class Hero6Actor extends Actor {
rollPerception() { rollPerception() {
let rollData = this.getCommonRollData("int") let rollData = this.getCommonRollData("int")
rollData.isPerception = true rollData.isPerception = true
rollData.title = "Perception roll"
rollData.charac.roll = Number(rollData.charac.perceptionroll) rollData.charac.roll = Number(rollData.charac.perceptionroll)
rollData.mode = "perception" rollData.mode = "perception"
if (rollData.target) { if (rollData.target) {
@ -682,6 +690,7 @@ export class Hero6Actor extends Actor {
rollCharac(chKey) { rollCharac(chKey) {
let rollData = this.getCommonRollData(chKey) let rollData = this.getCommonRollData(chKey)
rollData.mode = "charac" rollData.mode = "charac"
rollData.title = "Characteristic roll"
if (rollData.target) { if (rollData.target) {
ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.") ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
return return
@ -693,12 +702,13 @@ export class Hero6Actor extends Actor {
let item = this.items.get(itemId) let item = this.items.get(itemId)
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
rollData.mode = "item" rollData.mode = "item"
rollData.title = Hero6Utility.upperFirst(item.type) + " - " + item.name
rollData.item = duplicate(item) rollData.item = duplicate(item)
if (item.type == "skill") { if (item.type == "skill") {
this.prepareSkill(rollData.item) this.prepareSkill(rollData.item)
} }
if (item.type == "maneuver") { if (item.type == "maneuver") {
this.prepareManeuver(rollData.item) rollData.subMode = this.prepareManeuver(rollData.item)
} }
this.startRoll(rollData) this.startRoll(rollData)
} }
@ -792,9 +802,10 @@ export class Hero6Actor extends Actor {
if (weapon) { if (weapon) {
weapon = duplicate(weapon) weapon = duplicate(weapon)
let rollData = this.getCommonRollData() 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.mode = "weapon"
rollData.weapon = weapon rollData.item = weapon
rollData.img = weapon.img rollData.img = weapon.img
this.startRoll(rollData) this.startRoll(rollData)
} else { } else {
@ -807,9 +818,9 @@ export class Hero6Actor extends Actor {
if (maneuver) { if (maneuver) {
maneuver = duplicate(maneuver) maneuver = duplicate(maneuver)
let rollData = this.getCommonRollData() 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.mode = "mentalmaneuver"
rollData.maneuver = maneuver rollData.item = maneuver
rollData.img = maneuver.img rollData.img = maneuver.img
this.startRoll(rollData) this.startRoll(rollData)
} else { } else {
@ -823,12 +834,14 @@ export class Hero6Actor extends Actor {
power = duplicate(power) power = duplicate(power)
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
if (power.system.attackvalue == "ocv") { 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 { } 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.mode = "powerattack"
rollData.power = power rollData.item = power
rollData.img = power.img rollData.img = power.img
this.startRoll(rollData) this.startRoll(rollData)
} else { } else {

4
modules/hero6-roll-dialog.js
View File

@ -5,7 +5,7 @@ export class Hero6RollDialog extends Dialog {
/* -------------------------------------------- */ /* -------------------------------------------- */
static async create(actor, rollData) { 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); let html = await renderTemplate('systems/fvtt-hero-system-6/templates/apps/roll-dialog-generic.hbs', rollData);
return new Hero6RollDialog(actor, rollData, html, options); return new Hero6RollDialog(actor, rollData, html, options);
@ -14,7 +14,7 @@ export class Hero6RollDialog extends Dialog {
/* -------------------------------------------- */ /* -------------------------------------------- */
constructor(actor, rollData, html, options, close = undefined) { constructor(actor, rollData, html, options, close = undefined) {
let conf = { let conf = {
title: (rollData.mode == "skill") ? "Skill" : "Attribute", title: "Roll window",
content: html, content: html,
buttons: { buttons: {
roll: { roll: {

9
modules/hero6-utility.js
View File

@ -350,15 +350,6 @@ export class Hero6Utility {
let diceFormula = "3d6" let diceFormula = "3d6"
let target = 10 let target = 10
if(rollData.weapon) {
target = rollData.weaponRoll
}
if(rollData.maneuver) {
target = rollData.maneuverRoll
}
if(rollData.power) {
target = rollData.powerRoll
}
if (rollData.charac) { if (rollData.charac) {
target = rollData.charac.roll target = rollData.charac.roll
} }

0
packs/complications/000150.log → packs/complications/000158.log
View File

2
packs/complications/CURRENT
View File

@ -1 +1 @@
MANIFEST-000148 MANIFEST-000156

16
packs/complications/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.357191 7f2deb7fe6c0 Recovering log #146 2023/08/29-16:25:42.990569 7f2deaffd6c0 Recovering log #154
2023/08/29-09:15:42.368292 7f2deb7fe6c0 Delete type=3 #144 2023/08/29-16:25:43.182272 7f2deaffd6c0 Delete type=3 #152
2023/08/29-09:15:42.368357 7f2deb7fe6c0 Delete type=0 #146 2023/08/29-16:25:43.182363 7f2deaffd6c0 Delete type=0 #154
2023/08/29-09:15:56.203048 7f2b69bff6c0 Level-0 table #151: started 2023/08/29-16:40:28.792648 7f2b69bff6c0 Level-0 table #159: started
2023/08/29-09:15:56.203075 7f2b69bff6c0 Level-0 table #151: 0 bytes OK 2023/08/29-16:40:28.792681 7f2b69bff6c0 Level-0 table #159: 0 bytes OK
2023/08/29-09:15:56.210550 7f2b69bff6c0 Delete type=0 #149 2023/08/29-16:40:28.800879 7f2b69bff6c0 Delete type=0 #157
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-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-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:40:28.808800 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

16
packs/complications/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.663426 7f2deb7fe6c0 Recovering log #142 2023/08/29-16:09:59.520040 7f2deb7fe6c0 Recovering log #150
2023/08/28-17:21:57.682985 7f2deb7fe6c0 Delete type=3 #140 2023/08/29-16:09:59.534549 7f2deb7fe6c0 Delete type=3 #148
2023/08/28-17:21:57.683054 7f2deb7fe6c0 Delete type=0 #142 2023/08/29-16:09:59.534629 7f2deb7fe6c0 Delete type=0 #150
2023/08/28-17:29:29.211967 7f2b69bff6c0 Level-0 table #147: started 2023/08/29-16:24:59.318786 7f2b69bff6c0 Level-0 table #155: started
2023/08/28-17:29:29.211992 7f2b69bff6c0 Level-0 table #147: 0 bytes OK 2023/08/29-16:24:59.318844 7f2b69bff6c0 Level-0 table #155: 0 bytes OK
2023/08/28-17:29:29.220711 7f2b69bff6c0 Delete type=0 #145 2023/08/29-16:24:59.325770 7f2b69bff6c0 Delete type=0 #153
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/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/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:24:59.342392 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

BIN
packs/complications/MANIFEST-000148
View File

Binary file not shown.

BIN
packs/complications/MANIFEST-000156 Normal file
View File

Binary file not shown.

0
packs/equipment/000152.log → packs/equipment/000160.log
View File

2
packs/equipment/CURRENT
View File

@ -1 +1 @@
MANIFEST-000150 MANIFEST-000158

16
packs/equipment/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.343661 7f2deaffd6c0 Recovering log #148 2023/08/29-16:25:42.891384 7f2deb7fe6c0 Recovering log #156
2023/08/29-09:15:42.353556 7f2deaffd6c0 Delete type=3 #146 2023/08/29-16:25:42.986762 7f2deb7fe6c0 Delete type=3 #154
2023/08/29-09:15:42.353624 7f2deaffd6c0 Delete type=0 #148 2023/08/29-16:25:42.986861 7f2deb7fe6c0 Delete type=0 #156
2023/08/29-09:15:56.182688 7f2b69bff6c0 Level-0 table #153: started 2023/08/29-16:40:28.741963 7f2b69bff6c0 Level-0 table #161: started
2023/08/29-09:15:56.182720 7f2b69bff6c0 Level-0 table #153: 0 bytes OK 2023/08/29-16:40:28.742013 7f2b69bff6c0 Level-0 table #161: 0 bytes OK
2023/08/29-09:15:56.188926 7f2b69bff6c0 Delete type=0 #151 2023/08/29-16:40:28.749774 7f2b69bff6c0 Delete type=0 #159
2023/08/29-09:15:56.203038 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.776172 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
2023/08/29-09:15:56.210844 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.776271 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

16
packs/equipment/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.646235 7f2debfff6c0 Recovering log #144 2023/08/29-16:09:59.496232 7f2dea7fc6c0 Recovering log #152
2023/08/28-17:21:57.657147 7f2debfff6c0 Delete type=3 #142 2023/08/29-16:09:59.514894 7f2dea7fc6c0 Delete type=3 #150
2023/08/28-17:21:57.657220 7f2debfff6c0 Delete type=0 #144 2023/08/29-16:09:59.515025 7f2dea7fc6c0 Delete type=0 #152
2023/08/28-17:29:29.191960 7f2b69bff6c0 Level-0 table #149: started 2023/08/29-16:24:59.281362 7f2b69bff6c0 Level-0 table #157: started
2023/08/28-17:29:29.191991 7f2b69bff6c0 Level-0 table #149: 0 bytes OK 2023/08/29-16:24:59.281398 7f2b69bff6c0 Level-0 table #157: 0 bytes OK
2023/08/28-17:29:29.199910 7f2b69bff6c0 Delete type=0 #147 2023/08/29-16:24:59.289117 7f2b69bff6c0 Delete type=0 #155
2023/08/28-17:29:29.200069 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.305137 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
2023/08/28-17:29:29.211797 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.312278 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

BIN
packs/equipment/MANIFEST-000150 → packs/equipment/MANIFEST-000158
View File

Binary file not shown.

0
packs/skills/000152.log → packs/maneuvers/000152.log
View File

2
packs/maneuvers/CURRENT
View File

@ -1 +1 @@
MANIFEST-000142 MANIFEST-000150

16
packs/maneuvers/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.370537 7f2debfff6c0 Recovering log #140 2023/08/29-16:25:43.164843 7f2debfff6c0 Recovering log #148
2023/08/29-09:15:42.387404 7f2debfff6c0 Delete type=3 #138 2023/08/29-16:25:43.338845 7f2debfff6c0 Delete type=3 #146
2023/08/29-09:15:42.387482 7f2debfff6c0 Delete type=0 #140 2023/08/29-16:25:43.338920 7f2debfff6c0 Delete type=0 #148
2023/08/29-09:15:56.210998 7f2b69bff6c0 Level-0 table #145: started 2023/08/29-16:40:28.801017 7f2b69bff6c0 Level-0 table #153: started
2023/08/29-09:15:56.211022 7f2b69bff6c0 Level-0 table #145: 0 bytes OK 2023/08/29-16:40:28.801061 7f2b69bff6c0 Level-0 table #153: 0 bytes OK
2023/08/29-09:15:56.220377 7f2b69bff6c0 Delete type=0 #143 2023/08/29-16:40:28.808558 7f2b69bff6c0 Delete type=0 #151
2023/08/29-09:15:56.246099 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.808780 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
2023/08/29-09:15:56.246149 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.808811 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

16
packs/maneuvers/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.686488 7f2dea7fc6c0 Recovering log #136 2023/08/29-16:09:59.537488 7f2debfff6c0 Recovering log #144
2023/08/28-17:21:57.696930 7f2dea7fc6c0 Delete type=3 #134 2023/08/29-16:09:59.555680 7f2debfff6c0 Delete type=3 #142
2023/08/28-17:21:57.696989 7f2dea7fc6c0 Delete type=0 #136 2023/08/29-16:09:59.555787 7f2debfff6c0 Delete type=0 #144
2023/08/28-17:29:29.236177 7f2b69bff6c0 Level-0 table #141: started 2023/08/29-16:24:59.334341 7f2b69bff6c0 Level-0 table #149: started
2023/08/28-17:29:29.236204 7f2b69bff6c0 Level-0 table #141: 0 bytes OK 2023/08/29-16:24:59.334391 7f2b69bff6c0 Level-0 table #149: 0 bytes OK
2023/08/28-17:29:29.243295 7f2b69bff6c0 Delete type=0 #139 2023/08/29-16:24:59.342219 7f2b69bff6c0 Delete type=0 #147
2023/08/28-17:29:29.243432 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.342377 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
2023/08/28-17:29:29.243457 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.342413 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

BIN
packs/maneuvers/MANIFEST-000142 → packs/maneuvers/MANIFEST-000150
View File

Binary file not shown.

0
packs/maneuvers/000144.log → packs/perks/000158.log
View File

2
packs/perks/CURRENT
View File

@ -1 +1 @@
MANIFEST-000148 MANIFEST-000156

16
packs/perks/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.371336 7f2deb7fe6c0 Recovering log #146 2023/08/29-16:25:43.185065 7f2dea7fc6c0 Recovering log #154
2023/08/29-09:15:42.390934 7f2deb7fe6c0 Delete type=3 #144 2023/08/29-16:25:43.371993 7f2dea7fc6c0 Delete type=3 #152
2023/08/29-09:15:42.390982 7f2deb7fe6c0 Delete type=0 #146 2023/08/29-16:25:43.372074 7f2dea7fc6c0 Delete type=0 #154
2023/08/29-09:15:56.220622 7f2b69bff6c0 Level-0 table #151: started 2023/08/29-16:40:28.785308 7f2b69bff6c0 Level-0 table #159: started
2023/08/29-09:15:56.220687 7f2b69bff6c0 Level-0 table #151: 0 bytes OK 2023/08/29-16:40:28.785364 7f2b69bff6c0 Level-0 table #159: 0 bytes OK
2023/08/29-09:15:56.232894 7f2b69bff6c0 Delete type=0 #149 2023/08/29-16:40:28.792517 7f2b69bff6c0 Delete type=0 #157
2023/08/29-09:15:56.246119 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.808742 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
2023/08/29-09:15:56.246163 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.808790 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

16
packs/perks/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.686488 7f2deb7fe6c0 Recovering log #142 2023/08/29-16:09:59.537875 7f2dea7fc6c0 Recovering log #150
2023/08/28-17:21:57.696930 7f2deb7fe6c0 Delete type=3 #140 2023/08/29-16:09:59.558667 7f2dea7fc6c0 Delete type=3 #148
2023/08/28-17:21:57.696987 7f2deb7fe6c0 Delete type=0 #142 2023/08/29-16:09:59.558997 7f2dea7fc6c0 Delete type=0 #150
2023/08/28-17:29:29.243529 7f2b69bff6c0 Level-0 table #147: started 2023/08/29-16:24:59.312392 7f2b69bff6c0 Level-0 table #155: started
2023/08/28-17:29:29.243588 7f2b69bff6c0 Level-0 table #147: 0 bytes OK 2023/08/29-16:24:59.312430 7f2b69bff6c0 Level-0 table #155: 0 bytes OK
2023/08/28-17:29:29.249717 7f2b69bff6c0 Delete type=0 #145 2023/08/29-16:24:59.318578 7f2b69bff6c0 Delete type=0 #153
2023/08/28-17:29:29.256287 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.342333 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
2023/08/28-17:29:29.256310 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.342384 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

BIN
packs/perks/MANIFEST-000148
View File

Binary file not shown.

BIN
packs/perks/MANIFEST-000156 Normal file
View File

Binary file not shown.

0
packs/perks/000150.log → packs/powers/000159.log
View File

2
packs/powers/CURRENT
View File

@ -1 +1 @@
MANIFEST-000149 MANIFEST-000157

16
packs/powers/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.357219 7f2dea7fc6c0 Recovering log #147 2023/08/29-16:25:42.990448 7f2deb7fe6c0 Recovering log #155
2023/08/29-09:15:42.368318 7f2dea7fc6c0 Delete type=3 #145 2023/08/29-16:25:43.154128 7f2deb7fe6c0 Delete type=3 #153
2023/08/29-09:15:42.368432 7f2dea7fc6c0 Delete type=0 #147 2023/08/29-16:25:43.154225 7f2deb7fe6c0 Delete type=0 #155
2023/08/29-09:15:56.195769 7f2b69bff6c0 Level-0 table #152: started 2023/08/29-16:40:28.776406 7f2b69bff6c0 Level-0 table #160: started
2023/08/29-09:15:56.195793 7f2b69bff6c0 Level-0 table #152: 0 bytes OK 2023/08/29-16:40:28.776459 7f2b69bff6c0 Level-0 table #160: 0 bytes OK
2023/08/29-09:15:56.202903 7f2b69bff6c0 Delete type=0 #150 2023/08/29-16:40:28.785118 7f2b69bff6c0 Delete type=0 #158
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-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-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:40:28.808771 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

16
packs/powers/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.662535 7f2debfff6c0 Recovering log #143 2023/08/29-16:09:59.520160 7f2debfff6c0 Recovering log #151
2023/08/28-17:21:57.680123 7f2debfff6c0 Delete type=3 #141 2023/08/29-16:09:59.534547 7f2debfff6c0 Delete type=3 #149
2023/08/28-17:21:57.680184 7f2debfff6c0 Delete type=0 #143 2023/08/29-16:09:59.534665 7f2debfff6c0 Delete type=0 #151
2023/08/28-17:29:29.230042 7f2b69bff6c0 Level-0 table #148: started 2023/08/29-16:24:59.305197 7f2b69bff6c0 Level-0 table #156: started
2023/08/28-17:29:29.230073 7f2b69bff6c0 Level-0 table #148: 0 bytes OK 2023/08/29-16:24:59.305251 7f2b69bff6c0 Level-0 table #156: 0 bytes OK
2023/08/28-17:29:29.236045 7f2b69bff6c0 Delete type=0 #146 2023/08/29-16:24:59.312157 7f2b69bff6c0 Delete type=0 #154
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/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/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:24:59.312312 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

BIN
packs/powers/MANIFEST-000149 → packs/powers/MANIFEST-000157
View File

Binary file not shown.

0
packs/powers/000151.log → packs/skills/000160.log
View File

2
packs/skills/CURRENT
View File

@ -1 +1 @@
MANIFEST-000150 MANIFEST-000158

16
packs/skills/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.343665 7f2deb7fe6c0 Recovering log #148 2023/08/29-16:25:42.891392 7f2dea7fc6c0 Recovering log #156
2023/08/29-09:15:42.353489 7f2deb7fe6c0 Delete type=3 #146 2023/08/29-16:25:42.986777 7f2dea7fc6c0 Delete type=3 #154
2023/08/29-09:15:42.353571 7f2deb7fe6c0 Delete type=0 #148 2023/08/29-16:25:42.986886 7f2dea7fc6c0 Delete type=0 #156
2023/08/29-09:15:56.189045 7f2b69bff6c0 Level-0 table #153: started 2023/08/29-16:40:28.763206 7f2b69bff6c0 Level-0 table #161: started
2023/08/29-09:15:56.189069 7f2b69bff6c0 Level-0 table #153: 0 bytes OK 2023/08/29-16:40:28.763254 7f2b69bff6c0 Level-0 table #161: 0 bytes OK
2023/08/29-09:15:56.195646 7f2b69bff6c0 Delete type=0 #151 2023/08/29-16:40:28.775955 7f2b69bff6c0 Delete type=0 #159
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-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-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:40:28.776293 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

16
packs/skills/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.646376 7f2dea7fc6c0 Recovering log #144 2023/08/29-16:09:59.496231 7f2deb7fe6c0 Recovering log #152
2023/08/28-17:21:57.660740 7f2dea7fc6c0 Delete type=3 #142 2023/08/29-16:09:59.514870 7f2deb7fe6c0 Delete type=3 #150
2023/08/28-17:21:57.660805 7f2dea7fc6c0 Delete type=0 #144 2023/08/29-16:09:59.515006 7f2deb7fe6c0 Delete type=0 #152
2023/08/28-17:29:29.220843 7f2b69bff6c0 Level-0 table #149: started 2023/08/29-16:24:59.297215 7f2b69bff6c0 Level-0 table #157: started
2023/08/28-17:29:29.220875 7f2b69bff6c0 Level-0 table #149: 0 bytes OK 2023/08/29-16:24:59.297268 7f2b69bff6c0 Level-0 table #157: 0 bytes OK
2023/08/28-17:29:29.229929 7f2b69bff6c0 Delete type=0 #147 2023/08/29-16:24:59.304916 7f2b69bff6c0 Delete type=0 #155
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/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/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:24:59.312303 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

BIN
packs/skills/MANIFEST-000150
View File

Binary file not shown.

BIN
packs/skills/MANIFEST-000158 Normal file
View File

Binary file not shown.

0
packs/talents/000150.log → packs/talents/000158.log
View File

2
packs/talents/CURRENT
View File

@ -1 +1 @@
MANIFEST-000148 MANIFEST-000156

16
packs/talents/LOG
View File

@ -1,8 +1,8 @@
2023/08/29-09:15:42.388946 7f2dea7fc6c0 Recovering log #146 2023/08/29-16:25:43.341031 7f2deb7fe6c0 Recovering log #154
2023/08/29-09:15:42.400606 7f2dea7fc6c0 Delete type=3 #144 2023/08/29-16:25:43.476661 7f2deb7fe6c0 Delete type=3 #152
2023/08/29-09:15:42.400678 7f2dea7fc6c0 Delete type=0 #146 2023/08/29-16:25:43.476735 7f2deb7fe6c0 Delete type=0 #154
2023/08/29-09:15:56.233085 7f2b69bff6c0 Level-0 table #151: started 2023/08/29-16:40:28.808880 7f2b69bff6c0 Level-0 table #159: started
2023/08/29-09:15:56.233132 7f2b69bff6c0 Level-0 table #151: 0 bytes OK 2023/08/29-16:40:28.808911 7f2b69bff6c0 Level-0 table #159: 0 bytes OK
2023/08/29-09:15:56.245913 7f2b69bff6c0 Delete type=0 #149 2023/08/29-16:40:28.815205 7f2b69bff6c0 Delete type=0 #157
2023/08/29-09:15:56.246135 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.815419 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
2023/08/29-09:15:56.246177 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) 2023/08/29-16:40:28.815460 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

16
packs/talents/LOG.old
View File

@ -1,8 +1,8 @@
2023/08/28-17:21:57.699870 7f2deaffd6c0 Recovering log #142 2023/08/29-16:09:59.560765 7f2deaffd6c0 Recovering log #150
2023/08/28-17:21:57.710300 7f2deaffd6c0 Delete type=3 #140 2023/08/29-16:09:59.570734 7f2deaffd6c0 Delete type=3 #148
2023/08/28-17:21:57.710358 7f2deaffd6c0 Delete type=0 #142 2023/08/29-16:09:59.570804 7f2deaffd6c0 Delete type=0 #150
2023/08/28-17:29:29.249818 7f2b69bff6c0 Level-0 table #147: started 2023/08/29-16:24:59.325881 7f2b69bff6c0 Level-0 table #155: started
2023/08/28-17:29:29.249840 7f2b69bff6c0 Level-0 table #147: 0 bytes OK 2023/08/29-16:24:59.325905 7f2b69bff6c0 Level-0 table #155: 0 bytes OK
2023/08/28-17:29:29.256178 7f2b69bff6c0 Delete type=0 #145 2023/08/29-16:24:59.334131 7f2b69bff6c0 Delete type=0 #153
2023/08/28-17:29:29.256297 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.342366 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
2023/08/28-17:29:29.256320 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) 2023/08/29-16:24:59.342401 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

BIN
packs/talents/MANIFEST-000148
View File

Binary file not shown.

BIN
packs/talents/MANIFEST-000156 Normal file
View File

Binary file not shown.

5
styles/simple.css
View File

@ -821,10 +821,13 @@ ul, li {
.roll-dialog-header { .roll-dialog-header {
height: 52px; height: 52px;
} }
.dialog-roll-title {
margin-left: 8px;
}
.actor-icon { .actor-icon {
float: left; float: left;
width: 48px; width: 48px;
max-width: 48px;
height: 48px; height: 48px;
padding: 2px 6px 2px 2px; padding: 2px 6px 2px 2px;
} }

4
system.json
View File

@ -91,14 +91,14 @@
"styles": [ "styles": [
"styles/simple.css" "styles/simple.css"
], ],
"version": "11.0.19", "version": "11.0.20",
"compatibility": { "compatibility": {
"minimum": "11", "minimum": "11",
"verified": "11" "verified": "11"
}, },
"title": "Hero System 6E Basic (Official)", "title": "Hero System 6E Basic (Official)",
"manifest": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/raw/branch/master/system.json", "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/", "url": "https://www.uberwald.me/public/uberwald/",
"background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp", "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
"id": "fvtt-hero-system-6" "id": "fvtt-hero-system-6"

33
templates/apps/roll-dialog-generic.hbs
View File

@ -1,9 +1,11 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<header class="roll-dialog-header"> <header class="roll-dialog-header">
{{#if img}} <div class="flexrow">
<img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" /> {{#if img}}
{{/if}} <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
<h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1> {{/if}}
<h2 class="dialog-roll-title roll-dialog-header">{{title}}</h2>
</div>
</header> </header>
<div class="flexcol"> <div class="flexcol">
@ -15,24 +17,25 @@
</div> </div>
{{/if}} {{/if}}
{{#if weapon}} {{#if (eq subMode "ocv")}}
<div class="flexrow"> <div class="flexrow">
<span class="item-field-label-long margin-item-list">{{weapon.name}} : </span> <span class="item-field-label-long margin-item-list">OCV : </span>
<span class="item-field-label-medium margin-item-list">{{weaponRoll}}-</span> <span class="item-field-label-medium margin-item-list">{{characteristics.ocv.value}}</span>
</div>
<div class="flexrow">
<span class="item-field-label-long margin-item-list">{{upperFirst item.type}} OCV : </span>
<span class="item-field-label-medium margin-item-list">{{fixNum item.system.ocv}}</span>
</div> </div>
{{/if}} {{/if}}
{{#if maneuver}} {{#if (eq subMode "omcv")}}
<div class="flexrow"> <div class="flexrow">
<span class="item-field-label-long margin-item-list">{{maneuver.name}} : </span> <span class="item-field-label-long margin-item-list">OMCV : </span>
<span class="item-field-label-medium margin-item-list">{{maneuverRoll}}-</span> <span class="item-field-label-medium margin-item-list">{{characteristics.omcv.value}}</span>
</div> </div>
{{/if}}
{{#if power}}
<div class="flexrow"> <div class="flexrow">
<span class="item-field-label-long margin-item-list">{{power.name}} : </span> <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} OMCV : </span>
<span class="item-field-label-medium margin-item-list">{{powerRoll}}-</span> <span class="item-field-label-medium margin-item-list">{{fixNum item.system.omcv}}</span>
</div> </div>
{{/if}} {{/if}}

12
templates/chat/chat-generic-result.hbs
View File

@ -57,7 +57,7 @@
<li><strong>TOTAL : {{result}}</strong> <li><strong>TOTAL : {{result}}</strong>
{{#if (exists margin)}} {{#if (exists margin)}}
({{#if isSuccess}}Success!!{{else}}Failure!{{/if}}) (<strong>{{#if isSuccess}}Success!!{{else}}Failure!{{/if}}</strong>)
{{/if}} {{/if}}
</li> </li>
@ -66,7 +66,15 @@
{{/if}} {{/if}}
{{#if (exists margin)}} {{#if (exists margin)}}
<li><strong>Margin : {{margin}}</strong> {{#if (eq subMode "normal")}}
<li><strong>Margin : {{margin}}</strong>
{{/if}}
{{#if (eq subMode "ocv")}}
<li><strong>Margin (DCV Hit): {{margin}}</strong>
{{/if}}
{{#if (eq subMode "omcv")}}
<li><strong>Margin (DMCV Hit): {{margin}}</strong>
{{/if}}
{{/if}} {{/if}}
</ul> </ul>