diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/back/admin.ron index fc8f427533..04b45466e3 100644 --- a/assets/common/items/armor/back/admin.ron +++ b/assets/common/items/armor/back/admin.ron @@ -1,6 +1,7 @@ Item( name: "Admin's Cape", - description: "With great power comes + description: " + With great power comes great responsibility. ", kind: Armor( kind: Back(Admin), diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/back/short_0.ron index 805b88edd0..953cb40e13 100644 --- a/assets/common/items/armor/back/short_0.ron +++ b/assets/common/items/armor/back/short_0.ron @@ -1,6 +1,6 @@ Item( name: "Short leather Cape", - description: "WIP", + description: "", kind: Armor( kind: Back(Short0), stats: (20), diff --git a/assets/common/items/armor/lantern/black_0.ron b/assets/common/items/armor/lantern/black_0.ron index d10d4150d9..950cc28f41 100644 --- a/assets/common/items/armor/lantern/black_0.ron +++ b/assets/common/items/armor/lantern/black_0.ron @@ -1,6 +1,6 @@ Item( name: "Black Lantern", - description: "WIP", + description: "Used by city guards.", kind: Armor( kind: Lantern(Black0), stats: (20), diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/neck/neck_0.ron index 4dbd32ae6f..28125345bc 100644 --- a/assets/common/items/armor/neck/neck_0.ron +++ b/assets/common/items/armor/neck/neck_0.ron @@ -1,6 +1,6 @@ Item( name: "Plain Necklace", - description: "WIP", + description: "", kind: Armor( kind: Neck(Neck0), stats: (20), diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/ring/ring_0.ron index 8544765246..d094e21af8 100644 --- a/assets/common/items/armor/ring/ring_0.ron +++ b/assets/common/items/armor/ring/ring_0.ron @@ -1,6 +1,6 @@ Item( name: "Scratched Ring", - description: "WIP", + description: "Barely fits your finger.", kind: Armor( kind: Ring(Ring0), stats: (20), diff --git a/assets/common/items/armor/tabard/admin.ron b/assets/common/items/armor/tabard/admin.ron index 9ad427f3ed..5bb3fd22fb 100644 --- a/assets/common/items/armor/tabard/admin.ron +++ b/assets/common/items/armor/tabard/admin.ron @@ -1,6 +1,7 @@ Item( name: "Admin's Tabard", - description: "With great power comes + description: " + With great power comes great responsibility. ", kind: Armor( kind: Tabard(Admin), diff --git a/assets/voxygen/element/icons/tabard_admin.png b/assets/voxygen/element/icons/tabard_admin.png index 97257950db..600d89a60b 100644 Binary files a/assets/voxygen/element/icons/tabard_admin.png and b/assets/voxygen/element/icons/tabard_admin.png differ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 94bf948ef0..afc2378592 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -263,8 +263,9 @@ "element.icons.tabard_admin", ), // Heads - Armor(Head(Leather0)): Png( - "element.icons.head_leather-0", + Armor(Head(Leather0)): VoxTrans( + "voxel.armor.head.leather-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), Armor(Head(AssaMask0)): VoxTrans( "voxel.armor.head.assa_mask-0", diff --git a/assets/voxygen/voxel/armor/foot/cloth_sandals.vox b/assets/voxygen/voxel/armor/foot/cloth_sandals.vox index 5aae5d0c9f..1dbf11dfe0 100644 Binary files a/assets/voxygen/voxel/armor/foot/cloth_sandals.vox and b/assets/voxygen/voxel/armor/foot/cloth_sandals.vox differ diff --git a/assets/voxygen/voxel/armor/head/leather-0.vox b/assets/voxygen/voxel/armor/head/leather-0.vox new file mode 100644 index 0000000000..2b2bf519cb Binary files /dev/null and b/assets/voxygen/voxel/armor/head/leather-0.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/earring-0.vox b/assets/voxygen/voxel/figure/accessory/dwarf/earring-0.vox new file mode 100644 index 0000000000..2e7bbf2cfb Binary files /dev/null and b/assets/voxygen/voxel/figure/accessory/dwarf/earring-0.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/earring-1.vox b/assets/voxygen/voxel/figure/accessory/dwarf/earring-1.vox new file mode 100644 index 0000000000..114aa5b51e Binary files /dev/null and b/assets/voxygen/voxel/figure/accessory/dwarf/earring-1.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/earrings-0.vox b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-0.vox new file mode 100644 index 0000000000..62a022bc61 Binary files /dev/null and b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-0.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/earrings-1.vox b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-1.vox new file mode 100644 index 0000000000..c914ffb2ce Binary files /dev/null and b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-1.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/earrings-2.vox b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-2.vox new file mode 100644 index 0000000000..bac7f5dd45 Binary files /dev/null and b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-2.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/earrings-3.vox b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-3.vox new file mode 100644 index 0000000000..aba6ec7a4f Binary files /dev/null and b/assets/voxygen/voxel/figure/accessory/dwarf/earrings-3.vox differ diff --git a/assets/voxygen/voxel/figure/accessory/dwarf/warpaint-0.vox b/assets/voxygen/voxel/figure/accessory/dwarf/warpaint-0.vox index bdf9ef83b4..ea56726bc5 100644 Binary files a/assets/voxygen/voxel/figure/accessory/dwarf/warpaint-0.vox and b/assets/voxygen/voxel/figure/accessory/dwarf/warpaint-0.vox differ diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index ea061ff7f2..483a191315 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -194,8 +194,14 @@ Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), ], accessory: [ - None, - Some(("figure.accessory.elf.warpaint-0", (6, 9, 4))), ] + None, + Some(("figure.accessory.dwarf.earring-0", (0, 3, 0))), + Some(("figure.accessory.dwarf.earring-1", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-0", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))), + ] ), (Dwarf, Female): ( offset: (-6.0, -4.5, -6.0), @@ -209,7 +215,14 @@ ], beard: [None], accessory: [ - None] + None, + Some(("figure.accessory.dwarf.earring-0", (0, 3, 0))), + Some(("figure.accessory.dwarf.earring-1", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-0", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))), + Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))), + ] ), (Undead, Male): ( offset: (-5.0, -4.0, -6.75), diff --git a/assets/voxygen/voxel/not_found.vox b/assets/voxygen/voxel/not_found.vox index 13d64ee95a..1b5a049638 100644 Binary files a/assets/voxygen/voxel/not_found.vox and b/assets/voxygen/voxel/not_found.vox differ diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index f68b323a5a..4c243bc599 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -432,8 +432,8 @@ impl Race { match (self, body_type) { (Race::Danari, BodyType::Female) => 1, (Race::Danari, BodyType::Male) => 1, - (Race::Dwarf, BodyType::Female) => 1, - (Race::Dwarf, BodyType::Male) => 1, + (Race::Dwarf, BodyType::Female) => 7, + (Race::Dwarf, BodyType::Male) => 7, (Race::Elf, BodyType::Female) => 2, (Race::Elf, BodyType::Male) => 1, (Race::Human, BodyType::Female) => 1, diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 5cc42d5b8e..0fa256a5ef 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -164,6 +164,9 @@ impl Item { "common.items.armor.pants.cloth_purple_0", "common.items.armor.shoulder.cloth_purple_0", "common.items.armor.hand.cloth_purple_0", + "common.items.armor.ring.ring_0", + "common.items.armor.back.short_0", + "common.items.armor.neck.neck_0", ] .choose(&mut rand::thread_rng()) .unwrap(), // Can't fail