From d214358adbf859219ba420d838b56b69c26adcbd Mon Sep 17 00:00:00 2001 From: hjmaier <51607746+hjmaier@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:36:23 +0100 Subject: [PATCH 1/2] V0.05 - Final --- CHANGELOG.md | 5 ++- README.md | 4 +- lang/de.json | 1 + less/Character-sheet.less | 6 +++ midgard5.css | 4 ++ system.json | 4 +- template.json | 13 ++++++- templates/sheets/m5Character-Sheet.hbs | 4 +- templates/sheets/m5Item-Sheet.hbs | 52 ++++++++++++++------------ 9 files changed, 61 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4222899..f36e9d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,4 +7,7 @@ - Blaupausen für Spielerfiguren und Nichtspielerfiguren # 0.04 - Schönere Bilder für Macros der Krittabellen und Würfelmacros -- Macros auf Crit Tabellen funktionieren jetzt korrekt \ No newline at end of file +- Macros auf Crit Tabellen funktionieren jetzt korrekt +# 0.05 +- Flag für Items: Am Körper getragen +- Anpassungen, damit das Modul Tokenizer verwendet werden kann \ No newline at end of file diff --git a/README.md b/README.md index 0c71521..e573454 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,13 @@

 

License


-

Midgard

+

Midgard

Midgard is the intellectual property of Verlag für Fantasy- und SF-Spiele GbR (VFSF), Stelzenberg, Germany.


Icons

Icons were taken from Game-Icons.net they are under the CC BY 3.0 license. The creators of the icons are not responsible for the use of their art.

The following icons were taken:

+

No changes were made

