diff --git a/WorldDawnSimpleTest/.obsidian/types.json b/WorldDawnSimpleTest/.obsidian/types.json index 1183913..048cfe3 100644 --- a/WorldDawnSimpleTest/.obsidian/types.json +++ b/WorldDawnSimpleTest/.obsidian/types.json @@ -24,6 +24,7 @@ "armor": "checkbox", "armor.evade": "number", "armor.slots": "number", - "shield": "checkbox" + "shield": "checkbox", + "magic": "checkbox" } } \ No newline at end of file diff --git a/WorldDawnSimpleTest/.obsidian/workspace.json b/WorldDawnSimpleTest/.obsidian/workspace.json index 9ab9232..c935127 100644 --- a/WorldDawnSimpleTest/.obsidian/workspace.json +++ b/WorldDawnSimpleTest/.obsidian/workspace.json @@ -13,11 +13,11 @@ "state": { "type": "bases", "state": { - "file": "wiki/weapons/Items.base", - "viewName": "Armor" + "file": "wiki/Magie/Magic.base", + "viewName": "Categories" }, "icon": "lucide-table", - "title": "Items" + "title": "Magic" } }, { @@ -198,10 +198,14 @@ }, "active": "cbd86a1333362c95", "lastOpenFiles": [ - "wiki/weapons/Sword.md", - "wiki/weapons/Items.base", - "wiki/weapons/Stahlschild.md", + "wiki/Magie/Kampfmagie.md", + "wiki/Magie/Magic.base", + "Untitled.base", "wiki/weapons/Holzschild.md", + "wiki/weapons/Items.base", + "wiki/Magie", + "wiki/weapons/Sword.md", + "wiki/weapons/Stahlschild.md", "wiki/weapons/Lederrüstung.md", "wiki/weapons/Kettenhemd.md", "wiki/weapons/Bow.md", @@ -225,9 +229,7 @@ "wiki/weapons", "wiki/twomain/Hallo Welt.md", "wiki/twomain/Zweiter Hallo Welt.md", - "wiki/twomain", "adventures/Adventure.md", - "wiki/first subfolder/secondSub", "Welcome.md" ] } \ No newline at end of file diff --git a/WorldDawnSimpleTest/Untitled.base b/WorldDawnSimpleTest/Untitled.base new file mode 100644 index 0000000..e69de29 diff --git a/WorldDawnSimpleTest/wiki/Magie/Kampfmagie.md b/WorldDawnSimpleTest/wiki/Magie/Kampfmagie.md new file mode 100644 index 0000000..d419f8d --- /dev/null +++ b/WorldDawnSimpleTest/wiki/Magie/Kampfmagie.md @@ -0,0 +1,4 @@ +--- +magiccat: true +magiccat.description: Einem Gegner oder Objekt Schaden zufügen oder in eine Situation bringen in der die sie empfänglicher für Schaden wird. +--- diff --git a/WorldDawnSimpleTest/wiki/Magie/Magic.base b/WorldDawnSimpleTest/wiki/Magie/Magic.base new file mode 100644 index 0000000..f9034a2 --- /dev/null +++ b/WorldDawnSimpleTest/wiki/Magie/Magic.base @@ -0,0 +1,9 @@ +views: + - type: table + name: Categories + filters: + and: + - magiccat == true + order: + - file.name + - magiccat.description diff --git a/tools/charactercreation/characterlib.xml b/tools/charactercreation/characterlib.xml index 9b04c69..2f24a68 100644 --- a/tools/charactercreation/characterlib.xml +++ b/tools/charactercreation/characterlib.xml @@ -37,6 +37,54 @@ [local.cost] --> + + + + 0 + [local.sum] + + + [param.0] + + + [local.sum] + charlib_magiccatprice([param.loop]) + [local.sum] + + + + + + + + + [param.0] == 0 + 20 + [local.price] + + + [param.0] == 1 + 5 + [local.price] + + + [param.0] == 2 + 10 + [local.price] + + + [param.0] == 3 + 15 + [local.price] + + + [param.0] == 4 + 20 + [local.price] + + + [local.price] + + true diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml index f21f4e9..7ecea1a 100644 --- a/tools/charactercreation/charactertool.xml +++ b/tools/charactercreation/charactertool.xml @@ -18,6 +18,9 @@ wiki/weapons/Items + + wiki/Magie/Magic + charlib @@ -4042,7 +4045,7 @@ [data.character.magic.categories] true [data.character.control.xp] - [level] + charlib_magiccatprice_sum([level]) "Name" @@ -4063,18 +4066,69 @@ [level] < 4 - [level] + 1 - [level] + [data.character.control.xp] - charlib_magiccatprice([level] + 1) + [data.character.control.xp] [level] < 4 - [data.character.control.xp] - 5 + [level] + 1 + [level] + + + + + + + [data.character.magic.categories] + + + [file.name] + [name] + + + [magiccat.description] + [description] + + + 0 + [level] + + + + + "Name" + [file.name] + + + "Beschreibung" + [magiccat.description] + + + [base.magiccats.Categories] + [data.character.control.xp] + 20 + + +
+ 3 + "Neue Kategorie erstellen" +
2