diff --git a/lang/de.json b/lang/de.json index 8aaaf33..6e39d06 100644 --- a/lang/de.json +++ b/lang/de.json @@ -42,6 +42,7 @@ "midgard5.skill-value": "Fertigkeitswert", "midgard5.fw": "FW", "midgard5.bonus": "Bonus", + "midgard5.bonuses": "Boni", "midgard5.ew": "EW", "midgard5.pp-short": "PP", "midgard5.pp": "Praxispunkte", @@ -296,6 +297,7 @@ "midgard5.kampfkunst-type": "Kampfkunst Art", "midgard5.kampfkunst-variante": "Kampfkunst Variante", + "midgard5.kampfkunst-variante-short": "Var", "midgard5.kido-type": "Kido Art", "midgard5.kido-variante": "Kido Variante", diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index dfec80d..0e1fed9 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -322,7 +322,10 @@ export class M5Character extends Actor { hoarded: item.system?.hoarded, value: item.system.value || 0, calc: item.system.calc, + special: item.system.special, + damageBase: item.system.damageBase, equipped: item.system?.equipped, + containerId: item.system.containerId || "", }; }); } @@ -351,8 +354,10 @@ export class M5Character extends Actor { valuable: item.system?.valuable, hoarded: item.system?.hoarded, value: item.system.value || 0, + defenseBonus: item.system.stats.defenseBonus, calc: item.system.calc, equipped: item.system?.equipped, + containerId: item.system.containerId || "", }; }); } @@ -380,8 +385,10 @@ export class M5Character extends Actor { valuable: item.system?.valuable, hoarded: item.system?.hoarded, value: item.system.value || 0, + lpProtection: item.system.lpProtection, calc: item.system.calc, equipped: item.system?.equipped, + containerId: item.system.containerId || "", }; }); } diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less index 5577ad2..1a97399 100644 --- a/source/style/Character-sheet.less +++ b/source/style/Character-sheet.less @@ -23,6 +23,11 @@ flex-wrap: wrap; } + .flexcolumn-3 { + flex: 33%; + flex-wrap: wrap; + } + .flexcolumn-4 { flex: 25%; flex-wrap: wrap; @@ -167,6 +172,11 @@ text-align: left; font-weight: bold; } + + &.highlight { + font-weight: bold; + font-style: italic; + } } .table-icon { diff --git a/templates/sheets/character/combat.hbs b/templates/sheets/character/combat.hbs index 83ecdb1..3befab0 100644 --- a/templates/sheets/character/combat.hbs +++ b/templates/sheets/character/combat.hbs @@ -1,60 +1,42 @@ - - - - - - - - - - - {{#each data.calc.kampfkuenste as |item itemId|}} - - - - - - - {{/each}} - -
{{localize "TYPES.Item.kampfkunst"}}{{localize "midgard5.ew"}}
- {{item.label}} - {{#if item.isKido}} - {{localize (m5concat "midgard5.kido-type-" item.type)}} - {{#unless (eq item.type "finte")}} - ({{localize (m5concat "midgard5.kido-variante-" item.variante)}}) - {{/unless}} - {{else}} - {{localize (m5concat "midgard5.kampfkunst-type-" item.type)}} - {{#if (eq item.type "angriff")}} - ({{localize (m5concat "midgard5.kampfkunst-variante-" item.variante)}}) - {{/if}} - {{/if}} - {{item.calc.ew}}
+
+
+
+
{{localize "midgard5.attack"}}
- - + + + {{#each data.calc.gear.weapons as |item itemId|}} + {{#if item.equipped}} - + - - + + + + {{/if}} {{/each}} - - - + + + +
{{localize "TYPES.Item.weapon"}} {{localize "midgard5.ew"}}{{localize "midgard5.damage"}}
{{item.label}}{{item.label}}{{#if item.special}}(*){{/if}} {{item.calc.ew}}{{item.damageBase}} + {{#if item.equipped}} + + {{else}} + + {{/if}} +
{{localize "midgard5.brawl"}}{{data.calc.stats.brawlFw}}{{data.calc.stats.brawlFw}}1d6 -4 
@@ -62,42 +44,117 @@ - + + - + + + {{#each data.calc.kampfkuenste as |item itemId|}} + + + + + + + + {{/each}} + +
{{localize "TYPES.Item.defensiveWeapon"}}{{localize "TYPES.Item.kampfkunst"}}{{localize "midgard5.kampfkunst-variante-short"}} {{localize "midgard5.ew"}}
{{item.label}} + {{#if item.isKido}} + {{localize (m5concat "midgard5.kido-type-" item.type)}} + {{#unless (eq item.type "finte")}} + ({{localize (m5concat "midgard5.kido-variante-" item.variante)}}) + {{/unless}} + {{else}} + {{localize (m5concat "midgard5.kampfkunst-type-" item.type)}} + {{#if (eq item.type "angriff")}} + ({{localize (m5concat "midgard5.kampfkunst-variante-" item.variante)}}) + {{/if}} + {{/if}} + {{item.calc.ew}}
+
+
+ +
+
+
{{localize "midgard5.calculated-values"}}
+ + + + + + + + + + + + + + + + + + + +
{{localize "midgard5.movementRange"}}{{data.movement}}  
{{localize "midgard5.defense"}}{{data.calc.stats.defense.value}}{{localize "midgard5.defenseBonus"}}{{data.calc.stats.defenseBonus.value}}
{{localize "midgard5.damageBonus"}}{{data.calc.stats.damageBonus.value}}{{localize "midgard5.attackBonus"}}{{data.calc.stats.attackBonus.value}}
+
+
+ +
+
+
{{localize "midgard5.defense"}}
+ + + + + + + + + + + + + + + + + + + +
{{localize "midgard5.defense"}}{{add data.calc.stats.defense.value data.calc.stats.defenseBonus.value}}
{{localize "midgard5.resistanceMind"}}{{data.calc.stats.resistanceMind.value}}
{{localize "midgard5.resistanceBody"}}{{data.calc.stats.resistanceBody.value}}
+ + + + + + + + + + {{#each data.calc.gear.defensiveWeapons as |item itemId|}} + {{#if item.equipped}} - - + + + + {{/if}} {{/each}} - - - - - - - - - - - - - - - - - - - - -
{{localize "TYPES.Item.defensiveWeapon"}}{{localize "midgard5.ew"}}{{localize "midgard5.defenseBonus-short"}}
{{item.label}} {{item.calc.ew}}{{item.defenseBonus}} + {{#if item.equipped}} + + {{else}} + + {{/if}} +
{{localize "midgard5.defense"}}{{add data.calc.stats.defense.value data.calc.stats.defenseBonus.value}}
{{localize "midgard5.resistanceMind"}}{{data.calc.stats.resistanceMind.value}}
{{localize "midgard5.resistanceBody"}}{{data.calc.stats.resistanceBody.value}}
@@ -106,35 +163,27 @@ {{localize "TYPES.Item.armor"}} {{localize "midgard5.actor-lp-short"}} - {{localize "midgard5.actor-ap-short"}} - {{localize "midgard5.attackBonus-short"}} - {{localize "midgard5.defenseBonus-short"}} - B - Gw - + {{#each data.calc.gear.armor as |item itemId|}} + {{#if item.equipped}} - - {{item.label}} + {{item.label}} + {{lpProtection}} + {{#if item.equipped}} - {{localize "midgard5.equipped"}} + + {{else}} + {{/if}} - {{actorItemValue ../actor._id itemId "lpProtection" ../actor.isToken}} - {{actorItemValue ../actor._id itemId "apProtection"}} - {{actorItemValue ../actor._id itemId "stats.attackBonus"}} - {{actorItemValue ../actor._id itemId "stats.defenseBonus"}} - {{actorItemValue ../actor._id itemId "stats.movementBonus"}} - {{actorItemValue ../actor._id itemId "attributeMod.gw"}} - + {{/if}} {{/each}} - - {{localize "midgard5.movementRange"}}: {{data.calc.stats.movement.value}} - - \ No newline at end of file +
+
+
diff --git a/templates/sheets/item/armor.hbs b/templates/sheets/item/armor.hbs index 868350d..090136f 100644 --- a/templates/sheets/item/armor.hbs +++ b/templates/sheets/item/armor.hbs @@ -9,10 +9,6 @@
- - - -