diff --git a/css/fvtt-hellborn.css b/css/fvtt-hellborn.css index 0a1de13..4594919 100644 --- a/css/fvtt-hellborn.css +++ b/css/fvtt-hellborn.css @@ -1309,9 +1309,17 @@ i.fvtt-hellborn { min-width: 1.8rem; max-width: 1.8rem; } +.fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .domain { + min-width: 5rem; + max-width: 5rem; +} +.fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .level { + min-width: 3rem; + max-width: 3rem; +} .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .name { - min-width: 18rem; - max-width: 18rem; + min-width: 11rem; + max-width: 11rem; } .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .item-img { width: 24px; @@ -2337,6 +2345,7 @@ i.fvtt-hellborn { color: var(--color-dark-1); } .item-to-chat h2 { + margin-left: 10px; font-family: var(--font-title); font-size: calc(var(--font-size-standard) * 1.4); color: var(--title-color); diff --git a/module/applications/sheets/character-sheet.mjs b/module/applications/sheets/character-sheet.mjs index ae1eb99..d155ccd 100644 --- a/module/applications/sheets/character-sheet.mjs +++ b/module/applications/sheets/character-sheet.mjs @@ -90,12 +90,24 @@ export default class HellbornCharacterSheet extends HellbornActorSheet { case "status": context.tab = context.tabs.status context.perks = doc.itemTypes.perk - context.perks.sort((a, b) => a.name.localeCompare(b.name)) + // Sort the perks by system.role and then by the system.level + context.perks.sort((a, b) => { + if (a.system.role === b.system.role) { + return a.system.level.localeCompare(b.system.level) + } + return a.system.role.localeCompare(b.system.role) + }) break; case "maleficas": context.tab = context.tabs.maleficas context.maleficas = doc.itemTypes.malefica - context.maleficas.sort((a, b) => a.name.localeCompare(b.name)) + // Sort the maleficas by system.domain and then by the system.level + context.maleficas.sort((a, b) => { + if (a.system.domain === b.system.domain) { + return a.system.level.localeCompare(b.system.level) + } + return a.system.domain.localeCompare(b.system.domain) + }) context.rituals = doc.itemTypes.ritual context.rituals.sort((a, b) => a.name.localeCompare(b.name)) break diff --git a/styles/enemy.less b/styles/enemy.less index 39d69ca..1012050 100644 --- a/styles/enemy.less +++ b/styles/enemy.less @@ -300,9 +300,17 @@ min-width: 1.8rem; max-width: 1.8rem; } + .domain { + min-width: 5rem; + max-width: 5rem; + } + .level { + min-width: 3rem; + max-width: 3rem; + } .name { - min-width: 18rem; - max-width: 18rem; + min-width: 11rem; + max-width: 11rem; } .item-img { width: 24px; diff --git a/styles/roll.less b/styles/roll.less index eb8aa87..9f5fe9a 100644 --- a/styles/roll.less +++ b/styles/roll.less @@ -56,6 +56,7 @@ .item-to-chat { h2 { + margin-left:10px; font-family: var(--font-title); font-size: calc(var(--font-size-standard) * 1.4); color: var(--title-color); diff --git a/templates/character-status.hbs b/templates/character-status.hbs index 036d37d..4872a3c 100644 --- a/templates/character-status.hbs +++ b/templates/character-status.hbs @@ -6,23 +6,23 @@
- {{formInput systemFields.trauma.fields.current value=system.trauma.current}} / + {{formInput systemFields.trauma.fields.current value=system.trauma.current}} / {{formInput systemFields.trauma.fields.max value=system.trauma.max}} - {{formInput systemFields.darkness.fields.current value=system.darkness.current}} / + {{formInput systemFields.darkness.fields.current value=system.darkness.current}} / {{formInput systemFields.darkness.fields.max value=system.darkness.max}} {{formInput systemFields.darkness.fields.value value=system.darkness.value}} - {{formInput systemFields.defense.fields.base value=system.defense.base}} + {{formInput systemFields.defense.fields.base value=system.defense.base}} {{formInput systemFields.defense.fields.bonus value=system.defense.bonus }} {{formInput systemFields.defense.fields.total value=system.defense.total}} {{formInput systemFields.defense.fields.resistance value=system.defense.resistance}} - {{formInput systemFields.movement.fields.base value=system.movement.base}} + {{formInput systemFields.movement.fields.base value=system.movement.base}} {{formInput systemFields.movement.fields.reduce value=system.defense.reduce }}
Curr.Max - Curr.MaxMaxDR + Curr.MaxMal.DR BaseArmorTotalResi. BaseRedu. diff --git a/templates/enemy-trait.hbs b/templates/enemy-trait.hbs index 66d9538..5136d2d 100644 --- a/templates/enemy-trait.hbs +++ b/templates/enemy-trait.hbs @@ -9,20 +9,20 @@ {{formInput systemFields.trauma.fields.current value=system.trauma.current}} / {{formInput systemFields.trauma.fields.max value=system.trauma.max}} - {{formInput systemFields.darkness.fields.current value=system.darkness.current}} / + + {{formInput systemFields.darkness.fields.current value=system.darkness.current}} / {{formInput systemFields.darkness.fields.max value=system.darkness.max}} - {{formInput systemFields.defense.fields.base value=system.defense.base}} - {{formInput systemFields.defense.fields.maleficDR value=system.defense.maleficDR}} - {{formInput systemFields.defense.fields.resilience value=system.defense.resilience}} + {{formInput systemFields.darkness.fields.value value=system.darkness.value}} + + {{formInput systemFields.defense.fields.base value=system.defense.base}} + {{formInput systemFields.defense.fields.resilience value=system.defense.resilience}} {{formInput systemFields.movement.fields.base value=system.movement.base}}
Curr.Max -    Curr.     Max - - - +    Curr.     Max  Mal.DR +    Total   Resi. @@ -66,15 +66,17 @@ {{/if}} -
+
{{#each maleficas as |item|}} -
+
-
+ + {{upperFirst item.system.domain}} + {{getRomanLevel item.system.level}}