diff --git a/assets/common/items/apple.ron b/assets/common/items/apple.ron
index 0ab93030ce..46c20763ad 100644
--- a/assets/common/items/apple.ron
+++ b/assets/common/items/apple.ron
@@ -4,7 +4,7 @@ Item(
kind: Consumable(
kind: Apple,
effect: Health((
- amount: 10,
+ amount: 20,
cause: Item,
)),
),
diff --git a/assets/common/items/cheese.ron b/assets/common/items/cheese.ron
new file mode 100644
index 0000000000..00a2e124f5
--- /dev/null
+++ b/assets/common/items/cheese.ron
@@ -0,0 +1,11 @@
+Item(
+ name: "Dwarven Cheese",
+ description: "Aromatic and nutritious.",
+ kind: Consumable(
+ kind: Cheese,
+ effect: Health((
+ amount: 40,
+ cause: Item,
+ )),
+ ),
+)
diff --git a/assets/common/items/potion_minor.ron b/assets/common/items/potion_minor.ron
new file mode 100644
index 0000000000..ab3f5c1110
--- /dev/null
+++ b/assets/common/items/potion_minor.ron
@@ -0,0 +1,11 @@
+Item(
+ name: "Minor Potion",
+ description: "Restores a small amount of Health.",
+ kind: Consumable(
+ kind: PotionMinor,
+ effect: Health((
+ amount: 50,
+ cause: Item,
+ )),
+ ),
+)
diff --git a/assets/common/items/weapons/starter_staff.ron b/assets/common/items/weapons/starter_staff.ron
index 9fb4544e9c..f2ada50d49 100644
--- a/assets/common/items/weapons/starter_staff.ron
+++ b/assets/common/items/weapons/starter_staff.ron
@@ -1,5 +1,5 @@
Item(
- name: "Your first staff",
+ name: "Gnarled Rod",
description: "Smells like resin and magic.",
kind: Tool(
kind: Staff,
diff --git a/assets/voxygen/background/map.png b/assets/voxygen/background/map.png
index fc5728faf1..d1241c2522 100644
--- a/assets/voxygen/background/map.png
+++ b/assets/voxygen/background/map.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:89fa94eab748ca2b3ea7c99764a7c7ae9f8d54e4b63b7e9b9c56de1c30494f1f
-size 372303
+oid sha256:2197d74e40e86713fbebb5a6492be113e41db938176a67be97dcbc67e88884dd
+size 785322
diff --git a/assets/voxygen/element/icons/item_apple.vox b/assets/voxygen/element/icons/item_apple.vox
index c9d97c7b75..18fb62f43f 100644
--- a/assets/voxygen/element/icons/item_apple.vox
+++ b/assets/voxygen/element/icons/item_apple.vox
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e65311bb72c275675103ad0fe307f0b53ef26cb7766a40a7542e6f6e887d8e1a
-size 57215
+oid sha256:1be6cb5e8b2b0ebb8efe9dc6e180bcfabc7b55695908479afbebfe163d9d2178
+size 56231
diff --git a/assets/voxygen/element/icons/item_cheese.png b/assets/voxygen/element/icons/item_cheese.png
new file mode 100644
index 0000000000..aa77752c2f
--- /dev/null
+++ b/assets/voxygen/element/icons/item_cheese.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbebea679ed840e54e99441f52d4dd613876b52fcca3d88227ac85685e36ca1f
+size 1304
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 7637cb250a..048ac495b4 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -36,6 +36,13 @@
"element.icons.item_apple",
(0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 1.0,
),
+ Consumable(PotionMinor): VoxTrans(
+ "voxel.object.potion_red",
+ (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+ ),
+ Consumable(Cheese): Png(
+ "element.icons.item_cheese",
+ ),
Consumable(Potion): VoxTrans(
"voxel.object.potion_red",
(0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
diff --git a/assets/voxygen/voxel/figure/beard/human/human-2.vox b/assets/voxygen/voxel/figure/beard/human/human-2.vox
new file mode 100644
index 0000000000..9afb46e0c6
--- /dev/null
+++ b/assets/voxygen/voxel/figure/beard/human/human-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4be53d43ff9edae15b8ee553224d8829ba07423ae59a54d0ef62ddff8b87838
+size 58183
diff --git a/assets/voxygen/voxel/figure/hair/elf/male-2.vox b/assets/voxygen/voxel/figure/hair/elf/male-2.vox
new file mode 100644
index 0000000000..08f7052d22
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/elf/male-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e878845d35138cb1ab16ca78baf9d561cfa901330a52db1700301afb191152b9
+size 57002
diff --git a/assets/voxygen/voxel/figure/hair/human/male-10.vox b/assets/voxygen/voxel/figure/hair/human/male-10.vox
index 2cfbfc6eb5..86a4bf519f 100644
--- a/assets/voxygen/voxel/figure/hair/human/male-10.vox
+++ b/assets/voxygen/voxel/figure/hair/human/male-10.vox
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a277c8a7f2f12eef3738e17d443d54c972b4b96de590089253fab6c65043a28b
-size 55912
+oid sha256:53a158d070e5c1191f011efda7c0dfe07276973e5ce992c2e0cd9a6f7449d95d
+size 58552
diff --git a/assets/voxygen/voxel/figure/hair/human/male-20.vox b/assets/voxygen/voxel/figure/hair/human/male-20.vox
new file mode 100644
index 0000000000..08f7052d22
--- /dev/null
+++ b/assets/voxygen/voxel/figure/hair/human/male-20.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e878845d35138cb1ab16ca78baf9d561cfa901330a52db1700301afb191152b9
+size 57002
diff --git a/assets/voxygen/voxel/figure/hair/human/male-6.vox b/assets/voxygen/voxel/figure/hair/human/male-6.vox
index 7c79a52d1d..e010d18efd 100644
--- a/assets/voxygen/voxel/figure/hair/human/male-6.vox
+++ b/assets/voxygen/voxel/figure/hair/human/male-6.vox
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b3e72aa6cb47b75ed9020ded038d0a01a88d730f864b610593bd440edfdc6f34
-size 56268
+oid sha256:658ac65e350c7a046d23e301a8d79153d198004fe4f0722accc443722e627e34
+size 58757
diff --git a/assets/voxygen/voxel/figure/hair/human/male-7.vox b/assets/voxygen/voxel/figure/hair/human/male-7.vox
index 81497a6958..c5a8e712ef 100644
--- a/assets/voxygen/voxel/figure/hair/human/male-7.vox
+++ b/assets/voxygen/voxel/figure/hair/human/male-7.vox
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f6ad9f5896ec1a1d95a87c502a79754413223bc0e7d54bedc91b789927c3de84
-size 56288
+oid sha256:09d1a2f620519b6c3c521bfb677f9b25362f893652b0b74929ec4f19fd4ee6cd
+size 56420
diff --git a/assets/voxygen/voxel/figure/head/human/male.vox b/assets/voxygen/voxel/figure/head/human/male.vox
index 0d297f75db..4cf9b53885 100644
--- a/assets/voxygen/voxel/figure/head/human/male.vox
+++ b/assets/voxygen/voxel/figure/head/human/male.vox
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4f6b56b50fd3b554b951e151dea79ae6bb736359b81e0b5da4a2ef57c280649c
+oid sha256:2323f14bcb9f26f96e4e8df8b164e2fbf6de7aaa59ee787f3130d2d0985c883d
size 57819
diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron
index 6d1c51ecb8..2b1bc8a3f0 100644
--- a/assets/voxygen/voxel/humanoid_head_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_head_manifest.ron
@@ -7,11 +7,29 @@
Some(("figure.hair.human.male-0", (1, 1, 1))),
Some(("figure.hair.human.male-1", (1, 1, 1))),
Some(("figure.hair.human.male-2", (0, -1, 0))),
- Some(("figure.hair.human.male-3", (0, -1, 0))),
+ Some(("figure.hair.human.male-3", (0, -1, 0))),
+ Some(("figure.hair.human.male-4", (2, 2, 0))),
+ Some(("figure.hair.human.male-5", (1, 1, 0))),
+ Some(("figure.hair.human.male-6", (1, 1, 1))),
+ //Some(("figure.hair.human.male-7", (0, 0, 0))),
+ //Some(("figure.hair.human.male-8", (5, 0, 5))),
+ //Some(("figure.hair.human.male-9", (5, 0, 5))),
+ Some(("figure.hair.human.male-10", (-3, -5, -4))),
+ //Some(("figure.hair.human.male-11", (0, 0, 0))),
+ Some(("figure.hair.human.male-12", (4, 2, 7))),
+ Some(("figure.hair.human.male-13", (1, 1, 0))),
+ Some(("figure.hair.human.male-14", (2, 0, 1))),
+ Some(("figure.hair.human.male-15", (1, 1, 0))),
+ Some(("figure.hair.human.male-16", (1, 0, 0))),
+ Some(("figure.hair.human.male-17", (1, 1, 0))),
+ Some(("figure.hair.human.male-18", (1, 0, 0))),
+ Some(("figure.hair.human.male-19", (2, 1, 0))),
+ Some(("figure.hair.human.male-20", (-3, -4, -7))),
],
beard: [
Some(("figure.beard.human.human-0", (4, 6, -2))),
Some(("figure.beard.human.human-1", (5, 10, -2))),
+ Some(("figure.beard.human.human-2", (3, 7, -3))),
],
accessory: [
None]
@@ -94,6 +112,7 @@
hair: [
Some(("figure.hair.elf.male-0", (2, 1, 1))),
Some(("figure.hair.elf.male-1", (1, -1, 0))),
+ Some(("figure.hair.elf.male-2", (-2, -4, -7))),
],
beard: [None],
accessory: [
diff --git a/assets/voxygen/voxel/object/potion_red.vox b/assets/voxygen/voxel/object/potion_red.vox
index 64c36f780c..fadd6c69fd 100644
--- a/assets/voxygen/voxel/object/potion_red.vox
+++ b/assets/voxygen/voxel/object/potion_red.vox
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d086bb0aada484ba6236f7f767768136ac4ef014cc7081445bc3a19442b6a03e
-size 55768
+oid sha256:3734cb5df4d04a3373d72ebf361e7e95196906349aa32107af32b79836b884c1
+size 55889
diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs
index 5f76bb630c..bb6ed9a06a 100644
--- a/common/src/comp/body/humanoid.rs
+++ b/common/src/comp/body/humanoid.rs
@@ -335,9 +335,9 @@ impl Race {
(Race::Dwarf, BodyType::Female) => 1,
(Race::Dwarf, BodyType::Male) => 3,
(Race::Elf, BodyType::Female) => 21,
- (Race::Elf, BodyType::Male) => 2,
+ (Race::Elf, BodyType::Male) => 3,
(Race::Human, BodyType::Female) => 19,
- (Race::Human, BodyType::Male) => 4,
+ (Race::Human, BodyType::Male) => 17,
(Race::Orc, BodyType::Female) => 1,
(Race::Orc, BodyType::Male) => 8,
(Race::Undead, BodyType::Female) => 4,
@@ -369,7 +369,7 @@ impl Race {
(Race::Elf, BodyType::Female) => 1,
(Race::Elf, BodyType::Male) => 1,
(Race::Human, BodyType::Female) => 1,
- (Race::Human, BodyType::Male) => 3,
+ (Race::Human, BodyType::Male) => 4,
(Race::Orc, BodyType::Female) => 1,
(Race::Orc, BodyType::Male) => 3,
(Race::Undead, BodyType::Female) => 1,
diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index 17ad624b3d..5877d80475 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -46,10 +46,12 @@ pub enum Armor {
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum Consumable {
Apple,
+ Cheese,
Potion,
Mushroom,
Velorite,
VeloriteFrag,
+ PotionMinor,
}
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -110,7 +112,7 @@ impl Item {
Some(assets::load_expect_cloned("common.items.grasses.medium"))
}
BlockKind::ShortGrass => Some(assets::load_expect_cloned("common.items.grasses.short")),
- BlockKind::Chest => Some(match rand::random::<usize>() % 4 {
+ BlockKind::Chest => Some(match rand::random::<usize>() % 6 {
0 => assets::load_expect_cloned("common.items.apple"),
1 => assets::load_expect_cloned("common.items.velorite"),
2 => (**assets::load_glob::<Item>("common.items.weapons.*")
@@ -119,6 +121,8 @@ impl Item {
.expect("Empty glob"))
.clone(),
3 => assets::load_expect_cloned("common.items.veloritefrag"),
+ 4 => assets::load_expect_cloned("common.items.cheese"),
+ 5 => assets::load_expect_cloned("common.items.potion_minor"),
_ => unreachable!(),
}),
_ => None,
diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs
index 6c5b65e2ba..811c72ba8d 100644
--- a/common/src/comp/inventory/mod.rs
+++ b/common/src/comp/inventory/mod.rs
@@ -72,9 +72,8 @@ impl Default for Inventory {
let mut inventory = Inventory {
slots: vec![None; 25],
};
-
- inventory.push(assets::load_expect_cloned("common.items.debug.boost"));
- inventory.push(assets::load_expect_cloned("common.items.debug.possess"));
+ inventory.push(assets::load_expect_cloned("common.items.cheese"));
+ inventory.push(assets::load_expect_cloned("common.items.apple"));
inventory
}
}
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 7f8bf53b55..d93b3c23c5 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -85,7 +85,8 @@ lazy_static! {
ChatCommand::new(
"giveitem",
"{d}",
- "/giveitem <name> : Give yourself an item.",
+ "/giveitem <path to item>\n\
+ Example: common/items/debug/boost",
true,
handle_give,),
ChatCommand::new(