diff --git a/WorldDawnSimpleTest/.obsidian/types.json b/WorldDawnSimpleTest/.obsidian/types.json
index fd29ab6..1183913 100644
--- a/WorldDawnSimpleTest/.obsidian/types.json
+++ b/WorldDawnSimpleTest/.obsidian/types.json
@@ -19,6 +19,11 @@
"item": "checkbox",
"weapon": "checkbox",
"damage": "text",
- "item.slots": "number"
+ "item.slots": "number",
+ "ranged": "checkbox",
+ "armor": "checkbox",
+ "armor.evade": "number",
+ "armor.slots": "number",
+ "shield": "checkbox"
}
}
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/.obsidian/workspace.json b/WorldDawnSimpleTest/.obsidian/workspace.json
index 91d2f2d..ba2ab04 100644
--- a/WorldDawnSimpleTest/.obsidian/workspace.json
+++ b/WorldDawnSimpleTest/.obsidian/workspace.json
@@ -4,17 +4,34 @@
"type": "split",
"children": [
{
- "id": "a0c7b83c6b065d06",
+ "id": "3ed41090d6d6003b",
"type": "tabs",
"children": [
{
- "id": "4f3318fce357f3e3",
+ "id": "cbd86a1333362c95",
"type": "leaf",
"state": {
- "type": "empty",
- "state": {},
+ "type": "bases",
+ "state": {
+ "file": "wiki/weapons/Items.base",
+ "viewName": "Shields"
+ },
+ "icon": "lucide-table",
+ "title": "Items"
+ }
+ },
+ {
+ "id": "e865c65554502fdc",
+ "type": "leaf",
+ "state": {
+ "type": "markdown",
+ "state": {
+ "file": "wiki/weapons/Holzschild.md",
+ "mode": "source",
+ "source": false
+ },
"icon": "lucide-file",
- "title": "New tab"
+ "title": "Holzschild"
}
}
]
@@ -179,12 +196,19 @@
"bases:Create new base": false
}
},
- "active": "4f3318fce357f3e3",
+ "active": "cbd86a1333362c95",
"lastOpenFiles": [
- "wiki/weapons/Axt.md",
+ "wiki/weapons/Holzschild.md",
+ "wiki/weapons/Stahlschild.md",
"wiki/weapons/Items.base",
- "wiki/weapons/Sword.md",
+ "wiki/weapons/Lederrüstung.md",
+ "wiki/weapons/Kettenhemd.md",
+ "wiki/weapons/Bow.md",
+ "wiki/weapons/Armbrust.md",
"wiki/weapons/Spear.md",
+ "adventures/Untitled.canvas",
+ "wiki/weapons/Axt.md",
+ "wiki/weapons/Sword.md",
"wiki/costtables/Attribute A.md",
"wiki/costtables/CostTable.base",
"wiki/races/Races.base",
diff --git a/WorldDawnSimpleTest/adventures/Untitled.canvas b/WorldDawnSimpleTest/adventures/Untitled.canvas
new file mode 100644
index 0000000..8beeaf4
--- /dev/null
+++ b/WorldDawnSimpleTest/adventures/Untitled.canvas
@@ -0,0 +1,8 @@
+{
+ "nodes":[
+ {"id":"f7a3c430fe988560","x":-840,"y":-900,"width":360,"height":540,"type":"text","text":"Felix / Ira\nInitiative: 12\nStatus:\n- Brennt"},
+ {"id":"2a387de871d20754","type":"text","text":"Hunti / Knuhut\nInitiative: 9\nStatus:","x":-60,"y":-900,"width":396,"height":540},
+ {"id":"c86159a743e46642","x":-440,"y":-630,"width":340,"height":540,"type":"text","text":"B7 / Ork mit Axt\nInitiative: 10\nHealth: 32\nWaffe:\n- Axt \n\t- (AT: 12, PA: 7, QS: 3)\n\t- 2W6 + QS\nStatus:\n- Kackt"}
+ ],
+ "edges":[]
+}
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Armbrust.md b/WorldDawnSimpleTest/wiki/weapons/Armbrust.md
new file mode 100644
index 0000000..7054d45
--- /dev/null
+++ b/WorldDawnSimpleTest/wiki/weapons/Armbrust.md
@@ -0,0 +1,10 @@
+---
+item: true
+ranged: true
+item.cost: "16500"
+ranged.damage: 2W6 + 3
+ranged.technique: Armbrüste
+ranged.reload: (FF + KK) - 2
+item.slots: 3
+---
+ArmBRUST hihihi
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Bow.md b/WorldDawnSimpleTest/wiki/weapons/Bow.md
new file mode 100644
index 0000000..4abc042
--- /dev/null
+++ b/WorldDawnSimpleTest/wiki/weapons/Bow.md
@@ -0,0 +1,10 @@
+---
+item: true
+ranged: true
+item.cost: "1000"
+ranged.damage: 2W4 + 2
+ranged.technique: Bögen
+ranged.reload: FF
+item.slots: 2
+---
+Einen Bogen ist eine Schießi Schießi Waffe
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Holzschild.md b/WorldDawnSimpleTest/wiki/weapons/Holzschild.md
new file mode 100644
index 0000000..7a22a46
--- /dev/null
+++ b/WorldDawnSimpleTest/wiki/weapons/Holzschild.md
@@ -0,0 +1,7 @@
+---
+item: true
+item.cost: "460"
+item.slots: 2
+shield: true
+shield.parade: "+2"
+---
diff --git a/WorldDawnSimpleTest/wiki/weapons/Items.base b/WorldDawnSimpleTest/wiki/weapons/Items.base
index 0974e42..b90be18 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Items.base
+++ b/WorldDawnSimpleTest/wiki/weapons/Items.base
@@ -8,6 +8,7 @@ views:
- file.name
- item.cost
- item.slots
+ - shield.parade
- type: table
name: Weapons
filters:
@@ -29,3 +30,38 @@ views:
- file.name
- item.cost
- item.slots
+ - type: table
+ name: Ranged
+ filters:
+ and:
+ - ranged == true
+ order:
+ - file.name
+ - item.cost
+ - ranged.damage
+ - ranged.reload
+ - ranged.technique
+ - item.slots
+ - type: table
+ name: Shields
+ filters:
+ and:
+ - shield == true
+ order:
+ - file.name
+ - item.slots
+ - item.cost
+ - shield.parade
+ columnSize:
+ note.shield.parade^: 158
+ - type: table
+ name: Armor
+ filters:
+ and:
+ - armor == true
+ order:
+ - file.name
+ - item.cost
+ - item.slots
+ - armor.evade
+ - armor.armor
diff --git a/WorldDawnSimpleTest/wiki/weapons/Kettenhemd.md b/WorldDawnSimpleTest/wiki/weapons/Kettenhemd.md
new file mode 100644
index 0000000..346d37a
--- /dev/null
+++ b/WorldDawnSimpleTest/wiki/weapons/Kettenhemd.md
@@ -0,0 +1,9 @@
+---
+item: true
+item.cost: "800"
+item.slots: 3
+armor: true
+armor.evade: -2
+armor.armor: 2 + QS
+---
+Hemd aus Ketten
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Lederrüstung.md b/WorldDawnSimpleTest/wiki/weapons/Lederrüstung.md
new file mode 100644
index 0000000..42277ca
--- /dev/null
+++ b/WorldDawnSimpleTest/wiki/weapons/Lederrüstung.md
@@ -0,0 +1,9 @@
+---
+item: true
+item.cost: "600"
+item.slots: 2
+armor: true
+armor.evade: -1
+armor.armor: 1 + QS/2
+---
+Rüstung aus aus Haut vom toten Tier.
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Stahlschild.md b/WorldDawnSimpleTest/wiki/weapons/Stahlschild.md
new file mode 100644
index 0000000..2886f31
--- /dev/null
+++ b/WorldDawnSimpleTest/wiki/weapons/Stahlschild.md
@@ -0,0 +1,4 @@
+---
+shield: true
+shield.parade: "+3"
+---
diff --git a/tools/charactercreation/characterdata.xml b/tools/charactercreation/characterdata.xml
index 50459ad..d6fd429 100644
--- a/tools/charactercreation/characterdata.xml
+++ b/tools/charactercreation/characterdata.xml
@@ -197,6 +197,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/charactercreation/characterpdf.xml b/tools/charactercreation/characterpdf.xml
index cf18f09..65336e7 100644
--- a/tools/charactercreation/characterpdf.xml
+++ b/tools/charactercreation/characterpdf.xml
@@ -3951,10 +3951,12 @@
+
+
-
+
20
@@ -4123,6 +4125,322 @@
+
+
+
+
+
+
+ 20
+ true
+
+
+ 6
+ true
+
+
+ 20
+ true
+
+
+ 18
+ true
+
+
+ 16
+ true
+
+
+ 8
+ true
+
+
+ 12
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [data.character.items.ranged]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 20
+ true
+
+
+ 6
+ true
+
+
+ 20
+ true
+
+
+ 8
+ true
+
+
+ 8
+ true
+
+
+ 12
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ [data.character.items.armor]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 20
+ true
+
+
+ 6
+ true
+
+
+ 20
+ true
+
+
+ 8
+ true
+
+
+ 12
+ true
+
+
+
+
+
+
+
+
+
+
+
+ [data.character.items.shield]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index 2dcee70..6aaec23 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -4229,6 +4229,8 @@
+
+