diff --git a/source/module/M5Base.ts b/source/module/M5Base.ts index 98d7325..72e3358 100644 --- a/source/module/M5Base.ts +++ b/source/module/M5Base.ts @@ -157,7 +157,6 @@ export interface M5AttributeCalculated extends M5ModResult { export interface M5CharacterCalculatedData { level: number; - initiative: number; attributes: { st: M5AttributeCalculated; gs: M5AttributeCalculated; diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index c363383..0ce24d6 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -39,7 +39,6 @@ export class M5Character extends Actor { ): M5CharacterCalculatedData { let ret: M5CharacterCalculatedData = { level: 0, - initiative: 0, attributes: { st: { value: 0, bonus: 0, mods: [] }, gs: { value: 0, bonus: 0, mods: [] }, @@ -102,8 +101,6 @@ export class M5Character extends Actor { ret.level = M5Character.levelFromExp(data.info.race === "Zwerg" ? Math.min(data.calc.stats?.hoard * 2 || 0, data.es) : data.es); - ret.initiative = data.skills.general.anfuehren.fw; - ret.attributes.st.value = M5Character.attributeMinMax(data.attributes.st); // TODO item effects ret.attributes.gs.value = M5Character.attributeMinMax(data.attributes.gs); ret.attributes.gw.value = M5Character.attributeMinMax(data.attributes.gw); diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less index 6cc4357..a0047fd 100644 --- a/source/style/Character-sheet.less +++ b/source/style/Character-sheet.less @@ -42,8 +42,10 @@ .flexpart { gap: 0; padding: 0; - margin: 5px; + margin: 2px; background-color: beige; + border-collapse: separate; + border-radius: 10px; border: 2px solid black; } @@ -66,10 +68,15 @@ h3 { padding: 0.5rem 0.5rem 0.5rem 0.5rem; + margin-top: 0.5rem; + margin-bottom: 0; text-align: left; font-weight: bold; - background-color: dimgray; - color: white; + background-color: #eeede0; + color: black; + border-collapse: separate; + border: 2px solid black; + border-radius: 10px; } .profile-img { @@ -247,7 +254,8 @@ padding: 1px; //align-items: stretch; - input { + input, + .max-value { flex: 0 0 2rem; text-align: center; height: 100%; diff --git a/templates/sheets/character/base_values.hbs b/templates/sheets/character/base_values.hbs index 6ac423c..9aa2fd6 100644 --- a/templates/sheets/character/base_values.hbs +++ b/templates/sheets/character/base_values.hbs @@ -67,6 +67,12 @@ {{localize "midgard5.movementRange"}} + + {{localize "midgard5.actor-lp-short"}} + + {{localize "midgard5.actor-ap-short"}} + + {{localize "midgard5.brawl"}} {{data.calc.stats.brawl.value}} diff --git a/templates/sheets/character/combat.hbs b/templates/sheets/character/combat.hbs index 857b6dc..800610a 100644 --- a/templates/sheets/character/combat.hbs +++ b/templates/sheets/character/combat.hbs @@ -6,10 +6,10 @@ - - + + diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs index 9e80345..451fa02 100644 --- a/templates/sheets/character/gear.hbs +++ b/templates/sheets/character/gear.hbs @@ -42,7 +42,7 @@ - + diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs index 7ca7632..1039fc3 100644 --- a/templates/sheets/character/main.hbs +++ b/templates/sheets/character/main.hbs @@ -89,7 +89,7 @@
{{/if}} {{/times}} - +
{{data.lp.max}}
@@ -105,7 +105,7 @@
{{/if}} {{/times}} - +
{{data.ap.max}}
{{localize "midgard5.initiative"}} {{data.calc.initiative}} {{localize "midgard5.movementRange"}} {{data.calc.stats.movement.value}}
{{localize "midgard5.defense"}} {{data.calc.stats.defense.value}}{{localize "midgard5.item-value"}}