Merge pull request #15 from hjmaier/V0.05

V0.05 - Final
2021-02-16 12:14:24 +01:00 · 2021-02-16 12:14:24 +01:00 · e0c76780f4
parent 6ccd9510c5 c172b178b3
commit e0c76780f4
10 changed files with 64 additions and 34 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,3 +8,6 @@
 # 0.04
 - Schönere Bilder für Macros der Krittabellen und Würfelmacros
 - 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
--- a/README.md
+++ b/README.md
@ -22,12 +22,13 @@
 <p>&nbsp;</p>
 <h2>License</h2>
 <br/>
-<h2>Midgard<h2>
+<h2>Midgard</h2>
 <p>Midgard is the intellectual property of Verlag f&uuml;r Fantasy- und SF-Spiele GbR (VFSF), Stelzenberg, Germany.</p>
 <br/>
 <h2>Icons</h2>
 <p>Icons were taken from <a href="https://game-icons.net/">Game-Icons.net</a> they are under the <a href="https://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a> license. The creators of the icons are not responsible for the use of their art.<p>
 <p>The following icons were taken:</p>
+<ul>
 <li><a href="https://game-icons.net/1x1/delapouite/dice-twenty-faces-twenty.html">Dice 20 faces 20 icon</a> by <a href="https://delapouite.com/">Delapouite</a></li>
 <li><a href="https://game-icons.net/1x1/delapouite/perspective-dice-five.html">Perspective dice 5 icon</a> by <a href="https://delapouite.com/">Delapouite</a></li>
 <li><a href="https://game-icons.net/1x1/skoll/d10.html">Perspective dice 5 icon</a> by Skoll</li>
@ -36,4 +37,5 @@
 <li><a href="https://game-icons.net/1x1/lorc/broken-shield.html">Broken shield icon</a> by <a href="https://lorcblog.blogspot.com/">Lorc</a></li>
 <li><a href="https://game-icons.net/1x1/delapouite/shield-bash.html">Shield bash icon</a> by <a href="https://delapouite.com/">Delapouite</a></li>
 <li><a href="https://game-icons.net/1x1/lorc/mushroom-cloud.html">Mushroom cloud icon</a> by <a href="https://lorcblog.blogspot.com/">Lorc</a></li>
+</ul><br/>
 <p>No changes were made</p>
--- 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",
--- a/less/Character-sheet.less
+++ b/less/Character-sheet.less
@ -13,4 +13,10 @@
            height: 100%;
        }
    }
+    .profile-img {
+
+        height: 64px;
+        width: 64px; 
+
+    }
 }
--- 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;
+}
--- 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":[]}
--- 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"
 }
--- 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":{

         },
--- a/templates/sheets/m5Character-Sheet.hbs
+++ b/templates/sheets/m5Character-Sheet.hbs
@ -1,6 +1,6 @@
 <form class="actor-sheet {{cssClass}}" autocomplete="off">
    <header class="sheet-header">
-        <img src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="64" width="64" />
+        <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" />
        <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name" /></h1>
    </header>
    <div class="sheet-content">
--- a/templates/sheets/m5Item-Sheet.hbs
+++ b/templates/sheets/m5Item-Sheet.hbs
@ -8,6 +8,7 @@
      <tr>
        <th>{{localize "midgard5.item-quantity"}}</th>
        <th>{{localize "midgard5.item-value"}}</th>
+        <th>{{localize "midgard5.item-onbody"}}</th>
        <th>{{localize "midgard5.item-ismagic"}}</th>
      </tr>
      <tr>
@ -15,7 +16,10 @@
          <input name="data.quantity" type="text" value="{{data.quantity}}" data-dtype="Number" />
        </td>
        <td>
-            <input name="data.weight" type="text" value="{{data.weight}}" data-dtype="Number" />
+          <input name="data.value" type="text" value="{{data.value}}" data-dtype="Number" />
+        </td>
+        <td>
+          <input name="data.onbody" type="checkbox" {{checked data.onbody}} />
        </td>
        <td>
          <input name="data.magic" type="checkbox" {{checked data.magic}} />