Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes

assets/common/items/apple.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Apple",
-    description: "Red and juicy.
+    description: "Restores 20 Health\n\nRed and juicy\n\n<Right-Click to use>",
-    
-Restores 20 Health.",
     kind: Consumable(
         kind: Apple,
         effect: Health((

assets/common/items/armor/back/admin.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Admin's Cape",
-   description: "
+   description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility.\n\n<Right-Click to use>",
-   With great power comes 
-   great responsibility. ",
     kind: Armor(
         kind: Back(Admin),
         stats: (20),

assets/common/items/armor/back/short_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Short leather Cape",
-   description: "",
+   description: "Back\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Back(Short0),
         stats: (20),

assets/common/items/armor/belt/assassin.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Assassin Belt",
-    description: "Only the best for a member of the creed.",
+    description: "Belt\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Belt(Assassin),
         stats: (20),

assets/common/items/armor/belt/cloth_blue_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Blue Linen Belt",
-   description: "Soft and warm",
+   description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Belt(ClothBlue0),
         stats: (20),

assets/common/items/armor/belt/cloth_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Green Linen Belt",
-   description: "Soft and warm",
+   description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Belt(ClothGreen0),
         stats: (20),

assets/common/items/armor/belt/cloth_purple_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Purple Linen Belt",
-   description: "Soft and warm",
+   description: "Belt\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Belt(ClothPurple0),
         stats: (20),

assets/common/items/armor/belt/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Belt",
-    description: "Swift like the wind.",
+    description: "Belt\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Belt(Leather0),
         stats: (20),

assets/common/items/armor/belt/plate_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Belt",
-    description: "WIP",
+    description: "Belt\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Belt(Plate0),
         stats: (20),

assets/common/items/armor/chest/assassin.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Assassin Chest",
-    description: "Only the best for a member of the creed.",
+    description: "Chest\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(Assassin),
         stats: (20),

assets/common/items/armor/chest/cloth_blue_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Blue Linen Chest",
-   description: "Soft and warm",
+   description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(ClothBlue0),
         stats: (20),

assets/common/items/armor/chest/cloth_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Green Linen Chest",
-   description: "Soft and warm",
+   description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(ClothGreen0),
         stats: (20),

assets/common/items/armor/chest/cloth_purple_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Purple Linen Chest",
-   description: "Soft and warm",
+   description: "Chest\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(ClothPurple0),
         stats: (20),

assets/common/items/armor/chest/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Chest",
-    description: "Swift like the wind.",
+    description: "Chest\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(Leather0),
         stats: (20),

assets/common/items/armor/chest/plate_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Chestplate",
-    description: "Arrows to the stomach are soooo last update.",
+    description: "Chest\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(PlateGreen0),
         stats: (20),

assets/common/items/armor/foot/assassin.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Assassin Boots",
-    description: "Only the best for a member of the creed.",
+    description: "Feet\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(Assassin),
         stats: (20),

assets/common/items/armor/foot/cloth_blue_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Blue Linen Boots",
-   description: "Soft and warm",
+   description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(ClothBlue0),
         stats: (20),

assets/common/items/armor/foot/cloth_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Green Linen Boots",
-   description: "Soft and warm",
+   description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(ClothGreen0),
         stats: (20),

assets/common/items/armor/foot/cloth_purple_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Purple Linen Boots",
-   description: "Soft and warm",
+   description: "Feet\n\nArmor: 0\n\nSoft and warm\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(ClothPurple0),
         stats: (20),

assets/common/items/armor/foot/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Boots",
-    description: "Swift like the wind.",
+    description: "Feet\n\nArmor: 0\n\nSwift like the wind.\nWon't make you run faster.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(Leather0),
         stats: (20),

assets/common/items/armor/foot/plate_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Feet",
-    description: "WIP",
+    description: "Feet\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(Plate0),
         stats: (20),

assets/common/items/armor/hand/assassin.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Assassin Gloves",
-    description: "Only the best for a member of the creed.",
+    description: "Hands\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Hand(Assassin),
         stats: (20),

assets/common/items/armor/hand/cloth_blue_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Blue Linen Wrists",
-    description: "WIP",
+    description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Hand(ClothBlue0),
         stats: (20),

assets/common/items/armor/hand/cloth_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Green Linen Wrists",
-   description: "WIP",
+   description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Hand(ClothGreen0),
         stats: (20),

assets/common/items/armor/hand/cloth_purple_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Purple Silk Wrists",
-   description: "WIP",
+   description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Hand(ClothPurple0),
         stats: (20),

assets/common/items/armor/hand/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Gloves",
-    description: "Swift like the wind.",
+    description: "Hands\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Hand(Leather0),
         stats: (20),

assets/common/items/armor/hand/plate_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Handguards",
-    description: "WIP",
+    description: "Hands\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Hand(Plate0),
         stats: (20),

assets/common/items/armor/head/assa_mask_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Dark Assassin Mask",
-   description: "WIP",
+   description: "Head\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Head(AssaMask0),
         stats: (20),

assets/common/items/armor/head/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Leather Cap",
-   description: "WIP",
+   description: "Head\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Head(Leather0),
         stats: (20),

assets/common/items/armor/neck/neck_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Plain Necklace",
-   description: "",
+   description: "Neck\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Neck(Neck0),
         stats: (20),

assets/common/items/armor/pants/assassin.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Assassin Pants",
-    description: "Only the best for a member of the creed.",
+    description: "Legs\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(Assassin),
         stats: (20),

assets/common/items/armor/pants/cloth_blue_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Blue Linen Skirt",
-   description: "WIP",
+   description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(ClothBlue0),
         stats: (20),

assets/common/items/armor/pants/cloth_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Green Linen Skirt",
-   description: "WIP",
+   description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(ClothGreen0),
         stats: (20),

assets/common/items/armor/pants/cloth_purple_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Purple Linen Skirt",
-   description: "WIP",
+   description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(ClothPurple0),
         stats: (20),

assets/common/items/armor/pants/green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Hunting Pants",
-    description: "",
+    description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(Green),
         stats: (20),

assets/common/items/armor/pants/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Pants",
-    description: "",
+    description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(Leather0),
         stats: (20),

assets/common/items/armor/pants/plate_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Legguards",
-    description: "WIP",
+    description: "Legs\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(PlateGreen0),
         stats: (20),

assets/common/items/armor/ring/ring_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Scratched Ring",
-   description: "Barely fits your finger.",
+   description: "Ring\n\nBarely fits your finger.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Ring(Ring0),
         stats: (20),

assets/common/items/armor/shoulder/assassin.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Assassin Shoulder Guard",
-    description: "Only the best for a member of the creed.",
+    description: "Shoulders\n\nArmor: 0\n\nOnly the best for a member of the creed.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(Assassin),
         stats: (20),

assets/common/items/armor/shoulder/cloth_blue_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Blue Linen Coat",
-   description: "WIP",
+   description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(ClothBlue0),
         stats: (20),

assets/common/items/armor/shoulder/cloth_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Green Linen Coat",
-   description: "WIP",
+   description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(ClothGreen0),
         stats: (20),

assets/common/items/armor/shoulder/cloth_purple_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Purple Linen Coat",
-   description: "WIP",
+   description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(ClothPurple0),
         stats: (20),

assets/common/items/armor/shoulder/leather_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Leather Pauldrons",
-    description: "",
+    description: "Shoulders\n\nArmor: 0\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(Leather0),
         stats: (20),

assets/common/items/armor/shoulder/leather_1.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Swift Shoulderpads",
-    description: "Swift like the wind.",
+    description: "Shoulders\n\nArmor: 0\n\nSwift like the wind.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(Leather1),
         stats: (20),

assets/common/items/armor/shoulder/plate_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Shoulderguards",
-    description: "A strong shoulder to lean on.",
+    description: "Shoulders\n\nArmor: 0\n\nA strong shoulder to lean on.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Shoulder(Plate0),
         stats: (20),

assets/common/items/armor/starter/rugged_chest.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Rugged Shirt",
-    description: "Smells like Adventure.",
+    description: "Chest\n\nArmor: 0\n\nSmells like Adventure.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Chest(Rugged0),
         stats: (20),

assets/common/items/armor/starter/rugged_pants.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Rugged Commoner's Pants",
-   description: "They remind you of the old days.",
+   description: "Legs\n\nArmor: 0\n\nThey remind you of the old days.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Pants(Rugged0),
         stats: (20),

assets/common/items/armor/starter/sandals_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Worn out Sandals",
-    description: "Loyal companions.",
+    description: "Feet\n\nArmor: 0\n\nLoyal companions.\n\n<Right-Click to use>",
     kind: Armor(
         kind: Foot(Sandal0),
         stats: (20),

assets/common/items/armor/tabard/admin.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Admin's Tabard",
-   description: "
+   description: "Tabard\n\nWith great power comes\ngreat responsibility.\n\n<Right-Click to use>",
-   With great power comes
-   great responsibility. ",
     kind: Armor(
         kind: Tabard(Admin),
         stats: (20),

assets/common/items/cheese.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Dwarven Cheese",
-    description: "Aromatic and nutritious.
+    description: "Restores 15 Health\n\nAromatic and nutritious\n\n<Right-Click to use>",
-    
-Restores 15 Health.",
     kind: Consumable(
         kind: Cheese,
         effect: Health((

assets/common/items/coconut.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Coconut",
-    description: "Reliable source of water and fat.
+    description: "Restores 30 health\n\nReliable source of water and fat\n\n<Right-Click to use>",
-
-Restores 30 health.",
     kind: Consumable(
         kind: Coconut,
         effect: Health((

assets/common/items/collar.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Collar",
-    description: "Tames wild animals within 5 blocks.",
+    description: "Tames wild animals within 5 blocks\n\n<Right-Click to use>",
     kind: Utility(
         kind: Collar,
     ),

assets/common/items/debug/admin.ron

@@ -1,7 +1,6 @@
 Item(
     name: "Admin's Tabard",
-   description: "With great power comes
+   description: "Tabard\n\nWith great power comes\ngreat responsibility. ",
-   great responsibility. ",
     kind: Armor(
         kind: Tabard(Admin),
         stats: (20),

assets/common/items/debug/admin_back.ron

@@ -1,7 +1,6 @@
 Item(
     name: "Admin's Cape",
-   description: "With great power comes
+   description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility. ",
-   great responsibility. ",
     kind: Armor(
         kind: Back(Admin),
         stats: (20),

assets/common/items/debug/green_0.ron

@@ -1,5 +0,0 @@
-Item(
-    name: "Lime Zest Lantern",
-    description: "It has an opening that could fit a ring...",
-    kind: Lantern(Green0),
-)

assets/common/items/debug/leather_0.ron

@@ -1,8 +0,0 @@
-Item(
-    name: "Swift Leather Cap",
-   description: "WIP",
-    kind: Armor(
-        kind: Head(Leather0),
-        stats: (20),
-    ),
-)

assets/common/items/debug/neck_0.ron

@@ -1,8 +0,0 @@
-Item(
-    name: "Plain Necklace",
-   description: "WIP",
-    kind: Armor(
-        kind: Neck(Neck0),
-        stats: (20),
-    ),
-)

assets/common/items/debug/plate_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Belt",
-    description: "WIP",
+    description: "Belt\n\nArmor: 0\n\n",
     kind: Armor(
         kind: Belt(Plate0),
         stats: (20),

assets/common/items/debug/plate_feet.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Feet",
-    description: "WIP",
+    description: "Feet\n\nArmor: 0\n\n",
     kind: Armor(
         kind: Foot(Plate0),
         stats: (20),

assets/common/items/debug/plate_green_0.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Chestplate",
-    description: "Arrows to the stomach are soooo last update.",
+    description: "Chest\n\nArmor: 0",
     kind: Armor(
         kind: Chest(PlateGreen0),
         stats: (20),

assets/common/items/debug/plate_green_legs.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Legguards",
-    description: "WIP",
+    description: "Legs\n\nArmor: 0\n\n",
     kind: Armor(
         kind: Pants(PlateGreen0),
         stats: (20),

assets/common/items/debug/plate_hand.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Handguards",
-    description: "WIP",
+    description: "Hands\n\nArmor: 0\n\n",
     kind: Armor(
         kind: Hand(Plate0),
         stats: (20),

assets/common/items/debug/plate_shoulder.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Iron Shoulderguards",
-    description: "A strong shoulder to lean on.",
+    description: "Shoulders\n\nArmor: 0\n\A strong shoulder to lean on.",
     kind: Armor(
         kind: Shoulder(Plate0),
         stats: (20),

assets/common/items/debug/ring_0.ron

@@ -1,8 +0,0 @@
-Item(
-    name: "Scratched Ring",
-   description: "WIP",
-    kind: Armor(
-        kind: Ring(Ring0),
-        stats: (20),
-    ),
-)

assets/common/items/mushroom.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Mushroom",
-    description: "Hopefully this one is not poisonous.
+    description: "Restores 10 Health\n\nHopefully this one is not poisonous\n\n<Right-Click to use>",
-
-Restores 10 Health.",
     kind: Consumable(
         kind: Mushroom,
         effect: Health((

assets/common/items/potion_minor.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Minor Potion",
-    description: "Restores a small amount of Health.
+    description: "Restores 50 Health\n\n<Right-Click to use>",
-
-Restores 50 Health.",
     kind: Consumable(
         kind: PotionMinor,
         effect: Health((

assets/common/items/velorite.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Velorite",
-    description: "Just a slight touch makes you feel the knowledge of ancient times.
+    description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times\n\n<Right-Click to use>",
-
-Increases Exp by 20.",
     kind: Consumable(
         kind: Velorite,
         effect: Xp(20),

assets/common/items/veloritefrag.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Velorite Fragment",
-    description: "Small runes sparkle on its surface.
+    description: "Increases Exp by 10\n\nSmall runes sparkle on its surface\n\n<Right-Click to use>",
-
-Increases Exp by 10.",
     kind: Consumable(
         kind: VeloriteFrag,
         effect: Xp(10),

assets/common/items/weapons/hammer_1.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Crude Mallet",
-    description: "Breaks bones like sticks and stones.
+    description: "Two-Hand Hammer\n\nPower: 10-12\n\nBreaks bones like sticks and stones.\n\n<Right-Click to use>",
-    \n
-    Power: 20",
     kind: Tool(
         (
             kind: Hammer(BasicHammer),    

assets/common/items/weapons/shield_1.ron

@@ -1,6 +1,6 @@
 Item(
     name: "A Shield",
-    description: "Legends tell this item is useless.",
+    description: "WIP",
     kind: Tool (
         (
             kind: Shield(BasicShield),

assets/common/items/weapons/short_sword_0.ron

@@ -1,7 +1,6 @@
 Item(
     name: "Vicious Gladius",
-    description: "    
+    description: "Two-Hand Sword\n\nPower: 2-10\n\n<Right-Click to use>",
-    Power: 15",
     kind: Tool(
         (
             kind: Sword(Short0),    

assets/common/items/weapons/staff_1.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Humble Stick",
-    description: "Walking stick with a sharpened end.
+    description: "Two-Hand Staff\n\nPower: 2-10\n\nWalking stick with a sharpened end\n\n<Right-Click to use>",
-    
-    Power: 6",
     kind: Tool(
         (
             kind: Staff(BasicStaff),    

assets/common/items/weapons/staff_nature.ron

@@ -1,7 +1,6 @@
 Item(
     name: "Sceptre of Regeneration",
-    description: " Infused by the power of Nature.   
+    description: "Healing-Sceptre\n\nPower 15-18\n\nHeals your allies with the power of nature.\n\n<Right-Click to use>",      
-    Power: 25",
     kind: Tool(
         (
             kind: Staff(Sceptre),    

assets/common/items/weapons/starter_axe.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Notched Axe",
-    description: "Every dent tells the story of a chopped tree.
+    description: "Two-Hand Axe\n\nPower 3-14\n\nEvery dent tells the story of a chopped tree.\n\n<Right-Click to use>",
-    
-    Power: 15",
     kind: Tool(
         (
             kind: Axe(BasicAxe),    

assets/common/items/weapons/starter_bow.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Uneven Bow",
-    description: "Someone carved his initials into it...
+    description: "Bow\n\nPower: 5\n\nSomeone carved his initials into it...\n\n<Right-Click to use>",  
-    
-    Power: 15",
     kind: Tool(
         (
             kind: Bow(BasicBow),    

assets/common/items/weapons/starter_dagger.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Sharp Kitchen Knife",
-    description: "Great for cutting meat.
+    description: "WIP",
-    
-    Power: 15",
     kind: Tool(
         (
             kind: Dagger(BasicDagger),    

assets/common/items/weapons/starter_hammer.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Sturdy Old Hammer",
-    description: "'Property of...' The rest is missing.
+    description: "Two-Hand Hammer\n\nPower: 10-12\n\n'Property of...' The rest is missing.\n\n<Right-Click to use>",
-    
-    Power: 15",
     kind: Tool(
         (
             kind: Hammer(BasicHammer),    

assets/common/items/weapons/starter_staff.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Gnarled Rod",
-    description: "Smells like resin and magic.
+    description: "Firestaff\n\nPower: 1-13\n\nSmells like resin and magic.\n\n<Right-Click to use>",
-    
-    Power: 20",
     kind: Tool(
         (
             kind: Staff(BasicStaff),    

assets/common/items/weapons/starter_sword.ron

@@ -1,8 +1,6 @@
 Item(
     name: "Battered Sword",
-    description: "Held together by Rust and hope.
+    description: "Two-Hand Sword\n\nPower: 2-10\n\nHeld together by Rust and hope.\n\n<Right-Click to use>",
-    
-    Power: 15",
     kind: Tool(
         (
             kind: Sword(BasicSword),    

assets/common/items/weapons/wood_sword.ron

@@ -1,7 +1,6 @@
 Item(
     name: "Wooden Training Sword",
-    description: "    
+    description: "Two-Hand Sword\n\nPower: 2-10\n\n<Right-Click to use>",
-    Power: 15",
     kind: Tool(
         (
             kind: Sword(WoodTraining),    

assets/common/items/weapons/zweihander_sword_0.ron

@@ -1,7 +1,6 @@
 Item(
     name: "Sturdy Bihander",
-    description: "    
+    description: "Two-Hand Sword\n\nPower: 2-10\n\n<Right-Click to use>",
-    Power: 15",
     kind: Tool(
        (
             kind: Sword(Zweihander0),    

assets/common/npc_names.json

@@ -474,9 +474,23 @@
             ]
         },
         "species": {
-            "giant": {
+            "ogre": {
-                "keyword": "giant",
+                "keyword": "ogre",
-                "generic": "Giant"
+                "generic": "Ogre"
+            }
+        }
+    },
+    "golem": {
+        "body": {
+            "keyword": "golem",
+            "names": [
+                "phil"
+            ]
+        },
+        "species": {
+            "stonegolem": {
+                "keyword": "stonegolem",
+                "generic": "StoneGolem"
             }
         }
     },