diff --git a/changelog.md b/changelog.md index 0306b3c..e0a6096 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -v11.0.13 +v11.0.14 - Initial public release \ No newline at end of file diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js index b2c16fa..b0dc2b4 100644 --- a/modules/hero6-actor-sheet.js +++ b/modules/hero6-actor-sheet.js @@ -162,6 +162,18 @@ export class Hero6ActorSheet extends ActorSheet { html.find('.roll-perception').click((event) => { this.actor.rollPerception("int"); }); + html.find('.roll-weapon').click((event) => { + const li = $(event.currentTarget).parents(".item") + this.actor.rollWeapon(li.data("item-id")); + }); + html.find('.roll-mental-maneuver').click((event) => { + const li = $(event.currentTarget).parents(".item") + this.actor.rollMentalManeuver(li.data("item-id")); + }); + html.find('.roll-power-attack').click((event) => { + const li = $(event.currentTarget).parents(".item") + this.actor.rollPowerAttack(li.data("item-id")); + }); html.find('.roll-direct').click((event) => { const rollFormula = $(event.currentTarget).data("roll-formula") @@ -184,11 +196,6 @@ export class Hero6ActorSheet extends ActorSheet { let itemId = li.data("item-id") this.actor.rollLiftDice(itemId); }); - html.find('.roll-weapon').click((event) => { - const li = $(event.currentTarget).parents(".item"); - const skillId = li.data("item-id") - this.actor.rollWeapon(skillId) - }); html.find('.roll-maneuver').click((event) => { const li = $(event.currentTarget).parents(".item"); const maneuverId = li.data("maneuver-id") diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index f55f2d0..8632e7d 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -304,11 +304,13 @@ export class Hero6Actor extends Actor { let maneuvers = { general: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "general"), offensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "offensive"), - defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive") + defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive"), + mental: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "mental") } Hero6Utility.sortArrayObjectsByName(maneuvers.general) Hero6Utility.sortArrayObjectsByName(maneuvers.offensive) Hero6Utility.sortArrayObjectsByName(maneuvers.defensive) + Hero6Utility.sortArrayObjectsByName(maneuvers.mental) return maneuvers } getAllManeuvers() { @@ -744,7 +746,7 @@ export class Hero6Actor extends Actor { } /* -------------------------------------------- */ rollManeuver(maneuverId) { - let skill = this.items.get(skillId) + let skill = this.items.get(maneuverId) if (skill) { if (skill.system.islore && skill.system.level == 0) { ui.notifications.warn("You can't use Lore Skills with a SL of 0.") @@ -788,34 +790,54 @@ export class Hero6Actor extends Actor { } /* -------------------------------------------- */ - rollWeapon(weaponId) { + async rollWeapon(weaponId) { let weapon = this.items.get(weaponId) if (weapon) { weapon = duplicate(weapon) - let skill = this.items.find(item => item.name.toLowerCase() == weapon.system.skill.toLowerCase()) - if (skill) { - skill = duplicate(skill) - Hero6Utility.updateSkill(skill) - let abilityKey = skill.system.ability - let rollData = this.getCommonRollData(abilityKey) - rollData.mode = "weapon" - rollData.skill = skill - rollData.weapon = weapon - rollData.img = weapon.img - if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged - rollData.forceDisadvantage = this.isAttackDisadvantage() - } - /*if (rollData.weapon.system.isranged && rollData.tokensDistance > Hero6Utility.getWeaponMaxRange(rollData.weapon) ) { - ui.notifications.warn(`Your target is out of range of your weapon (max: ${Hero6Utility.getWeaponMaxRange(rollData.weapon)} - current : ${rollData.tokensDistance})` ) - return - }*/ - this.startRoll(rollData) - } else { - ui.notifications.warn("Unable to find the relevant skill for weapon " + weapon.name) - } + let rollData = this.getCommonRollData() + rollData.weaponRoll = 11 + this.system.characteristics.ocv.value + (Number(weapon.system.ocv) || 0) + rollData.mode = "weapon" + rollData.weapon = weapon + rollData.img = weapon.img + this.startRoll(rollData) + } else { + ui.notifications.warn("Unable to find the weapon " + weapon.name) + } + } + /* -------------------------------------------- */ + rollMentalManeuver(maneuverId) { + let maneuver = this.items.get(maneuverId) + if (maneuver) { + maneuver = duplicate(maneuver) + let rollData = this.getCommonRollData() + rollData.maneuverRoll = 11 + this.system.characteristics.omcv.value + (Number(maneuver.system.omcv) || 0) + rollData.mode = "mentalmaneuver" + rollData.maneuver = maneuver + rollData.img = maneuver.img + this.startRoll(rollData) + } else { + ui.notifications.warn("Unable to find the maneuver " + maneuver.name) + } + } + /* -------------------------------------------- */ + rollPowerAttack(powerId ) { + let power = this.items.get(powerId) + if (power) { + power = duplicate(power) + let rollData = this.getCommonRollData() + if (power.system.attackvalue == "ocv") { + rollData.powerRoll = 11 + this.system.characteristics.ocv.value + (Number(power.system.ocv) || 0) + } else { + rollData.powerRoll = 11 + this.system.characteristics.omcv.value + (Number(power.system.omcv) || 0) + } + rollData.mode = "powerattack" + rollData.power = power + rollData.img = power.img + this.startRoll(rollData) + } else { + ui.notifications.warn("Unable to find power " + power.name) } } - /* -------------------------------------------- */ async startRoll(rollData) { let rollDialog = await Hero6RollDialog.create(this, rollData) diff --git a/modules/hero6-config.js b/modules/hero6-config.js index 870a8ad..5591dee 100644 --- a/modules/hero6-config.js +++ b/modules/hero6-config.js @@ -10,7 +10,8 @@ export const Hero6_CONFIG = { maneuverTypes: { "general": "General", "offensive": "Offensive", - "defensive": "Defensive" + "defensive": "Defensive", + "mental": "Mental" }, rollCharac : { "str": "Strength", @@ -29,6 +30,10 @@ export const Hero6_CONFIG = { "combat": "Combat" , "custom": "Custom" }, + attackTypes: { + "ocv": "OCV", + "omcv": "OMCV" + }, powerEquipmentType: { "adjustment": "Adjustment", "mental": "Mental", diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index f84aeb5..1d1b68e 100644 --- a/modules/hero6-utility.js +++ b/modules/hero6-utility.js @@ -346,6 +346,13 @@ export class Hero6Utility { // ability/save/size => 0 let diceFormula = "3d6" let target = 10 + + if(rollData.weapon) { + target = rollData.weaponRoll + } + if(rollData.maneuver) { + target = rollData.maneuverRoll + } if (rollData.charac) { target = rollData.charac.roll } diff --git a/packs/complications/000099.log b/packs/complications/000106.log similarity index 100% rename from packs/complications/000099.log rename to packs/complications/000106.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index 95395b2..c8e9be6 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000104 diff --git a/packs/complications/LOG b/packs/complications/LOG index 4170a27..ccd9e5f 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.588130 7fda7bbff6c0 Recovering log #96 -2023/08/24-20:28:52.597974 7fda7bbff6c0 Delete type=3 #94 -2023/08/24-20:28:52.598068 7fda7bbff6c0 Delete type=0 #96 +2023/08/25-22:33:43.637308 7f2dea7fc6c0 Recovering log #102 +2023/08/25-22:33:43.656562 7f2dea7fc6c0 Delete type=3 #100 +2023/08/25-22:33:43.656635 7f2dea7fc6c0 Delete type=0 #102 +2023/08/25-23:00:06.995735 7f2b69bff6c0 Level-0 table #107: started +2023/08/25-23:00:06.995769 7f2b69bff6c0 Level-0 table #107: 0 bytes OK +2023/08/25-23:00:07.032420 7f2b69bff6c0 Delete type=0 #105 +2023/08/25-23:00:07.148662 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/25-23:00:07.148788 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 1b9eed7..9d5803b 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/24-20:11:49.190057 7fda7abfd6c0 Recovering log #92 -2023/08/24-20:11:49.204015 7fda7abfd6c0 Delete type=3 #90 -2023/08/24-20:11:49.204065 7fda7abfd6c0 Delete type=0 #92 -2023/08/24-20:28:26.993087 7fda79bfb6c0 Level-0 table #97: started -2023/08/24-20:28:26.993130 7fda79bfb6c0 Level-0 table #97: 0 bytes OK -2023/08/24-20:28:27.002024 7fda79bfb6c0 Delete type=0 #95 -2023/08/24-20:28:27.002188 7fda79bfb6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/24-20:28:27.002221 7fda79bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.171457 7f2debfff6c0 Recovering log #99 +2023/08/25-22:03:49.191726 7f2debfff6c0 Delete type=0 #99 +2023/08/25-22:03:49.191857 7f2debfff6c0 Delete type=3 #98 +2023/08/25-22:33:29.419721 7f2b69bff6c0 Level-0 table #103: started +2023/08/25-22:33:29.419749 7f2b69bff6c0 Level-0 table #103: 0 bytes OK +2023/08/25-22:33:29.426232 7f2b69bff6c0 Delete type=0 #101 +2023/08/25-22:33:29.435893 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.442710 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-000098 b/packs/complications/MANIFEST-000098 deleted file mode 100644 index 1a3985a..0000000 Binary files a/packs/complications/MANIFEST-000098 and /dev/null differ diff --git a/packs/complications/MANIFEST-000104 b/packs/complications/MANIFEST-000104 new file mode 100644 index 0000000..8a4913d Binary files /dev/null and b/packs/complications/MANIFEST-000104 differ diff --git a/packs/equipment/000101.log b/packs/equipment/000108.log similarity index 100% rename from packs/equipment/000101.log rename to packs/equipment/000108.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index d7ae20e..abdfdfe 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000100 +MANIFEST-000106 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 18707b2..cbaebbd 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.572724 7fda7a3fc6c0 Recovering log #97 -2023/08/24-20:28:52.584112 7fda7a3fc6c0 Delete type=3 #95 -2023/08/24-20:28:52.584178 7fda7a3fc6c0 Delete type=0 #97 +2023/08/25-22:33:43.623322 7f2deb7fe6c0 Recovering log #104 +2023/08/25-22:33:43.633958 7f2deb7fe6c0 Delete type=3 #102 +2023/08/25-22:33:43.634029 7f2deb7fe6c0 Delete type=0 #104 +2023/08/25-23:00:06.835716 7f2b69bff6c0 Level-0 table #109: started +2023/08/25-23:00:06.835770 7f2b69bff6c0 Level-0 table #109: 0 bytes OK +2023/08/25-23:00:06.878030 7f2b69bff6c0 Delete type=0 #107 +2023/08/25-23:00:06.934520 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/25-23:00:06.995606 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 698b394..6d0b64a 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,15 +1,8 @@ -2023/08/24-20:11:49.176021 7fda7b3fe6c0 Recovering log #92 -2023/08/24-20:11:49.186442 7fda7b3fe6c0 Delete type=3 #90 -2023/08/24-20:11:49.186511 7fda7b3fe6c0 Delete type=0 #92 -2023/08/24-20:28:26.929251 7fda79bfb6c0 Level-0 table #98: started -2023/08/24-20:28:26.933483 7fda79bfb6c0 Level-0 table #98: 61208 bytes OK -2023/08/24-20:28:26.940562 7fda79bfb6c0 Delete type=0 #96 -2023/08/24-20:28:26.961338 7fda79bfb6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) -2023/08/24-20:28:26.961409 7fda79bfb6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at '!items!zFQRJSrYV4E12NgW' @ 355 : 1 -2023/08/24-20:28:26.961416 7fda79bfb6c0 Compacting 1@1 + 1@2 files -2023/08/24-20:28:26.966548 7fda79bfb6c0 Generated table #99@1: 125 keys, 61208 bytes -2023/08/24-20:28:26.966578 7fda79bfb6c0 Compacted 1@1 + 1@2 files => 61208 bytes -2023/08/24-20:28:26.974691 7fda79bfb6c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2023/08/24-20:28:26.974830 7fda79bfb6c0 Delete type=2 #94 -2023/08/24-20:28:26.975013 7fda79bfb6c0 Delete type=2 #98 -2023/08/24-20:28:27.002145 7fda79bfb6c0 Manual compaction at level-1 from '!items!zFQRJSrYV4E12NgW' @ 355 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.155681 7f2deaffd6c0 Recovering log #101 +2023/08/25-22:03:49.166583 7f2deaffd6c0 Delete type=0 #101 +2023/08/25-22:03:49.166702 7f2deaffd6c0 Delete type=3 #100 +2023/08/25-22:33:29.368510 7f2b69bff6c0 Level-0 table #105: started +2023/08/25-22:33:29.368545 7f2b69bff6c0 Level-0 table #105: 0 bytes OK +2023/08/25-22:33:29.374540 7f2b69bff6c0 Delete type=0 #103 +2023/08/25-22:33:29.384577 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.395889 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-000100 b/packs/equipment/MANIFEST-000106 similarity index 73% rename from packs/equipment/MANIFEST-000100 rename to packs/equipment/MANIFEST-000106 index 433ad01..6cd1fd9 100644 Binary files a/packs/equipment/MANIFEST-000100 and b/packs/equipment/MANIFEST-000106 differ diff --git a/packs/maneuvers/000091.log b/packs/maneuvers/000098.log similarity index 100% rename from packs/maneuvers/000091.log rename to packs/maneuvers/000098.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 2f2c868..6274e55 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000090 +MANIFEST-000096 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index c10c519..b5793f2 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.601708 7fda7a3fc6c0 Recovering log #88 -2023/08/24-20:28:52.613896 7fda7a3fc6c0 Delete type=3 #86 -2023/08/24-20:28:52.614012 7fda7a3fc6c0 Delete type=0 #88 +2023/08/25-22:33:43.656478 7f2deb7fe6c0 Recovering log #94 +2023/08/25-22:33:43.672940 7f2deb7fe6c0 Delete type=3 #92 +2023/08/25-22:33:43.673310 7f2deb7fe6c0 Delete type=0 #94 +2023/08/25-23:00:07.111419 7f2b69bff6c0 Level-0 table #99: started +2023/08/25-23:00:07.111451 7f2b69bff6c0 Level-0 table #99: 0 bytes OK +2023/08/25-23:00:07.148478 7f2b69bff6c0 Delete type=0 #97 +2023/08/25-23:00:07.148766 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/25-23:00:07.148848 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index 68add4d..76cef33 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,8 +1,8 @@ -2023/08/24-20:11:49.203061 7fda7bbff6c0 Recovering log #84 -2023/08/24-20:11:49.219726 7fda7bbff6c0 Delete type=3 #82 -2023/08/24-20:11:49.219820 7fda7bbff6c0 Delete type=0 #84 -2023/08/24-20:28:27.002307 7fda79bfb6c0 Level-0 table #89: started -2023/08/24-20:28:27.002338 7fda79bfb6c0 Level-0 table #89: 0 bytes OK -2023/08/24-20:28:27.008560 7fda79bfb6c0 Delete type=0 #87 -2023/08/24-20:28:27.051981 7fda79bfb6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/24-20:28:27.052022 7fda79bfb6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.194406 7f2deb7fe6c0 Recovering log #91 +2023/08/25-22:03:49.208360 7f2deb7fe6c0 Delete type=0 #91 +2023/08/25-22:03:49.208425 7f2deb7fe6c0 Delete type=3 #90 +2023/08/25-22:33:29.426425 7f2b69bff6c0 Level-0 table #95: started +2023/08/25-22:33:29.426459 7f2b69bff6c0 Level-0 table #95: 0 bytes OK +2023/08/25-22:33:29.435592 7f2b69bff6c0 Delete type=0 #93 +2023/08/25-22:33:29.442698 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.449825 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000090 b/packs/maneuvers/MANIFEST-000090 deleted file mode 100644 index 1f1f334..0000000 Binary files a/packs/maneuvers/MANIFEST-000090 and /dev/null differ diff --git a/packs/maneuvers/MANIFEST-000096 b/packs/maneuvers/MANIFEST-000096 new file mode 100644 index 0000000..c687585 Binary files /dev/null and b/packs/maneuvers/MANIFEST-000096 differ diff --git a/packs/perks/000099.log b/packs/perks/000106.log similarity index 100% rename from packs/perks/000099.log rename to packs/perks/000106.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index 95395b2..c8e9be6 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000104 diff --git a/packs/perks/LOG b/packs/perks/LOG index aad2650..40b67c6 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.601706 7fda7abfd6c0 Recovering log #96 -2023/08/24-20:28:52.613896 7fda7abfd6c0 Delete type=3 #94 -2023/08/24-20:28:52.613994 7fda7abfd6c0 Delete type=0 #96 +2023/08/25-22:33:43.658173 7f2debfff6c0 Recovering log #102 +2023/08/25-22:33:43.676709 7f2debfff6c0 Delete type=3 #100 +2023/08/25-22:33:43.676789 7f2debfff6c0 Delete type=0 #102 +2023/08/25-23:00:07.148917 7f2b69bff6c0 Level-0 table #107: started +2023/08/25-23:00:07.148979 7f2b69bff6c0 Level-0 table #107: 0 bytes OK +2023/08/25-23:00:07.190254 7f2b69bff6c0 Delete type=0 #105 +2023/08/25-23:00:07.227324 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/25-23:00:07.227354 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 51bd074..1bd55e1 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/08/24-20:11:49.205472 7fda7b3fe6c0 Recovering log #92 -2023/08/24-20:11:49.222633 7fda7b3fe6c0 Delete type=3 #90 -2023/08/24-20:11:49.222697 7fda7b3fe6c0 Delete type=0 #92 -2023/08/24-20:28:27.019936 7fda79bfb6c0 Level-0 table #97: started -2023/08/24-20:28:27.019979 7fda79bfb6c0 Level-0 table #97: 0 bytes OK -2023/08/24-20:28:27.051866 7fda79bfb6c0 Delete type=0 #95 -2023/08/24-20:28:27.052012 7fda79bfb6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/24-20:28:27.052040 7fda79bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.195155 7f2dea7fc6c0 Recovering log #99 +2023/08/25-22:03:49.211553 7f2dea7fc6c0 Delete type=0 #99 +2023/08/25-22:03:49.211615 7f2dea7fc6c0 Delete type=3 #98 +2023/08/25-22:33:29.435955 7f2b69bff6c0 Level-0 table #103: started +2023/08/25-22:33:29.436016 7f2b69bff6c0 Level-0 table #103: 0 bytes OK +2023/08/25-22:33:29.442590 7f2b69bff6c0 Delete type=0 #101 +2023/08/25-22:33:29.449794 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.449873 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-000098 b/packs/perks/MANIFEST-000098 deleted file mode 100644 index 3dc8b6f..0000000 Binary files a/packs/perks/MANIFEST-000098 and /dev/null differ diff --git a/packs/perks/MANIFEST-000104 b/packs/perks/MANIFEST-000104 new file mode 100644 index 0000000..bf09adb Binary files /dev/null and b/packs/perks/MANIFEST-000104 differ diff --git a/packs/powers/000100.log b/packs/powers/000107.log similarity index 100% rename from packs/powers/000100.log rename to packs/powers/000107.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index b86155c..2a5d251 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000099 +MANIFEST-000105 diff --git a/packs/powers/LOG b/packs/powers/LOG index 798dfba..822cfb7 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.588130 7fda7abfd6c0 Recovering log #97 -2023/08/24-20:28:52.597915 7fda7abfd6c0 Delete type=3 #95 -2023/08/24-20:28:52.597970 7fda7abfd6c0 Delete type=0 #97 +2023/08/25-22:33:43.636903 7f2deaffd6c0 Recovering log #103 +2023/08/25-22:33:43.653604 7f2deaffd6c0 Delete type=3 #101 +2023/08/25-22:33:43.653664 7f2deaffd6c0 Delete type=0 #103 +2023/08/25-23:00:07.074697 7f2b69bff6c0 Level-0 table #108: started +2023/08/25-23:00:07.074729 7f2b69bff6c0 Level-0 table #108: 0 bytes OK +2023/08/25-23:00:07.111279 7f2b69bff6c0 Delete type=0 #106 +2023/08/25-23:00:07.148710 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/25-23:00:07.148825 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 23e6129..63589d1 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/24-20:11:49.190059 7fda7a3fc6c0 Recovering log #93 -2023/08/24-20:11:49.201012 7fda7a3fc6c0 Delete type=3 #91 -2023/08/24-20:11:49.201080 7fda7a3fc6c0 Delete type=0 #93 -2023/08/24-20:28:26.985277 7fda79bfb6c0 Level-0 table #98: started -2023/08/24-20:28:26.985305 7fda79bfb6c0 Level-0 table #98: 0 bytes OK -2023/08/24-20:28:26.992913 7fda79bfb6c0 Delete type=0 #96 -2023/08/24-20:28:27.002175 7fda79bfb6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/24-20:28:27.002210 7fda79bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.171203 7f2deb7fe6c0 Recovering log #100 +2023/08/25-22:03:49.188376 7f2deb7fe6c0 Delete type=0 #100 +2023/08/25-22:03:49.188518 7f2deb7fe6c0 Delete type=3 #99 +2023/08/25-22:33:29.412461 7f2b69bff6c0 Level-0 table #104: started +2023/08/25-22:33:29.412486 7f2b69bff6c0 Level-0 table #104: 0 bytes OK +2023/08/25-22:33:29.419516 7f2b69bff6c0 Delete type=0 #102 +2023/08/25-22:33:29.426395 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.435927 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-000099 b/packs/powers/MANIFEST-000105 similarity index 75% rename from packs/powers/MANIFEST-000099 rename to packs/powers/MANIFEST-000105 index 68256a5..02472d3 100644 Binary files a/packs/powers/MANIFEST-000099 and b/packs/powers/MANIFEST-000105 differ diff --git a/packs/skills/000099.log b/packs/skills/000106.log similarity index 100% rename from packs/skills/000099.log rename to packs/skills/000106.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 95395b2..c8e9be6 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000104 diff --git a/packs/skills/LOG b/packs/skills/LOG index 69d4bfd..1ceb91f 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.572723 7fda7b3fe6c0 Recovering log #96 -2023/08/24-20:28:52.584114 7fda7b3fe6c0 Delete type=3 #94 -2023/08/24-20:28:52.584178 7fda7b3fe6c0 Delete type=0 #96 +2023/08/25-22:33:43.623321 7f2dea7fc6c0 Recovering log #102 +2023/08/25-22:33:43.633958 7f2dea7fc6c0 Delete type=3 #100 +2023/08/25-22:33:43.634019 7f2dea7fc6c0 Delete type=0 #102 +2023/08/25-23:00:07.032595 7f2b69bff6c0 Level-0 table #107: started +2023/08/25-23:00:07.032643 7f2b69bff6c0 Level-0 table #107: 0 bytes OK +2023/08/25-23:00:07.074550 7f2b69bff6c0 Delete type=0 #105 +2023/08/25-23:00:07.148689 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/25-23:00:07.148806 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 0041d54..eddaaf1 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/08/24-20:11:49.176021 7fda7bbff6c0 Recovering log #92 -2023/08/24-20:11:49.186443 7fda7bbff6c0 Delete type=3 #90 -2023/08/24-20:11:49.186509 7fda7bbff6c0 Delete type=0 #92 -2023/08/24-20:28:26.975180 7fda79bfb6c0 Level-0 table #97: started -2023/08/24-20:28:26.975225 7fda79bfb6c0 Level-0 table #97: 0 bytes OK -2023/08/24-20:28:26.985137 7fda79bfb6c0 Delete type=0 #95 -2023/08/24-20:28:27.002160 7fda79bfb6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/24-20:28:27.002199 7fda79bfb6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.155679 7f2deb7fe6c0 Recovering log #99 +2023/08/25-22:03:49.166527 7f2deb7fe6c0 Delete type=0 #99 +2023/08/25-22:03:49.166599 7f2deb7fe6c0 Delete type=3 #98 +2023/08/25-22:33:29.406141 7f2b69bff6c0 Level-0 table #103: started +2023/08/25-22:33:29.406187 7f2b69bff6c0 Level-0 table #103: 0 bytes OK +2023/08/25-22:33:29.412334 7f2b69bff6c0 Delete type=0 #101 +2023/08/25-22:33:29.419707 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.426413 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-000098 b/packs/skills/MANIFEST-000098 deleted file mode 100644 index 468e28c..0000000 Binary files a/packs/skills/MANIFEST-000098 and /dev/null differ diff --git a/packs/skills/MANIFEST-000104 b/packs/skills/MANIFEST-000104 new file mode 100644 index 0000000..713a59d Binary files /dev/null and b/packs/skills/MANIFEST-000104 differ diff --git a/packs/talents/000099.log b/packs/talents/000106.log similarity index 100% rename from packs/talents/000099.log rename to packs/talents/000106.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index 95395b2..c8e9be6 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000104 diff --git a/packs/talents/LOG b/packs/talents/LOG index 518b8a5..7536af4 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,3 +1,8 @@ -2023/08/24-20:28:52.617237 7fda7abfd6c0 Recovering log #96 -2023/08/24-20:28:52.627761 7fda7abfd6c0 Delete type=3 #94 -2023/08/24-20:28:52.627835 7fda7abfd6c0 Delete type=0 #96 +2023/08/25-22:33:43.675716 7f2deaffd6c0 Recovering log #102 +2023/08/25-22:33:43.687652 7f2deaffd6c0 Delete type=3 #100 +2023/08/25-22:33:43.687775 7f2deaffd6c0 Delete type=0 #102 +2023/08/25-23:00:07.190524 7f2b69bff6c0 Level-0 table #107: started +2023/08/25-23:00:07.190606 7f2b69bff6c0 Level-0 table #107: 0 bytes OK +2023/08/25-23:00:07.227189 7f2b69bff6c0 Delete type=0 #105 +2023/08/25-23:00:07.227339 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/25-23:00:07.227364 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 fb8a2e0..7d81b5b 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2023/08/24-20:11:49.221624 7fda7a3fc6c0 Recovering log #92 -2023/08/24-20:11:49.232090 7fda7a3fc6c0 Delete type=3 #90 -2023/08/24-20:11:49.232138 7fda7a3fc6c0 Delete type=0 #92 -2023/08/24-20:28:27.008700 7fda79bfb6c0 Level-0 table #97: started -2023/08/24-20:28:27.008737 7fda79bfb6c0 Level-0 table #97: 0 bytes OK -2023/08/24-20:28:27.019736 7fda79bfb6c0 Delete type=0 #95 -2023/08/24-20:28:27.051993 7fda79bfb6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/24-20:28:27.052030 7fda79bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/25-22:03:49.214304 7f2deb7fe6c0 Recovering log #99 +2023/08/25-22:03:49.224837 7f2deb7fe6c0 Delete type=0 #99 +2023/08/25-22:03:49.224905 7f2deb7fe6c0 Delete type=3 #98 +2023/08/25-22:33:29.442721 7f2b69bff6c0 Level-0 table #103: started +2023/08/25-22:33:29.442743 7f2b69bff6c0 Level-0 table #103: 0 bytes OK +2023/08/25-22:33:29.449583 7f2b69bff6c0 Delete type=0 #101 +2023/08/25-22:33:29.449849 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/25-22:33:29.449897 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-000098 b/packs/talents/MANIFEST-000098 deleted file mode 100644 index 9609b1a..0000000 Binary files a/packs/talents/MANIFEST-000098 and /dev/null differ diff --git a/packs/talents/MANIFEST-000104 b/packs/talents/MANIFEST-000104 new file mode 100644 index 0000000..e54832c Binary files /dev/null and b/packs/talents/MANIFEST-000104 differ diff --git a/system.json b/system.json index a1240d6..b339c93 100644 --- a/system.json +++ b/system.json @@ -91,14 +91,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.13", + "version": "11.0.14", "compatibility": { "minimum": "11", "verified": "11" }, "title": "Hero System v6 for FoundrtVTT (Official)", "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/master/system.json", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.13.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.14.zip", "url": "https://www.uberwald.me/gitea/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 b1779df..c366716 100644 --- a/template.json +++ b/template.json @@ -357,6 +357,7 @@ "damage": "", "endurance": 0, "hasroll": false, + "attackvalue": "ocv", "roll": 0, "computebody": false, "haseffectroll": false, @@ -375,6 +376,8 @@ "pha": "", "ocv": "", "dcv" : "", + "omcv": "", + "dmcv" : "", "isstock": false, "active": false }, diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index e8891c6..164dd5e 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -175,9 +175,9 @@ {{maneuver.name}} - {{maneuver.system.pha}} - {{maneuver.system.ocv}} - {{maneuver.system.dcv}} + {{maneuver.system.pha}} + {{maneuver.system.ocv}} + {{maneuver.system.dcv}} {{maneuver.system.effects}} {{#if maneuver.system.haseffectroll}} @@ -556,26 +556,75 @@ {{#each allmaneuvers as |maneuver key|}} -
-
  • - - {{maneuver.name}} + {{#if (ne maneuver.system.maneuvertype "mental")}} +
    +
  • + + {{maneuver.name}} - {{maneuver.system.pha}} - {{maneuver.system.ocv}} - {{maneuver.system.dcv}} + {{maneuver.system.pha}} + {{maneuver.system.ocv}} + {{maneuver.system.dcv}} - {{maneuver.system.effects}} + {{maneuver.system.effects}} -
     
    -
    - -
    -
    • -
    +
     
    +
    + +
    + + + {{/if}} {{/each}} + + + {{!-- Powers Tab --}} @@ -610,7 +659,16 @@ {{power.system.cost}} + {{#if (eq system.typemodifier "attack")}} + + + + {{power.name}} + + + {{else}} {{power.name}} + {{/if}} {{power.system.displayname}} {{power.system.damage}} diff --git a/templates/apps/roll-dialog-generic.hbs b/templates/apps/roll-dialog-generic.hbs index 27bd617..1645b01 100644 --- a/templates/apps/roll-dialog-generic.hbs +++ b/templates/apps/roll-dialog-generic.hbs @@ -15,6 +15,27 @@ {{/if}} + {{#if weapon}} +
    + {{weapon.name}} : + {{weaponRoll}}- +
    + {{/if}} + + {{#if maneuver}} +
    + {{maneuver.name}} : + {{maneuverRoll}}- +
    + {{/if}} + + {{#if power}} +
    + {{power.name}} : + {{powerRoll}}- +
    + {{/if}} + {{#if item}}
    {{upperFirst item.type}} - {{upperFirst item.name}} diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index b53d75b..113ac9d 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -17,6 +17,21 @@ {{/if}} + {{#if weapon}} +
  • Weapon : {{weapon.name}} +
    • + {{/if}} + + {{#if maneuver}} +
  • Maneuver : {{maneuver.name}} +
    • + {{/if}} + + {{#if power}} +
  • Power : {{power.name}} +
    • + {{/if}} + {{#if rollSource}}
  • Roll : {{rollSource}}
    • {{/if}} diff --git a/templates/items/item-maneuver-sheet.hbs b/templates/items/item-maneuver-sheet.hbs index 000cee7..8ee9091 100644 --- a/templates/items/item-maneuver-sheet.hbs +++ b/templates/items/item-maneuver-sheet.hbs @@ -37,14 +37,21 @@ + {{#if (eq system.maneuvertype "mental")}} +
  • + +
    • +
  • + +
    • + {{else}}
    • -
    • - + {{/if}}
    • diff --git a/templates/partials/partial-actor-equipment.hbs b/templates/partials/partial-actor-equipment.hbs index 0e1b003..87cdde5 100644 --- a/templates/partials/partial-actor-equipment.hbs +++ b/templates/partials/partial-actor-equipment.hbs @@ -3,7 +3,13 @@ - {{equip.name}} + + {{#if (eq equip.system.subtype "weapon")}} + {{equip.name}} + {{else}} + {{equip.name}} + {{/if}} + {{#if (or (eq equip.system.subtype "money") (eq equip.system.subtype "equipment"))}} diff --git a/templates/partials/partial-power-equipment-cost.hbs b/templates/partials/partial-power-equipment-cost.hbs index 1bab214..39c9f19 100644 --- a/templates/partials/partial-power-equipment-cost.hbs +++ b/templates/partials/partial-power-equipment-cost.hbs @@ -18,6 +18,18 @@ + {{#if (eq (lower system.typemodifier) "attack")}} +
  • + +
    • + {{/if}} +