diff --git a/lang/de.json b/lang/de.json index 6e39d06..4f9a934 100644 --- a/lang/de.json +++ b/lang/de.json @@ -17,6 +17,7 @@ "midgard5.phase-movement": "Bewegungsphase", "midgard5.no-encounter": "Kein Kampf", "midgard5.encounter-not-started": "Kein aktiver Kampf", + "midgard5.initiative": "Initiative", "midgard5.time-duration": "Dauer", "midgard5.time-round": "Runde(n)", @@ -254,6 +255,11 @@ "midgard5.active": "Aktiv", "midgard5.rangedWeapon": "Schusswaffe", "midgard5.assignItemToCharacter": "Füge Gegenstand einem Charakter hinzu, um hier etwas auswählen zu können", + "midgard5.showAll": "Alle anzeigen", + "midgard5.wealthAndContainers": "Vermögen und Aufbewahrung", + "midgard5.itemsInContainers": "Gegenstände in Aufbewahrung", + "midgard5.allItems": "Alle Gegenstände", + "midgard5.pw": "Prüfwurf", "midgard5.attack": "Angriff", diff --git a/package.json b/package.json index efe783e..1a73a8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "foundry-system-midgard5", - "version": "2.4.0", + "version": "2.4.1", "description": "", "main": "index.js", "scripts": { diff --git a/source/index.ts b/source/index.ts index 42b83d9..f00d480 100644 --- a/source/index.ts +++ b/source/index.ts @@ -90,6 +90,16 @@ Hooks.once("init", async () => { return label.toLowerCase().includes(contains.toLowerCase()); }); + Handlebars.registerHelper("count", (object: any) => { + var length = 0; + for( var key in object ) { + if( object.hasOwnProperty(key) ) { + ++length; + } + } + return length; + }); + // Default Sheet für Items definieren und das Standardsheet deaktivieren Items.unregisterSheet("core", ItemSheet); Items.registerSheet("midgard5", M5ItemSheet, { makeDefault: true }); diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index 0ce24d6..2fb4d88 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -187,9 +187,8 @@ export class M5Character extends Actor { let icon = item.img; let rollable = false; - // console.log(item.system.rolls.formulas.map((p) => p.enabled)); for (let key in item.system.rolls.formulas) { - rollable = item.system.rolls.formulas[key].enabled; + rollable = item.system.rolls.formulas[key]?.enabled; if (rollable) { break; } @@ -226,9 +225,8 @@ export class M5Character extends Actor { let icon = item.img; let rollable = false; - // console.log(item.system.rolls.formulas.map((p) => p.enabled)); for (let key in item.system.rolls.formulas) { - rollable = item.system.rolls.formulas[key].enabled; + rollable = item.system.rolls.formulas[key]?.enabled; if (rollable) { break; } diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less index 75a86bb..b34e013 100644 --- a/source/style/Character-sheet.less +++ b/source/style/Character-sheet.less @@ -11,38 +11,41 @@ .flexcolumn { flex-wrap: wrap; + flex-direction: column; } .flexcolumn-1 { - flex: 100%; + flex-basis: 100%; flex-wrap: wrap; } .flexcolumn-2 { - flex: 50%; + flex-basis: 50%; flex-wrap: wrap; } .flexcolumn-3 { - flex: 33%; + flex-basis: 33%; flex-wrap: wrap; } .flexcolumn-4 { - flex: 25%; + flex-basis: 25%; flex-wrap: wrap; } .flexcolumn-5 { - flex: 20%; + flex-basis: 20%; flex-wrap: wrap; } .flexpart { gap: 0; padding: 0; - margin: 5px; + margin: 2px; background-color: beige; + border-collapse: separate; + border-radius: 10px; border: 2px solid black; } @@ -65,10 +68,24 @@ h3 { padding: 0.5rem 0.5rem 0.5rem 0.5rem; + margin-top: 0.5rem; + margin-bottom: 0; text-align: left; font-weight: bold; - background-color: dimgray; - color: white; + background-color: #eeede0; + color: black; + border-collapse: separate; + border: 2px solid black; + border-radius: 10px; + } + + .profile-img { + display: block; + margin-left: auto; + margin-right: auto; + height: 100%; + width: auto; + border: 0px solid black; } .profile-img { @@ -246,7 +263,8 @@ padding: 1px; //align-items: stretch; - input { + input, + .max-value { flex: 0 0 2rem; text-align: center; height: 100%; diff --git a/source/system.json b/source/system.json index 829b8ca..e1d362b 100644 --- a/source/system.json +++ b/source/system.json @@ -3,17 +3,13 @@ "name": "midgard5", "title": "Midgard 5. Edition", "description": "The German RPG Midgard 5. Edition", - "version": "2.4.0", + "version": "2.4.1", "compatibility": { "minimum": "10", "verified": "11", "maximum": "11" }, - "authors": [ - {"name": "Byroks"}, - {"name": "Le-Frique"}, - {"name": "Oskaloq"} - ], + "authors": [{ "name": "Byroks" }, { "name": "Le-Frique" }, { "name": "Oskaloq" }], "scripts": ["bundle.js"], "styles": ["bundle.css"], "packs": [ @@ -107,41 +103,25 @@ "name": "Midgard 5", "sorting": "a", "color": "#0000FF", - "packs": [ - "blaupause-spielfiguren", - "tabellen-kritische-ereignisse", - "makros-kritische-ereignisse", - "makros-standardwurfel" - ], + "packs": ["blaupause-spielfiguren", "tabellen-kritische-ereignisse", "makros-kritische-ereignisse", "makros-standardwurfel"], "folders": [ { "name": "Ausrüstung", "sorting": "a", "color": "#008000", - "packs": [ - "ausruestung", - "ruestkammer", - "waffenkammer" - ] + "packs": ["ausruestung", "ruestkammer", "waffenkammer"] }, { "name": "Effekte", "sorting": "a", "color": "#800080", - "packs": [ - "kampfzustaende", - "verletzungen", - "zauberwirkungen" - ] + "packs": ["kampfzustaende", "verletzungen", "zauberwirkungen"] }, { "name": "Fähigkeiten", "sorting": "a", "color": "#800000", - "packs": [ - "fertigkeiten", - "kampf" - ] + "packs": ["fertigkeiten", "kampf"] } ] } @@ -158,8 +138,8 @@ "primaryTokenAttribute": "lp", "secondaryTokenAttribute": "ap", "url": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5", - "manifest": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.0/system.json", - "download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.0/midgard5-v2.4.0.zip", + "manifest": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.1/system.json", + "download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.1/midgard5-v2.4.1.zip", "initiative": "@c.calc.attributes.gw.value", "license": "LICENSE.txt" -} \ No newline at end of file +} diff --git a/templates/sheets/character/base_values.hbs b/templates/sheets/character/base_values.hbs index 6ac423c..9aa2fd6 100644 --- a/templates/sheets/character/base_values.hbs +++ b/templates/sheets/character/base_values.hbs @@ -67,6 +67,12 @@ {{localize "midgard5.movementRange"}} + + {{localize "midgard5.actor-lp-short"}} + + {{localize "midgard5.actor-ap-short"}} + + {{localize "midgard5.brawl"}} {{data.calc.stats.brawl.value}} diff --git a/templates/sheets/character/combat.hbs b/templates/sheets/character/combat.hbs index e26b12a..800610a 100644 --- a/templates/sheets/character/combat.hbs +++ b/templates/sheets/character/combat.hbs @@ -1,5 +1,32 @@
-
+ +
+
+
{{localize "midgard5.calculated-values"}}
+ + + + + + + + + + + + + + + + + + + +
{{localize "midgard5.movementRange"}}{{data.calc.stats.movement.value}}
{{localize "midgard5.defense"}}{{data.calc.stats.defense.value}}{{localize "midgard5.defenseBonus"}}{{data.calc.stats.defenseBonus.value}}
{{localize "midgard5.attackBonus"}}{{data.calc.stats.attackBonus.value}}{{localize "midgard5.damageBonus"}}{{data.calc.stats.damageBonus.value}}
+
+
+ +
{{localize "midgard5.attack"}}
@@ -78,33 +105,7 @@ -
-
-
{{localize "midgard5.calculated-values"}}
-
- - - - - - - - - - - - - - - - - - -
{{localize "midgard5.movementRange"}}{{data.calc.stats.movement.value}}  
{{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"}}
diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs index 6f88e2a..451fa02 100644 --- a/templates/sheets/character/gear.hbs +++ b/templates/sheets/character/gear.hbs @@ -1,6 +1,7 @@ +

{{localize "midgard5.wealthAndContainers"}}

-
+
{{localize "midgard5.currency"}}
@@ -29,165 +30,9 @@
- -
-
- - {{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.item-quantity"}}{{localize "midgard5.item-value"}}
- {{item.label}} - - - {{item.quantity}} - - - {{#unless (or (eq item.value 0) (eq item.currency ""))}} - {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} - {{/unless}} - - {{#if item.equipped}} - - {{else}} - - {{/if}} - {{#if item.rollExist}}{{/if}}
-
- -
-
{{localize "midgard5.weapons"}}
- - - - - - - - - - - - {{#each data.calc.gear.weapons as |item itemId|}} - - - - - - - {{/each}} - -
{{localize "TYPES.Item.weapon"}}{{localize "midgard5.item-value"}}
{{item.label}} - {{#unless (or (eq item.value 0) (eq item.currency ""))}} - {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} - {{/unless}} - - {{#if item.equipped}} - - {{else}} - - {{/if}} -
-
- -
-
{{localize "midgard5.defensive-weapons"}}
- - - - - - - - - - - {{#each data.calc.gear.defensiveWeapons as |item itemId|}} - - - - - - - {{/each}} - -
{{localize "TYPES.Item.defensiveWeapon"}}{{localize "midgard5.item-value"}}
{{item.label}} - {{#unless (or (eq item.value 0) (eq item.currency ""))}} - {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} - {{/unless}} - - {{#if item.equipped}} - - {{else}} - - {{/if}} -
-
- -
-
{{localize "midgard5.armor"}}
- - - - - - - - - - - {{#each data.calc.gear.armor as |item itemId|}} - - - - - - - {{/each}} - -
{{localize "TYPES.Item.armor"}}{{localize "midgard5.item-value"}}
{{item.label}} - {{#unless (or (eq item.value 0) (eq item.currency ""))}} - {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} - {{/unless}} - - {{#if item.equipped}} - - {{else}} - - {{/if}} -
-
-
{{localize "TYPES.Item.container"}}
@@ -226,8 +71,13 @@
+
+
- {{#each data.calc.gear.containers as |container containerId|}} +

{{localize "midgard5.itemsInContainers"}}

+
+ {{#each data.calc.gear.containers as |container containerId|}} +
{{container.label}}
@@ -271,9 +121,265 @@ {{/if}} {{/each}} + {{#each ../data.calc.gear.weapons as |item itemId|}} + {{#if (eq item.containerId containerId)}} + + + + + + + + + {{/if}} + {{/each}} + {{#each ../data.calc.gear.defensiveWeapons as |item itemId|}} + {{#if (eq item.containerId containerId)}} + + + + + + + + + {{/if}} + {{/each}} + {{#each ../data.calc.gear.armor as |item itemId|}} + {{#if (eq item.containerId containerId)}} + + + + + + + + + {{/if}} + {{/each}}
+ {{item.label}} + + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} + {{#if item.rollExist}}{{/if}}
+ {{item.label}} + + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} + {{#if item.rollExist}}{{/if}}
+ {{item.label}} + + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} + {{#if item.rollExist}}{{/if}}
- {{/each}}
+ {{/each}} +
+ +

+ {{localize "midgard5.allItems"}} + + +

+
+ {{#unless (eq (count data.calc.gear.items) 0)}} +
+
+
{{localize "midgard5.gear"}}
+ + + + + + + + + + + + + + + {{#each data.calc.gear.items as |item itemId|}} + {{#if (or ../data.info.showAllItems (eq item.containerId ""))}} + + + + + + + + + {{/if}} + {{/each}} + +
{{localize "TYPES.Item.item"}}{{localize "midgard5.item-quantity"}}{{localize "midgard5.item-value"}}
+ {{item.label}} + + + {{item.quantity}} + + + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} + {{#if item.rollExist}}{{/if}}
+
+
+ {{/unless}} + + {{#unless (eq (count data.calc.gear.weapons) 0)}} +
+
+
+ {{localize "midgard5.weapons"}}
+ + + + + + + + + + + + {{#each data.calc.gear.weapons as |item itemId|}} + {{#if (or ../data.info.showAllItems (eq item.containerId ""))}} + + + + + + + {{/if}} + {{/each}} + +
{{localize "TYPES.Item.weapon"}}{{localize "midgard5.item-value"}}
{{item.label}} + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} +
+
+
+ {{/unless}} + + {{#unless (eq (count data.calc.gear.defensiveWeapons) 0)}} +
+
+
{{localize "midgard5.defensive-weapons"}}
+ + + + + + + + + + + {{#each data.calc.gear.defensiveWeapons as |item itemId|}} + {{#if (or ../data.info.showAllItems (eq item.containerId ""))}} + + + + + + + {{/if}} + {{/each}} + +
{{localize "TYPES.Item.defensiveWeapon"}}{{localize "midgard5.item-value"}}
{{item.label}} + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} +
+
+
+ {{/unless}} + + {{#unless (eq (count data.calc.gear.armor) 0)}} +
+
+
{{localize "midgard5.armor"}}
+ + + + + + + + + + + {{#each data.calc.gear.armor as |item itemId|}} + {{#if (or ../data.info.showAllItems (eq item.containerId ""))}} + + + + + + + {{/if}} + {{/each}} + +
{{localize "TYPES.Item.armor"}}{{localize "midgard5.item-value"}}
{{item.label}} + {{#unless (or (eq item.value 0) (eq item.currency ""))}} + {{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}} + {{/unless}} + + {{#if item.equipped}} + + {{else}} + + {{/if}} +
+
+
+ {{/unless}} + + +
\ No newline at end of file diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs index 7ca7632..1039fc3 100644 --- a/templates/sheets/character/main.hbs +++ b/templates/sheets/character/main.hbs @@ -89,7 +89,7 @@
{{/if}} {{/times}} - +
{{data.lp.max}}
@@ -105,7 +105,7 @@
{{/if}} {{/times}} - +
{{data.ap.max}}