From 2373314382416caf5eda3aeabbc22f62e5276dbf Mon Sep 17 00:00:00 2001
From: hjmaier <51607746+hjmaier@users.noreply.github.com>
Date: Sat, 13 Feb 2021 14:24:41 +0100
Subject: [PATCH] V0.04

---
 .DS_Store                                   | Bin 6148 -> 6148 bytes
 CHANGELOG.md                                |   5 ++-
 lang/de.json                                |  29 ++++++++++++++----
 midgard5.js                                 |   4 +++
 packs/macros/makros-kritische-ereignisse.db |   1 +
 template.json                               |  32 ++++++++++++++++++++
 templates/sheets/m5Character-Sheet.hbs      |   6 ++--
 templates/sheets/m5Item-Sheet.hbs           |   6 ++--
 8 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index c8aed6060fa9c3663173082c9fddbae256c17893..28e73ccfafbb20b738e3e40f8dc9aa71c6723849 100644
GIT binary patch
delta 65
zcmZoMXfc@J&nU4mU^g?P#AY6ruS}EYvvKp31sCPz<maU`FfcGq{>Qd>G9$Y%ir~aV
K-OcPAfB6BOxD(d^

delta 35
rcmZoMXfc@J&nUJrU^g?P*k&G<uS}C2*@Y+TvG-0)P20@Q@s}R}$vz8Q

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa627d1..25834cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,4 +4,7 @@
 - Kritische Tabellen
 # 0.03
 - Makros für Standardwürfel (W6. W20. W100)
-- Blaupausen für Spielerffiguren und Nichtspielerfiguren
\ No newline at end of file
+- Blaupausen für Spielerfiguren und Nichtspielerfiguren
+# 0.04
+- Schönere Bilder für Macros der Krittabellen
+- Macros auf Crit Tabellen funktionieren jetzt korrekt
\ No newline at end of file
diff --git a/lang/de.json b/lang/de.json
index c359d9a..8e85fed 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -4,12 +4,29 @@
   "ACTOR.TypeVehicle": "Transportmittel / Pferd etc.",
   "ITEM.TypeItem": "Gegenstand",
   "midgard5.description": "Beschreibung",
-  "midgard5.item.value": "Wert",
-  "midgard5.quantity": "Menge",
-  "midgard5.ismagic": "Ist Magisch",
-  "midgard5.lp": "Lebenspunkte",
-  "midgard5.ap": "Ausdauerpunkte",
-  "midgard5.gw": "Gewandheit",
+  "midgard5.item-value": "Wert",
+  "midgard5.item-quantity": "Menge",
+  "midgard5.item-ismagic": "Ist Magisch",
+  "midgard5.actor-lp": "Lebenspunkte",
+  "midgard5.actor-ap": "Ausdauerpunkte",
+  "midgard5.actor-st": "St",
+  "midgard5.actor-st-long": "Stärke",
+  "midgard5.actor-ko": "Ko",
+  "midgard5.actor-ko-long": "Konstitution",
+  "midgard5.actor-au": "Au",
+  "midgard5.actor-au-long": "Aussehen",
+  "midgard5.actor-gs": "Gs",
+  "midgard5.actor-gs-long": "Geschicklichkeit",
+  "midgard5.actor-in": "In",
+  "midgard5.actor-in-long": "Intelligenz",
+  "midgard5.actor-pa": "pA",
+  "midgard5.actor-pa-long": "persönliche Ausstrahlung",
+  "midgard5.actor-gw": "Gw",
+  "midgard5.actor-gw-long": "Gewandtheit",
+  "midgard5.actor-zt": "Zt",
+  "midgard5.actor-zt-long": "Zaubertalent",
+  "midgard5.actor-wk": "Wk",
+  "midgard5.actor-wk-long": "Willenskraft",
   "midgard5.bonus": "Bonus",
   "midgard5.aktuell": "Akt.",
   "midgard5.maximum": "Max.",
diff --git a/midgard5.js b/midgard5.js
index b8df74c..6e60c3d 100644
--- a/midgard5.js
+++ b/midgard5.js
@@ -4,9 +4,13 @@ import m5CharacterSheet from "./module/sheets/m5CharacterSheet.js";
 Hooks.once("init", function () {
   console.log("M5 | Initialisierung Midgard 5");
 
+// Default Sheet für Items definieren und das Standardsheet deaktivieren
+
   Items.unregisterSheet("core", ItemSheet);
   Items.registerSheet("midgard5", m5ItemSheet, { makeDefault: true });
 
+// Default Sheet für Actors definieren und das Standardsheet deaktivieren
+
   Actors.unregisterSheet("core", ActorSheet);
   Actors.registerSheet("midgard5", m5CharacterSheet, { makeDefault: true });
 });
