diff --git a/css/fvtt-cthulhu-eternal.css b/css/fvtt-cthulhu-eternal.css index 6e9f4b9..427ccfa 100644 --- a/css/fvtt-cthulhu-eternal.css +++ b/css/fvtt-cthulhu-eternal.css @@ -275,9 +275,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; overflow: scroll; } @@ -400,7 +398,7 @@ i.fvtt-cthulhu-eternal { } .fvtt-cthulhu-eternal .protagonist-main .protagonist-pc .protagonist-left .protagonist-hp input { flex: none; - width: 2rem; + width: 4rem; margin-left: 4px; } .fvtt-cthulhu-eternal .protagonist-main .protagonist-pc .protagonist-left .protagonist-hp .hp-separator { @@ -977,9 +975,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; overflow: scroll; } @@ -1235,9 +1231,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; overflow: scroll; } @@ -1297,6 +1291,25 @@ i.fvtt-cthulhu-eternal { .fvtt-cthulhu-eternal .sheet-tabs { background-color: var(--color-light-1); } +.fvtt-cthulhu-eternal .creature-hp { + gap: 2px; + align-items: center; +} +.fvtt-cthulhu-eternal .creature-hp .form-fields input { + flex: none; + min-width: 4rem; + max-width: 4rem; + margin-left: 4px; +} +.fvtt-cthulhu-eternal .creature-hp .damage-bonus { + font-size: calc(var(--font-size-standard) * 0.8); +} +.fvtt-cthulhu-eternal .creature-hp .hp-separator { + font-size: calc(var(--font-size-standard) * 1.2); + display: flex; + align-items: center; + justify-content: center; +} .fvtt-cthulhu-eternal .creature-main { background-color: var(--color-light-1); display: flex; @@ -1322,24 +1335,6 @@ i.fvtt-cthulhu-eternal { width: auto; border: none; } -.fvtt-cthulhu-eternal .creature-main .creature-pc .creature-left .creature-hp { - gap: 2px; - align-items: center; -} -.fvtt-cthulhu-eternal .creature-main .creature-pc .creature-left .creature-hp input { - flex: none; - width: 2rem; - margin-left: 4px; -} -.fvtt-cthulhu-eternal .creature-main .creature-pc .creature-left .creature-hp .damage-bonus { - font-size: calc(var(--font-size-standard) * 0.8); -} -.fvtt-cthulhu-eternal .creature-main .creature-pc .creature-left .creature-hp .hp-separator { - font-size: calc(var(--font-size-standard) * 1.2); - display: flex; - align-items: center; - justify-content: center; -} .fvtt-cthulhu-eternal .creature-main .creature-pc .creature-left .creature-dv .form-fields, .fvtt-cthulhu-eternal .creature-main .creature-pc .creature-left .creature-dmax .form-fields { flex: none; @@ -1894,9 +1889,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .skill-content .sheet-tabs a { @@ -1989,9 +1982,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .injury-content .sheet-tabs a { @@ -2084,9 +2075,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .weapon-content .sheet-tabs a { @@ -2171,9 +2160,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .armor-content .sheet-tabs a { @@ -2258,9 +2245,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .motivation-content .sheet-tabs a { @@ -2345,9 +2330,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .mentaldisorder-content .sheet-tabs a { @@ -2432,9 +2415,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .bond-content .sheet-tabs a { @@ -2535,9 +2516,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .gear-content .sheet-tabs a { @@ -2622,9 +2601,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .arcane-content .sheet-tabs a { @@ -2709,9 +2686,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .archetype-content .sheet-tabs a { @@ -2796,9 +2771,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .ritual-content .sheet-tabs a { @@ -2891,9 +2864,7 @@ i.fvtt-cthulhu-eternal { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; } .fvtt-cthulhu-eternal .tome-content .sheet-tabs a { diff --git a/module/config/system.mjs b/module/config/system.mjs index f36b466..bc36cd8 100644 --- a/module/config/system.mjs +++ b/module/config/system.mjs @@ -46,7 +46,7 @@ export const ERA_CSS = { modern: { primaryFont: "Georama", secondaryFont: "Georama", titleFont: "Georama", baseFontSize: "1.0rem", titleFontSize: "1.2rem",imgFilter: "brightness(0) saturate(100%) invert(92%) sepia(11%) saturate(1214%) hue-rotate(51deg) brightness(93%) contrast(86%)" }, future: { primaryFont: "Georama", secondaryFont: "Georama", titleFont: "Seabreed", baseFontSize: "1.0rem", titleFontSize: "2.0rem",imgFilter: "invert(90%) sepia(6%) saturate(1818%) hue-rotate(152deg) brightness(91%) contrast(91%)" }, victorian: { primaryFont: "Volkhov", secondaryFont: "Volkhov", titleFont: "Excelsior", baseFontSize: "1.0rem", titleFontSize: "1.2rem",imgFilter: "brightness(0) saturate(100%) invert(100%) sepia(59%) saturate(1894%) hue-rotate(337deg) brightness(88%) contrast(98%)" }, - coldwar: { primaryFont: "Georama", secondaryFont: "Georama", titleFont: "TopSecret", baseFontSize: "1.0rem", titleFontSize: "1.2rem",imgFilter: "brightness(0) saturate(100%) invert(81%) sepia(14%) saturate(2508%) hue-rotate(202deg) brightness(99%) contrast(105%)"}, + coldwar: { primaryFont: "Georama", secondaryFont: "Georama", titleFont: "TopSecret", baseFontSize: "0.9rem", titleFontSize: "1.2rem",imgFilter: "brightness(0) saturate(100%) invert(81%) sepia(14%) saturate(2508%) hue-rotate(202deg) brightness(99%) contrast(105%)"}, revolution: { primaryFont: "IMFell", secondaryFont: "IMFell", titleFont: "Dominican", baseFontSize: "1.0rem",titleFontSize: "1.3rem",imgFilter: "brightness(0) saturate(100%) invert(81%) sepia(25%) saturate(386%) hue-rotate(7deg) brightness(101%) contrast(84%)" }, medieval: { primaryFont: "Skranji", secondaryFont: "UncialAntiqua", titleFont: "Luminari", baseFontSize: "0.9rem",titleFontSize: "1.2rem",imgFilter: "brightness(0) saturate(100%) invert(93%) sepia(46%) saturate(354%) hue-rotate(321deg) brightness(93%) contrast(87%)"}, ww2: { primaryFont: "SairaStencilOne", secondaryFont: "SairaStencilOne", titleFont: "Armalite", baseFontSize: "0.9rem",titleFontSize: "1.2rem",imgFilter: "filter: invert(44%) sepia(8%) saturate(2657%) hue-rotate(40deg) brightness(96%) contrast(75%)"}, diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index 1422832..c7c726d 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -177,7 +177,7 @@ export default class CthulhuEternalRoll extends Roll { // If the weapon is not lethal, we can proceed with the regular damage roll let formula = weapon.system.damage if (weapon.system.weaponType === "melee" || weapon.system.weaponType === "unarmed") { - formula += ` + ${weapon.damageBonus}` + formula += ` + ${actor.system?.damageBonus}` } if (options?.previousResultType === "successCritical") { formula = `( ${formula} ) * 2` @@ -188,6 +188,7 @@ export default class CthulhuEternalRoll extends Roll { "system.ammo.value": Math.max(0, weapon.system.ammo.value - ammoUsed) }]) } + console.log("Weapon damage formula", formula, weapon, ammoUsed) let damageRoll = new Roll(formula) await damageRoll.evaluate() let msgData = { diff --git a/packs-system/rituals/000169.log b/packs-system/rituals/000173.log similarity index 100% rename from packs-system/rituals/000169.log rename to packs-system/rituals/000173.log diff --git a/packs-system/rituals/CURRENT b/packs-system/rituals/CURRENT index c5ea6dc..91e41f4 100644 --- a/packs-system/rituals/CURRENT +++ b/packs-system/rituals/CURRENT @@ -1 +1 @@ -MANIFEST-000167 +MANIFEST-000171 diff --git a/packs-system/rituals/LOG b/packs-system/rituals/LOG index 05e4dad..e163bbe 100644 --- a/packs-system/rituals/LOG +++ b/packs-system/rituals/LOG @@ -1,7 +1,7 @@ -2025/06/29-22:25:29.091880 7fda6d9f96c0 Recovering log #165 -2025/06/29-22:25:29.103184 7fda6d9f96c0 Delete type=3 #163 -2025/06/29-22:25:29.103305 7fda6d9f96c0 Delete type=0 #165 -2025/06/29-22:26:56.370766 7fda5bbff6c0 Level-0 table #170: started -2025/06/29-22:26:56.370832 7fda5bbff6c0 Level-0 table #170: 0 bytes OK -2025/06/29-22:26:56.379673 7fda5bbff6c0 Delete type=0 #168 -2025/06/29-22:26:56.380010 7fda5bbff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end) +2025/07/09-17:04:59.082095 7f2a0effd6c0 Recovering log #169 +2025/07/09-17:04:59.092675 7f2a0effd6c0 Delete type=3 #167 +2025/07/09-17:04:59.092780 7f2a0effd6c0 Delete type=0 #169 +2025/07/09-17:18:46.206680 7f276ffff6c0 Level-0 table #174: started +2025/07/09-17:18:46.206717 7f276ffff6c0 Level-0 table #174: 0 bytes OK +2025/07/09-17:18:46.235941 7f276ffff6c0 Delete type=0 #172 +2025/07/09-17:18:46.287862 7f276ffff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end) diff --git a/packs-system/rituals/LOG.old b/packs-system/rituals/LOG.old index c8d53ee..05e4dad 100644 --- a/packs-system/rituals/LOG.old +++ b/packs-system/rituals/LOG.old @@ -1,7 +1,7 @@ -2025/06/29-22:24:52.674663 7fda6c9f76c0 Recovering log #161 -2025/06/29-22:24:52.733389 7fda6c9f76c0 Delete type=3 #159 -2025/06/29-22:24:52.733531 7fda6c9f76c0 Delete type=0 #161 -2025/06/29-22:25:23.612345 7fda5bbff6c0 Level-0 table #166: started -2025/06/29-22:25:23.612406 7fda5bbff6c0 Level-0 table #166: 0 bytes OK -2025/06/29-22:25:23.683484 7fda5bbff6c0 Delete type=0 #164 -2025/06/29-22:25:23.834365 7fda5bbff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end) +2025/06/29-22:25:29.091880 7fda6d9f96c0 Recovering log #165 +2025/06/29-22:25:29.103184 7fda6d9f96c0 Delete type=3 #163 +2025/06/29-22:25:29.103305 7fda6d9f96c0 Delete type=0 #165 +2025/06/29-22:26:56.370766 7fda5bbff6c0 Level-0 table #170: started +2025/06/29-22:26:56.370832 7fda5bbff6c0 Level-0 table #170: 0 bytes OK +2025/06/29-22:26:56.379673 7fda5bbff6c0 Delete type=0 #168 +2025/06/29-22:26:56.380010 7fda5bbff6c0 Manual compaction at level-0 from '!items!4oyPRBWPBWAChrJP' @ 72057594037927935 : 1 .. '!items!zVFfp3o0G0Zg3Ia4' @ 0 : 0; will stop at (end) diff --git a/packs-system/rituals/MANIFEST-000167 b/packs-system/rituals/MANIFEST-000171 similarity index 73% rename from packs-system/rituals/MANIFEST-000167 rename to packs-system/rituals/MANIFEST-000171 index 5c76961..66c5cfa 100644 Binary files a/packs-system/rituals/MANIFEST-000167 and b/packs-system/rituals/MANIFEST-000171 differ diff --git a/packs-system/skills/000338.log b/packs-system/skills/000342.log similarity index 100% rename from packs-system/skills/000338.log rename to packs-system/skills/000342.log diff --git a/packs-system/skills/CURRENT b/packs-system/skills/CURRENT index 26ca7ad..757ec85 100644 --- a/packs-system/skills/CURRENT +++ b/packs-system/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000336 +MANIFEST-000340 diff --git a/packs-system/skills/LOG b/packs-system/skills/LOG index 4f901d0..5d2a756 100644 --- a/packs-system/skills/LOG +++ b/packs-system/skills/LOG @@ -1,7 +1,7 @@ -2025/06/29-22:25:29.069935 7fda6d1f86c0 Recovering log #334 -2025/06/29-22:25:29.081064 7fda6d1f86c0 Delete type=3 #332 -2025/06/29-22:25:29.081192 7fda6d1f86c0 Delete type=0 #334 -2025/06/29-22:26:56.360514 7fda5bbff6c0 Level-0 table #339: started -2025/06/29-22:26:56.360577 7fda5bbff6c0 Level-0 table #339: 0 bytes OK -2025/06/29-22:26:56.370559 7fda5bbff6c0 Delete type=0 #337 -2025/06/29-22:26:56.379992 7fda5bbff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end) +2025/07/09-17:04:59.062504 7f2a0dffb6c0 Recovering log #338 +2025/07/09-17:04:59.072990 7f2a0dffb6c0 Delete type=3 #336 +2025/07/09-17:04:59.073130 7f2a0dffb6c0 Delete type=0 #338 +2025/07/09-17:18:46.236069 7f276ffff6c0 Level-0 table #343: started +2025/07/09-17:18:46.236095 7f276ffff6c0 Level-0 table #343: 0 bytes OK +2025/07/09-17:18:46.287671 7f276ffff6c0 Delete type=0 #341 +2025/07/09-17:18:46.287875 7f276ffff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end) diff --git a/packs-system/skills/LOG.old b/packs-system/skills/LOG.old index 85287c4..4f901d0 100644 --- a/packs-system/skills/LOG.old +++ b/packs-system/skills/LOG.old @@ -1,7 +1,7 @@ -2025/06/29-22:24:52.606734 7fda6d9f96c0 Recovering log #330 -2025/06/29-22:24:52.662677 7fda6d9f96c0 Delete type=3 #328 -2025/06/29-22:24:52.662873 7fda6d9f96c0 Delete type=0 #330 -2025/06/29-22:25:23.549590 7fda5bbff6c0 Level-0 table #335: started -2025/06/29-22:25:23.549651 7fda5bbff6c0 Level-0 table #335: 0 bytes OK -2025/06/29-22:25:23.612061 7fda5bbff6c0 Delete type=0 #333 -2025/06/29-22:25:23.834320 7fda5bbff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end) +2025/06/29-22:25:29.069935 7fda6d1f86c0 Recovering log #334 +2025/06/29-22:25:29.081064 7fda6d1f86c0 Delete type=3 #332 +2025/06/29-22:25:29.081192 7fda6d1f86c0 Delete type=0 #334 +2025/06/29-22:26:56.360514 7fda5bbff6c0 Level-0 table #339: started +2025/06/29-22:26:56.360577 7fda5bbff6c0 Level-0 table #339: 0 bytes OK +2025/06/29-22:26:56.370559 7fda5bbff6c0 Delete type=0 #337 +2025/06/29-22:26:56.379992 7fda5bbff6c0 Manual compaction at level-0 from '!folders!5PrT9QmN1cFPzDFP' @ 72057594037927935 : 1 .. '!items!zvoUByzWSWZ87fxA' @ 0 : 0; will stop at (end) diff --git a/packs-system/skills/MANIFEST-000336 b/packs-system/skills/MANIFEST-000340 similarity index 71% rename from packs-system/skills/MANIFEST-000336 rename to packs-system/skills/MANIFEST-000340 index 290a532..3016009 100644 Binary files a/packs-system/skills/MANIFEST-000336 and b/packs-system/skills/MANIFEST-000340 differ diff --git a/styles/creature.less b/styles/creature.less index 55d57a4..1e31a74 100644 --- a/styles/creature.less +++ b/styles/creature.less @@ -8,6 +8,28 @@ background-color: var(--color-light-1); } +.creature-hp { + gap: 2px; + align-items: center; + .form-fields { + input { + flex: none; + min-width: 4rem; + max-width: 4rem; + margin-left: 4px; + } + } + .damage-bonus { + font-size: calc(var(--font-size-standard) * 0.8); + } + .hp-separator { + font-size: calc(var(--font-size-standard) * 1.2); + display: flex; + align-items: center; + justify-content: center; + } +} + .creature-main { background-color: var(--color-light-1); display: flex; @@ -34,25 +56,6 @@ } } - .creature-hp { - gap: 2px; - align-items: center; - input { - flex: none; - width: 2rem; - margin-left: 4px; - } - .damage-bonus { - font-size: calc(var(--font-size-standard) * 0.8); - } - .hp-separator { - font-size: calc(var(--font-size-standard) * 1.2); - display: flex; - align-items: center; - justify-content: center; - } - } - .creature-dv, .creature-dmax { .form-fields { diff --git a/styles/mixins.less b/styles/mixins.less index 6667d6d..0a8fc6d 100644 --- a/styles/mixins.less +++ b/styles/mixins.less @@ -2,9 +2,7 @@ font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1.05); color: var(--color-dark-1); - background-image: var(--background-image-base); - background-repeat: no-repeat; - background-size: 100% 100%; + background: var(--color-light-1); --input-height: 1.4rem; .sheet-tabs { diff --git a/styles/protagonist.less b/styles/protagonist.less index 80a4243..2b162f3 100644 --- a/styles/protagonist.less +++ b/styles/protagonist.less @@ -39,7 +39,7 @@ align-items: center; input { flex: none; - width: 2rem; + width: 4rem; margin-left: 4px; } .hp-separator {