diff --git a/lang/de.json b/lang/de.json index 8e85fed..5ad4efb 100644 --- a/lang/de.json +++ b/lang/de.json @@ -6,6 +6,7 @@ "midgard5.description": "Beschreibung", "midgard5.item-value": "Wert", "midgard5.item-quantity": "Menge", + "midgard5.item-onbody": "Am Körper", "midgard5.item-ismagic": "Ist Magisch", "midgard5.actor-lp": "Lebenspunkte", "midgard5.actor-ap": "Ausdauerpunkte", diff --git a/less/Character-sheet.less b/less/Character-sheet.less index e1f4dab..946c249 100644 --- a/less/Character-sheet.less +++ b/less/Character-sheet.less @@ -13,4 +13,10 @@ height: 100%; } } + .profile-img { + + height: 64px; + width: 64px; + + } } diff --git a/midgard5.css b/midgard5.css index 2aac189..cd11c58 100644 --- a/midgard5.css +++ b/midgard5.css @@ -22,3 +22,7 @@ .midgard5.sheet.character .sheet-content .editor { height: 100%; } +.midgard5.sheet.character .profile-img { + height: 64px; + width: 64px; +} diff --git a/system.json b/system.json index 6c3782d..5c5a5cb 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "name": "midgard5", "title": "Midgard 5. Edition", "description": "The German RPG Midgard 5. Edition", - "version": 0.04, + "version": 0.05, "minimumCoreVersion": "0.7.9", "compatibleCoreVersion": "0.7.9", "templateVersion": 2, @@ -52,7 +52,7 @@ "secondaryTokenAttribute": "ap", "url": "https://github.com/hjmaier/midgard5", "manifest": "https://raw.githubusercontent.com/hjmaier/midgard5/main/system.json", - "download": "https://github.com/hjmaier/midgard5/archive/V0.04.zip", + "download": "https://github.com/hjmaier/midgard5/archive/V0.05.zip", "initiative": "@gw.value + @gw.bonus", "license": "LICENSE.txt" } diff --git a/template.json b/template.json index e6e0bac..675b059 100644 --- a/template.json +++ b/template.json @@ -20,6 +20,13 @@ "max":20 } }, + "characterHeader": { + "es":0, + "ep":0, + "gg":0, + "sg":0, + "gp":2 + }, "attributes":{ "st": { "value": 50, @@ -63,7 +70,8 @@ "templates": [ "characterBars", "attributes", - "characterDescription" + "characterDescription", + "characterHeader" ] }, "npc":{ @@ -94,8 +102,9 @@ "itemDescription" ], "quantity":1, - "weight":0, + "value":0, "magic":false, + "onbody":false, "attributes":{ }, diff --git a/templates/sheets/m5Character-Sheet.hbs b/templates/sheets/m5Character-Sheet.hbs index a82eb99..f511954 100644 --- a/templates/sheets/m5Character-Sheet.hbs +++ b/templates/sheets/m5Character-Sheet.hbs @@ -1,6 +1,6 @@
- +

@@ -57,7 +57,7 @@ {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
- {{!--
+{{!--

Owned Items

    {{#each actor.items as |item id|}} diff --git a/templates/sheets/m5Item-Sheet.hbs b/templates/sheets/m5Item-Sheet.hbs index a0380b1..23918f6 100644 --- a/templates/sheets/m5Item-Sheet.hbs +++ b/templates/sheets/m5Item-Sheet.hbs @@ -1,27 +1,31 @@ -
    - -

    -
    -
    - - - - - - - - - - - -
    {{localize "midgard5.item-quantity"}}{{localize "midgard5.item-value"}}{{localize "midgard5.item-ismagic"}}
    - - - - - -
    - {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} +
    + +

    +
    +
    + + + + + + + + + + + + + +
    {{localize "midgard5.item-quantity"}}{{localize "midgard5.item-value"}}{{localize "midgard5.item-onbody"}}{{localize "midgard5.item-ismagic"}}
    + + + + + + + +
    + {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
    \ No newline at end of file From c172b178b35dddd96c1d036be4c3be17cabe4f3e Mon Sep 17 00:00:00 2001 From: hjmaier <51607746+hjmaier@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:13:34 +0100 Subject: [PATCH 2/2] V0.05 Nachtrag --- packs/actors/blaupause-spielfiguren.db | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packs/actors/blaupause-spielfiguren.db b/packs/actors/blaupause-spielfiguren.db index cbc0b22..50ebd4e 100644 --- a/packs/actors/blaupause-spielfiguren.db +++ b/packs/actors/blaupause-spielfiguren.db @@ -1,2 +1,3 @@ -{"_id":"9d4uk6kRSl6R3RQW","name":"Blaupause NSpF","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"npc","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"gw":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.midgard5.blaupause-spielfiguren.UZ24J3Izksd0gNfR"}},"img":"icons/svg/wing.svg","token":{"flags":{},"name":"Blaupause NSpF","displayName":30,"img":"icons/svg/wing.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"9d4uk6kRSl6R3RQW","actorLink":true,"disposition":-1,"displayBars":30,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]} -{"_id":"FeM5qp9YncZX61nj","name":"Blaupause Spielerfigur","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"character","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"gw":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.world.blaupause-spielfiguren.t9eB2RdE1n9wV8eq"}},"img":"icons/svg/aura.svg","token":{"flags":{},"name":"Blaupause Spielfigur","displayName":30,"img":"icons/svg/aura.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"FeM5qp9YncZX61nj","actorLink":true,"disposition":1,"displayBars":30,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]} +{"_id":"R41aDRCMdLzXuTwY","name":"Blaupause Spielerfigur","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"character","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"st":{"value":50,"bonus":0},"ge":{"value":50,"bonus":0},"gw":{"value":50,"bonus":0},"ko":{"value":50,"bonus":0},"in":{"value":50,"bonus":0},"zt":{"value":50,"bonus":0},"au":{"value":50,"bonus":0},"pa":{"value":50,"bonus":0},"wk":{"value":50,"bonus":0},"description":" ","es":0,"ep":0,"gg":0,"sg":0,"gp":2},"sort":100001,"flags":{"core":{"sourceId":"Compendium.world.blaupause-spielfiguren.t9eB2RdE1n9wV8eq"}},"img":"icons/svg/aura.svg","token":{"flags":{},"name":"Blaupause Spielfigur","displayName":30,"img":"icons/svg/aura.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"R41aDRCMdLzXuTwY","actorLink":true,"disposition":1,"displayBars":50,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]} +{"_id":"bqttz8gtZyKV7t30","name":"Blaupause NSpF - verbunden","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"npc","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"st":{"value":50,"bonus":0},"ge":{"value":50,"bonus":0},"gw":{"value":50,"bonus":0},"ko":{"value":50,"bonus":0},"in":{"value":50,"bonus":0},"zt":{"value":50,"bonus":0},"au":{"value":50,"bonus":0},"pa":{"value":50,"bonus":0},"wk":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.midgard5.blaupause-spielfiguren.UZ24J3Izksd0gNfR"}},"img":"icons/svg/wing.svg","token":{"flags":{},"name":"Blaupause NSpF - verbunden","displayName":30,"img":"icons/svg/wing.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"bqttz8gtZyKV7t30","actorLink":true,"disposition":-1,"displayBars":50,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]} +{"_id":"d9fKKyYxVSnUOsE4","name":"Blaupause NSpF - nicht verbunden","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"npc","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"st":{"value":50,"bonus":0},"ge":{"value":50,"bonus":0},"gw":{"value":50,"bonus":0},"ko":{"value":50,"bonus":0},"in":{"value":50,"bonus":0},"zt":{"value":50,"bonus":0},"au":{"value":50,"bonus":0},"pa":{"value":50,"bonus":0},"wk":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.midgard5.blaupause-spielfiguren.UZ24J3Izksd0gNfR"}},"img":"icons/svg/wing.svg","token":{"flags":{},"name":"Blaupause NSpF - nicht verbunden","displayName":30,"img":"icons/svg/wing.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"d9fKKyYxVSnUOsE4","actorLink":false,"disposition":-1,"displayBars":50,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]}