From 72ef2dbe1b6dcb6bc27737a0bbfae2497fd8e982 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 25 Feb 2025 07:13:59 +0100 Subject: [PATCH] Reset progression button --- lethal-fantasy.mjs | 5 +++-- module/applications/combat.mjs | 5 +++++ module/utils.mjs | 5 +++++ .../lf-equipment/{000169.log => 000173.log} | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++++++-------- packs-system/lf-equipment/LOG.old | 16 ++++++++-------- .../{MANIFEST-000167 => MANIFEST-000171} | Bin 176 -> 176 bytes .../lf-gifts/{000168.log => 000172.log} | 0 packs-system/lf-gifts/CURRENT | 2 +- packs-system/lf-gifts/LOG | 16 ++++++++-------- packs-system/lf-gifts/LOG.old | 16 ++++++++-------- packs-system/lf-gifts/MANIFEST-000166 | Bin 140 -> 0 bytes packs-system/lf-gifts/MANIFEST-000170 | Bin 0 -> 140 bytes .../lf-skills/{000168.log => 000172.log} | 0 packs-system/lf-skills/CURRENT | 2 +- packs-system/lf-skills/LOG | 16 ++++++++-------- packs-system/lf-skills/LOG.old | 16 ++++++++-------- packs-system/lf-skills/MANIFEST-000166 | Bin 141 -> 0 bytes packs-system/lf-skills/MANIFEST-000170 | Bin 0 -> 141 bytes .../{000168.log => 000172.log} | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++++++-------- packs-system/lf-vulnerabilities/LOG.old | 16 ++++++++-------- .../{MANIFEST-000166 => MANIFEST-000170} | Bin 141 -> 141 bytes 25 files changed, 81 insertions(+), 70 deletions(-) rename packs-system/lf-equipment/{000169.log => 000173.log} (100%) rename packs-system/lf-equipment/{MANIFEST-000167 => MANIFEST-000171} (72%) rename packs-system/lf-gifts/{000168.log => 000172.log} (100%) delete mode 100644 packs-system/lf-gifts/MANIFEST-000166 create mode 100644 packs-system/lf-gifts/MANIFEST-000170 rename packs-system/lf-skills/{000168.log => 000172.log} (100%) delete mode 100644 packs-system/lf-skills/MANIFEST-000166 create mode 100644 packs-system/lf-skills/MANIFEST-000170 rename packs-system/lf-vulnerabilities/{000168.log => 000172.log} (100%) rename packs-system/lf-vulnerabilities/{MANIFEST-000166 => MANIFEST-000170} (71%) diff --git a/lethal-fantasy.mjs b/lethal-fantasy.mjs index f9b7adc..b0847fb 100644 --- a/lethal-fantasy.mjs +++ b/lethal-fantasy.mjs @@ -169,8 +169,9 @@ Hooks.on("renderChatMessage", (message, html, data) => { } }) -Hooks.on("updateSetting", async (setting, update, options, id) => { -}) +Hooks.on("getCombatTrackerEntryContext", (html, options) => { + LethalFantasyUtils.pushCombatOptions(html, options); +}); /** * Create a macro when dropping an entity on the hotbar diff --git a/module/applications/combat.mjs b/module/applications/combat.mjs index 5a2c446..5de7f19 100644 --- a/module/applications/combat.mjs +++ b/module/applications/combat.mjs @@ -87,6 +87,11 @@ export class LethalFantasyCombat extends Combat { return this; } + resetProgression(cId) { + let c = this.combatants.get(cId); + c.update({ 'system.progressionCount': 0 }); + } + async nextTurn() { console.log("NEXT TURN"); diff --git a/module/utils.mjs b/module/utils.mjs index 57c5389..82c89d4 100644 --- a/module/utils.mjs +++ b/module/utils.mjs @@ -13,6 +13,11 @@ export default class LethalFantasyUtils { return compendiumData.filter(filter) } + /* -------------------------------------------- */ + static pushCombatOptions(html, options) { + options.push({ name: "Reset Progression", condition: true, icon: '', callback: target => { game.combat.resetProgression(target.data('combatant-id')); } }) + } + static handleSocketEvent(msg = {}) { console.log(`handleSocketEvent !`, msg) let actor diff --git a/packs-system/lf-equipment/000169.log b/packs-system/lf-equipment/000173.log similarity index 100% rename from packs-system/lf-equipment/000169.log rename to packs-system/lf-equipment/000173.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index c5ea6dc..91e41f4 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000167 +MANIFEST-000171 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index 9c121a2..0b4cdaa 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/02/09-09:17:46.952095 7f46adffb6c0 Recovering log #165 -2025/02/09-09:17:47.003194 7f46adffb6c0 Delete type=3 #163 -2025/02/09-09:17:47.003256 7f46adffb6c0 Delete type=0 #165 -2025/02/09-09:18:22.678103 7f46abbff6c0 Level-0 table #170: started -2025/02/09-09:18:22.678129 7f46abbff6c0 Level-0 table #170: 0 bytes OK -2025/02/09-09:18:22.715696 7f46abbff6c0 Delete type=0 #168 -2025/02/09-09:18:22.853749 7f46abbff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/02/09-09:18:22.853920 7f46abbff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/25-07:05:20.257875 7f4fbcbf96c0 Recovering log #169 +2025/02/25-07:05:20.359696 7f4fbcbf96c0 Delete type=3 #167 +2025/02/25-07:05:20.359809 7f4fbcbf96c0 Delete type=0 #169 +2025/02/25-07:13:31.414455 7f4fb6bff6c0 Level-0 table #174: started +2025/02/25-07:13:31.414499 7f4fb6bff6c0 Level-0 table #174: 0 bytes OK +2025/02/25-07:13:31.420623 7f4fb6bff6c0 Delete type=0 #172 +2025/02/25-07:13:31.427207 7f4fb6bff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/25-07:13:31.427286 7f4fb6bff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index b78a0e7..9c121a2 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/02/09-00:22:48.003450 7f46ac7f86c0 Recovering log #161 -2025/02/09-00:22:48.018643 7f46ac7f86c0 Delete type=3 #159 -2025/02/09-00:22:48.018714 7f46ac7f86c0 Delete type=0 #161 -2025/02/09-00:29:06.730919 7f46abbff6c0 Level-0 table #166: started -2025/02/09-00:29:06.730977 7f46abbff6c0 Level-0 table #166: 0 bytes OK -2025/02/09-00:29:06.788041 7f46abbff6c0 Delete type=0 #164 -2025/02/09-00:29:06.953135 7f46abbff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/02/09-00:29:06.953183 7f46abbff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/09-09:17:46.952095 7f46adffb6c0 Recovering log #165 +2025/02/09-09:17:47.003194 7f46adffb6c0 Delete type=3 #163 +2025/02/09-09:17:47.003256 7f46adffb6c0 Delete type=0 #165 +2025/02/09-09:18:22.678103 7f46abbff6c0 Level-0 table #170: started +2025/02/09-09:18:22.678129 7f46abbff6c0 Level-0 table #170: 0 bytes OK +2025/02/09-09:18:22.715696 7f46abbff6c0 Delete type=0 #168 +2025/02/09-09:18:22.853749 7f46abbff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/09-09:18:22.853920 7f46abbff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/MANIFEST-000167 b/packs-system/lf-equipment/MANIFEST-000171 similarity index 72% rename from packs-system/lf-equipment/MANIFEST-000167 rename to packs-system/lf-equipment/MANIFEST-000171 index 3a939b53eac4e591982cafdc8b20b4095b13659e..6f176278bb1ed338e1e37d47a23523278e383d9c 100644 GIT binary patch delta 41 scmdnMxPfs(pVGPmzus~&Ffy%S8Ck-neSY>5B(M@Buo@@;021^IzW@LL diff --git a/packs-system/lf-gifts/000168.log b/packs-system/lf-gifts/000172.log similarity index 100% rename from packs-system/lf-gifts/000168.log rename to packs-system/lf-gifts/000172.log diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index 830373b..301747a 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000166 +MANIFEST-000170 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index be31a96..2171f52 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/02/09-09:17:47.005741 7f46ad7fa6c0 Recovering log #164 -2025/02/09-09:17:47.054649 7f46ad7fa6c0 Delete type=3 #162 -2025/02/09-09:17:47.054741 7f46ad7fa6c0 Delete type=0 #164 -2025/02/09-09:18:22.556082 7f46abbff6c0 Level-0 table #169: started -2025/02/09-09:18:22.556121 7f46abbff6c0 Level-0 table #169: 0 bytes OK -2025/02/09-09:18:22.591317 7f46abbff6c0 Delete type=0 #167 -2025/02/09-09:18:22.677973 7f46abbff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/02/09-09:18:22.678023 7f46abbff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/25-07:05:20.365068 7f4fb7fff6c0 Recovering log #168 +2025/02/25-07:05:20.456483 7f4fb7fff6c0 Delete type=3 #166 +2025/02/25-07:05:20.456655 7f4fb7fff6c0 Delete type=0 #168 +2025/02/25-07:13:31.400371 7f4fb6bff6c0 Level-0 table #173: started +2025/02/25-07:13:31.400477 7f4fb6bff6c0 Level-0 table #173: 0 bytes OK +2025/02/25-07:13:31.406784 7f4fb6bff6c0 Delete type=0 #171 +2025/02/25-07:13:31.427160 7f4fb6bff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/25-07:13:31.427242 7f4fb6bff6c0 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 b8b7838..be31a96 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/02/09-00:22:48.022227 7f46acff96c0 Recovering log #160 -2025/02/09-00:22:48.039352 7f46acff96c0 Delete type=3 #158 -2025/02/09-00:22:48.039406 7f46acff96c0 Delete type=0 #160 -2025/02/09-00:29:06.900070 7f46abbff6c0 Level-0 table #165: started -2025/02/09-00:29:06.900100 7f46abbff6c0 Level-0 table #165: 0 bytes OK -2025/02/09-00:29:06.953004 7f46abbff6c0 Delete type=0 #163 -2025/02/09-00:29:06.953173 7f46abbff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/02/09-00:29:06.953216 7f46abbff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/09-09:17:47.005741 7f46ad7fa6c0 Recovering log #164 +2025/02/09-09:17:47.054649 7f46ad7fa6c0 Delete type=3 #162 +2025/02/09-09:17:47.054741 7f46ad7fa6c0 Delete type=0 #164 +2025/02/09-09:18:22.556082 7f46abbff6c0 Level-0 table #169: started +2025/02/09-09:18:22.556121 7f46abbff6c0 Level-0 table #169: 0 bytes OK +2025/02/09-09:18:22.591317 7f46abbff6c0 Delete type=0 #167 +2025/02/09-09:18:22.677973 7f46abbff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/09-09:18:22.678023 7f46abbff6c0 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-000166 b/packs-system/lf-gifts/MANIFEST-000166 deleted file mode 100644 index f5d7133309b6eaa443b1bd2500e750c1ff210d5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmZQ=x?Pvdz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PL2x}i)_F)cqQCAFwn zu`(dsy{y8+E6K&rBP=*Cl2L&H4CECvOHy--6|1t!+;g&ue6mf0i!+=pT^Ly)@~h)- fb#gHG8~i6v diff --git a/packs-system/lf-gifts/MANIFEST-000170 b/packs-system/lf-gifts/MANIFEST-000170 new file mode 100644 index 0000000000000000000000000000000000000000..3fb26b48fb23dcf1a2ffd0147a5de78d69ea726c GIT binary patch literal 140 zcmZQ=x?Pvdz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PL2x}i)_F)cqQCAFwn zu`(dsy{y8+E6K&rBP=*Cl2L&H4CECvOHy--6|1t!+;g&ue6mf0i!+=pT^Ly)^2e=e fI=C1ZnN~A$GBB@UWKr0$D(E3dU=2uM9Z&!O704$} literal 0 HcmV?d00001 diff --git a/packs-system/lf-skills/000168.log b/packs-system/lf-skills/000172.log similarity index 100% rename from packs-system/lf-skills/000168.log rename to packs-system/lf-skills/000172.log diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT index 830373b..301747a 100644 --- a/packs-system/lf-skills/CURRENT +++ b/packs-system/lf-skills/CURRENT @@ -1 +1 @@ -MANIFEST-000166 +MANIFEST-000170 diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG index 22c1085..e5d4ab4 100644 --- a/packs-system/lf-skills/LOG +++ b/packs-system/lf-skills/LOG @@ -1,8 +1,8 @@ -2025/02/09-09:17:46.895896 7f46ac7f86c0 Recovering log #164 -2025/02/09-09:17:46.947734 7f46ac7f86c0 Delete type=3 #162 -2025/02/09-09:17:46.947832 7f46ac7f86c0 Delete type=0 #164 -2025/02/09-09:18:22.529278 7f46abbff6c0 Level-0 table #169: started -2025/02/09-09:18:22.529322 7f46abbff6c0 Level-0 table #169: 0 bytes OK -2025/02/09-09:18:22.555928 7f46abbff6c0 Delete type=0 #167 -2025/02/09-09:18:22.677958 7f46abbff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/02/09-09:18:22.678006 7f46abbff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/02/25-07:05:20.159274 7f4fb77fe6c0 Recovering log #168 +2025/02/25-07:05:20.252142 7f4fb77fe6c0 Delete type=3 #166 +2025/02/25-07:05:20.252245 7f4fb77fe6c0 Delete type=0 #168 +2025/02/25-07:13:31.406936 7f4fb6bff6c0 Level-0 table #173: started +2025/02/25-07:13:31.406981 7f4fb6bff6c0 Level-0 table #173: 0 bytes OK +2025/02/25-07:13:31.414307 7f4fb6bff6c0 Delete type=0 #171 +2025/02/25-07:13:31.427187 7f4fb6bff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/02/25-07:13:31.427257 7f4fb6bff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-skills/LOG.old b/packs-system/lf-skills/LOG.old index 4dde0fb..22c1085 100644 --- a/packs-system/lf-skills/LOG.old +++ b/packs-system/lf-skills/LOG.old @@ -1,8 +1,8 @@ -2025/02/09-00:22:47.986326 7f46adffb6c0 Recovering log #160 -2025/02/09-00:22:48.000956 7f46adffb6c0 Delete type=3 #158 -2025/02/09-00:22:48.001008 7f46adffb6c0 Delete type=0 #160 -2025/02/09-00:29:06.788155 7f46abbff6c0 Level-0 table #165: started -2025/02/09-00:29:06.788178 7f46abbff6c0 Level-0 table #165: 0 bytes OK -2025/02/09-00:29:06.840912 7f46abbff6c0 Delete type=0 #163 -2025/02/09-00:29:06.953151 7f46abbff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/02/09-00:29:06.953189 7f46abbff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/02/09-09:17:46.895896 7f46ac7f86c0 Recovering log #164 +2025/02/09-09:17:46.947734 7f46ac7f86c0 Delete type=3 #162 +2025/02/09-09:17:46.947832 7f46ac7f86c0 Delete type=0 #164 +2025/02/09-09:18:22.529278 7f46abbff6c0 Level-0 table #169: started +2025/02/09-09:18:22.529322 7f46abbff6c0 Level-0 table #169: 0 bytes OK +2025/02/09-09:18:22.555928 7f46abbff6c0 Delete type=0 #167 +2025/02/09-09:18:22.677958 7f46abbff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/02/09-09:18:22.678006 7f46abbff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-skills/MANIFEST-000166 b/packs-system/lf-skills/MANIFEST-000166 deleted file mode 100644 index 97cd36508b86d425fe057f3350b53bb217ea79ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmYdufBGqffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfd5@L?mnqGDQpPD*M~ zv7&jFg@?IIQm#{yWoT8RQ3PW$0~p9FW|pMp7AsbjSQML^nwg{)82TidLU=>gR09P9)7XSbN diff --git a/packs-system/lf-skills/MANIFEST-000170 b/packs-system/lf-skills/MANIFEST-000170 new file mode 100644 index 0000000000000000000000000000000000000000..3a89899c71e7ac18f05e8a416baf7db227c15804 GIT binary patch literal 141 zcmYdufBGqffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfd5@L?mnqGDQpPD*M~ zv7&jFg@?IIQm#{yWoT8RQ3PW$0~p9FW|pMp7AsbjSQML^nwg{)82TidL}8ygt<*MuUpE&6BhzX|P6p;Rj4U#h`V+2z1lE8A)&T_o@lOfc delta 41 rcmeBW>}8ygt&~+I(Z|KW$h4f1lYw~!Ba2MXFTM(pzzUGSDxd%W(DDea