From 674e7fca9284d69de305aeb5d9adbe8ec5570cd7 Mon Sep 17 00:00:00 2001 From: Ender Date: Sat, 13 Jan 2024 20:35:30 +0100 Subject: [PATCH] - Created description tab -Added background - Redesign of base_value and skill tab --- lang/de.json | 19 +- source/PreloadTemplates.ts | 3 +- source/style/Character-sheet.less | 27 +- source/template.json | 3 +- templates/sheets/character/base_values.hbs | 285 ++++++++---------- .../{kampfkuenste.hbs => combat.hbs} | 29 +- templates/sheets/character/description.hbs | 50 +++ templates/sheets/character/gear.hbs | 2 +- templates/sheets/character/main.hbs | 11 +- templates/sheets/character/skills.hbs | 285 +++++++++--------- 10 files changed, 385 insertions(+), 329 deletions(-) rename templates/sheets/character/{kampfkuenste.hbs => combat.hbs} (84%) create mode 100644 templates/sheets/character/description.hbs diff --git a/lang/de.json b/lang/de.json index aa4a004..c62ffa2 100644 --- a/lang/de.json +++ b/lang/de.json @@ -29,7 +29,16 @@ "midgard5.label": "Bezeichnung", "midgard5.description": "Beschreibung", - "midgard5.attribute": "Leiteigenschaft", + "midgard5.Characteristic": "Merkmal", + "midgard5.characteristics": "Merkmale", + "midgard5.background": "Hintergrund", + "midgard5.attribute": "Eigenschaft", + "midgard5.attributes": "Eigenschaften", + "midgard5.derived-attribute": "Abgeleitete Eigenschaft", + "midgard5.derived-attributes": "Abgeleitete Eigenschaften", + "midgard5.calculated-value": "Berechneter Wert", + "midgard5.calculated-values": "Berechnete Werte", + "midgard5.skill": "Fertigkeit", "midgard5.skill-value": "Fertigkeitswert", "midgard5.fw": "FW", @@ -80,6 +89,8 @@ "midgard5.spells": "Zauber", "midgard5.effects": "Aktive Effekte", "midgard5.kampfkuenste": "Kampfkünste", + "midgard5.combat": "Kampf", + "midgard5.actor-name": "Figur", "midgard5.level": "Grad", @@ -221,10 +232,14 @@ "midgard5.new-skill": "Neue Fertigkeit", "midgard5.special": "Spezial", "midgard5.learned-skill": "Gelernte Fertigkeit", + "midgard5.learned-skills": "Gelernte Fertigkeiten", "midgard5.language": "Sprache", + "midgard5.languages": "Sprachen", "midgard5.weapon-skill": "Waffenfertigkeit", "midgard5.unlearned-skill": "Ungelernte Fertigkeit", - "midgard5.innate-ability": "Angeborene Fähigkeit", + "midgard5.unlearned-skills": "Ungelernte Fertigkeiten", + "midgard5.innate-ability": "Angeborene/Besondere Fertigkeit", + "midgard5.innate-abilities": "Angeborene/Besondere Fertigkeit", "midgard5.base-damage": "Grundschaden", "midgard5.defensive-weapon": "Verteidigungswaffe", diff --git a/source/PreloadTemplates.ts b/source/PreloadTemplates.ts index bbd4ae9..b2f2d19 100644 --- a/source/PreloadTemplates.ts +++ b/source/PreloadTemplates.ts @@ -6,13 +6,14 @@ const preloadTemplates = async (): Promise[]> = // const templates = [ rootPath + "actor/actor-sheet.hbs" ] // This would map to our local folder of /Assets/Templates/Actor/actor-sheet.hbs const templates: Array = [ + "sheets/character/description.hbs", "sheets/character/attribute.hbs", "sheets/character/base_values.hbs", "sheets/character/main.hbs", "sheets/character/skills.hbs", "sheets/character/gear.hbs", "sheets/character/spells.hbs", - "sheets/character/kampfkuenste.hbs", + "sheets/character/combat.hbs", "sheets/character/effects.hbs", "sheets/partial/mod.hbs", "sheets/item/rolls.hbs", diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less index 00f2432..5577ad2 100644 --- a/source/style/Character-sheet.less +++ b/source/style/Character-sheet.less @@ -197,13 +197,9 @@ font-style: italic; background: rgba(0, 0, 0, 0.3); color: rgba(255, 255, 255); - - button { - background: rgba(255, 255, 255, 0.5); - } } - button.roll-button { + .roll-button { background: url(/icons/svg/d20-black.svg) no-repeat; background-size: 1rem 1rem; border: #000000 solid 0px; @@ -211,6 +207,17 @@ height: 1rem; } + .learn-button { + padding: 0; + margin: 0; + height: 1rem; + width: 4rem; + background: rgba(255, 255, 255, 0.5); + font-size: smaller; + text-align: center; + line-height: 0.8rem; + } + span.spell-process { color: rgb(93, 93, 93); font-style: italic; @@ -261,15 +268,23 @@ } } + .biography { + margin: 0.5rem 0.5rem 0.5rem 0.5rem; + height: 180px; + background-color: #eaead7; + } + .attributes { padding: 0.5rem 0.5rem 0.5rem 0.5rem; display: flex; flex-direction: row; margin-bottom: 0.5rem; background-color: beige; + flex-wrap: wrap; + justify-content: center; .attribute { - flex: 0 0 7rem; + flex: 0 0 6rem; margin: 0; border: 1px solid @attributeBorderColor; //border-bottom: none; diff --git a/source/template.json b/source/template.json index d926a5e..5dd1d3b 100644 --- a/source/template.json +++ b/source/template.json @@ -5,6 +5,7 @@ "characterDescription": { "info": { "description": "", + "background": "", "class": "", "race": "", "magicUsing": false, @@ -203,7 +204,7 @@ }, "equippable": { "equippable": false, - "equipped": true + "equipped": false }, "valuable": { "valuable": false, diff --git a/templates/sheets/character/base_values.hbs b/templates/sheets/character/base_values.hbs index ad10c13..4c25aa7 100644 --- a/templates/sheets/character/base_values.hbs +++ b/templates/sheets/character/base_values.hbs @@ -1,168 +1,121 @@ +
+ +
+
{{localize "midgard5.attributes"}}
+
+
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="st" attribute=data.attributes.st calc=data.calc.attributes.st}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gs" attribute=data.attributes.gs calc=data.calc.attributes.gs}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gw" attribute=data.attributes.gw calc=data.calc.attributes.gw}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="ko" attribute=data.attributes.ko calc=data.calc.attributes.ko}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="in" attribute=data.attributes.in calc=data.calc.attributes.in}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="zt" attribute=data.attributes.zt calc=data.calc.attributes.zt}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="au" attribute=data.attributes.au calc=data.calc.attributes.au}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="pa" attribute=data.attributes.pa calc=data.calc.attributes.pa}} +
+ {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="wk" attribute=data.attributes.wk calc=data.calc.attributes.wk}} +
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Eigenschaften
{{localize "midgard5.magicUsing"}}  
{{localize "midgard5.grace"}}{{localize "midgard5.exp-overall"}}
{{localize "midgard5.destiny"}}{{localize "midgard5.exp-available"}}
{{localize "midgard5.luckPoints"}}{{localize "midgard5.movementRange"}}
+
+
+
{{localize "midgard5.derived-attributes"}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{localize "midgard5.magicUsing"}}  
{{localize "midgard5.grace"}}{{localize "midgard5.exp-overall"}}
{{localize "midgard5.destiny"}}{{localize "midgard5.exp-available"}}
{{localize "midgard5.luckPoints"}}{{localize "midgard5.movementRange"}}
+
+
- - - - - - - - - - - - - - -
Leiteigenschaften
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="st" attribute=data.attributes.st calc=data.calc.attributes.st}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gs" attribute=data.attributes.gs calc=data.calc.attributes.gs}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gw" attribute=data.attributes.gw calc=data.calc.attributes.gw}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="ko" attribute=data.attributes.ko calc=data.calc.attributes.ko}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="in" attribute=data.attributes.in calc=data.calc.attributes.in}} -
-
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="zt" attribute=data.attributes.zt calc=data.calc.attributes.zt}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="au" attribute=data.attributes.au calc=data.calc.attributes.au}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="pa" attribute=data.attributes.pa calc=data.calc.attributes.pa}} -
- {{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="wk" attribute=data.attributes.wk calc=data.calc.attributes.wk}} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{#if (eq data.info.race "Zwerg")}} - - - {{/if}} - - - {{#if (eq data.info.race "Zwerg")}} - - - - - {{/if}} - - - -
Berechnete Werte
{{localize "midgard5.brawl"}}{{data.calc.stats.brawl.value}}{{localize "midgard5.enduranceBonus"}}{{data.calc.stats.enduranceBonus}}
{{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.spellCasting"}}{{data.calc.stats.spellCasting.value}}{{localize "midgard5.poisonResistance"}}{{data.calc.stats.poisonResistance.value}}
{{localize "midgard5.resistanceMind"}}{{data.calc.stats.resistanceMind.value}}{{localize "midgard5.resistanceBody"}}{{data.calc.stats.resistanceBody.value}}
{{localize "midgard5.movementRange"}}{{data.calc.stats.movement.value}}{{localize "midgard5.hoard"}}{{data.calc.stats.hoard}}
{{localize "midgard5.hoardMin"}}{{data.calc.stats.hoardMin}}{{localize "midgard5.hoard-next"}}{{data.calc.stats.hoardNext}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung
{{localize "midgard5.origin"}}{{localize "midgard5.gender"}}
{{localize "midgard5.weight"}}{{localize "midgard5.height"}}
{{localize "midgard5.shape"}}{{localize "midgard5.age"}}
{{localize "midgard5.caste"}}{{localize "midgard5.faith"}}
- -{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} +
+
+
{{localize "midgard5.calculated-values"}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{#if (eq data.info.race "Zwerg")}} + + + {{/if}} + + + {{#if (eq data.info.race "Zwerg")}} + + + + + {{/if}} + + + +
{{localize "midgard5.brawl"}}{{data.calc.stats.brawl.value}}{{localize "midgard5.enduranceBonus"}}{{data.calc.stats.enduranceBonus}}
{{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.spellCasting"}}{{data.calc.stats.spellCasting.value}}{{localize "midgard5.poisonResistance"}}{{data.calc.stats.poisonResistance.value}}
{{localize "midgard5.resistanceMind"}}{{data.calc.stats.resistanceMind.value}}{{localize "midgard5.resistanceBody"}}{{data.calc.stats.resistanceBody.value}}
{{localize "midgard5.movementRange"}}{{data.calc.stats.movement.value}}{{localize "midgard5.hoard"}}{{data.calc.stats.hoard}}
{{localize "midgard5.hoardMin"}}{{data.calc.stats.hoardMin}}{{localize "midgard5.hoard-next"}}{{data.calc.stats.hoardNext}}
+
+
+
\ No newline at end of file diff --git a/templates/sheets/character/kampfkuenste.hbs b/templates/sheets/character/combat.hbs similarity index 84% rename from templates/sheets/character/kampfkuenste.hbs rename to templates/sheets/character/combat.hbs index c1e7cf8..5a1df51 100644 --- a/templates/sheets/character/kampfkuenste.hbs +++ b/templates/sheets/character/combat.hbs @@ -133,4 +133,31 @@ {{/each}} - \ No newline at end of file + + + + + + + + + + + + + + + + {{#each data.calc.skills.combat as |skill skillId|}} + + + + + + + + + + {{/each}} + +
{{localize "midgard5.weapon-skill"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}{{skill.pp}}
diff --git a/templates/sheets/character/description.hbs b/templates/sheets/character/description.hbs new file mode 100644 index 0000000..0558494 --- /dev/null +++ b/templates/sheets/character/description.hbs @@ -0,0 +1,50 @@ +
+
+
+
{{localize "midgard5.characteristics"}}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{{localize "midgard5.origin"}}{{localize "midgard5.gender"}}{{localize "midgard5.shape"}}{{localize "midgard5.age"}}
{{localize "midgard5.weight"}}{{localize "midgard5.height"}}{{localize "midgard5.caste"}}{{localize "midgard5.faith"}}
+
+
+ +
+
+
{{localize "midgard5.description"}}
+
+
{{editor characterDescription target="data.info.description"}}
+
+
+ +
+
+
{{localize "midgard5.background"}}
+
+
{{editor characterBackground target="data.info.background"}}
+
+
+ +
diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs index a0b38d2..a04930e 100644 --- a/templates/sheets/character/gear.hbs +++ b/templates/sheets/character/gear.hbs @@ -2,7 +2,7 @@
-
Geld
+
{{localize "midgard5.currency"}}
diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs index ecc0c87..91b43e9 100644 --- a/templates/sheets/character/main.hbs +++ b/templates/sheets/character/main.hbs @@ -115,18 +115,23 @@ {{!-- Character Sheet Navigation --}}
+
+ {{> "systems/midgard5/templates/sheets/character/description.hbs"}} +
+
{{> "systems/midgard5/templates/sheets/character/base_values.hbs"}}
@@ -143,8 +148,8 @@ {{> "systems/midgard5/templates/sheets/character/spells.hbs"}} -
- {{> "systems/midgard5/templates/sheets/character/kampfkuenste.hbs"}} +
+ {{> "systems/midgard5/templates/sheets/character/combat.hbs"}}
diff --git a/templates/sheets/character/skills.hbs b/templates/sheets/character/skills.hbs index 9ca501e..90b2e27 100644 --- a/templates/sheets/character/skills.hbs +++ b/templates/sheets/character/skills.hbs @@ -1,153 +1,142 @@ -
- - - - - - - - - - - - - {{#each data.calc.skills.general as |skill skillId|}} - - - - - - - - - - {{/each}} - -
{{localize "midgard5.learned-skill"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}{{skill.pp}}
+
+
- - - - - - - - - - - - - - {{#each data.calc.skills.language as |skill skillId|}} - - - - - - - - - - {{/each}} - -
{{localize "midgard5.language"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}{{skill.pp}}
+
+
{{localize "midgard5.learned-skills"}}
+ + + + + + + + + + + + + + {{#each data.calc.skills.general as |skill skillId|}} + + + + + + + + + + {{/each}} + +
{{localize "midgard5.learned-skill"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}
+
- - - - - - - - - - - - - {{#each data.calc.skills.innate as |skill skillId|}} - - - - - - - - - {{/each}} - - - - - - - - +
+
{{localize "midgard5.innate-abilities"}}
+
{{localize "midgard5.innate-ability"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}
{{localize "midgard5.perception"}}{{data.calc.stats.perceptionFW}}{{data.calc.stats.perception.value}}{{add data.calc.stats.perception.value data.calc.stats.perceptionFW}}
+ + + + + + + + + + + + {{#each data.calc.skills.innate as |skill skillId|}} + + + + + + + + + {{/each}} + + + + + + + + - - - - - - - - - -
{{localize "midgard5.innate-ability"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}
{{localize "midgard5.perception"}}{{data.calc.stats.perceptionFW}}{{data.calc.stats.perception.value}}{{add data.calc.stats.perception.value data.calc.stats.perceptionFW}}
{{localize "midgard5.drinking"}}{{data.calc.stats.drinkingFW}}{{data.calc.stats.drinking.value}}{{add data.calc.stats.drinking.value data.calc.stats.drinkingFW}}
+ + {{localize "midgard5.drinking"}} + {{data.calc.stats.drinkingFW}} + {{data.calc.stats.drinking.value}} + {{add data.calc.stats.drinking.value data.calc.stats.drinkingFW}} + + + + + +
- - - - - - - - - - - - - - {{#each data.calc.skills.combat as |skill skillId|}} - - - - - - - - - - {{/each}} - -
{{localize "midgard5.weapon-skill"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}{{skill.pp}}
+
+
{{localize "midgard5.languages"}}
+ + + + + + + + + + + + + + {{#each data.calc.skills.language as |skill skillId|}} + + + + + + + + + + {{/each}} + +
{{localize "midgard5.language"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{skill.label}}{{skill.fw}}{{skill.calc.bonus}}{{skill.calc.ew}}{{skill.pp}}
+
+
- - - - - - - - - - - - - - - {{#each data.skills.general as |skill key|}} - {{#unless (isSkillInList (localizeMidgard key) ../actor.system.calc.skills.general) }} - - - - - - - - - - - {{/unless}} - {{/each}} - -
{{localize "midgard5.unlearned-skill"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}{{localize "midgard5.pp-short"}}
{{localizeMidgard key}}{{skill.fw}}{{skillBonus ../actor._id skill}}{{skillEw ../actor._id skill}}
\ No newline at end of file +
+ +
+
{{localize "midgard5.unlearned-skills"}}
+ + + + + + + + + + + + + {{#each data.skills.general as |skill key|}} + {{#unless (isSkillInList (localizeMidgard key) ../actor.system.calc.skills.general) }} + + + + + + + + + {{/unless}} + {{/each}} + +
{{localize "midgard5.unlearned-skill"}}{{localize "midgard5.fw"}}{{localize "midgard5.bonus"}}{{localize "midgard5.ew"}}
{{localizeMidgard key}}{{skill.fw}}{{skillBonus ../actor._id skill}}{{skillEw ../actor._id skill}}
+
+
+
\ No newline at end of file