diff --git a/assets/icons/backgrounds/bg1.webp b/assets/icons/backgrounds/bg1.webp new file mode 100644 index 0000000..a911203 Binary files /dev/null and b/assets/icons/backgrounds/bg1.webp differ diff --git a/assets/icons/icon/battle-gear.svg b/assets/icons/icon/battle-gear.svg new file mode 100644 index 0000000..7160628 --- /dev/null +++ b/assets/icons/icon/battle-gear.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/icon/black-hand-shield.svg b/assets/icons/icon/black-hand-shield.svg deleted file mode 100644 index 38ba4cd..0000000 --- a/assets/icons/icon/black-hand-shield.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/icons/icon/confirmed.svg b/assets/icons/icon/confirmed.svg new file mode 100644 index 0000000..e43f621 --- /dev/null +++ b/assets/icons/icon/confirmed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/logo/banner01.webp b/assets/icons/logo/banner01.webp new file mode 100644 index 0000000..deae56f Binary files /dev/null and b/assets/icons/logo/banner01.webp differ diff --git a/assets/icons/logo/banner02.webp b/assets/icons/logo/banner02.webp new file mode 100644 index 0000000..0cc9f58 Binary files /dev/null and b/assets/icons/logo/banner02.webp differ diff --git a/assets/icons/logo/banner03.webp b/assets/icons/logo/banner03.webp new file mode 100644 index 0000000..b809c85 Binary files /dev/null and b/assets/icons/logo/banner03.webp differ diff --git a/assets/icons/logo/banner04.webp b/assets/icons/logo/banner04.webp new file mode 100644 index 0000000..29ce03b Binary files /dev/null and b/assets/icons/logo/banner04.webp differ diff --git a/lang/de.json b/lang/de.json index efc50fd..aa4a004 100644 --- a/lang/de.json +++ b/lang/de.json @@ -81,7 +81,9 @@ "midgard5.effects": "Aktive Effekte", "midgard5.kampfkuenste": "Kampfkünste", - "midgard5.class": "Klasse", + "midgard5.actor-name": "Figur", + "midgard5.level": "Grad", + "midgard5.class": "Typ", "midgard5.race": "Rasse", "midgard5.magicUsing": "Zauberkundig", "midgard5.gender": "Geschlecht", diff --git a/source/module/sheets/M5CharacterSheet.ts b/source/module/sheets/M5CharacterSheet.ts index ff225fe..8690943 100644 --- a/source/module/sheets/M5CharacterSheet.ts +++ b/source/module/sheets/M5CharacterSheet.ts @@ -8,7 +8,7 @@ export default class M5CharacterSheet extends ActorSheet { static get defaultOptions() { return mergeObject(super.defaultOptions, { template: "systems/midgard5/templates/sheets/character/main.hbs", - width: 1200, + width: 1000, height: 800, classes: ["midgard5", "sheet", "character"], tabs: [{ navSelector: ".sheet-navigation", contentSelector: ".sheet-content", initial: "base_values" }], diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less index a88acb5..273651d 100644 --- a/source/style/Character-sheet.less +++ b/source/style/Character-sheet.less @@ -9,14 +9,34 @@ flex-wrap: wrap } + .flexcolumn { + flex-wrap: wrap; + } + + .flexcolumn-1{ + flex: 100%; + flex-wrap: wrap; + } + .flexcolumn-2 { flex: 50%; + flex-wrap: wrap; + } + + .flexcolumn-4 { + flex: 25%; + flex-wrap: wrap; + } + + .flexcolumn-5 { + flex: 20%; + flex-wrap: wrap; } .flexpart { gap: 0; padding: 0; - margin: 10px; + margin: 5px; background-color: beige; border: 2px solid black; } @@ -46,6 +66,15 @@ color: white; } + .profile-img { + display: block; + margin-left: auto; + margin-right: auto; + height: 100%; + width: auto; + border: 0px solid black; + } + .sheet.character { form { display: flex; @@ -62,12 +91,6 @@ } } - .profile-img { - max-width: 128px; - height: 128px; - border: 0px solid black; - } - .description { flex: 0 0 100%; margin: 0; @@ -100,6 +123,13 @@ table { background-color: beige; border: 0px solid transparent; + &.bordered{ + border-collapse: separate; + border: 2px solid black; + border-radius: 10px; + font-size: larger; + font-weight: bolder; + } } td, @@ -146,6 +176,10 @@ border: 0px solid transparent; } + input { + border: 0px solid black; + } + input.skill { width: 5rem; } diff --git a/source/template.json b/source/template.json index 454e250..d926a5e 100644 --- a/source/template.json +++ b/source/template.json @@ -8,6 +8,7 @@ "class": "", "race": "", "magicUsing": false, + "showAllItems": false, "gender": "", "weight": "", "height": "", diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs index e50a55e..349913f 100644 --- a/templates/sheets/character/gear.hbs +++ b/templates/sheets/character/gear.hbs @@ -31,31 +31,31 @@
-
{{localize "TYPES.Item.item"}}
+
+ + {{localize "midgard5.gear"}} + (alle ) +
- - - + + + {{#each data.calc.gear.items as |item itemId|}} + {{#if (or ../data.info.showAllItems (eq item.containerId ""))}} - + + {{/if}} {{/each}}
{{localize "TYPES.Item.item"}}{{localize "midgard5.equipped"}} {{localize "midgard5.item-quantity"}} {{localize "midgard5.item-value"}} 
{{item.label}} - {{#if item.equipped}} - - {{/if}} - {{item.quantity}} @@ -66,9 +66,15 @@ {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} {{/unless}} + {{#if item.equipped}} + + {{/if}} + {{#if item.rollExist}}{{/if}}
@@ -83,30 +89,29 @@ {{localize "TYPES.Item.container"}} - {{localize "midgard5.equipped"}} {{localize "midgard5.item-value"}} - - + + +   - {{#each data.calc.gear.containers as |item itemId|}} {{item.label}} - - {{#if item.equipped}} - - {{/if}} - {{#unless (or (eq item.value 0) (eq item.currency ""))}} {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} {{/unless}} + + {{#if item.equipped}} + + {{/if}} + {{#if item.rollExist}}{{/if}} @@ -122,31 +127,21 @@ {{localize "TYPES.Item.item"}} - {{localize "midgard5.equipped"}} - {{localize "TYPES.Item.container"}} {{localize "midgard5.item-quantity"}} {{localize "midgard5.item-value"}} - - + + +   - {{#each ../data.calc.gear.items as |item itemId|}} {{#if (eq item.containerId containerId)}} {{item.label}} - - {{#if item.equipped}} - - {{/if}} - - - {{localize "TYPES.Item.container"}} - {{item.quantity}} @@ -157,6 +152,11 @@ {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} {{/unless}} + + {{#if item.equipped}} + + {{/if}} + {{#if item.rollExist}}{{/if}} diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs index bfd17bf..ecc0c87 100644 --- a/templates/sheets/character/main.hbs +++ b/templates/sheets/character/main.hbs @@ -1,101 +1,116 @@
-
- - - - - - - +
+ + +
+ Midgard +
+ + +
+
Midgard
{{data.calc.level}}
+ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{localize "midgard5.actor-name"}}
NameGrad
- - - -
{{localize "midgard5.race"}}{{localize "midgard5.class"}}{{localize "midgard5.occupation"}}
{{localize "midgard5.actor-lp-short"}} -
- - {{#times data.lp.max}} - {{#if (lt this ../data.lp.value)}} -
- {{else}} -
- {{/if}} - {{/times}} - -
-
{{localize "midgard5.actor-ap-short"}} -
- - {{#times data.ap.max}} - {{#if (lt this ../data.ap.value)}} -
- {{else}} -
- {{/if}} - {{/times}} - -
-
{{localize "midgard5.actor-st"}}{{localize "midgard5.actor-gs"}}{{localize "midgard5.actor-gw"}}{{localize "midgard5.actor-ko"}}{{localize "midgard5.actor-in"}}{{localize "midgard5.actor-zt"}}{{localize "midgard5.actor-au"}}{{localize "midgard5.actor-pa"}}{{localize "midgard5.actor-wk"}}{{localize "midgard5.actor-git"}}
{{data.calc.attributes.st.value}}{{data.calc.attributes.gs.value}}{{data.calc.attributes.gw.value}}{{data.calc.attributes.ko.value}}{{data.calc.attributes.in.value}}{{data.calc.attributes.zt.value}}{{data.calc.attributes.au.value}}{{data.calc.attributes.pa.value}}{{data.calc.attributes.wk.value}}{{data.calc.stats.poisonResistance.value}}
+ + {{localize "midgard5.class"}} + + {{localize "midgard5.level"}} + {{data.calc.level}} + + + + + + + + + + + + +
+ + + +
{{localize "midgard5.race"}}{{localize "midgard5.occupation"}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{{localize "midgard5.actor-st"}}{{localize "midgard5.actor-gs"}}{{localize "midgard5.actor-gw"}}{{localize "midgard5.actor-ko"}}{{localize "midgard5.actor-in"}}{{localize "midgard5.actor-zt"}}{{localize "midgard5.actor-au"}}{{localize "midgard5.actor-pa"}}{{localize "midgard5.actor-wk"}}{{localize "midgard5.actor-git"}}
{{data.calc.attributes.st.value}}{{data.calc.attributes.gs.value}}{{data.calc.attributes.gw.value}}{{data.calc.attributes.ko.value}}{{data.calc.attributes.in.value}}{{data.calc.attributes.zt.value}}{{data.calc.attributes.au.value}}{{data.calc.attributes.pa.value}}{{data.calc.attributes.wk.value}}{{data.calc.stats.poisonResistance.value}}
+
+ + +
+ +
+ + +
+ + + + + + + + + +
{{localize "midgard5.actor-lp-short"}} +
+ + {{#times data.lp.max}} + {{#if (lt this ../data.lp.value)}} +
+ {{else}} +
+ {{/if}} + {{/times}} + +
+
{{localize "midgard5.actor-ap-short"}} +
+ + {{#times data.ap.max}} + {{#if (lt this ../data.ap.value)}} +
+ {{else}} +
+ {{/if}} + {{/times}} + +
+
+
{{!-- Character Sheet Navigation --}}