From ceed6efc0ba3315ddd286cee307da196972a20b7 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 21 Oct 2023 14:16:06 +0200 Subject: [PATCH] Add initiative and ammo --- modules/dark-stars-combat.js | 14 ++++++- modules/dark-stars-utility.js | 51 ++++++++++++++++--------- packs/armor/000100.log | 0 packs/armor/CURRENT | 2 +- packs/armor/LOG | 11 ++---- packs/armor/LOG.old | 16 ++++---- packs/armor/MANIFEST-000098 | Bin 134 -> 0 bytes packs/conditions/000100.log | 0 packs/conditions/CURRENT | 2 +- packs/conditions/LOG | 10 ++--- packs/conditions/LOG.old | 14 +++---- packs/conditions/MANIFEST-000098 | Bin 65 -> 0 bytes packs/currency/000100.log | 0 packs/currency/CURRENT | 2 +- packs/currency/LOG | 10 ++--- packs/currency/LOG.old | 14 +++---- packs/currency/MANIFEST-000098 | Bin 65 -> 0 bytes packs/cybernetics/000028.log | 0 packs/cybernetics/CURRENT | 2 +- packs/cybernetics/LOG | 11 ++---- packs/cybernetics/LOG.old | 16 ++++---- packs/cybernetics/MANIFEST-000026 | Bin 137 -> 0 bytes packs/equipment/000100.log | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 10 ++--- packs/equipment/LOG.old | 14 +++---- packs/equipment/MANIFEST-000098 | Bin 65 -> 0 bytes packs/perks/000100.log | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 11 ++---- packs/perks/LOG.old | 16 ++++---- packs/perks/MANIFEST-000098 | Bin 135 -> 0 bytes packs/shields/000100.log | 0 packs/shields/CURRENT | 2 +- packs/shields/LOG | 10 ++--- packs/shields/LOG.old | 14 +++---- packs/shields/MANIFEST-000098 | Bin 65 -> 0 bytes packs/skills/000100.log | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 11 ++---- packs/skills/LOG.old | 16 ++++---- packs/skills/MANIFEST-000098 | Bin 134 -> 0 bytes packs/weapons/000101.log | 0 packs/weapons/CURRENT | 2 +- packs/weapons/LOG | 11 ++---- packs/weapons/LOG.old | 16 ++++---- packs/weapons/MANIFEST-000099 | Bin 171 -> 0 bytes system.json | 4 +- templates/chat/chat-generic-result.hbs | 12 ++++-- 49 files changed, 159 insertions(+), 171 deletions(-) delete mode 100644 packs/armor/000100.log delete mode 100644 packs/armor/MANIFEST-000098 delete mode 100644 packs/conditions/000100.log delete mode 100644 packs/conditions/MANIFEST-000098 delete mode 100644 packs/currency/000100.log delete mode 100644 packs/currency/MANIFEST-000098 delete mode 100644 packs/cybernetics/000028.log delete mode 100644 packs/cybernetics/MANIFEST-000026 delete mode 100644 packs/equipment/000100.log delete mode 100644 packs/equipment/MANIFEST-000098 delete mode 100644 packs/perks/000100.log delete mode 100644 packs/perks/MANIFEST-000098 delete mode 100644 packs/shields/000100.log delete mode 100644 packs/shields/MANIFEST-000098 delete mode 100644 packs/skills/000100.log delete mode 100644 packs/skills/MANIFEST-000098 delete mode 100644 packs/weapons/000101.log delete mode 100644 packs/weapons/MANIFEST-000099 diff --git a/modules/dark-stars-combat.js b/modules/dark-stars-combat.js index 9444b9f..dd521d5 100644 --- a/modules/dark-stars-combat.js +++ b/modules/dark-stars-combat.js @@ -10,7 +10,7 @@ export class DarkStarsCombat extends Combat { let hasLastWord = token.actor.hasLastWord() while ( (initScore > 5) || (hasLastWord && initScore >= 5)) { initScore -= 5; - toCreate.push({tokenId: c.tokenId, sceneId: c.sceneId, actorId: c.actorId, hidden: c.hidden, initiative: initScore, isDuplicated: true}); + toCreate.push({tokenId: c.tokenId, sceneId: c.sceneId, actorId: c.actorId, hidden: c.hidden, initiative: initScore, flags: { world: { isDuplicated: true} } } ); } this.createEmbeddedDocuments("Combatant", toCreate); } @@ -28,6 +28,18 @@ export class DarkStarsCombat extends Combat { return this; } + /* -------------------------------------------- */ + nextRound() { + super.nextRound() + let toDelete = [] + for (let c of this.combatants) { + if (c.flags?.world?.isDuplicated) { + toDelete.push(c._id) + } + } + this.deleteEmbeddedDocuments("Combatant", toDelete); + } + /* -------------------------------------------- */ _onUpdate(changed, options, userId) { } diff --git a/modules/dark-stars-utility.js b/modules/dark-stars-utility.js index d22bd5e..290f35e 100644 --- a/modules/dark-stars-utility.js +++ b/modules/dark-stars-utility.js @@ -42,7 +42,7 @@ export class DarkStarsUtility { Handlebars.registerHelper('locationLabel', function (key) { return __locationNames[key] }) - + this.gameSettings() @@ -240,14 +240,14 @@ export class DarkStarsUtility { } /* -------------------------------------------- */ - static getAimingMalus(location) { + static getAimingMalus(location) { if (location == "arm" || location == "head") { return -50 } if (location == "torso" || location == "leg") { return -30 } - if (location == "hand" ) { + if (location == "hand") { return -70 } return 0 @@ -255,14 +255,22 @@ export class DarkStarsUtility { /* -------------------------------------------- */ static getAimingLocation(roll) { if (roll == 1) return "head" - if (roll >=2 && roll <=4 ) return "chest" - if (roll >=5 && roll <=6 ) return "abdomen" - if (roll == 7 ) return "leftarm" - if (roll == 8 ) return "rightarm" - if (roll == 9 ) return "rightleg" - if (roll == 10 ) return "leftleg" + if (roll >= 2 && roll <= 4) return "chest" + if (roll >= 5 && roll <= 6) return "abdomen" + if (roll == 7) return "leftarm" + if (roll == 8) return "rightarm" + if (roll == 9) return "rightleg" + if (roll == 10) return "leftleg" return "abdomen" } + /* -------------------------------------------- */ + static locationMultiplier(location) { + if (location == "head") return 0.3 + if (location.includes("arm")) return 0.2 + if (location.includes("leg")) return 0.4 + if (location == "chest") return 0.5 + return 0.3 // Abdomen case + } /* -------------------------------------------- */ static async rollDarkStars(rollData) { @@ -271,13 +279,13 @@ export class DarkStarsUtility { // ability/save/size => 0 rollData.percentValue = 0 - if ( rollData.skill ) { + if (rollData.skill) { rollData.percentValue = rollData.skill.total } - rollData.percentValue += rollData.bonusMalus + rollData.percentValue += rollData.bonusMalus rollData.diceFormula = "1d100" - if (rollData.isAboveEffectiveRange) { + if (rollData.isAboveEffectiveRange) { rollData.percentValue -= 30 rollData.percentValue = Math.max(0, rollData.percentValue) } @@ -299,18 +307,23 @@ export class DarkStarsUtility { rollData.isCriticalFailure = rollData.diceResult == 100 rollData.isSuccess = rollData.diceResult == 1 || rollData.diceResult <= rollData.percentValue rollData.isFailure = rollData.diceResult == 100 || rollData.diceResult > rollData.percentValue - rollData.degrees = Math.floor(rollData.percentValue/10) - Math.floor(rollData.diceResult/10) - + rollData.degrees = Math.floor(rollData.percentValue / 10) - Math.floor(rollData.diceResult / 10) + rollData.damageMultiplier = rollData.isCriticalSuccess ? 2 : 1 + if (rollData.reroll) { actor.modifyRerolls(-1) rollData.rerolls = 0 // DIsable rerolls } - if (rollData.weaponAiming == "none" ) { - let rollLoc = new Roll("1d10").roll({async: false}) - rollData.weaponAiming = this.getAimingLocation(rollLoc.total) + if (rollData.mode == "weapon") { + if (rollData.weaponAiming == "none") { + let rollLoc = new Roll("1d10").roll({ async: false }) + rollData.weaponAiming = this.getAimingLocation(rollLoc.total) + } + // Compute + rollData.locationMultiplier = this.locationMultiplier(rollData.weaponAiming) } - + let msg = await this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-dark-stars/templates/chat/chat-generic-result.hbs`, rollData) }) @@ -418,7 +431,7 @@ export class DarkStarsUtility { let rollData = { rollId: randomID(16), rollMode: game.settings.get("core", "rollMode"), - bonusMalus : 0, + bonusMalus: 0, isAboveEffectiveRange: false, weaponAiming: "none" } diff --git a/packs/armor/000100.log b/packs/armor/000100.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/armor/CURRENT b/packs/armor/CURRENT index 95395b2..e333c89 100644 --- a/packs/armor/CURRENT +++ b/packs/armor/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000102 diff --git a/packs/armor/LOG b/packs/armor/LOG index 148d235..25c5037 100644 --- a/packs/armor/LOG +++ b/packs/armor/LOG @@ -1,8 +1,3 @@ -2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96 -2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94 -2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96 -2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) -2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-12:57:48.590897 7f8105ffb6c0 Recovering log #100 +2023/10/21-12:57:48.601577 7f8105ffb6c0 Delete type=3 #98 +2023/10/21-12:57:48.601642 7f8105ffb6c0 Delete type=0 #100 diff --git a/packs/armor/LOG.old b/packs/armor/LOG.old index e036603..148d235 100644 --- a/packs/armor/LOG.old +++ b/packs/armor/LOG.old @@ -1,8 +1,8 @@ -2023/10/21-09:05:36.542041 7f8105ffb6c0 Recovering log #92 -2023/10/21-09:05:36.602565 7f8105ffb6c0 Delete type=3 #90 -2023/10/21-09:05:36.602727 7f8105ffb6c0 Delete type=0 #92 -2023/10/21-09:46:38.900681 7f7e677006c0 Level-0 table #97: started -2023/10/21-09:46:38.900730 7f7e677006c0 Level-0 table #97: 0 bytes OK -2023/10/21-09:46:38.908919 7f7e677006c0 Delete type=0 #95 -2023/10/21-09:46:38.909203 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) -2023/10/21-09:46:38.909242 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96 +2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94 +2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96 +2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) diff --git a/packs/armor/MANIFEST-000098 b/packs/armor/MANIFEST-000098 deleted file mode 100644 index 582ad0fcfde3669778a581d26c54d975d35229f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmWeu=MYI`U}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfn6U8pOsm|2pVTdZj8 zZ|s{DlwFh?Vd9aR7!b+G$N&Z~`9e!C_i!JRN|Vx*$fBw;7e;=FyywpAHXIC$Ov#)K U%qcAVHevS}LEID|H;siK0MITWh5!Hn diff --git a/packs/conditions/000100.log b/packs/conditions/000100.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/conditions/CURRENT b/packs/conditions/CURRENT index 95395b2..e333c89 100644 --- a/packs/conditions/CURRENT +++ b/packs/conditions/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000102 diff --git a/packs/conditions/LOG b/packs/conditions/LOG index 5e54d65..880778c 100644 --- a/packs/conditions/LOG +++ b/packs/conditions/LOG @@ -1,7 +1,3 @@ -2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96 -2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94 -2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96 -2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-12:57:48.639550 7f8105ffb6c0 Recovering log #100 +2023/10/21-12:57:48.652746 7f8105ffb6c0 Delete type=3 #98 +2023/10/21-12:57:48.652801 7f8105ffb6c0 Delete type=0 #100 diff --git a/packs/conditions/LOG.old b/packs/conditions/LOG.old index 2db826c..5e54d65 100644 --- a/packs/conditions/LOG.old +++ b/packs/conditions/LOG.old @@ -1,7 +1,7 @@ -2023/10/21-09:05:36.797969 7f8105ffb6c0 Recovering log #92 -2023/10/21-09:05:36.849645 7f8105ffb6c0 Delete type=3 #90 -2023/10/21-09:05:36.849750 7f8105ffb6c0 Delete type=0 #92 -2023/10/21-09:46:38.929884 7f7e677006c0 Level-0 table #97: started -2023/10/21-09:46:38.929933 7f7e677006c0 Level-0 table #97: 0 bytes OK -2023/10/21-09:46:38.937826 7f7e677006c0 Delete type=0 #95 -2023/10/21-09:46:38.938170 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96 +2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94 +2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96 +2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/MANIFEST-000098 b/packs/conditions/MANIFEST-000098 deleted file mode 100644 index 502185bb498e77d89fdb2989dc81c61eee01471c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAevy9c{1y%dMy6y=2IdqN R2B|~SPlC89KyDff0|4=i6IuWO diff --git a/packs/currency/000100.log b/packs/currency/000100.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/currency/CURRENT b/packs/currency/CURRENT index 95395b2..e333c89 100644 --- a/packs/currency/CURRENT +++ b/packs/currency/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000102 diff --git a/packs/currency/LOG b/packs/currency/LOG index abbda2b..59ffc48 100644 --- a/packs/currency/LOG +++ b/packs/currency/LOG @@ -1,7 +1,3 @@ -2023/10/21-09:46:53.241977 7f81067fc6c0 Recovering log #96 -2023/10/21-09:46:53.252607 7f81067fc6c0 Delete type=3 #94 -2023/10/21-09:46:53.252753 7f81067fc6c0 Delete type=0 #96 -2023/10/21-10:25:16.654235 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.654260 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.660290 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.674565 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-12:57:48.654499 7f81077fe6c0 Recovering log #100 +2023/10/21-12:57:48.665788 7f81077fe6c0 Delete type=3 #98 +2023/10/21-12:57:48.665868 7f81077fe6c0 Delete type=0 #100 diff --git a/packs/currency/LOG.old b/packs/currency/LOG.old index f194f1c..abbda2b 100644 --- a/packs/currency/LOG.old +++ b/packs/currency/LOG.old @@ -1,7 +1,7 @@ -2023/10/21-09:05:36.852656 7f81067fc6c0 Recovering log #92 -2023/10/21-09:05:36.913271 7f81067fc6c0 Delete type=3 #90 -2023/10/21-09:05:36.913385 7f81067fc6c0 Delete type=0 #92 -2023/10/21-09:46:38.952342 7f7e677006c0 Level-0 table #97: started -2023/10/21-09:46:38.952387 7f7e677006c0 Level-0 table #97: 0 bytes OK -2023/10/21-09:46:38.959129 7f7e677006c0 Delete type=0 #95 -2023/10/21-09:46:38.966401 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.241977 7f81067fc6c0 Recovering log #96 +2023/10/21-09:46:53.252607 7f81067fc6c0 Delete type=3 #94 +2023/10/21-09:46:53.252753 7f81067fc6c0 Delete type=0 #96 +2023/10/21-10:25:16.654235 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.654260 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.660290 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674565 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/currency/MANIFEST-000098 b/packs/currency/MANIFEST-000098 deleted file mode 100644 index 502185bb498e77d89fdb2989dc81c61eee01471c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAevy9c{1y%dMy6y=2IdqN R2B|~SPlC89KyDff0|4=i6IuWO diff --git a/packs/cybernetics/000028.log b/packs/cybernetics/000028.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/cybernetics/CURRENT b/packs/cybernetics/CURRENT index 8b15215..caa721a 100644 --- a/packs/cybernetics/CURRENT +++ b/packs/cybernetics/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000030 diff --git a/packs/cybernetics/LOG b/packs/cybernetics/LOG index f486bbf..3d443ac 100644 --- a/packs/cybernetics/LOG +++ b/packs/cybernetics/LOG @@ -1,8 +1,3 @@ -2023/10/21-09:46:53.283509 7f8106ffd6c0 Recovering log #24 -2023/10/21-09:46:53.293910 7f8106ffd6c0 Delete type=3 #22 -2023/10/21-09:46:53.294097 7f8106ffd6c0 Delete type=0 #24 -2023/10/21-10:25:16.674800 7f7e677006c0 Level-0 table #29: started -2023/10/21-10:25:16.674835 7f7e677006c0 Level-0 table #29: 0 bytes OK -2023/10/21-10:25:16.680984 7f7e677006c0 Delete type=0 #27 -2023/10/21-10:25:16.681147 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) -2023/10/21-10:25:16.681203 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-12:57:48.693267 7f8105ffb6c0 Recovering log #28 +2023/10/21-12:57:48.706472 7f8105ffb6c0 Delete type=3 #26 +2023/10/21-12:57:48.706580 7f8105ffb6c0 Delete type=0 #28 diff --git a/packs/cybernetics/LOG.old b/packs/cybernetics/LOG.old index 7d40463..f486bbf 100644 --- a/packs/cybernetics/LOG.old +++ b/packs/cybernetics/LOG.old @@ -1,8 +1,8 @@ -2023/10/21-09:05:37.030189 7f8105ffb6c0 Recovering log #20 -2023/10/21-09:05:37.086732 7f8105ffb6c0 Delete type=3 #18 -2023/10/21-09:05:37.086828 7f8105ffb6c0 Delete type=0 #20 -2023/10/21-09:46:38.959328 7f7e677006c0 Level-0 table #25: started -2023/10/21-09:46:38.959384 7f7e677006c0 Level-0 table #25: 0 bytes OK -2023/10/21-09:46:38.966078 7f7e677006c0 Delete type=0 #23 -2023/10/21-09:46:38.966424 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) -2023/10/21-09:46:38.966478 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.283509 7f8106ffd6c0 Recovering log #24 +2023/10/21-09:46:53.293910 7f8106ffd6c0 Delete type=3 #22 +2023/10/21-09:46:53.294097 7f8106ffd6c0 Delete type=0 #24 +2023/10/21-10:25:16.674800 7f7e677006c0 Level-0 table #29: started +2023/10/21-10:25:16.674835 7f7e677006c0 Level-0 table #29: 0 bytes OK +2023/10/21-10:25:16.680984 7f7e677006c0 Delete type=0 #27 +2023/10/21-10:25:16.681147 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.681203 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) diff --git a/packs/cybernetics/MANIFEST-000026 b/packs/cybernetics/MANIFEST-000026 deleted file mode 100644 index a305beb326fecc46182eefcbdf3bf033ad3f598b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmZoa`1)rO10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1tp>yhUy@`{-yskz09 z23|Q~US;VOfq~(X7C8m}jEoFm0F$rEst7a5O?LGuPl^h)a4li{4v{Z?EqjfVfssj? WlYv==tN9B9?W`{?X_&WPlSf(+CLFCOl-db@mFft`` VGBBsGgefUM{SV@%0J&)_VE|-zCBpy! diff --git a/packs/shields/000100.log b/packs/shields/000100.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/shields/CURRENT b/packs/shields/CURRENT index 95395b2..e333c89 100644 --- a/packs/shields/CURRENT +++ b/packs/shields/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000102 diff --git a/packs/shields/LOG b/packs/shields/LOG index 643952a..9809884 100644 --- a/packs/shields/LOG +++ b/packs/shields/LOG @@ -1,7 +1,3 @@ -2023/10/21-09:46:53.199962 7f81077fe6c0 Recovering log #96 -2023/10/21-09:46:53.211394 7f81077fe6c0 Delete type=3 #94 -2023/10/21-09:46:53.211491 7f81077fe6c0 Delete type=0 #96 -2023/10/21-10:25:16.626403 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.626435 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.633066 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.646322 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-12:57:48.614993 7f81067fc6c0 Recovering log #100 +2023/10/21-12:57:48.625621 7f81067fc6c0 Delete type=3 #98 +2023/10/21-12:57:48.625711 7f81067fc6c0 Delete type=0 #100 diff --git a/packs/shields/LOG.old b/packs/shields/LOG.old index 1e9b48f..643952a 100644 --- a/packs/shields/LOG.old +++ b/packs/shields/LOG.old @@ -1,7 +1,7 @@ -2023/10/21-09:05:36.672950 7f8106ffd6c0 Recovering log #92 -2023/10/21-09:05:36.722365 7f8106ffd6c0 Delete type=3 #90 -2023/10/21-09:05:36.722463 7f8106ffd6c0 Delete type=0 #92 -2023/10/21-09:46:38.916263 7f7e677006c0 Level-0 table #97: started -2023/10/21-09:46:38.916316 7f7e677006c0 Level-0 table #97: 0 bytes OK -2023/10/21-09:46:38.923082 7f7e677006c0 Delete type=0 #95 -2023/10/21-09:46:38.938109 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.199962 7f81077fe6c0 Recovering log #96 +2023/10/21-09:46:53.211394 7f81077fe6c0 Delete type=3 #94 +2023/10/21-09:46:53.211491 7f81077fe6c0 Delete type=0 #96 +2023/10/21-10:25:16.626403 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.626435 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.633066 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.646322 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/shields/MANIFEST-000098 b/packs/shields/MANIFEST-000098 deleted file mode 100644 index 502185bb498e77d89fdb2989dc81c61eee01471c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAevy9c{1y%dMy6y=2IdqN R2B|~SPlC89KyDff0|4=i6IuWO diff --git a/packs/skills/000100.log b/packs/skills/000100.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 95395b2..e333c89 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000098 +MANIFEST-000102 diff --git a/packs/skills/LOG b/packs/skills/LOG index a7ff36f..1461bfb 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,3 @@ -2023/10/21-09:46:53.254913 7f81077fe6c0 Recovering log #96 -2023/10/21-09:46:53.266376 7f81077fe6c0 Delete type=3 #94 -2023/10/21-09:46:53.266469 7f81077fe6c0 Delete type=0 #96 -2023/10/21-10:25:16.660405 7f7e677006c0 Level-0 table #101: started -2023/10/21-10:25:16.660579 7f7e677006c0 Level-0 table #101: 0 bytes OK -2023/10/21-10:25:16.667324 7f7e677006c0 Delete type=0 #99 -2023/10/21-10:25:16.674581 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) -2023/10/21-10:25:16.674617 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-12:57:48.667993 7f81067fc6c0 Recovering log #100 +2023/10/21-12:57:48.678231 7f81067fc6c0 Delete type=3 #98 +2023/10/21-12:57:48.678292 7f81067fc6c0 Delete type=0 #100 diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 6b0a17f..a7ff36f 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/10/21-09:05:36.915510 7f8106ffd6c0 Recovering log #92 -2023/10/21-09:05:36.973675 7f8106ffd6c0 Delete type=3 #90 -2023/10/21-09:05:36.973827 7f8106ffd6c0 Delete type=0 #92 -2023/10/21-09:46:38.938371 7f7e677006c0 Level-0 table #97: started -2023/10/21-09:46:38.938498 7f7e677006c0 Level-0 table #97: 0 bytes OK -2023/10/21-09:46:38.945449 7f7e677006c0 Delete type=0 #95 -2023/10/21-09:46:38.966340 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) -2023/10/21-09:46:38.966443 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.254913 7f81077fe6c0 Recovering log #96 +2023/10/21-09:46:53.266376 7f81077fe6c0 Delete type=3 #94 +2023/10/21-09:46:53.266469 7f81077fe6c0 Delete type=0 #96 +2023/10/21-10:25:16.660405 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.660579 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.667324 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674581 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.674617 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000098 b/packs/skills/MANIFEST-000098 deleted file mode 100644 index c7461d9838320b9c1c641ae5efa1161d921e863a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmaErvd}S+fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb+5C$VrEHdZn2_i zq*r*UdtzdGZl+;MdQur9BLf(~0ID zFDk{=*uBWx($dnMaT)^{urmo=n+sQEWM&#>QC?M4Bonus/Malus: {{bonusMalus}}% -
  • Final score: {{percentValue}}%
    • +
  • Target Number: {{percentValue}}%
  • Result: {{diceResult}}
  • Degrees: {{degrees}}
    • @@ -51,15 +51,19 @@ {{#if (and weapon isSuccess)}} {{#if weapon.ammo}} -
  • Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}]]
    • +
  • Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]
    • +
  • BR: {{weapon.ammo.system.br}}
    • + {{else}} {{#if weapon.system.hashpdamage}} -
  • Roll HP Damage: [[/r {{weapon.system.damage}}]]
    • +
  • Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]
    • {{/if}} {{#if weapon.system.hasfatiguedamage}} -
  • Roll Fatigue Damage: [[/r {{weapon.system.fatiguedamage}}]]
    • +
  • Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}*{{locationMultiplier}}]]
    • {{/if}} +
  • BR: [[/r {{weapon.system.br}}]]
    • {{/if}} +
  • Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}
    • {{/if}} {{#if (and (not isSuccess) rerolls)}}