From 3738fe45f7c0088679178df79c5649c32704050a Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Sun, 8 Mar 2020 00:53:49 +0100
Subject: [PATCH] better item desc
---
assets/common/items/weapons/hammer_1.ron | 4 +++-
assets/common/items/weapons/staff_1.ron | 4 +++-
assets/common/items/weapons/starter_axe.ron | 4 +++-
assets/common/items/weapons/starter_bow.ron | 4 +++-
assets/common/items/weapons/starter_dagger.ron | 3 ++-
assets/common/items/weapons/starter_hammer.ron | 4 +++-
assets/common/items/weapons/starter_staff.ron | 4 +++-
assets/common/items/weapons/starter_sword.ron | 4 +++-
assets/voxygen/element/buttons/inv_tab.vox | 3 +++
9 files changed, 26 insertions(+), 8 deletions(-)
create mode 100644 assets/voxygen/element/buttons/inv_tab.vox
diff --git a/assets/common/items/weapons/hammer_1.ron b/assets/common/items/weapons/hammer_1.ron
index caeaf8ad28..268cf1f7da 100644
--- a/assets/common/items/weapons/hammer_1.ron
+++ b/assets/common/items/weapons/hammer_1.ron
@@ -1,6 +1,8 @@
Item(
name: "Crude Mallet",
- description: "Breaks bones like sticks and stones.",
+ description: "Breaks bones like sticks and stones.
+ \n
+ Power: 20",
kind: Tool(
ToolData (
kind: Hammer,
diff --git a/assets/common/items/weapons/staff_1.ron b/assets/common/items/weapons/staff_1.ron
index f56cb59f42..4a66a40399 100644
--- a/assets/common/items/weapons/staff_1.ron
+++ b/assets/common/items/weapons/staff_1.ron
@@ -1,6 +1,8 @@
Item(
name: "Humble Stick",
- description: "Walking stick with a sharpened end.",
+ description: "Walking stick with a sharpened end.
+
+ Power: 6",
kind: Tool(
ToolData (
kind: Staff,
diff --git a/assets/common/items/weapons/starter_axe.ron b/assets/common/items/weapons/starter_axe.ron
index adbb486de2..89a71e297c 100644
--- a/assets/common/items/weapons/starter_axe.ron
+++ b/assets/common/items/weapons/starter_axe.ron
@@ -1,6 +1,8 @@
Item(
name: "Notched Axe",
- description: "Every dent tells the story of a chopped tree.",
+ description: "Every dent tells the story of a chopped tree.
+
+ Power: 15",
kind: Tool(
ToolData (
kind: Axe,
diff --git a/assets/common/items/weapons/starter_bow.ron b/assets/common/items/weapons/starter_bow.ron
index b265ef65da..14b11333a5 100644
--- a/assets/common/items/weapons/starter_bow.ron
+++ b/assets/common/items/weapons/starter_bow.ron
@@ -1,6 +1,8 @@
Item(
name: "Uneven Bow",
- description: "Someone carved his initials into it...",
+ description: "Someone carved his initials into it...
+
+ Power: 15",
kind: Tool(
ToolData (
kind: Bow,
diff --git a/assets/common/items/weapons/starter_dagger.ron b/assets/common/items/weapons/starter_dagger.ron
index bb50379b52..8817c6865f 100644
--- a/assets/common/items/weapons/starter_dagger.ron
+++ b/assets/common/items/weapons/starter_dagger.ron
@@ -1,6 +1,7 @@
Item(
name: "Sharp Kitchen Knife",
- description: "Great for cutting meat.",
+ description: "Great for cutting meat.
+ Power: 15",
kind: Tool(
ToolData (
kind: Dagger,
diff --git a/assets/common/items/weapons/starter_hammer.ron b/assets/common/items/weapons/starter_hammer.ron
index 1d3aa1a05a..6242cfc7c1 100644
--- a/assets/common/items/weapons/starter_hammer.ron
+++ b/assets/common/items/weapons/starter_hammer.ron
@@ -1,6 +1,8 @@
Item(
name: "Sturdy Old Hammer",
- description: "'Property of...' The rest is missing. ",
+ description: "'Property of...' The rest is missing.
+
+ Power: 15",
kind: Tool(
ToolData (
kind: Hammer,
diff --git a/assets/common/items/weapons/starter_staff.ron b/assets/common/items/weapons/starter_staff.ron
index e275179ded..2cf741181c 100644
--- a/assets/common/items/weapons/starter_staff.ron
+++ b/assets/common/items/weapons/starter_staff.ron
@@ -1,6 +1,8 @@
Item(
name: "Gnarled Rod",
- description: "Smells like resin and magic.",
+ description: "Smells like resin and magic.
+
+ Power: 20",
kind: Tool(
ToolData (
kind: Staff,
diff --git a/assets/common/items/weapons/starter_sword.ron b/assets/common/items/weapons/starter_sword.ron
index ad3511c1e2..4429ac2850 100644
--- a/assets/common/items/weapons/starter_sword.ron
+++ b/assets/common/items/weapons/starter_sword.ron
@@ -1,6 +1,8 @@
Item(
name: "Battered Sword",
- description: "Held together by Rust and hope.",
+ description: "Held together by Rust and hope.
+
+ Power: 15",
kind: Tool(
ToolData (
kind: Sword(Rapier),
diff --git a/assets/voxygen/element/buttons/inv_tab.vox b/assets/voxygen/element/buttons/inv_tab.vox
new file mode 100644
index 0000000000..dc60c1323b
--- /dev/null
+++ b/assets/voxygen/element/buttons/inv_tab.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab46da914aa73fd0a7aff023883cd5392d01f0609383d4c143d5c3680b65250a
+size 57195