From 7a06e8a5c9a3f74603555b38ff30b25b54e8b7a3 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 29 May 2025 18:48:33 +0200 Subject: [PATCH] Combat tab for v13 --- css/fvtt-lethal-fantasy.css | 10 ++ lang/en.json | 2 +- module/applications/combat.mjs | 49 ++++++++-- module/models/monster.mjs | 2 +- .../lf-equipment/{000338.log => 000350.log} | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 +-- packs-system/lf-equipment/LOG.old | 16 +-- .../{MANIFEST-000336 => MANIFEST-000348} | Bin 178 -> 178 bytes .../lf-gifts/{000337.log => 000349.log} | 0 packs-system/lf-gifts/CURRENT | 2 +- packs-system/lf-gifts/LOG | 16 +-- packs-system/lf-gifts/LOG.old | 16 +-- .../{MANIFEST-000335 => MANIFEST-000347} | Bin 175 -> 175 bytes .../lf-skills/{000337.log => 000349.log} | 0 packs-system/lf-skills/CURRENT | 2 +- packs-system/lf-skills/LOG | 16 +-- packs-system/lf-skills/LOG.old | 16 +-- .../{MANIFEST-000335 => MANIFEST-000347} | Bin 178 -> 178 bytes .../{000037.log => 000049.log} | 0 packs-system/lf-spells-miracles/CURRENT | 2 +- packs-system/lf-spells-miracles/LOG | 16 +-- packs-system/lf-spells-miracles/LOG.old | 16 +-- .../{MANIFEST-000035 => MANIFEST-000047} | Bin 173 -> 173 bytes .../{000337.log => 000349.log} | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 +-- packs-system/lf-vulnerabilities/LOG.old | 16 +-- .../{MANIFEST-000335 => MANIFEST-000347} | Bin 176 -> 176 bytes styles/global.less | 11 +++ templates/combat-tracker-footer-v2.hbs | 39 ++++++++ templates/combat-tracker-header-v2.hbs | 92 ++++++++++++++++++ templates/combat-tracker-v2.hbs | 81 +++++++++++++++ 33 files changed, 362 insertions(+), 94 deletions(-) rename packs-system/lf-equipment/{000338.log => 000350.log} (100%) rename packs-system/lf-equipment/{MANIFEST-000336 => MANIFEST-000348} (71%) rename packs-system/lf-gifts/{000337.log => 000349.log} (100%) rename packs-system/lf-gifts/{MANIFEST-000335 => MANIFEST-000347} (73%) rename packs-system/lf-skills/{000337.log => 000349.log} (100%) rename packs-system/lf-skills/{MANIFEST-000335 => MANIFEST-000347} (71%) rename packs-system/lf-spells-miracles/{000037.log => 000049.log} (100%) rename packs-system/lf-spells-miracles/{MANIFEST-000035 => MANIFEST-000047} (73%) rename packs-system/lf-vulnerabilities/{000337.log => 000349.log} (100%) rename packs-system/lf-vulnerabilities/{MANIFEST-000335 => MANIFEST-000347} (72%) create mode 100644 templates/combat-tracker-footer-v2.hbs create mode 100644 templates/combat-tracker-header-v2.hbs create mode 100644 templates/combat-tracker-v2.hbs diff --git a/css/fvtt-lethal-fantasy.css b/css/fvtt-lethal-fantasy.css index 97dba58..8a9cf2a 100644 --- a/css/fvtt-lethal-fantasy.css +++ b/css/fvtt-lethal-fantasy.css @@ -13,6 +13,16 @@ --font-secondary: "BaskervilleBold", serif; --logo-standard: url("../assets/ui/lf_logo_small_02.webp"); } +.initiative-area { + min-width: 8rem; + max-width: 8rem; + display: flex; + flex-direction: row; +} +.initiative-area input { + min-width: 3rem; + max-width: 3rem; +} #logo { content: var(--logo-standard); width: 50px; diff --git a/lang/en.json b/lang/en.json index 29dbd7f..9f81fce 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,6 +1,6 @@ { "COMBAT": { - "Round": "Second", + "Round": "Second {round}", "Rounds": "Seconds", "RoundNext": "Next second" }, diff --git a/module/applications/combat.mjs b/module/applications/combat.mjs index 169b27f..06285a6 100644 --- a/module/applications/combat.mjs +++ b/module/applications/combat.mjs @@ -2,17 +2,53 @@ /* -------------------------------------------- */ export class LethalFantasyCombatTracker extends foundry.applications.sidebar.tabs.CombatTracker { - async getData(options) { - let data = await super.getData(options); - for (let u of data.turns) { + static PARTS = { + "header": { + "template": "systems/fvtt-lethal-fantasy/templates/combat-tracker-header-v2.hbs" + }, + "tracker": { + "template": "systems/fvtt-lethal-fantasy/templates/combat-tracker-v2.hbs" + }, + "footer": { + "template": "systems/fvtt-lethal-fantasy/templates/combat-tracker-footer-v2.hbs" + } + } + + static DEFAULT_OPTIONS = foundry.utils.mergeObject(super.DEFAULT_OPTIONS, { + actions: { + initiativePlus: LethalFantasyCombatTracker.#initiativePlus, + initiativeMinus: LethalFantasyCombatTracker.#initiativeMinus, + }, + }); + + async _prepareContext(options) { + let data = await super._prepareContext(options); + console?.log("Combat Tracker Data", data); + /*for (let u of data.turns) { let c = game.combat.combatants.get(u.id); u.progressionCount = c.system.progressionCount u.isMonster = c.actor.type === "monster" } - console.log("Combat Data", data); + console.log("Combat Data", data);*/ return data; } + static #initiativePlus(ev) { + ev.preventDefault(); + let cId = ev.target.closest(".combatant").dataset.combatantId; + let c = game.combat.combatants.get(cId); + c.update({ 'initiative': c.initiative + 1 }); + console.log("Initiative Plus"); + } + + static #initiativeMinus(ev) { + ev.preventDefault(); + let cId = ev.target.closest(".combatant").dataset.combatantId; + let c = game.combat.combatants.get(cId); + let newInit = Math.max(c.initiative - 1, 0); + c.update({ 'initiative': newInit }); + } + activateListeners(html) { super.activateListeners(html); // Display Combat settings @@ -21,7 +57,6 @@ export class LethalFantasyCombatTracker extends foundry.applications.sidebar.tab let cId = ev.currentTarget.closest(".combatant").dataset.combatantId; let c = game.combat.combatants.get(cId); c.update({ 'initiative': c.initiative + 1 }); - console.log("Initiative Plus"); }); html.find(".initiative-minus").click(ev => { @@ -160,10 +195,10 @@ export class LethalFantasyCombat extends Combat { } for (let c of this.combatants) { - if ( nextRound >= c.initiative) { + if (nextRound >= c.initiative) { let user = game.users.find(u => u.active && u.character && u.character.id === c.actor.id); if (user?.hasPlayerOwner) { - game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", progressionCount: c.system.progressionCount+1, actorId: c.actor.id, combatId: this.id, combatantId: c.id }); + game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", progressionCount: c.system.progressionCount + 1, actorId: c.actor.id, combatId: this.id, combatantId: c.id }); } else { user = game.users.find(u => u.active && u.isGM); c.actor.system.rollProgressionDice(this.id, c.id); diff --git a/module/models/monster.mjs b/module/models/monster.mjs index bbe9532..7e6c4f5 100644 --- a/module/models/monster.mjs +++ b/module/models/monster.mjs @@ -238,7 +238,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel async rollProgressionDice(combatId, combatantId) { - const rollModes = Object.fromEntries(Object.entries(CONFIG.Dice.rollModes).map(([key, value]) => [key, game.i18n.localize(value)])) + const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes) const fieldRollMode = new foundry.data.fields.StringField({ choices: rollModes, blank: false, diff --git a/packs-system/lf-equipment/000338.log b/packs-system/lf-equipment/000350.log similarity index 100% rename from packs-system/lf-equipment/000338.log rename to packs-system/lf-equipment/000350.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index 26ca7ad..549acb4 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000336 +MANIFEST-000348 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index 5fa2072..8616c98 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/05/14-09:18:06.447327 7f5ccd7fa6c0 Recovering log #334 -2025/05/14-09:18:06.457498 7f5ccd7fa6c0 Delete type=3 #332 -2025/05/14-09:18:06.457555 7f5ccd7fa6c0 Delete type=0 #334 -2025/05/14-10:01:12.490342 7f5ccb7ff6c0 Level-0 table #339: started -2025/05/14-10:01:12.490385 7f5ccb7ff6c0 Level-0 table #339: 0 bytes OK -2025/05/14-10:01:12.496360 7f5ccb7ff6c0 Delete type=0 #337 -2025/05/14-10:01:12.515162 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) -2025/05/14-10:01:12.515209 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/05/29-16:36:11.138560 7f53e4df86c0 Recovering log #346 +2025/05/29-16:36:11.150394 7f53e4df86c0 Delete type=3 #344 +2025/05/29-16:36:11.150472 7f53e4df86c0 Delete type=0 #346 +2025/05/29-18:48:12.764595 7f53df3ff6c0 Level-0 table #351: started +2025/05/29-18:48:12.764652 7f53df3ff6c0 Level-0 table #351: 0 bytes OK +2025/05/29-18:48:12.777058 7f53df3ff6c0 Delete type=0 #349 +2025/05/29-18:48:12.800778 7f53df3ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/05/29-18:48:12.800877 7f53df3ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index 4159263..e3e3b3f 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/05/14-07:47:09.475124 7f5ccd7fa6c0 Recovering log #330 -2025/05/14-07:47:09.486681 7f5ccd7fa6c0 Delete type=3 #328 -2025/05/14-07:47:09.486812 7f5ccd7fa6c0 Delete type=0 #330 -2025/05/14-08:06:15.866972 7f5ccb7ff6c0 Level-0 table #335: started -2025/05/14-08:06:15.867049 7f5ccb7ff6c0 Level-0 table #335: 0 bytes OK -2025/05/14-08:06:15.873425 7f5ccb7ff6c0 Delete type=0 #333 -2025/05/14-08:06:15.893680 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) -2025/05/14-08:06:15.893803 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/05/22-18:45:28.754313 7f53737fe6c0 Recovering log #342 +2025/05/22-18:45:28.804653 7f53737fe6c0 Delete type=3 #340 +2025/05/22-18:45:28.804783 7f53737fe6c0 Delete type=0 #342 +2025/05/22-19:43:04.046497 7f53723ff6c0 Level-0 table #347: started +2025/05/22-19:43:04.046522 7f53723ff6c0 Level-0 table #347: 0 bytes OK +2025/05/22-19:43:04.084205 7f53723ff6c0 Delete type=0 #345 +2025/05/22-19:43:04.153359 7f53723ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/05/22-19:43:04.153400 7f53723ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/MANIFEST-000336 b/packs-system/lf-equipment/MANIFEST-000348 similarity index 71% rename from packs-system/lf-equipment/MANIFEST-000336 rename to packs-system/lf-equipment/MANIFEST-000348 index 805c895c7e0ac9ee58847bd49a849aa5a317df10..ce72c5a4485d6fc31afcf1df40d2003e9824102a 100644 GIT binary patch delta 43 tcmdnQxQTH>pGtM=p-bEhj7)c#I2oAlF|j=3C^o5%0g2oLi97&_001f_3^V`$ delta 43 tcmdnQxQTH>pGxAhPn_Hgj7%4qI2o8PF|j=3a0+An3=+8n61f5r0RSP$3*-O* diff --git a/packs-system/lf-gifts/000337.log b/packs-system/lf-gifts/000349.log similarity index 100% rename from packs-system/lf-gifts/000337.log rename to packs-system/lf-gifts/000349.log diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index adf199b..2033052 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000335 +MANIFEST-000347 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index 0e2d60a..8547a51 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/05/14-09:18:06.461139 7f5ccdffb6c0 Recovering log #333 -2025/05/14-09:18:06.471748 7f5ccdffb6c0 Delete type=3 #331 -2025/05/14-09:18:06.471810 7f5ccdffb6c0 Delete type=0 #333 -2025/05/14-10:01:12.509221 7f5ccb7ff6c0 Level-0 table #338: started -2025/05/14-10:01:12.509244 7f5ccb7ff6c0 Level-0 table #338: 0 bytes OK -2025/05/14-10:01:12.515073 7f5ccb7ff6c0 Delete type=0 #336 -2025/05/14-10:01:12.515202 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/05/14-10:01:12.515252 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/05/29-16:36:11.158130 7f53e5dfa6c0 Recovering log #345 +2025/05/29-16:36:11.168794 7f53e5dfa6c0 Delete type=3 #343 +2025/05/29-16:36:11.168968 7f53e5dfa6c0 Delete type=0 #345 +2025/05/29-18:48:12.777345 7f53df3ff6c0 Level-0 table #350: started +2025/05/29-18:48:12.777387 7f53df3ff6c0 Level-0 table #350: 0 bytes OK +2025/05/29-18:48:12.788225 7f53df3ff6c0 Delete type=0 #348 +2025/05/29-18:48:12.800802 7f53df3ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/05/29-18:48:12.800914 7f53df3ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-gifts/LOG.old b/packs-system/lf-gifts/LOG.old index 37770ea..38f6d3b 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/05/14-07:47:09.493325 7f5ccc7f86c0 Recovering log #329 -2025/05/14-07:47:09.503988 7f5ccc7f86c0 Delete type=3 #327 -2025/05/14-07:47:09.504090 7f5ccc7f86c0 Delete type=0 #329 -2025/05/14-08:06:15.873602 7f5ccb7ff6c0 Level-0 table #334: started -2025/05/14-08:06:15.873653 7f5ccb7ff6c0 Level-0 table #334: 0 bytes OK -2025/05/14-08:06:15.879920 7f5ccb7ff6c0 Delete type=0 #332 -2025/05/14-08:06:15.893720 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/05/14-08:06:15.893853 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/05/22-18:45:28.835173 7f5373fff6c0 Recovering log #341 +2025/05/22-18:45:28.894795 7f5373fff6c0 Delete type=3 #339 +2025/05/22-18:45:28.894867 7f5373fff6c0 Delete type=0 #341 +2025/05/22-19:43:04.009442 7f53723ff6c0 Level-0 table #346: started +2025/05/22-19:43:04.009522 7f53723ff6c0 Level-0 table #346: 0 bytes OK +2025/05/22-19:43:04.046375 7f53723ff6c0 Delete type=0 #344 +2025/05/22-19:43:04.153344 7f53723ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/05/22-19:43:04.153392 7f53723ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-gifts/MANIFEST-000335 b/packs-system/lf-gifts/MANIFEST-000347 similarity index 73% rename from packs-system/lf-gifts/MANIFEST-000335 rename to packs-system/lf-gifts/MANIFEST-000347 index 595590a46790480fffa1a50fe04a5eb72101fd11..47ef6fc662b7799bae4d8a0bb6e3542a5d309778 100644 GIT binary patch delta 41 scmZ3_xSnxBuTsj<pUV16TSU1T7@6)caWXL9WnyV#5v%dN3lg~t61fi&0RSLA3w!_o delta 43 tcmdnQxQTH>pUTz1C&#!M7@00GaWXJpWMXM!dGkv~03>n|Byt%f0suB+3@88q diff --git a/packs-system/lf-spells-miracles/000037.log b/packs-system/lf-spells-miracles/000049.log similarity index 100% rename from packs-system/lf-spells-miracles/000037.log rename to packs-system/lf-spells-miracles/000049.log diff --git a/packs-system/lf-spells-miracles/CURRENT b/packs-system/lf-spells-miracles/CURRENT index 29a53d8..1afa5d4 100644 --- a/packs-system/lf-spells-miracles/CURRENT +++ b/packs-system/lf-spells-miracles/CURRENT @@ -1 +1 @@ -MANIFEST-000035 +MANIFEST-000047 diff --git a/packs-system/lf-spells-miracles/LOG b/packs-system/lf-spells-miracles/LOG index 070cfa3..92a1d53 100644 --- a/packs-system/lf-spells-miracles/LOG +++ b/packs-system/lf-spells-miracles/LOG @@ -1,8 +1,8 @@ -2025/05/14-09:18:06.487926 7f5ccc7f86c0 Recovering log #33 -2025/05/14-09:18:06.497838 7f5ccc7f86c0 Delete type=3 #31 -2025/05/14-09:18:06.497894 7f5ccc7f86c0 Delete type=0 #33 -2025/05/14-10:01:12.535301 7f5ccb7ff6c0 Level-0 table #38: started -2025/05/14-10:01:12.535349 7f5ccb7ff6c0 Level-0 table #38: 0 bytes OK -2025/05/14-10:01:12.541664 7f5ccb7ff6c0 Delete type=0 #36 -2025/05/14-10:01:12.541942 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) -2025/05/14-10:01:12.541971 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/05/29-16:36:11.187985 7f53e4df86c0 Recovering log #45 +2025/05/29-16:36:11.199498 7f53e4df86c0 Delete type=3 #43 +2025/05/29-16:36:11.199566 7f53e4df86c0 Delete type=0 #45 +2025/05/29-18:48:12.801134 7f53df3ff6c0 Level-0 table #50: started +2025/05/29-18:48:12.801185 7f53df3ff6c0 Level-0 table #50: 0 bytes OK +2025/05/29-18:48:12.810101 7f53df3ff6c0 Delete type=0 #48 +2025/05/29-18:48:12.859825 7f53df3ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/05/29-18:48:12.859922 7f53df3ff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-spells-miracles/LOG.old b/packs-system/lf-spells-miracles/LOG.old index 37eaea0..517b336 100644 --- a/packs-system/lf-spells-miracles/LOG.old +++ b/packs-system/lf-spells-miracles/LOG.old @@ -1,8 +1,8 @@ -2025/05/14-07:47:09.521604 7f5ccd7fa6c0 Recovering log #29 -2025/05/14-07:47:09.533204 7f5ccd7fa6c0 Delete type=3 #27 -2025/05/14-07:47:09.533353 7f5ccd7fa6c0 Delete type=0 #29 -2025/05/14-08:06:15.894136 7f5ccb7ff6c0 Level-0 table #34: started -2025/05/14-08:06:15.894209 7f5ccb7ff6c0 Level-0 table #34: 0 bytes OK -2025/05/14-08:06:15.900873 7f5ccb7ff6c0 Delete type=0 #32 -2025/05/14-08:06:15.921517 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) -2025/05/14-08:06:15.921613 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/05/22-18:45:28.985810 7f5372ffd6c0 Recovering log #41 +2025/05/22-18:45:29.040662 7f5372ffd6c0 Delete type=3 #39 +2025/05/22-18:45:29.040742 7f5372ffd6c0 Delete type=0 #41 +2025/05/22-19:43:04.281148 7f53723ff6c0 Level-0 table #46: started +2025/05/22-19:43:04.281205 7f53723ff6c0 Level-0 table #46: 0 bytes OK +2025/05/22-19:43:04.315875 7f53723ff6c0 Delete type=0 #44 +2025/05/22-19:43:04.316126 7f53723ff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/05/22-19:43:04.366588 7f53723ff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-spells-miracles/MANIFEST-000035 b/packs-system/lf-spells-miracles/MANIFEST-000047 similarity index 73% rename from packs-system/lf-spells-miracles/MANIFEST-000035 rename to packs-system/lf-spells-miracles/MANIFEST-000047 index 452c715e672a42198eede8d04216f4a6f6a3e84b..40e1a895135e7091c3b21dc6ebee4ee291c0ba06 100644 GIT binary patch delta 39 qcmZ3>xR!B3ufmcSmqIxi7?}(>8JG=OI#`1Kv}^$J4S{@PARhqkObO%w delta 39 qcmZ3>xR!B3uR>nk6L(GqMkW34wfI8>vw_pszAOvkPiUeI|*O_ diff --git a/packs-system/lf-vulnerabilities/000337.log b/packs-system/lf-vulnerabilities/000349.log similarity index 100% rename from packs-system/lf-vulnerabilities/000337.log rename to packs-system/lf-vulnerabilities/000349.log diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT index adf199b..2033052 100644 --- a/packs-system/lf-vulnerabilities/CURRENT +++ b/packs-system/lf-vulnerabilities/CURRENT @@ -1 +1 @@ -MANIFEST-000335 +MANIFEST-000347 diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG index 2facba4..5669061 100644 --- a/packs-system/lf-vulnerabilities/LOG +++ b/packs-system/lf-vulnerabilities/LOG @@ -1,8 +1,8 @@ -2025/05/14-09:18:06.475503 7f5cccff96c0 Recovering log #333 -2025/05/14-09:18:06.485731 7f5cccff96c0 Delete type=3 #331 -2025/05/14-09:18:06.485791 7f5cccff96c0 Delete type=0 #333 -2025/05/14-10:01:12.496479 7f5ccb7ff6c0 Level-0 table #338: started -2025/05/14-10:01:12.496503 7f5ccb7ff6c0 Level-0 table #338: 0 bytes OK -2025/05/14-10:01:12.502768 7f5ccb7ff6c0 Delete type=0 #336 -2025/05/14-10:01:12.515177 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/05/14-10:01:12.515216 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/05/29-16:36:11.172412 7f53e55f96c0 Recovering log #345 +2025/05/29-16:36:11.183464 7f53e55f96c0 Delete type=3 #343 +2025/05/29-16:36:11.183540 7f53e55f96c0 Delete type=0 #345 +2025/05/29-18:48:12.788378 7f53df3ff6c0 Level-0 table #350: started +2025/05/29-18:48:12.788406 7f53df3ff6c0 Level-0 table #350: 0 bytes OK +2025/05/29-18:48:12.800425 7f53df3ff6c0 Delete type=0 #348 +2025/05/29-18:48:12.800827 7f53df3ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/05/29-18:48:12.800943 7f53df3ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-vulnerabilities/LOG.old b/packs-system/lf-vulnerabilities/LOG.old index f77064f..3248b5e 100644 --- a/packs-system/lf-vulnerabilities/LOG.old +++ b/packs-system/lf-vulnerabilities/LOG.old @@ -1,8 +1,8 @@ -2025/05/14-07:47:09.507023 7f5ccdffb6c0 Recovering log #329 -2025/05/14-07:47:09.517849 7f5ccdffb6c0 Delete type=3 #327 -2025/05/14-07:47:09.517975 7f5ccdffb6c0 Delete type=0 #329 -2025/05/14-08:06:15.880220 7f5ccb7ff6c0 Level-0 table #334: started -2025/05/14-08:06:15.880293 7f5ccb7ff6c0 Level-0 table #334: 0 bytes OK -2025/05/14-08:06:15.886487 7f5ccb7ff6c0 Delete type=0 #332 -2025/05/14-08:06:15.893747 7f5ccb7ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/05/14-08:06:15.893881 7f5ccb7ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/05/22-18:45:28.912541 7f5378bfa6c0 Recovering log #341 +2025/05/22-18:45:28.969080 7f5378bfa6c0 Delete type=3 #339 +2025/05/22-18:45:28.969151 7f5378bfa6c0 Delete type=0 #341 +2025/05/22-19:43:04.122198 7f53723ff6c0 Level-0 table #346: started +2025/05/22-19:43:04.122219 7f53723ff6c0 Level-0 table #346: 0 bytes OK +2025/05/22-19:43:04.153184 7f53723ff6c0 Delete type=0 #344 +2025/05/22-19:43:04.153383 7f53723ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/05/22-19:43:04.153407 7f53723ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-vulnerabilities/MANIFEST-000335 b/packs-system/lf-vulnerabilities/MANIFEST-000347 similarity index 72% rename from packs-system/lf-vulnerabilities/MANIFEST-000335 rename to packs-system/lf-vulnerabilities/MANIFEST-000347 index 4ae612f6540431aa54d4d4ce5bd7a176e39e818e..e6386879f08e9c9610d5aa2956dd8a8182adaaec 100644 GIT binary patch delta 41 scmdnMxPfs(pAzTO+LK%ij7)c!I2oAlGO=Vug}=@R3ETw<+y@E(01CznZ2$lO delta 41 rcmdnMxPfs(pHi%ZOdA&iBhv*YP6p + {{~#if hasCombat~}} + + {{!-- GM Controls --}} + {{#if user.isGM}} + {{#if combat.round}} + + + + + + {{else}} + + {{/if}} + + {{!-- Active Player Controls --}} + {{else if control}} + + {{/if}} + {{/if}} + diff --git a/templates/combat-tracker-header-v2.hbs b/templates/combat-tracker-header-v2.hbs new file mode 100644 index 0000000..7b89365 --- /dev/null +++ b/templates/combat-tracker-header-v2.hbs @@ -0,0 +1,92 @@ +
+ + {{!-- Encounter Controls --}} + {{#if user.isGM}} + + {{/if}} + +
+ + {{!-- Bulk Rolls --}} +
+ {{#if user.isGM}} + + + {{else}} +
+
+ {{/if}} +
+ + {{!-- Combat Status --}} + + {{#if combats.length}} + {{#if combat.round}} + {{ localize "COMBAT.Round" round=combat.round }} + {{else}} + {{ localize "COMBAT.NotStarted" }} + {{/if}} + {{else}} + {{ localize "COMBAT.None" }} + {{/if}} + + + {{!-- Combat Controls --}} +
+
+ +
+ +
+ +
diff --git a/templates/combat-tracker-v2.hbs b/templates/combat-tracker-v2.hbs new file mode 100644 index 0000000..5b91554 --- /dev/null +++ b/templates/combat-tracker-v2.hbs @@ -0,0 +1,81 @@ +
    + {{#each turns}} +
  1. + {{!-- TODO: Targets --}} + + {{!-- Image --}} + {{ name }} + + {{!-- Name & Controls --}} +
    + {{ name }} +
    + {{#if @root.user.isGM}} + + + {{/if}} + {{#if canPing}} + + {{/if}} + {{#unless @root.user.isGM}} + + {{/unless}} + {{!-- TODO: Target Control --}} +
    + {{#each effects.icons}} + {{ name }} + {{/each}} +
    +
    +
    + + {{!-- Resource --}} + {{#if resource includeZero=true}} +
    + {{ resource }} +
    + {{/if}} + + {{!-- Initiative --}} +
    + {{#if initiative includeZero=true}} + + {{!-- Decimal Initiative --}} + {{#if @root.hasDecimals}} + {{ initiative }} + + {{!-- Simple Initiative --}} + {{else}} + + + {{/if}} + + {{#if isOwner}} + + + {{/if}} + + {{#if isMonster}} + - + {{else}} + {{progressionCount}} + {{/if}} + + {{!-- Roll Initiative --}} + {{else if isOwner}} + + {{/if}} +
    +
    2. + {{/each}} +