From c37bf59cf5dd2f43434ec85f97c3c2a1d7d291ed Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 16 Jun 2026 11:21:44 +0200 Subject: [PATCH] Update Magic Page and PDF Generation --- WorldDawnSimpleTest/.obsidian/types.json | 3 +- WorldDawnSimpleTest/.obsidian/workspace.json | 28 +- WorldDawnSimpleTest/wiki/Magie/Items/Laute.md | 8 + .../wiki/Magie/Items/Sylyl Ring.md | 8 + WorldDawnSimpleTest/wiki/weapons/Items.base | 11 + tools/charactercreation/characterlib.xml | 89 +++++++ tools/charactercreation/characterpdf.xml | 245 ++++++++++++++++++ tools/charactercreation/charactertool.xml | 24 +- 8 files changed, 397 insertions(+), 19 deletions(-) create mode 100644 WorldDawnSimpleTest/wiki/Magie/Items/Laute.md create mode 100644 WorldDawnSimpleTest/wiki/Magie/Items/Sylyl Ring.md diff --git a/WorldDawnSimpleTest/.obsidian/types.json b/WorldDawnSimpleTest/.obsidian/types.json index 048cfe3..b79c92d 100644 --- a/WorldDawnSimpleTest/.obsidian/types.json +++ b/WorldDawnSimpleTest/.obsidian/types.json @@ -25,6 +25,7 @@ "armor.evade": "number", "armor.slots": "number", "shield": "checkbox", - "magic": "checkbox" + "magic": "checkbox", + "magicitem": "checkbox" } } \ No newline at end of file diff --git a/WorldDawnSimpleTest/.obsidian/workspace.json b/WorldDawnSimpleTest/.obsidian/workspace.json index 626a757..4f7cb8d 100644 --- a/WorldDawnSimpleTest/.obsidian/workspace.json +++ b/WorldDawnSimpleTest/.obsidian/workspace.json @@ -13,11 +13,25 @@ "state": { "type": "bases", "state": { - "file": "wiki/Magie/Magic.base", - "viewName": "Categories" + "file": "wiki/weapons/Items.base", + "viewName": "Magicitems" }, "icon": "lucide-table", - "title": "Magic" + "title": "Items" + } + }, + { + "id": "d6119cdcde5a0576", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "wiki/Magie/Items/Sylyl Ring.md", + "mode": "source", + "source": false + }, + "icon": "lucide-file", + "title": "Sylyl Ring" } }, { @@ -198,11 +212,14 @@ }, "active": "cbd86a1333362c95", "lastOpenFiles": [ - "Untitled.base", + "wiki/Magie/Items/Sylyl Ring.md", + "wiki/weapons/Items.base", + "wiki/Magie/Items/Laute.md", "wiki/Magie/Magic.base", + "wiki/Magie/Items", + "Untitled.base", "wiki/weapons/Holzschild.md", "wiki/Magie/Kampfmagie.md", - "wiki/weapons/Items.base", "wiki/Magie", "wiki/weapons/Sword.md", "wiki/weapons/Stahlschild.md", @@ -226,7 +243,6 @@ "wiki/Test123.md", "wiki/Authbased.md", "Untitled.md", - "wiki/weapons", "wiki/twomain/Hallo Welt.md", "wiki/twomain/Zweiter Hallo Welt.md", "adventures/Adventure.md", diff --git a/WorldDawnSimpleTest/wiki/Magie/Items/Laute.md b/WorldDawnSimpleTest/wiki/Magie/Items/Laute.md new file mode 100644 index 0000000..b5e274b --- /dev/null +++ b/WorldDawnSimpleTest/wiki/Magie/Items/Laute.md @@ -0,0 +1,8 @@ +--- +item: true +item.cost: "500" +item.slots: 2 +magicitem.source: Musik +magicitem.value: "+2" +magicitem: true +--- diff --git a/WorldDawnSimpleTest/wiki/Magie/Items/Sylyl Ring.md b/WorldDawnSimpleTest/wiki/Magie/Items/Sylyl Ring.md new file mode 100644 index 0000000..aded2b5 --- /dev/null +++ b/WorldDawnSimpleTest/wiki/Magie/Items/Sylyl Ring.md @@ -0,0 +1,8 @@ +--- +item: true +item.cost: "2341" +item.slots: 1 +magicitem.source: Objekt +magicitem.value: "+5" +magicitem: true +--- diff --git a/WorldDawnSimpleTest/wiki/weapons/Items.base b/WorldDawnSimpleTest/wiki/weapons/Items.base index af397d7..362a4ca 100644 --- a/WorldDawnSimpleTest/wiki/weapons/Items.base +++ b/WorldDawnSimpleTest/wiki/weapons/Items.base @@ -70,3 +70,14 @@ views: - item.slots - armor.evade - armor.armor + - type: table + name: Magicitems + filters: + and: + - magicitem == true + order: + - file.name + - magicitem.source + - magicitem.value + - item.cost + - item.slots diff --git a/tools/charactercreation/characterlib.xml b/tools/charactercreation/characterlib.xml index 0e4d6f2..7bb9d60 100644 --- a/tools/charactercreation/characterlib.xml +++ b/tools/charactercreation/characterlib.xml @@ -333,5 +333,94 @@ + + + + + -2 + [local.val] + + + [data.character.talents.willpower] >= 1 + -1 + [local.val] + + + [data.character.talents.willpower] >= 4 + 0 + [local.val] + + + [data.character.talents.willpower] >= 7 + 1 + [local.val] + + + [data.character.talents.willpower] >= 10 + 2 + [local.val] + + + [data.character.talents.willpower] >= 14 + 3 + [local.val] + + + [data.character.talents.willpower] >= 18 + 4 + [local.val] + + + [local.val] + + + + + 0 + [local.val] + + + [params.0] >= 1 + 1 + [local.val] + + + [params.0] >= 3 + 2 + [local.val] + + + [params.0] >= 5 + 3 + [local.val] + + + [params.0] >= 7 + 4 + [local.val] + + + [params.0] >= 10 + 5 + [local.val] + + + [params.0] >= 13 + 6 + [local.val] + + + [params.0] >= 16 + 7 + [local.val] + + + [params.0] >= 18 + 8 + [local.val] + + + [local.val] + \ No newline at end of file diff --git a/tools/charactercreation/characterpdf.xml b/tools/charactercreation/characterpdf.xml index dec881f..b5c65c9 100644 --- a/tools/charactercreation/characterpdf.xml +++ b/tools/charactercreation/characterpdf.xml @@ -5569,5 +5569,250 @@ + + +
+ + + + + + + + + +
+ + + + + + + + + + + 80 + true + + + 20 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 50 + true + + + 50 + true + + + + + + + + + + + + + + + 40 + true + + + 40 + true + + + 20 + true + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml index f899670..f5048bf 100644 --- a/tools/charactercreation/charactertool.xml +++ b/tools/charactercreation/charactertool.xml @@ -44,18 +44,6 @@ - - Truncate([data.character.race.minheight] + [data.character.race.maxheight] / 2) - [data.character.definition.height] - - - Truncate([data.character.race.minweight] + [data.character.race.maxweight] / 2) - [data.character.definition.weight] - - - Truncate([data.character.race.minage] + [data.character.race.maxage] / 2) - [data.character.definition.age] - [data.character.flow.currentPage] @@ -136,6 +124,18 @@