From b0d61ef626e389cd116890f97bc61cff50e1ce7a Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 20 Jan 2025 18:53:23 +0100 Subject: [PATCH] Update sheet again... --- css/fvtt-lethal-fantasy.css | 3 +++ module/applications/combat.mjs | 18 ++++++++++++++++++ module/models/monster.mjs | 4 +++- packs-system/lf-equipment/000096.log | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++++++-------- packs-system/lf-equipment/LOG.old | 16 ++++++++-------- packs-system/lf-equipment/MANIFEST-000094 | Bin 0 -> 137 bytes packs-system/lf-gifts/000096.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-000094 | Bin 0 -> 136 bytes packs-system/lf-skills/000096.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-000094 | Bin 0 -> 137 bytes packs-system/lf-vulnerabilities/000096.log | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++++++-------- packs-system/lf-vulnerabilities/LOG.old | 16 ++++++++-------- .../lf-vulnerabilities/MANIFEST-000094 | Bin 0 -> 137 bytes styles/global.less | 3 +++ system.json | 2 +- templates/character-biography.hbs | 2 +- templates/combat-tracker.hbs | 4 ++++ templates/monster-main.hbs | 4 ++++ 28 files changed, 105 insertions(+), 71 deletions(-) create mode 100644 packs-system/lf-equipment/000096.log create mode 100644 packs-system/lf-equipment/MANIFEST-000094 create mode 100644 packs-system/lf-gifts/000096.log create mode 100644 packs-system/lf-gifts/MANIFEST-000094 create mode 100644 packs-system/lf-skills/000096.log create mode 100644 packs-system/lf-skills/MANIFEST-000094 create mode 100644 packs-system/lf-vulnerabilities/000096.log create mode 100644 packs-system/lf-vulnerabilities/MANIFEST-000094 diff --git a/css/fvtt-lethal-fantasy.css b/css/fvtt-lethal-fantasy.css index 1996083..0d8f2a6 100644 --- a/css/fvtt-lethal-fantasy.css +++ b/css/fvtt-lethal-fantasy.css @@ -66,6 +66,9 @@ i.lethalfantasy { .combat-sidebar li.combatant .token-initiative { flex: none; } +.initiative-minus { + margin-right: 8px; +} .lethalfantasy .character-sheet-common label { font-family: var(--font-secondary); font-size: calc(var(--font-size-standard) * 1.2); diff --git a/module/applications/combat.mjs b/module/applications/combat.mjs index 678cf62..5a2c446 100644 --- a/module/applications/combat.mjs +++ b/module/applications/combat.mjs @@ -13,6 +13,24 @@ export class LethalFantasyCombatTracker extends CombatTracker { return data; } + activateListeners(html) { + super.activateListeners(html); + // Display Combat settings + html.find(".initiative-plus").click(ev => { + ev.preventDefault(); + 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 => { + ev.preventDefault(); + let cId = ev.currentTarget.closest(".combatant").dataset.combatantId; + let c = game.combat.combatants.get(cId); + c.update({ 'initiative': c.initiative - 1 }); + console.log("Initiative Minus"); + }); + } /* -------------------------------------------- */ static get defaultOptions() { diff --git a/module/models/monster.mjs b/module/models/monster.mjs index 533ec77..a3e5cd8 100644 --- a/module/models/monster.mjs +++ b/module/models/monster.mjs @@ -60,7 +60,8 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel value: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }), average: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }), max: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }), - damageResistance: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }) + damageResistance: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }), + painDamage: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }) }) const attackField = (label) => { @@ -155,6 +156,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel actorImage: this.parent.img, combatId, combatantId, + actorClass: "fighter", maxInit, }) if (!roll) return null diff --git a/packs-system/lf-equipment/000096.log b/packs-system/lf-equipment/000096.log new file mode 100644 index 0000000..e69de29 diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index 2f2c868..0ab25fa 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000090 +MANIFEST-000094 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index 306eb2b..b9fd83e 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/01/20-07:20:09.509287 7f6e777fe6c0 Recovering log #88 -2025/01/20-07:20:09.519035 7f6e777fe6c0 Delete type=3 #86 -2025/01/20-07:20:09.519121 7f6e777fe6c0 Delete type=0 #88 -2025/01/20-07:28:47.827329 7f6e753ff6c0 Level-0 table #93: started -2025/01/20-07:28:47.827358 7f6e753ff6c0 Level-0 table #93: 0 bytes OK -2025/01/20-07:28:47.833248 7f6e753ff6c0 Delete type=0 #91 -2025/01/20-07:28:47.833416 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) -2025/01/20-07:28:47.833441 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/20-18:34:52.996209 7f6e76ffd6c0 Recovering log #92 +2025/01/20-18:34:53.044133 7f6e76ffd6c0 Delete type=3 #90 +2025/01/20-18:34:53.044195 7f6e76ffd6c0 Delete type=0 #92 +2025/01/20-18:52:31.113580 7f6e753ff6c0 Level-0 table #97: started +2025/01/20-18:52:31.113605 7f6e753ff6c0 Level-0 table #97: 0 bytes OK +2025/01/20-18:52:31.119961 7f6e753ff6c0 Delete type=0 #95 +2025/01/20-18:52:31.120109 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/20-18:52:31.120139 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index af82383..306eb2b 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/01/19-20:28:04.294851 7f6e76ffd6c0 Recovering log #84 -2025/01/19-20:28:04.332992 7f6e76ffd6c0 Delete type=3 #82 -2025/01/19-20:28:04.333048 7f6e76ffd6c0 Delete type=0 #84 -2025/01/19-22:33:17.587402 7f6e753ff6c0 Level-0 table #89: started -2025/01/19-22:33:17.587446 7f6e753ff6c0 Level-0 table #89: 0 bytes OK -2025/01/19-22:33:17.593554 7f6e753ff6c0 Delete type=0 #87 -2025/01/19-22:33:17.612509 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) -2025/01/19-22:33:17.612553 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/20-07:20:09.509287 7f6e777fe6c0 Recovering log #88 +2025/01/20-07:20:09.519035 7f6e777fe6c0 Delete type=3 #86 +2025/01/20-07:20:09.519121 7f6e777fe6c0 Delete type=0 #88 +2025/01/20-07:28:47.827329 7f6e753ff6c0 Level-0 table #93: started +2025/01/20-07:28:47.827358 7f6e753ff6c0 Level-0 table #93: 0 bytes OK +2025/01/20-07:28:47.833248 7f6e753ff6c0 Delete type=0 #91 +2025/01/20-07:28:47.833416 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/20-07:28:47.833441 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/MANIFEST-000094 b/packs-system/lf-equipment/MANIFEST-000094 new file mode 100644 index 0000000000000000000000000000000000000000..047c7f12315c48c7ae564b8f2a1ce794584a1f7c GIT binary patch literal 137 zcmaEU;D&1o10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1v9>GB7Rii&CZIVq_{ z#fpw0MV94J8R@2_Az>le#lDPU3}7Iym|2pVTdY{+R#chpWfYQERFRzFl$gn=36Zyv eyLX3!fsrYmlYu#b#g)m}bry)50OTgIxB>tq@+Q6j literal 0 HcmV?d00001 diff --git a/packs-system/lf-gifts/000096.log b/packs-system/lf-gifts/000096.log new file mode 100644 index 0000000..e69de29 diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index 2f2c868..0ab25fa 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000090 +MANIFEST-000094 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index d0fe9c9..4151ccd 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/01/20-07:20:09.522029 7f6e76ffd6c0 Recovering log #88 -2025/01/20-07:20:09.532119 7f6e76ffd6c0 Delete type=3 #86 -2025/01/20-07:20:09.532210 7f6e76ffd6c0 Delete type=0 #88 -2025/01/20-07:28:47.807697 7f6e753ff6c0 Level-0 table #93: started -2025/01/20-07:28:47.807747 7f6e753ff6c0 Level-0 table #93: 0 bytes OK -2025/01/20-07:28:47.813633 7f6e753ff6c0 Delete type=0 #91 -2025/01/20-07:28:47.833369 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/01/20-07:28:47.833424 7f6e753ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/20-18:34:53.050237 7f6e777fe6c0 Recovering log #92 +2025/01/20-18:34:53.090154 7f6e777fe6c0 Delete type=3 #90 +2025/01/20-18:34:53.090233 7f6e777fe6c0 Delete type=0 #92 +2025/01/20-18:52:31.100235 7f6e753ff6c0 Level-0 table #97: started +2025/01/20-18:52:31.100273 7f6e753ff6c0 Level-0 table #97: 0 bytes OK +2025/01/20-18:52:31.106232 7f6e753ff6c0 Delete type=0 #95 +2025/01/20-18:52:31.120084 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/20-18:52:31.120132 7f6e753ff6c0 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 500ae51..d0fe9c9 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/01/19-20:28:04.336215 7f6e767fc6c0 Recovering log #84 -2025/01/19-20:28:04.372498 7f6e767fc6c0 Delete type=3 #82 -2025/01/19-20:28:04.372572 7f6e767fc6c0 Delete type=0 #84 -2025/01/19-22:33:17.593695 7f6e753ff6c0 Level-0 table #89: started -2025/01/19-22:33:17.593726 7f6e753ff6c0 Level-0 table #89: 0 bytes OK -2025/01/19-22:33:17.600149 7f6e753ff6c0 Delete type=0 #87 -2025/01/19-22:33:17.612522 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/01/19-22:33:17.612568 7f6e753ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/20-07:20:09.522029 7f6e76ffd6c0 Recovering log #88 +2025/01/20-07:20:09.532119 7f6e76ffd6c0 Delete type=3 #86 +2025/01/20-07:20:09.532210 7f6e76ffd6c0 Delete type=0 #88 +2025/01/20-07:28:47.807697 7f6e753ff6c0 Level-0 table #93: started +2025/01/20-07:28:47.807747 7f6e753ff6c0 Level-0 table #93: 0 bytes OK +2025/01/20-07:28:47.813633 7f6e753ff6c0 Delete type=0 #91 +2025/01/20-07:28:47.833369 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/20-07:28:47.833424 7f6e753ff6c0 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-000094 b/packs-system/lf-gifts/MANIFEST-000094 new file mode 100644 index 0000000000000000000000000000000000000000..51d0765be26ea0f138b13d666d528db7c5683c20 GIT binary patch literal 136 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)@{e1! cu5&OjGR1Q;Fek7m$eunp8^lcja+6pT0C~wKDF6Tf literal 0 HcmV?d00001 diff --git a/packs-system/lf-skills/000096.log b/packs-system/lf-skills/000096.log new file mode 100644 index 0000000..e69de29 diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT index 2f2c868..0ab25fa 100644 --- a/packs-system/lf-skills/CURRENT +++ b/packs-system/lf-skills/CURRENT @@ -1 +1 @@ -MANIFEST-000090 +MANIFEST-000094 diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG index e4faef3..3512f14 100644 --- a/packs-system/lf-skills/LOG +++ b/packs-system/lf-skills/LOG @@ -1,8 +1,8 @@ -2025/01/20-07:20:09.494321 7f6e75ffb6c0 Recovering log #88 -2025/01/20-07:20:09.505058 7f6e75ffb6c0 Delete type=3 #86 -2025/01/20-07:20:09.505116 7f6e75ffb6c0 Delete type=0 #88 -2025/01/20-07:28:47.813759 7f6e753ff6c0 Level-0 table #93: started -2025/01/20-07:28:47.813783 7f6e753ff6c0 Level-0 table #93: 0 bytes OK -2025/01/20-07:28:47.820354 7f6e753ff6c0 Delete type=0 #91 -2025/01/20-07:28:47.833389 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/01/20-07:28:47.833433 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/20-18:34:52.945940 7f6e767fc6c0 Recovering log #92 +2025/01/20-18:34:52.991196 7f6e767fc6c0 Delete type=3 #90 +2025/01/20-18:34:52.991251 7f6e767fc6c0 Delete type=0 #92 +2025/01/20-18:52:31.093998 7f6e753ff6c0 Level-0 table #97: started +2025/01/20-18:52:31.094052 7f6e753ff6c0 Level-0 table #97: 0 bytes OK +2025/01/20-18:52:31.100089 7f6e753ff6c0 Delete type=0 #95 +2025/01/20-18:52:31.120068 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/20-18:52:31.120116 7f6e753ff6c0 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 89995d0..e4faef3 100644 --- a/packs-system/lf-skills/LOG.old +++ b/packs-system/lf-skills/LOG.old @@ -1,8 +1,8 @@ -2025/01/19-20:28:04.243940 7f6e777fe6c0 Recovering log #84 -2025/01/19-20:28:04.287892 7f6e777fe6c0 Delete type=3 #82 -2025/01/19-20:28:04.287949 7f6e777fe6c0 Delete type=0 #84 -2025/01/19-22:33:17.600271 7f6e753ff6c0 Level-0 table #89: started -2025/01/19-22:33:17.600297 7f6e753ff6c0 Level-0 table #89: 0 bytes OK -2025/01/19-22:33:17.606219 7f6e753ff6c0 Delete type=0 #87 -2025/01/19-22:33:17.612535 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/01/19-22:33:17.612561 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/20-07:20:09.494321 7f6e75ffb6c0 Recovering log #88 +2025/01/20-07:20:09.505058 7f6e75ffb6c0 Delete type=3 #86 +2025/01/20-07:20:09.505116 7f6e75ffb6c0 Delete type=0 #88 +2025/01/20-07:28:47.813759 7f6e753ff6c0 Level-0 table #93: started +2025/01/20-07:28:47.813783 7f6e753ff6c0 Level-0 table #93: 0 bytes OK +2025/01/20-07:28:47.820354 7f6e753ff6c0 Delete type=0 #91 +2025/01/20-07:28:47.833389 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/20-07:28:47.833433 7f6e753ff6c0 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-000094 b/packs-system/lf-skills/MANIFEST-000094 new file mode 100644 index 0000000000000000000000000000000000000000..f802c3f76c9eeebe3632c844289b6a8fdd656caf GIT binary patch literal 137 zcmYdufBGqffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfd5@L?mnqGDQpPD*M~ zv7&jFg@?IIQm#{yWoT8RQ3PW$0~p9FW|pMp7AsbjSQML^nwg{)82TidL - HP/Level + Last HD roll {{formInput systemFields.biodata.fields.hpPerLevel value=system.biodata.hpPerLevel disabled=true}} diff --git a/templates/combat-tracker.hbs b/templates/combat-tracker.hbs index 3f6a355..aeef381 100644 --- a/templates/combat-tracker.hbs +++ b/templates/combat-tracker.hbs @@ -106,6 +106,10 @@
{{#if this.hasRolled}} {{this.initiative}} + {{#if this.owner}} + + + {{/if}} {{else if this.owner}} diff --git a/templates/monster-main.hbs b/templates/monster-main.hbs index 7e0e1ec..3a5906d 100644 --- a/templates/monster-main.hbs +++ b/templates/monster-main.hbs @@ -86,6 +86,10 @@ {{formField systemFields.saves.fields.paincourage.fields.value value=system.saves.paincourage.value disabled=isPlayMode}} + + {{formField systemFields.hp.fields.painDamage value=system.hp.painDamage disabled=isPlayMode tooltip="Pain Damage"}} + +