diff --git a/src/main.mjs b/src/main.mjs index 1db263e8..1a9d560e 100644 --- a/src/main.mjs +++ b/src/main.mjs @@ -49,7 +49,7 @@ Hooks.once("init", () => { } CONFIG.Combat.initiative = { - formula: `1d6 + @attribute.ini`, + formula: `(@attribute.ini.wuerfel)d6 + @attribute.ini.aktuell`, decimals: 0 } diff --git a/src/module/data/character.mjs b/src/module/data/character.mjs index bbe64078..f70ac2ab 100644 --- a/src/module/data/character.mjs +++ b/src/module/data/character.mjs @@ -95,8 +95,9 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel { mod: new NumberField({ required: true, integer: true }), }), ini: new SchemaField({ - aktuell: new NumberField({ required: true, integer: true }), - mod: new NumberField({ required: true, integer: true }), + aktuell: new NumberField({ required: true, integer: true, initial: 0 }), + mod: new NumberField({ required: true, integer: true, initial: 0 }), + wuerfel: new NumberField({ required: true, integer: true, initial: 1}), }), so: new SchemaField({ start: new NumberField({ required: true, integer: true }), diff --git a/src/module/sheets/characterSheet.mjs b/src/module/sheets/characterSheet.mjs index 55e110e9..3e413c7b 100644 --- a/src/module/sheets/characterSheet.mjs +++ b/src/module/sheets/characterSheet.mjs @@ -38,6 +38,7 @@ export class CharacterSheet extends ActorSheet { this.#addAdvantagesToContext(context) this.#addAttributesToContext(context) this.#addEquipmentsToContext(context) + this.#addCombatStatistics(context) return context; } @@ -170,6 +171,15 @@ export class CharacterSheet extends ActorSheet { return false } + #addCombatStatistics(context) { + const actorData = context.data; + context.inidice = actorData.system.attribute.ini.wuerfel; + context.inivalue = actorData.system.attribute.ini.aktuell; + context.inimod = actorData.system.attribute.ini.mod; + + + } + #addEquipmentsToContext(context) { context.equipments = []; const actorData = context.data; diff --git a/src/style/_character-sheet.scss b/src/style/_character-sheet.scss index 4870454e..37e47e61 100644 --- a/src/style/_character-sheet.scss +++ b/src/style/_character-sheet.scss @@ -97,6 +97,35 @@ } + .tab.combat { + + .initiaitve { + width: 100%; + height: 48px; + position: relative; + + label { + width: 80px; + line-height: 48px; + vertical-align: middle; + } + + input { + display: inline-block; + width: 40px; + height: 48px; + } + span.inline { + line-height: 48px; + vertical-align: middle; + width: 40px; + text-align: center; + } + + } + + } + } } diff --git a/src/templates/actor/actor-character-sheet.hbs b/src/templates/actor/actor-character-sheet.hbs index e8bca370..17fddb78 100644 --- a/src/templates/actor/actor-character-sheet.hbs +++ b/src/templates/actor/actor-character-sheet.hbs @@ -76,6 +76,13 @@