diff --git a/src/module/data/character.mjs b/src/module/data/character.mjs index dfa814e1..eb5df953 100644 --- a/src/module/data/character.mjs +++ b/src/module/data/character.mjs @@ -1,5 +1,12 @@ const { - SchemaField, NumberField, StringField, EmbeddedDocumentField, DocumentIdField, ArrayField, ForeignDocumentField + SchemaField, + NumberField, + StringField, + HTMLField, + EmbeddedDocumentField, + DocumentIdField, + ArrayField, + ForeignDocumentField } = foundry.data.fields; export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel { @@ -18,8 +25,8 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel { geburtstag: new StringField(), alter: new NumberField({required: true, integer: true}), gewicht: new NumberField({required: true, integer: true}), - aussehen: new ArrayField(new StringField()), - familie: new ArrayField(new StringField()), + aussehen: new HTMLField(), + familie: new HTMLField(), titel: new StringField(), stand: new StringField(), }), diff --git a/src/module/xml-import/xml-import.mjs b/src/module/xml-import/xml-import.mjs index 66eb09d2..6efb67d7 100644 --- a/src/module/xml-import/xml-import.mjs +++ b/src/module/xml-import/xml-import.mjs @@ -251,16 +251,14 @@ function mapRawJson(actor, rawJson) { held.basis.rasse.aussehen.aussehentext0, held.basis.rasse.aussehen.aussehentext1, held.basis.rasse.aussehen.aussehentext2, - held.basis.rasse.aussehen.aussehentext3, - ] + held.basis.rasse.aussehen.aussehentext3].join('\n') json.meta.familie = [ held.basis.rasse.aussehen.familietext0, held.basis.rasse.aussehen.familietext1, held.basis.rasse.aussehen.familietext2, held.basis.rasse.aussehen.familietext3, held.basis.rasse.aussehen.familietext4, - held.basis.rasse.aussehen.familietext5, - ] + held.basis.rasse.aussehen.familietext5].join('\n') json.meta.titel = held.basis.rasse.aussehen.titel json.meta.stand = held.basis.rasse.aussehen.stand let attributes = held.eigenschaften.eigenschaft diff --git a/src/style/_character-sheet.scss b/src/style/_character-sheet.scss index 44a35047..df3d6709 100644 --- a/src/style/_character-sheet.scss +++ b/src/style/_character-sheet.scss @@ -57,6 +57,63 @@ overflow: auto; } + .tab.overview.active { + + display: flex; + flex-direction: column; + height: 100%; + + .meta-data { + flex: 0; + + columns: 2; + gap: 0 16px; + + + div { + break-inside: avoid; + padding: 4px 0; + } + + .double { + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-areas: 'label label' 'left right'; + + label { + grid-area: label; + } + } + + .editor { + background-color: rgba(0, 0, 0, 0.2) + } + + & + .meta-data { + flex: 1; + } + } + + .meta-data.html { + + & > div { + display: flex; + flex-direction: column; + height: 100%; + + label { + flex: 0; + } + + .editor { + flex: 1; + } + } + + } + + } + .backpack.active { padding: 8px; display: grid; diff --git a/src/templates/actor/actor-character-sheet.hbs b/src/templates/actor/actor-character-sheet.hbs index 5e66e3fa..2ca6af31 100644 --- a/src/templates/actor/actor-character-sheet.hbs +++ b/src/templates/actor/actor-character-sheet.hbs @@ -79,19 +79,52 @@ {{!-- Sheet Body --}}
-
+ + -
-
-
-
-
+ +