diff --git a/packs/macros/makros-kritische-ereignisse.db b/packs/macros/makros-kritische-ereignisse.db
index 39de48e..2cd43e8 100644
--- a/packs/macros/makros-kritische-ereignisse.db
+++ b/packs/macros/makros-kritische-ereignisse.db
@@ -3,3 +3,4 @@
 {"name":"Kritischer Fehler bei der Abwehr","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.k1tLp8Q2NY9twiZ6"}},"scope":"global","command":"main()\nasync function main() {\n\n//Das richtige Pack (Kompendium) holen\n\nconst pack = game.packs.get(\"midgard5.tabellen-kritische-ereignisse\");\n\n// Richtige Tabelle aus dem Pack holen\n\nlet entry = pack.index.find(e => e.name === \"Kritischer Fehler bei der Abwehr\");\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/fire-shield.svg","actorIds":[],"_id":"W7rYb00B6rtabV05"}
 {"name":"Kritische Fehler beim Zaubern","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.e4KLlTBq8Z4Pt7In"}},"scope":"global","command":"main()\nasync function main() {\n\n//Das richtige Pack (Kompendium) holen\n\nconst pack = game.packs.get(\"midgard5.tabellen-kritische-ereignisse\");\n\n// Richtige Tabelle aus dem Pack holen\n\nlet entry = pack.index.find(e => e.name === \"Kritische Fehler beim Zaubern\");\n\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/book.svg","actorIds":[],"_id":"XtzGuyYRyX8wVi1e"}
 {"name":"Kritischer Erfolg bei der Abwehr","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.P6jQGko7PdG6Xlhe"}},"scope":"global","command":"main()\nasync function main() {\n\n//Das richtige Pack (Kompendium) holen\n\nconst pack = game.packs.get(\"midgard5.tabellen-kritische-ereignisse\");\n\n// Richtige Tabelle aus dem Pack holen\n\nlet entry = pack.index.find(e => e.name === \"Kritischer Erfolg bei der Abwehr\");\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/holy-shield.svg","actorIds":[],"_id":"qWyrwvh7g9CbTKg9"}
+ 
\ No newline at end of file
diff --git a/template.json b/template.json
index 7fa96eb..e6e0bac 100644
--- a/template.json
+++ b/template.json
@@ -21,9 +21,41 @@
             }
         },
         "attributes":{
+          "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
           }
         }
       },
diff --git a/templates/sheets/m5Character-Sheet.hbs b/templates/sheets/m5Character-Sheet.hbs
index 9dc8e36..a82eb99 100644
--- a/templates/sheets/m5Character-Sheet.hbs
+++ b/templates/sheets/m5Character-Sheet.hbs
@@ -6,9 +6,9 @@
     <div class="sheet-content">
         <table>
             <tr>
-                <th>{{localize "midgard5.lp"}}</th>
-                <th>{{localize "midgard5.ap"}}</th>
-                <th>{{localize "midgard5.gw"}}</th>
+                <th>{{localize "midgard5.actor-lp"}}</th>
+                <th>{{localize "midgard5.actor-ap"}}</th>
+                <th>{{localize "midgard5.actor-gw-long"}}</th>
             </tr>
             <tr>
                 <td>
diff --git a/templates/sheets/m5Item-Sheet.hbs b/templates/sheets/m5Item-Sheet.hbs
index fd317aa..a0380b1 100644
--- a/templates/sheets/m5Item-Sheet.hbs
+++ b/templates/sheets/m5Item-Sheet.hbs
@@ -6,9 +6,9 @@
     <div class="sheet-content">
       <table>
         <tr>
-          <th>{{localize "midgard5.quantity"}}</th>
-          <th>{{localize "midgard5.item.value"}}</th>
-          <th>{{localize "midgard5.ismagic"}}</th>
+          <th>{{localize "midgard5.item-quantity"}}</th>
+          <th>{{localize "midgard5.item-value"}}</th>
+          <th>{{localize "midgard5.item-ismagic"}}</th>
         </tr>
         <tr>
           <td>