diff --git a/.DS_Store b/.DS_Store index c8aed60..08b03a1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/CHANGELOG.md b/CHANGELOG.md index fa627d1..4222899 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 und Würfelmacros +- Macros auf Crit Tabellen funktionieren jetzt korrekt \ No newline at end of file diff --git a/README.md b/README.md index a8fad77..0c71521 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

 

Features

 

-

Only a very basic system right now. Everything you need to run a combat (healthbar, endurance, initiative for the combat tracker).
I've added rollable tables, Macros for using them and Macros for standard dices (D6, D20, D100

+

Only a very basic system right now. Everything you need to run a combat (healthbar, endurance, initiative for the combat tracker).
I've added rollable tables, Macros for using them and Macros for standard dices (D6, D20,D10, D100

 

ToDo:

 

@@ -21,4 +21,19 @@

 

License

-

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

\ No newline at end of file +
+

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:

+
  • Dice 20 faces 20 icon by Delapouite
    • +
  • Perspective dice 5 icon by Delapouite
    • +
  • Perspective dice 5 icon by Skoll
    • +
  • Broken axe icon by Delapouite
    • +
  • Chopped Skull icon by Lorc
    • +
  • Broken shield icon by Lorc
    • +
  • Shield bash icon by Delapouite
    • +
  • Mushroom cloud icon by Lorc
    • +

    No changes were made

    diff --git a/assets/.DS_Store b/assets/.DS_Store new file mode 100644 index 0000000..46f7ed5 Binary files /dev/null and b/assets/.DS_Store differ diff --git a/assets/icons/.DS_Store b/assets/icons/.DS_Store new file mode 100644 index 0000000..9f191d3 Binary files /dev/null and b/assets/icons/.DS_Store differ diff --git a/assets/icons/macro/kriterfolgabwehr.svg b/assets/icons/macro/kriterfolgabwehr.svg new file mode 100644 index 0000000..6985f7f --- /dev/null +++ b/assets/icons/macro/kriterfolgabwehr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/macro/kriterfolgangriff.svg b/assets/icons/macro/kriterfolgangriff.svg new file mode 100644 index 0000000..e40ac21 --- /dev/null +++ b/assets/icons/macro/kriterfolgangriff.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/macro/kritfehlerabwehr.svg b/assets/icons/macro/kritfehlerabwehr.svg new file mode 100644 index 0000000..a782a8b --- /dev/null +++ b/assets/icons/macro/kritfehlerabwehr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/macro/kritfehlerangriff.svg b/assets/icons/macro/kritfehlerangriff.svg new file mode 100644 index 0000000..92e2b2c --- /dev/null +++ b/assets/icons/macro/kritfehlerangriff.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/macro/kritfehlerzauber.svg b/assets/icons/macro/kritfehlerzauber.svg new file mode 100644 index 0000000..e841d7b --- /dev/null +++ b/assets/icons/macro/kritfehlerzauber.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/wurfel/w10.svg b/assets/icons/wurfel/w10.svg new file mode 100644 index 0000000..210abea --- /dev/null +++ b/assets/icons/wurfel/w10.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/wurfel/w100.svg b/assets/icons/wurfel/w100.svg new file mode 100644 index 0000000..e68bdd9 --- /dev/null +++ b/assets/icons/wurfel/w100.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/wurfel/w20.svg b/assets/icons/wurfel/w20.svg new file mode 100644 index 0000000..b1accc8 --- /dev/null +++ b/assets/icons/wurfel/w20.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/wurfel/w6.svg b/assets/icons/wurfel/w6.svg new file mode 100644 index 0000000..697aebb --- /dev/null +++ b/assets/icons/wurfel/w6.svg @@ -0,0 +1 @@ + \ 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..5bade6f 100644 --- a/packs/macros/makros-kritische-ereignisse.db +++ b/packs/macros/makros-kritische-ereignisse.db @@ -1,5 +1,5 @@ -{"name":"Kritischer Schaden","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.QZlbT0tgD2aYW5YJ"}},"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 Schaden\");\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/d20-highlight.svg","actorIds":[],"_id":"48DUqxdpHDCGKOHp"} -{"name":"Kritischer Fehler bei Angriffen","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.FZUermrYHSbrEluS"}},"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 Angriffen\");\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/d20-grey.svg","actorIds":[],"_id":"798kmgnTkpfP89Z9"} -{"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"} +{"name":"Kritischer Schaden","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.QZlbT0tgD2aYW5YJ"}},"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\nawait pack.getIndex();\n\n// Richtige Tabelle aus dem Pack holen\n\nlet entry = pack.index.find(e => e.name === \"Kritischer Schaden\");\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"systems/midgard5/assets/icons/macro/kriterfolgangriff.svg","actorIds":[],"_id":"48DUqxdpHDCGKOHp"} +{"name":"Kritischer Fehler bei Angriffen","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"script","flags":{"core":{"sourceId":"Macro.FZUermrYHSbrEluS"}},"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\nawait pack.getIndex();\n\n// Richtige Tabelle aus dem Pack holen\n\nlet entry = pack.index.find(e => e.name === \"Kritischer Fehler bei Angriffen\");\n\n// Zum Schluss drauf würfeln\n\npack.getEntity(entry._id).then(table => table.draw());\n\n}","author":"CBq5YXAqbO7HoJ03","img":"systems/midgard5/assets/icons/macro/kritfehlerangriff.svg","actorIds":[],"_id":"798kmgnTkpfP89Z9"} +{"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\nawait pack.getIndex();\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":"systems/midgard5/assets/icons/macro/kritfehlerabwehr.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\nawait pack.getIndex();\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":"systems/midgard5/assets/icons/macro/kritfehlerzauber.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\nawait pack.getIndex();\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":"systems/midgard5/assets/icons/macro/kriterfolgabwehr.svg","actorIds":[],"_id":"qWyrwvh7g9CbTKg9"} diff --git a/packs/macros/makros-standardwurfel.db b/packs/macros/makros-standardwurfel.db index f09b9bb..9503c3e 100644 --- a/packs/macros/makros-standardwurfel.db +++ b/packs/macros/makros-standardwurfel.db @@ -1,3 +1,4 @@ -{"name":"1W6","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.QBhV6De80g1wH6ot"}},"scope":"global","command":"/r 1d6","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/d6-grey.svg","actorIds":[],"_id":"5tpfRgbM5sTL9gur"} -{"name":"1W100","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.TqmUKpMpY4GhiTML"}},"scope":"global","command":"/r 1d100","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/circle.svg","actorIds":[],"_id":"YWsPRUpZpgLBKIB3"} -{"name":"1W20","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.S01PfXnvLPeuKOH8"}},"scope":"global","command":"/r 1d20","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/d20-grey.svg","actorIds":[],"_id":"pXZIfqDIX9VKYonr"} +{"name":"1W6","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.QBhV6De80g1wH6ot"}},"scope":"global","command":"/r 1d6","author":"CBq5YXAqbO7HoJ03","img":"systems/midgard5/assets/icons/wurfel/w6.svg","actorIds":[],"_id":"5tpfRgbM5sTL9gur"} +{"name":"1W10","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.TqmUKpMpY4GhiTML"}},"scope":"global","command":"/r 1d10","author":"CBq5YXAqbO7HoJ03","img":"systems/midgard5/assets/icons/wurfel/w10.svg","actorIds":[],"_id":"YWsPRUpZpgLBKIB3"} +{"name":"1W100","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.S01PfXnvLPeuKOH8"}},"scope":"global","command":"/r 1d100","author":"CBq5YXAqbO7HoJ03","img":"systems/midgard5/assets/icons/wurfel/w100.svg","actorIds":[],"_id":"pXZIfqDIX9VKYonr"} +{"name":"1W20","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.mj9nIEgk0UDz8tbH"}},"scope":"global","command":"/r 1d20","author":"CBq5YXAqbO7HoJ03","img":"systems/midgard5/assets/icons/wurfel/w20.svg","actorIds":[],"_id":"qBoxslCQXxR22xKc"} diff --git a/system.json b/system.json index bbeb61b..6c3782d 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.03, + "version": 0.04, "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.03h.zip", + "download": "https://github.com/hjmaier/midgard5/archive/V0.04.zip", "initiative": "@gw.value + @gw.bonus", "license": "LICENSE.txt" } 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 @@
    - - - + + +
    {{localize "midgard5.lp"}}{{localize "midgard5.ap"}}{{localize "midgard5.gw"}}{{localize "midgard5.actor-lp"}}{{localize "midgard5.actor-ap"}}{{localize "midgard5.actor-gw-long"}}
    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 @@
    - - - + + +
    {{localize "midgard5.quantity"}}{{localize "midgard5.item.value"}}{{localize "midgard5.ismagic"}}{{localize "midgard5.item-quantity"}}{{localize "midgard5.item-value"}}{{localize "midgard5.item-ismagic"}}