From 534aa47b7b7766cbf8fd70df2b86c4124f56d86f Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sun, 9 Feb 2025 00:29:23 +0100 Subject: [PATCH] Minor fixes --- css/fvtt-lethal-fantasy.css | 9 ++++++--- module/documents/roll.mjs | 5 +++-- module/models/miracle.mjs | 2 +- module/models/spell.mjs | 2 ++ .../lf-equipment/{000157.log => 000165.log} | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++++++-------- packs-system/lf-equipment/LOG.old | 16 ++++++++-------- .../{MANIFEST-000155 => MANIFEST-000163} | Bin 176 -> 176 bytes .../lf-gifts/{000156.log => 000164.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-000154 | Bin 140 -> 0 bytes packs-system/lf-gifts/MANIFEST-000162 | Bin 0 -> 140 bytes .../lf-skills/{000156.log => 000164.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-000154 | Bin 141 -> 0 bytes packs-system/lf-skills/MANIFEST-000162 | Bin 0 -> 141 bytes .../{000156.log => 000164.log} | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++++++-------- packs-system/lf-vulnerabilities/LOG.old | 16 ++++++++-------- .../{MANIFEST-000154 => MANIFEST-000162} | Bin 141 -> 141 bytes styles/character.less | 9 ++++++--- templates/character-combat.hbs | 4 ++-- templates/spell.hbs | 2 ++ 29 files changed, 90 insertions(+), 79 deletions(-) rename packs-system/lf-equipment/{000157.log => 000165.log} (100%) rename packs-system/lf-equipment/{MANIFEST-000155 => MANIFEST-000163} (72%) rename packs-system/lf-gifts/{000156.log => 000164.log} (100%) delete mode 100644 packs-system/lf-gifts/MANIFEST-000154 create mode 100644 packs-system/lf-gifts/MANIFEST-000162 rename packs-system/lf-skills/{000156.log => 000164.log} (100%) delete mode 100644 packs-system/lf-skills/MANIFEST-000154 create mode 100644 packs-system/lf-skills/MANIFEST-000162 rename packs-system/lf-vulnerabilities/{000156.log => 000164.log} (100%) rename packs-system/lf-vulnerabilities/{MANIFEST-000154 => MANIFEST-000162} (71%) diff --git a/css/fvtt-lethal-fantasy.css b/css/fvtt-lethal-fantasy.css index e3847f6..112dbb6 100644 --- a/css/fvtt-lethal-fantasy.css +++ b/css/fvtt-lethal-fantasy.css @@ -582,6 +582,7 @@ i.lethalfantasy { display: grid; grid-template-columns: repeat(2, 1fr); gap: 4px; + min-width: 20rem; } .lethalfantasy .tab.character-combat .shields .shield { display: flex; @@ -594,7 +595,7 @@ i.lethalfantasy { margin: 4px 0 0 0; } .lethalfantasy .tab.character-combat .shields .item-detail { - min-width: 2rem; + min-width: 2.5rem; } .lethalfantasy .tab.character-combat .shields .name { min-width: 12rem; @@ -631,8 +632,9 @@ i.lethalfantasy { } .lethalfantasy .tab.character-spells .spells { display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: repeat(2, 1fr); gap: 4px; + min-width: 18rem; } .lethalfantasy .tab.character-spells .spells .spell { display: flex; @@ -683,8 +685,9 @@ i.lethalfantasy { } .lethalfantasy .tab.character-miracles .miracles { display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: repeat(2, 1fr); gap: 4px; + min-width: 18rem; } .lethalfantasy .tab.character-miracles .miracles .miracle { display: flex; diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index 13d6732..f2fdb98 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -221,19 +221,20 @@ export default class LethalFantasyRoll extends Roll { options.rollTarget.value = options.rollTarget.actorModifiers.levelSpellModifier + options.rollTarget.actorModifiers.intSpellModifier options.rollTarget.charModifier = options.rollTarget.actorModifiers.intSpellModifier hasStaticModifier = options.rollType === "spell-power" + hasModifier = options.rollType !== "spell-attack" options.rollTarget.staticModifier = options.rollTarget.actorLevel - } else if (options.rollType === "miracle" || options.rollType === "miracle-attack" || options.rollType === "spell-power") { + } else if (options.rollType === "miracle" || options.rollType === "miracle-attack" || options.rollType === "miracle-power") { hasD30 = true options.rollName = options.rollTarget.name dice = "1D20" baseFormula = "D20" maxValue = 20 - hasModifier = true hasChangeDice = false options.rollTarget.value = options.rollTarget.actorModifiers.levelMiracleModifier + options.rollTarget.actorModifiers.chaMiracleModifier options.rollTarget.charModifier = options.rollTarget.actorModifiers.chaMiracleModifier hasStaticModifier = options.rollType === "spell-power" + hasModifier = options.rollType !== "miracle-attack" options.rollTarget.staticModifier = options.rollTarget.actorLevel } else if (options.rollType === "shield-roll") { diff --git a/module/models/miracle.mjs b/module/models/miracle.mjs index aa9fa3d..f492e66 100644 --- a/module/models/miracle.mjs +++ b/module/models/miracle.mjs @@ -15,7 +15,7 @@ export default class LethalFantasyMiracle extends foundry.abstract.TypeDataModel ...requiredInteger, initial: 1, min: 1, - max: 20, + max: 25, }) schema.components = new fields.SchemaField({ verbal: new fields.BooleanField(), diff --git a/module/models/spell.mjs b/module/models/spell.mjs index 2b8ddc8..9907c0e 100644 --- a/module/models/spell.mjs +++ b/module/models/spell.mjs @@ -19,6 +19,8 @@ export default class LethalFantasySpell extends foundry.abstract.TypeDataModel { }) schema.cost = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }) + schema.memorized = new fields.BooleanField({ required: true, initial: false }) + schema.components = new fields.SchemaField({ verbal: new fields.BooleanField(), somatic: new fields.BooleanField(), diff --git a/packs-system/lf-equipment/000157.log b/packs-system/lf-equipment/000165.log similarity index 100% rename from packs-system/lf-equipment/000157.log rename to packs-system/lf-equipment/000165.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index 53dc731..abf5eb3 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000155 +MANIFEST-000163 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index 4c23e92..b78a0e7 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/02/07-16:34:05.730976 7fd3049f96c0 Recovering log #153 -2025/02/07-16:34:05.789986 7fd3049f96c0 Delete type=3 #151 -2025/02/07-16:34:05.790047 7fd3049f96c0 Delete type=0 #153 -2025/02/07-16:37:31.289294 7fd2febff6c0 Level-0 table #158: started -2025/02/07-16:37:31.289337 7fd2febff6c0 Level-0 table #158: 0 bytes OK -2025/02/07-16:37:31.336559 7fd2febff6c0 Delete type=0 #156 -2025/02/07-16:37:31.458940 7fd2febff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/02/07-16:37:31.458968 7fd2febff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +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) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index 6894efc..fe6793b 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/02/06-10:14:34.569454 7ffae7fff6c0 Recovering log #149 -2025/02/06-10:14:34.654202 7ffae7fff6c0 Delete type=3 #147 -2025/02/06-10:14:34.654269 7ffae7fff6c0 Delete type=0 #149 -2025/02/06-10:23:45.931839 7ffae6bff6c0 Level-0 table #154: started -2025/02/06-10:23:45.931895 7ffae6bff6c0 Level-0 table #154: 0 bytes OK -2025/02/06-10:23:45.938070 7ffae6bff6c0 Delete type=0 #152 -2025/02/06-10:23:45.938269 7ffae6bff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/02/06-10:23:45.938320 7ffae6bff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/08-21:49:26.702095 7f46adffb6c0 Recovering log #157 +2025/02/08-21:49:26.754932 7f46adffb6c0 Delete type=3 #155 +2025/02/08-21:49:26.754990 7f46adffb6c0 Delete type=0 #157 +2025/02/08-21:50:08.853716 7f46abbff6c0 Level-0 table #162: started +2025/02/08-21:50:08.853754 7f46abbff6c0 Level-0 table #162: 0 bytes OK +2025/02/08-21:50:08.899711 7f46abbff6c0 Delete type=0 #160 +2025/02/08-21:50:09.023376 7f46abbff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/08-21:50:09.023414 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-000155 b/packs-system/lf-equipment/MANIFEST-000163 similarity index 72% rename from packs-system/lf-equipment/MANIFEST-000155 rename to packs-system/lf-equipment/MANIFEST-000163 index da6ac3607781ac8d89dde7d7e0f83554cb0b5365..4cbf1a5e2d661941fb3b08b5dd06eac9cb7b489c 100644 GIT binary patch delta 41 scmdnMxPfs(pVCAV2_7y6My4fpF delta 41 scmdnMxPfs(pOQ;cG&dImBhws4P6p<=j4WZ>-<(ke3Cslv%m)ep0ONEC!T`pgoS$2eSd>_jU&PL2x}i)_F)cqQCAFwn zu`(dsy{y8+E6K&rBP=*Cl2L&H4CECvOHy--6|1t!+;g&ue6mf0i!+=pT^Ly)^1456 fWNWMH1d$f98M;_-fvz#NdkJfHvoA5SNh diff --git a/packs-system/lf-gifts/MANIFEST-000162 b/packs-system/lf-gifts/MANIFEST-000162 new file mode 100644 index 0000000000000000000000000000000000000000..144a3409f0fd22ef58194035989bcbecbdbd6289 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)@)7&y fWpXhvGA(B0WME#x$fA(Ww_zVhUQ&V08c+A;s5{u literal 0 HcmV?d00001 diff --git a/packs-system/lf-vulnerabilities/000156.log b/packs-system/lf-vulnerabilities/000164.log similarity index 100% rename from packs-system/lf-vulnerabilities/000156.log rename to packs-system/lf-vulnerabilities/000164.log diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT index 1ccaccd..f405c4b 100644 --- a/packs-system/lf-vulnerabilities/CURRENT +++ b/packs-system/lf-vulnerabilities/CURRENT @@ -1 +1 @@ -MANIFEST-000154 +MANIFEST-000162 diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG index 253e0bb..d5f438c 100644 --- a/packs-system/lf-vulnerabilities/LOG +++ b/packs-system/lf-vulnerabilities/LOG @@ -1,8 +1,8 @@ -2025/02/07-16:34:05.875578 7fd2ff7fe6c0 Recovering log #152 -2025/02/07-16:34:05.953534 7fd2ff7fe6c0 Delete type=3 #150 -2025/02/07-16:34:05.953877 7fd2ff7fe6c0 Delete type=0 #152 -2025/02/07-16:37:31.250358 7fd2febff6c0 Level-0 table #157: started -2025/02/07-16:37:31.250517 7fd2febff6c0 Level-0 table #157: 0 bytes OK -2025/02/07-16:37:31.289065 7fd2febff6c0 Delete type=0 #155 -2025/02/07-16:37:31.458928 7fd2febff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/02/07-16:37:31.458974 7fd2febff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/09-00:22:48.041933 7f46ad7fa6c0 Recovering log #160 +2025/02/09-00:22:48.057731 7f46ad7fa6c0 Delete type=3 #158 +2025/02/09-00:22:48.057804 7f46ad7fa6c0 Delete type=0 #160 +2025/02/09-00:29:06.841056 7f46abbff6c0 Level-0 table #165: started +2025/02/09-00:29:06.841088 7f46abbff6c0 Level-0 table #165: 0 bytes OK +2025/02/09-00:29:06.899934 7f46abbff6c0 Delete type=0 #163 +2025/02/09-00:29:06.953163 7f46abbff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/09-00:29:06.953208 7f46abbff6c0 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 10e24f1..f6ee1c0 100644 --- a/packs-system/lf-vulnerabilities/LOG.old +++ b/packs-system/lf-vulnerabilities/LOG.old @@ -1,8 +1,8 @@ -2025/02/06-10:14:34.802017 7ffaecbf96c0 Recovering log #148 -2025/02/06-10:14:34.896611 7ffaecbf96c0 Delete type=3 #146 -2025/02/06-10:14:34.896680 7ffaecbf96c0 Delete type=0 #148 -2025/02/06-10:23:45.911293 7ffae6bff6c0 Level-0 table #153: started -2025/02/06-10:23:45.911347 7ffae6bff6c0 Level-0 table #153: 0 bytes OK -2025/02/06-10:23:45.917684 7ffae6bff6c0 Delete type=0 #151 -2025/02/06-10:23:45.938219 7ffae6bff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/02/06-10:23:45.938282 7ffae6bff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/08-21:49:26.811898 7f46acff96c0 Recovering log #156 +2025/02/08-21:49:26.859033 7f46acff96c0 Delete type=3 #154 +2025/02/08-21:49:26.859093 7f46acff96c0 Delete type=0 #156 +2025/02/08-21:50:08.981113 7f46abbff6c0 Level-0 table #161: started +2025/02/08-21:50:08.981151 7f46abbff6c0 Level-0 table #161: 0 bytes OK +2025/02/08-21:50:09.023271 7f46abbff6c0 Delete type=0 #159 +2025/02/08-21:50:09.023407 7f46abbff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/08-21:50:09.023427 7f46abbff6c0 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-000154 b/packs-system/lf-vulnerabilities/MANIFEST-000162 similarity index 71% rename from packs-system/lf-vulnerabilities/MANIFEST-000154 rename to packs-system/lf-vulnerabilities/MANIFEST-000162 index c2b4f1a3e92b8dce75e9cc3bc80c685464e2d67a..75e64ccde02b057891957afbc37984e0aa1e7d72 100644 GIT binary patch delta 41 rcmeBW>}8ygtu#|OCXb7Ok!dj_Cj;{mMi!Z6hl@6Y1eSmVmH`C-*wYC` delta 41 scmeBW>}8ygt@P%BcrF(MBhzd~P6p;Vj4U#rKd5X03CsZr%mWGl0QV3IEC2ui diff --git a/styles/character.less b/styles/character.less index 942e437..4cc6632 100644 --- a/styles/character.less +++ b/styles/character.less @@ -476,6 +476,7 @@ display: grid; grid-template-columns: repeat(2, 1fr); gap: 4px; + min-width: 20rem; .shield { display: flex; align-items: center; @@ -487,7 +488,7 @@ } } .item-detail { - min-width:2rem; + min-width:2.5rem; } .name { min-width: 12rem; @@ -532,8 +533,9 @@ .spells { display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: repeat(2, 1fr); gap: 4px; + min-width: 18rem; .spell { display: flex; align-items: center; @@ -590,8 +592,9 @@ .miracles { display: grid; - grid-template-columns: repeat(3, 1fr); + grid-template-columns: repeat(2, 1fr); gap: 4px; + min-width: 18rem; .miracle { display: flex; align-items: center; diff --git a/templates/character-combat.hbs b/templates/character-combat.hbs index b162ad9..02d0e73 100644 --- a/templates/character-combat.hbs +++ b/templates/character-combat.hbs @@ -138,12 +138,12 @@
- {{item.system.defense}} + {{upperFirst item.system.defense}}
{{item.system.movementreduction}}
-
{{item.system.hascover}}
+
{{#if item.system.hascover}}Cover{{/if}}
+ {{formField systemFields.memorized value=system.memorized}} + {{formField systemFields.castingTime value=system.castingTime}} {{formField systemFields.spellRange value=system.spellRange}} {{formField systemFields.areaAffected value=system.areaAffected}}