From bf1c46d5962ecf67d41fa41796be7583bb13eb78 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Thu, 5 Mar 2020 18:18:17 +0100 Subject: [PATCH] item images --- assets/common/items/armor/belt_plate-0.ron | 6 +++--- .../items/armor/chest_plate_green-0.ron | 2 +- assets/common/items/armor/foot_plate-0.ron | 6 +++--- assets/common/items/armor/hand_plate-0.ron | 6 +++--- .../items/armor/pants_plate_green-0.ron | 6 +++--- .../common/items/armor/shoulder_plate-0.ron | 6 +++--- assets/voxygen/item_image_manifest.ron | 2 +- assets/voxygen/voxel/armor/belt/assa.vox | 2 +- assets/voxygen/voxel/armor/chest/assa.vox | 4 ++-- assets/voxygen/voxel/armor/foot/assa.vox | 4 ++-- assets/voxygen/voxel/armor/hand/assa_left.vox | 2 +- .../voxygen/voxel/armor/hand/assa_right.vox | 2 +- .../voxel/armor/hand/plate_right-0.vox | 4 ++-- assets/voxygen/voxel/armor/head/assa_mask.vox | 3 +++ assets/voxygen/voxel/armor/pants/assa.vox | 2 +- .../pants/{plate-0.vox => plate_green-0.vox} | 0 .../voxel/armor/shoulder/assa_left.vox | 4 ++-- .../voxel/armor/shoulder/assa_right.vox | 4 ++-- .../voxel/armor/shoulder/plate_right-0.vox | 4 ++-- .../voxel/humanoid_armor_belt_manifest.ron | 4 ++-- .../voxel/humanoid_armor_pants_manifest.ron | 6 +----- .../humanoid_armor_shoulder_manifest.ron | 20 +++++++++---------- common/src/comp/body/humanoid.rs | 20 ++++++++++++------- 23 files changed, 62 insertions(+), 57 deletions(-) create mode 100644 assets/voxygen/voxel/armor/head/assa_mask.vox rename assets/voxygen/voxel/armor/pants/{plate-0.vox => plate_green-0.vox} (100%) diff --git a/assets/common/items/armor/belt_plate-0.ron b/assets/common/items/armor/belt_plate-0.ron index c365499f9b..7246beb7a4 100644 --- a/assets/common/items/armor/belt_plate-0.ron +++ b/assets/common/items/armor/belt_plate-0.ron @@ -1,8 +1,8 @@ Item( - name: "Assassin Belt", - description: "Only the best for a member of the creed.", + name: "Iron Belt", + description: "WIP", kind: Armor( - kind: Belt(Assassin), + kind: Belt(Plate0), stats: 20, ), ) diff --git a/assets/common/items/armor/chest_plate_green-0.ron b/assets/common/items/armor/chest_plate_green-0.ron index 5916cd5547..a4d9916e63 100644 --- a/assets/common/items/armor/chest_plate_green-0.ron +++ b/assets/common/items/armor/chest_plate_green-0.ron @@ -2,7 +2,7 @@ Item( name: "Iron Chestplate", description: "Arrows to the stomach are soooo last update.", kind: Armor( - kind: Chest(Plate), + kind: Chest(PlateGreen0), stats: 20, ), ) diff --git a/assets/common/items/armor/foot_plate-0.ron b/assets/common/items/armor/foot_plate-0.ron index c365499f9b..f4f221147f 100644 --- a/assets/common/items/armor/foot_plate-0.ron +++ b/assets/common/items/armor/foot_plate-0.ron @@ -1,8 +1,8 @@ Item( - name: "Assassin Belt", - description: "Only the best for a member of the creed.", + name: "Iron Feet", + description: "WIP", kind: Armor( - kind: Belt(Assassin), + kind: Foot(Plate0), stats: 20, ), ) diff --git a/assets/common/items/armor/hand_plate-0.ron b/assets/common/items/armor/hand_plate-0.ron index 819538cc5e..8e27eee491 100644 --- a/assets/common/items/armor/hand_plate-0.ron +++ b/assets/common/items/armor/hand_plate-0.ron @@ -1,8 +1,8 @@ Item( - name: "Assassin Shoulder Guard", - description: "Only the best for a member of the creed.", + name: "Iron Handguards", + description: "WIP", kind: Armor( - kind: Shoulder(Assassin), + kind: Hand(Plate0), stats: 20, ), ) diff --git a/assets/common/items/armor/pants_plate_green-0.ron b/assets/common/items/armor/pants_plate_green-0.ron index 5916cd5547..131d87be51 100644 --- a/assets/common/items/armor/pants_plate_green-0.ron +++ b/assets/common/items/armor/pants_plate_green-0.ron @@ -1,8 +1,8 @@ Item( - name: "Iron Chestplate", - description: "Arrows to the stomach are soooo last update.", + name: "Iron Legguards", + description: "WIP", kind: Armor( - kind: Chest(Plate), + kind: Pants(PlateGreen0), stats: 20, ), ) diff --git a/assets/common/items/armor/shoulder_plate-0.ron b/assets/common/items/armor/shoulder_plate-0.ron index 819538cc5e..37bde3183d 100644 --- a/assets/common/items/armor/shoulder_plate-0.ron +++ b/assets/common/items/armor/shoulder_plate-0.ron @@ -1,8 +1,8 @@ Item( - name: "Assassin Shoulder Guard", - description: "Only the best for a member of the creed.", + name: "Iron Shoulderguards", + description: "A strong shoulder to lean on.", kind: Armor( - kind: Shoulder(Assassin), + kind: Shoulder(Plate0), stats: 20, ), ) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 7763dae1d1..3d8d53ce24 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -66,7 +66,7 @@ "voxel.armor.chest.plate_green-0", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), - Armor(Pants((PlateGreen0)): VoxTrans( + Armor(Pants(PlateGreen0)): VoxTrans( "voxel.armor.pants.plate_green-0", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), diff --git a/assets/voxygen/voxel/armor/belt/assa.vox b/assets/voxygen/voxel/armor/belt/assa.vox index dffd8e6ffe..e6285a27cf 100644 --- a/assets/voxygen/voxel/armor/belt/assa.vox +++ b/assets/voxygen/voxel/armor/belt/assa.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6149f83d15faf914cd8286ba61e37cc14eeeb4a3ae3fd02e917afcdeca6f757d +oid sha256:0ab185c2f3af358eb6f45d8ceb19d7df33417b13b327aae65ff1d296a7587e79 size 1472 diff --git a/assets/voxygen/voxel/armor/chest/assa.vox b/assets/voxygen/voxel/armor/chest/assa.vox index 2368550782..dc173f1cf0 100644 --- a/assets/voxygen/voxel/armor/chest/assa.vox +++ b/assets/voxygen/voxel/armor/chest/assa.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2d7513d18f28cf272a585dbeda6669ae5a28ad84b945efbf13d7f4b6c639b9d -size 45819 +oid sha256:8ec2c2ec85bca46a9ae5db921064cd817cf29bf98080d186fd327256421f7a57 +size 2712 diff --git a/assets/voxygen/voxel/armor/foot/assa.vox b/assets/voxygen/voxel/armor/foot/assa.vox index 881ec1a5de..48dfb84f1a 100644 --- a/assets/voxygen/voxel/armor/foot/assa.vox +++ b/assets/voxygen/voxel/armor/foot/assa.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49178c027d6e9f20978786138fd76e0413057600d7094705686c1b2ea0a89e6d -size 1480 +oid sha256:8596adda7d5f16aced46959050ee8135f72123a1943531fdda11c816a86db380 +size 55963 diff --git a/assets/voxygen/voxel/armor/hand/assa_left.vox b/assets/voxygen/voxel/armor/hand/assa_left.vox index b103659d78..2ee60e1f18 100644 --- a/assets/voxygen/voxel/armor/hand/assa_left.vox +++ b/assets/voxygen/voxel/armor/hand/assa_left.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3c8d6c4226337c43cd1d5b8ab2f251c38ccb9357a524697b672c0e63bf7f41e +oid sha256:d981e3ab25371195bdb81ab260b41e6fd985130969b96068dc560ea0412fc49a size 1240 diff --git a/assets/voxygen/voxel/armor/hand/assa_right.vox b/assets/voxygen/voxel/armor/hand/assa_right.vox index 2bf33c0563..5bd9116e8c 100644 --- a/assets/voxygen/voxel/armor/hand/assa_right.vox +++ b/assets/voxygen/voxel/armor/hand/assa_right.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38f226fd0c2425db70c294dbe3566138cd49e05fde6c09f3d972de4a88751741 +oid sha256:b9e41c15237da8a886002d03f1d01558672212de1e8f57b5df207db2d1dd0566 size 55723 diff --git a/assets/voxygen/voxel/armor/hand/plate_right-0.vox b/assets/voxygen/voxel/armor/hand/plate_right-0.vox index 57d9f2747f..9db01e9dc7 100644 --- a/assets/voxygen/voxel/armor/hand/plate_right-0.vox +++ b/assets/voxygen/voxel/armor/hand/plate_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:401a93697104fbe414cdc04dc2e4d9767f540358c3ba64f3abb7263d444cbbc7 -size 1240 +oid sha256:58457547228410c17d04ad5b60329aa282b02888217e6d840806448120b47d6b +size 55723 diff --git a/assets/voxygen/voxel/armor/head/assa_mask.vox b/assets/voxygen/voxel/armor/head/assa_mask.vox new file mode 100644 index 0000000000..07dac5e2f7 --- /dev/null +++ b/assets/voxygen/voxel/armor/head/assa_mask.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d088786a9c7c6ba623d637fa9d301c6565430449285cd9ad830a52be357bfa1 +size 1544 diff --git a/assets/voxygen/voxel/armor/pants/assa.vox b/assets/voxygen/voxel/armor/pants/assa.vox index c487e62091..0fd67628f4 100644 --- a/assets/voxygen/voxel/armor/pants/assa.vox +++ b/assets/voxygen/voxel/armor/pants/assa.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5df651f1df9d57ebd10eaafe9c3bac8b882b2c77f9cec0c57323b5b220f8ef4e +oid sha256:7db069a83bdb723c5057c975d5a31950ccd7a550d2145b22a681db13f05d5be2 size 1912 diff --git a/assets/voxygen/voxel/armor/pants/plate-0.vox b/assets/voxygen/voxel/armor/pants/plate_green-0.vox similarity index 100% rename from assets/voxygen/voxel/armor/pants/plate-0.vox rename to assets/voxygen/voxel/armor/pants/plate_green-0.vox diff --git a/assets/voxygen/voxel/armor/shoulder/assa_left.vox b/assets/voxygen/voxel/armor/shoulder/assa_left.vox index 590c2531a8..ed416fed2f 100644 --- a/assets/voxygen/voxel/armor/shoulder/assa_left.vox +++ b/assets/voxygen/voxel/armor/shoulder/assa_left.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84b93b691e9179fa6e84be5e6aaaec68217a8fe71a4fa670e5544ffd4b04096c -size 44491 +oid sha256:68b31a19a383d3157f6754987ea4f7284e8bbb7e16705500ab9c7774e1de7a51 +size 1384 diff --git a/assets/voxygen/voxel/armor/shoulder/assa_right.vox b/assets/voxygen/voxel/armor/shoulder/assa_right.vox index 7136338ccf..ad59092ec3 100644 --- a/assets/voxygen/voxel/armor/shoulder/assa_right.vox +++ b/assets/voxygen/voxel/armor/shoulder/assa_right.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:195656b4b047b8c0095c86f00bc0c374c4e3b65fc610d4c74670a19aa07c228b -size 44491 +oid sha256:05df36be9cf12a9bfca9fe5d0c83a4fdafab077a1dc834ec121dc1072ecdf9d2 +size 1384 diff --git a/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox b/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox index 023047b426..45022728e4 100644 --- a/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox +++ b/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db1ab248201355827dad3fc954354d67981629314bc74cfc1615ba684bd20c5d -size 1460 +oid sha256:44710553f64bdea121df4c2be97ae700d2216cde30623099517f2ea06121c29f +size 55943 diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 16ef6d7f37..07d813cb04 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -20,11 +20,11 @@ color: None ), Dark:( - vox_spec: ("armor.belt.plate-0", (-4.0, -3.5, 2.0)), + vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)), color: None ), Plate0:( - vox_spec: ("armor.belt.plate-0", (-4.0, -3.5, 2.0)), + vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)), color: None ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index de9daf63b3..4ec93ad4bf 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -26,11 +26,7 @@ Kimono: ( vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)), color: None - ), - Assassin: ( - vox_spec: ("armor.pants.plate-0", (-5.0, -3.5, 1.0)), - color: None - ), + ), PlateGreen0: ( vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)), color: None diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index ee90d42e87..bcbfeded1c 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -2,51 +2,51 @@ //This shouldn't be the none option, but what is? None: ( left: ( - vox_spec: ("armor.empty", (-3.0, -3.5, 0.1)), + vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), color: None ), right: ( - vox_spec: ("armor.empty", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.empty", (-2.0, -3.5, 1.0)), color: None ) ), Brown1: ( left: ( - vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 1.0)), color: None ), right: ( - vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 1.0)), color: None ) ), Assassin: ( left: ( - vox_spec: ("armor.shoulder.assa_left", (-4.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.assa_left", (-4.0, -3.5, 1.0)), color: None ), right: ( - vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)), color: None ) ), Chain: ( left: ( - vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 1.0)), color: None ), right: ( - vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)), color: None ) ), Plate0: ( left: ( - vox_spec: ("armor.shoulder.plate_left-0", (-4.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.plate_left-0", (-3.6, -3.5, 1.0)), color: None ), right: ( - vox_spec: ("armor.shoulder.plate_right-0", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 1.0)), color: None ) ), diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index a1ca449a6d..57c8780d8c 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -125,7 +125,7 @@ impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { } // Hair Colors -pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 11] = [ +pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 12] = [ (198, 169, 113), // Philosopher's Grey //(245, 232, 175), // Cream Blonde //(228, 208, 147), // Gold Blonde @@ -141,9 +141,10 @@ pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 11] = [ (107, 32, 60), // Grape Purple (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red - //(146, 32, 32), // Autumn Red + //(146, 32, 32), // Autumn Red + (20, 19, 17), // Black ]; -pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [ +pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [ (245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde (228, 223, 141), // Platinum Blonde @@ -164,8 +165,9 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [ (163, 186, 192), // Matte Green (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green + (20, 19, 17), // Black ]; -pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [ +pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [ (66, 83, 113), // Mysterious Blue (13, 76, 41), // Rainforest Green (245, 232, 175), // Cream Blonde @@ -189,8 +191,9 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [ (163, 186, 192), // Matte Green (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green + (20, 19, 17), // Black ]; -pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [ +pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [ (245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde (228, 223, 141), // Platinum Blonde @@ -212,8 +215,9 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [ (163, 186, 192), // Matte Green (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green + (20, 19, 17), // Black ]; -pub const ORC_HAIR_COLORS: [(u8, u8, u8); 10] = [ +pub const ORC_HAIR_COLORS: [(u8, u8, u8); 11] = [ (66, 66, 59), // Wise Grey //(107, 76, 51), // Oak Skin4 //(203, 154, 98), // Light Skin4 @@ -226,8 +230,9 @@ pub const ORC_HAIR_COLORS: [(u8, u8, u8); 10] = [ (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (66, 83, 113), // Mysterious Blue + (20, 19, 17), // Black ]; -pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 21] = [ +pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 22] = [ //(245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde //(228, 223, 141), // Platinum Blonde @@ -252,6 +257,7 @@ pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 21] = [ (163, 186, 192), // Matte Green (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green + (20, 19, 17), // Black ]; // Skin colors