From 8b05dda1d9fd9fd85a4d46e5819cef233f8351ee Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Wed, 25 Mar 2020 16:47:48 +0100 Subject: [PATCH] assset cleanup, transparency, new icons --- assets/common/items/apple.ron | 4 +- assets/common/items/cheese.ron | 4 +- assets/common/items/mushroom.ron | 4 +- assets/common/items/potion_minor.ron | 4 +- assets/common/items/velorite.ron | 6 ++- assets/common/items/veloritefrag.ron | 6 ++- assets/voxygen/element/icons/2haxe_m1.png | 3 ++ assets/voxygen/element/icons/2haxe_m1.vox | 3 -- assets/voxygen/element/icons/2haxe_m2.png | 3 ++ assets/voxygen/element/icons/2haxe_m2.vox | 3 -- assets/voxygen/element/icons/2hhammer_m1.png | 3 ++ assets/voxygen/element/icons/2hhammer_m1.vox | 3 -- assets/voxygen/element/icons/2hhammer_m2.png | 3 ++ assets/voxygen/element/icons/2hhammer_m2.vox | 3 -- assets/voxygen/element/icons/2hsword_m1.png | 3 ++ assets/voxygen/element/icons/2hsword_m1.vox | 3 -- assets/voxygen/element/icons/2hsword_m2.png | 3 ++ assets/voxygen/element/icons/2hsword_m2.vox | 3 -- .../voxygen/element/icons/2hsword_slash.png | 3 ++ .../voxygen/element/icons/2hsword_slash.vox | 3 -- assets/voxygen/element/icons/back.vox | 3 -- assets/voxygen/element/icons/belt.vox | 3 -- assets/voxygen/element/icons/bow_m1.png | 3 ++ assets/voxygen/element/icons/bow_m1.vox | 3 -- assets/voxygen/element/icons/chest.vox | 3 -- assets/voxygen/element/icons/collar.png | 3 ++ assets/voxygen/element/icons/collar.vox | 3 -- .../voxygen/element/icons/debug_wand_m1.png | 3 ++ .../voxygen/element/icons/debug_wand_m1.vox | 3 -- .../voxygen/element/icons/debug_wand_m2.png | 3 ++ .../voxygen/element/icons/debug_wand_m2.vox | 3 -- assets/voxygen/element/icons/feet.vox | 3 -- assets/voxygen/element/icons/gem.vox | 3 -- assets/voxygen/element/icons/hands.vox | 3 -- assets/voxygen/element/icons/head.vox | 3 -- assets/voxygen/element/icons/item_flower.png | 3 -- .../voxygen/element/icons/item_mushroom.vox | 3 -- assets/voxygen/element/icons/legs.vox | 3 -- assets/voxygen/element/icons/mainhand.vox | 3 -- assets/voxygen/element/icons/necklace.vox | 3 -- assets/voxygen/element/icons/offhand.vox | 3 -- assets/voxygen/element/icons/ring.vox | 3 -- assets/voxygen/element/icons/shoulders.vox | 3 -- assets/voxygen/element/icons/skill_charge.vox | 3 -- .../voxygen/element/icons/skill_charge_2.png | 3 ++ .../voxygen/element/icons/skill_charge_2.vox | 3 -- .../voxygen/element/icons/skill_charge_3.png | 3 ++ .../voxygen/element/icons/skill_charge_3.vox | 3 -- .../voxygen/element/icons/skill_slice_2.png | 3 ++ .../voxygen/element/icons/skill_slice_2.vox | 3 -- assets/voxygen/element/icons/skull.png | 3 ++ assets/voxygen/element/icons/skull.vox | 3 -- assets/voxygen/element/icons/skull_2.png | 3 ++ assets/voxygen/element/icons/skull_2.vox | 3 -- assets/voxygen/element/icons/staff_m1.png | 3 ++ assets/voxygen/element/icons/staff_m1.vox | 3 -- assets/voxygen/element/icons/staff_m2.png | 3 ++ assets/voxygen/element/icons/staff_m2.vox | 3 -- assets/voxygen/element/icons/tabard.vox | 3 -- assets/voxygen/item_image_manifest.ron | 4 +- common/src/comp/inventory/item.rs | 1 + voxygen/src/hud/img_ids.rs | 35 +++++++++-------- voxygen/src/hud/skillbar.rs | 38 +++++++++++-------- 63 files changed, 118 insertions(+), 147 deletions(-) create mode 100644 assets/voxygen/element/icons/2haxe_m1.png delete mode 100644 assets/voxygen/element/icons/2haxe_m1.vox create mode 100644 assets/voxygen/element/icons/2haxe_m2.png delete mode 100644 assets/voxygen/element/icons/2haxe_m2.vox create mode 100644 assets/voxygen/element/icons/2hhammer_m1.png delete mode 100644 assets/voxygen/element/icons/2hhammer_m1.vox create mode 100644 assets/voxygen/element/icons/2hhammer_m2.png delete mode 100644 assets/voxygen/element/icons/2hhammer_m2.vox create mode 100644 assets/voxygen/element/icons/2hsword_m1.png delete mode 100644 assets/voxygen/element/icons/2hsword_m1.vox create mode 100644 assets/voxygen/element/icons/2hsword_m2.png delete mode 100644 assets/voxygen/element/icons/2hsword_m2.vox create mode 100644 assets/voxygen/element/icons/2hsword_slash.png delete mode 100644 assets/voxygen/element/icons/2hsword_slash.vox delete mode 100644 assets/voxygen/element/icons/back.vox delete mode 100644 assets/voxygen/element/icons/belt.vox create mode 100644 assets/voxygen/element/icons/bow_m1.png delete mode 100644 assets/voxygen/element/icons/bow_m1.vox delete mode 100644 assets/voxygen/element/icons/chest.vox create mode 100644 assets/voxygen/element/icons/collar.png delete mode 100644 assets/voxygen/element/icons/collar.vox create mode 100644 assets/voxygen/element/icons/debug_wand_m1.png delete mode 100644 assets/voxygen/element/icons/debug_wand_m1.vox create mode 100644 assets/voxygen/element/icons/debug_wand_m2.png delete mode 100644 assets/voxygen/element/icons/debug_wand_m2.vox delete mode 100644 assets/voxygen/element/icons/feet.vox delete mode 100644 assets/voxygen/element/icons/gem.vox delete mode 100644 assets/voxygen/element/icons/hands.vox delete mode 100644 assets/voxygen/element/icons/head.vox delete mode 100644 assets/voxygen/element/icons/item_flower.png delete mode 100644 assets/voxygen/element/icons/item_mushroom.vox delete mode 100644 assets/voxygen/element/icons/legs.vox delete mode 100644 assets/voxygen/element/icons/mainhand.vox delete mode 100644 assets/voxygen/element/icons/necklace.vox delete mode 100644 assets/voxygen/element/icons/offhand.vox delete mode 100644 assets/voxygen/element/icons/ring.vox delete mode 100644 assets/voxygen/element/icons/shoulders.vox delete mode 100644 assets/voxygen/element/icons/skill_charge.vox create mode 100644 assets/voxygen/element/icons/skill_charge_2.png delete mode 100644 assets/voxygen/element/icons/skill_charge_2.vox create mode 100644 assets/voxygen/element/icons/skill_charge_3.png delete mode 100644 assets/voxygen/element/icons/skill_charge_3.vox create mode 100644 assets/voxygen/element/icons/skill_slice_2.png delete mode 100644 assets/voxygen/element/icons/skill_slice_2.vox create mode 100644 assets/voxygen/element/icons/skull.png delete mode 100644 assets/voxygen/element/icons/skull.vox create mode 100644 assets/voxygen/element/icons/skull_2.png delete mode 100644 assets/voxygen/element/icons/skull_2.vox create mode 100644 assets/voxygen/element/icons/staff_m1.png delete mode 100644 assets/voxygen/element/icons/staff_m1.vox create mode 100644 assets/voxygen/element/icons/staff_m2.png delete mode 100644 assets/voxygen/element/icons/staff_m2.vox delete mode 100644 assets/voxygen/element/icons/tabard.vox diff --git a/assets/common/items/apple.ron b/assets/common/items/apple.ron index 46c20763ad..7179502e22 100644 --- a/assets/common/items/apple.ron +++ b/assets/common/items/apple.ron @@ -1,6 +1,8 @@ Item( name: "Apple", - description: "Red and juicy.", + description: "Red and juicy. + +Restores 20 Health.", kind: Consumable( kind: Apple, effect: Health(( diff --git a/assets/common/items/cheese.ron b/assets/common/items/cheese.ron index 00a2e124f5..6e0bbe751e 100644 --- a/assets/common/items/cheese.ron +++ b/assets/common/items/cheese.ron @@ -1,6 +1,8 @@ Item( name: "Dwarven Cheese", - description: "Aromatic and nutritious.", + description: "Aromatic and nutritious. + +Restores 40 Health.", kind: Consumable( kind: Cheese, effect: Health(( diff --git a/assets/common/items/mushroom.ron b/assets/common/items/mushroom.ron index 04d300329e..09702079e9 100644 --- a/assets/common/items/mushroom.ron +++ b/assets/common/items/mushroom.ron @@ -1,6 +1,8 @@ Item( name: "Mushroom", - description: "Hopefully this one is not poisonous.", + description: "Hopefully this one is not poisonous. + +Restores 10 Health.", kind: Consumable( kind: Mushroom, effect: Health(( diff --git a/assets/common/items/potion_minor.ron b/assets/common/items/potion_minor.ron index ab3f5c1110..aaf0b948c9 100644 --- a/assets/common/items/potion_minor.ron +++ b/assets/common/items/potion_minor.ron @@ -1,6 +1,8 @@ Item( name: "Minor Potion", - description: "Restores a small amount of Health.", + description: "Restores a small amount of Health. + +Restores 50 Health.", kind: Consumable( kind: PotionMinor, effect: Health(( diff --git a/assets/common/items/velorite.ron b/assets/common/items/velorite.ron index 342a743847..2cefef40b0 100644 --- a/assets/common/items/velorite.ron +++ b/assets/common/items/velorite.ron @@ -1,8 +1,10 @@ Item( name: "Velorite", - description: "Just a slight touch makes you feel the knowledge of ancient times.", + description: "Just a slight touch makes you feel the knowledge of ancient times. + +Increases Exp by 20.", kind: Consumable( kind: Velorite, - effect: Xp(50), + effect: Xp(20), ), ) diff --git a/assets/common/items/veloritefrag.ron b/assets/common/items/veloritefrag.ron index 417eca94b4..d29abf6a4f 100644 --- a/assets/common/items/veloritefrag.ron +++ b/assets/common/items/veloritefrag.ron @@ -1,8 +1,10 @@ Item( name: "Velorite Fragment", - description: "Small runes sparkle on its surface.", + description: "Small runes sparkle on its surface. + +Increases Exp by 10.", kind: Consumable( kind: VeloriteFrag, - effect: Xp(20), + effect: Xp(10), ), ) diff --git a/assets/voxygen/element/icons/2haxe_m1.png b/assets/voxygen/element/icons/2haxe_m1.png new file mode 100644 index 0000000000..5b26cd998a --- /dev/null +++ b/assets/voxygen/element/icons/2haxe_m1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bddd94d15a337c957883c58d8c0cc437f59c1adab9cadd083d3bbaeedc4540be +size 947 diff --git a/assets/voxygen/element/icons/2haxe_m1.vox b/assets/voxygen/element/icons/2haxe_m1.vox deleted file mode 100644 index 0acae649d4..0000000000 --- a/assets/voxygen/element/icons/2haxe_m1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30285d002357f18544456a063c66549e804075979a9f4c5e120eab2bf58923f5 -size 57713 diff --git a/assets/voxygen/element/icons/2haxe_m2.png b/assets/voxygen/element/icons/2haxe_m2.png new file mode 100644 index 0000000000..3a4718ad2d --- /dev/null +++ b/assets/voxygen/element/icons/2haxe_m2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7967e73c1aad20878c3a72c3763a5500b2d147d09ec052351d7bb700866e2246 +size 708 diff --git a/assets/voxygen/element/icons/2haxe_m2.vox b/assets/voxygen/element/icons/2haxe_m2.vox deleted file mode 100644 index 7df7f10fed..0000000000 --- a/assets/voxygen/element/icons/2haxe_m2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95af09926041808154892286e0f0088783c24bc43e45bb00d717921cc29ec4e9 -size 57937 diff --git a/assets/voxygen/element/icons/2hhammer_m1.png b/assets/voxygen/element/icons/2hhammer_m1.png new file mode 100644 index 0000000000..522767626c --- /dev/null +++ b/assets/voxygen/element/icons/2hhammer_m1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cd9bde2284656bd1b44856098cd32dd02f51d1bc233fc7658d71ae57e6468f2 +size 597 diff --git a/assets/voxygen/element/icons/2hhammer_m1.vox b/assets/voxygen/element/icons/2hhammer_m1.vox deleted file mode 100644 index 691b8df6f2..0000000000 --- a/assets/voxygen/element/icons/2hhammer_m1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bbd371eedd0710e05a13e894edd9a3d13e209ace6df0f27fda344fc110a944b -size 57721 diff --git a/assets/voxygen/element/icons/2hhammer_m2.png b/assets/voxygen/element/icons/2hhammer_m2.png new file mode 100644 index 0000000000..143311f155 --- /dev/null +++ b/assets/voxygen/element/icons/2hhammer_m2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a87e8d141f83e135f42e9d3b6b0c8b1d961506d8f8e28398e67c6a84d998411 +size 806 diff --git a/assets/voxygen/element/icons/2hhammer_m2.vox b/assets/voxygen/element/icons/2hhammer_m2.vox deleted file mode 100644 index dfbcfa3460..0000000000 --- a/assets/voxygen/element/icons/2hhammer_m2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e32dd1e339f933a80e701e3fdf997a1b9e361083059a1e301d2324091c9ff4e1 -size 57809 diff --git a/assets/voxygen/element/icons/2hsword_m1.png b/assets/voxygen/element/icons/2hsword_m1.png new file mode 100644 index 0000000000..1b36b8a46f --- /dev/null +++ b/assets/voxygen/element/icons/2hsword_m1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f442cb6ef061bfee9e66168b9c32e5bdb7e59fde790c0be31f93785857779e6f +size 784 diff --git a/assets/voxygen/element/icons/2hsword_m1.vox b/assets/voxygen/element/icons/2hsword_m1.vox deleted file mode 100644 index fabf326482..0000000000 --- a/assets/voxygen/element/icons/2hsword_m1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29883a92ce28f094ff146f942101ea0e6dd4882b42a18259d16636cf5d091b38 -size 57621 diff --git a/assets/voxygen/element/icons/2hsword_m2.png b/assets/voxygen/element/icons/2hsword_m2.png new file mode 100644 index 0000000000..d54cda0e92 --- /dev/null +++ b/assets/voxygen/element/icons/2hsword_m2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b7a2ab9fac21eade39278def1c4e76ce793737c6bd3f4d55037a930ad304e34 +size 929 diff --git a/assets/voxygen/element/icons/2hsword_m2.vox b/assets/voxygen/element/icons/2hsword_m2.vox deleted file mode 100644 index d62b2b3b40..0000000000 --- a/assets/voxygen/element/icons/2hsword_m2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:131cba637ca168a8fa1f3d5fba6e163323d5ff3968dca00d7839366142fa3c4b -size 58366 diff --git a/assets/voxygen/element/icons/2hsword_slash.png b/assets/voxygen/element/icons/2hsword_slash.png new file mode 100644 index 0000000000..18d36aef24 --- /dev/null +++ b/assets/voxygen/element/icons/2hsword_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b827aa50558455a6ba821e4f032d45ae04d7bfdcecd2597fc1cb6c0b0e6d1973 +size 782 diff --git a/assets/voxygen/element/icons/2hsword_slash.vox b/assets/voxygen/element/icons/2hsword_slash.vox deleted file mode 100644 index ea2a8e1eb9..0000000000 --- a/assets/voxygen/element/icons/2hsword_slash.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfd03c8de8d52353a54311ef539d0a03786929e1b0842e9806f389659d8faca2 -size 57621 diff --git a/assets/voxygen/element/icons/back.vox b/assets/voxygen/element/icons/back.vox deleted file mode 100644 index a9f8eee678..0000000000 --- a/assets/voxygen/element/icons/back.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0fed53b953e06948cf233f3d4f3f27bac06c12f1b9c1687e1b47a3f66d5bc35 -size 62604 diff --git a/assets/voxygen/element/icons/belt.vox b/assets/voxygen/element/icons/belt.vox deleted file mode 100644 index 49d0bff7cb..0000000000 --- a/assets/voxygen/element/icons/belt.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa92f8ffc54d7838fa7bb90ff76df7a9e67d95bcbf1c339b7563f5e7b57befe1 -size 61268 diff --git a/assets/voxygen/element/icons/bow_m1.png b/assets/voxygen/element/icons/bow_m1.png new file mode 100644 index 0000000000..b9cb8af63d --- /dev/null +++ b/assets/voxygen/element/icons/bow_m1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff1b52d259aafa8384e05dc5ae2ca3dcd7a88c7a4456149cc7a37e9e0c106ad5 +size 808 diff --git a/assets/voxygen/element/icons/bow_m1.vox b/assets/voxygen/element/icons/bow_m1.vox deleted file mode 100644 index 1ec968f5d3..0000000000 --- a/assets/voxygen/element/icons/bow_m1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0575beddb81670abd9e2cd8571b0d21bd902756f0b321ffa5b3433bc96da480 -size 61545 diff --git a/assets/voxygen/element/icons/chest.vox b/assets/voxygen/element/icons/chest.vox deleted file mode 100644 index e7593a2382..0000000000 --- a/assets/voxygen/element/icons/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3446d88d65fd7bdbb5b195dbe45809a56c27e527c59360a4be32795c4f034f0d -size 61612 diff --git a/assets/voxygen/element/icons/collar.png b/assets/voxygen/element/icons/collar.png new file mode 100644 index 0000000000..a24983860c --- /dev/null +++ b/assets/voxygen/element/icons/collar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78eb78fef1639b035869ee1de1fed5ccc86caf1199651ce8881afc10f8d737d2 +size 506 diff --git a/assets/voxygen/element/icons/collar.vox b/assets/voxygen/element/icons/collar.vox deleted file mode 100644 index 92b3346340..0000000000 --- a/assets/voxygen/element/icons/collar.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8d5ce0e89923fa33ab1cb169ff7cab414c863956b6b7620bd4a6b82409af3e5 -size 58948 diff --git a/assets/voxygen/element/icons/debug_wand_m1.png b/assets/voxygen/element/icons/debug_wand_m1.png new file mode 100644 index 0000000000..ae496eec91 --- /dev/null +++ b/assets/voxygen/element/icons/debug_wand_m1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca52786d85797896195c075c1bc91c22f2c87d6a9e64f08dac65d3da3e91e48b +size 839 diff --git a/assets/voxygen/element/icons/debug_wand_m1.vox b/assets/voxygen/element/icons/debug_wand_m1.vox deleted file mode 100644 index cbb55307e3..0000000000 --- a/assets/voxygen/element/icons/debug_wand_m1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d1dc3cc5efc9e9a6278af9fef4894abd7a3e99635b518d063c54f39d64b55e4 -size 58630 diff --git a/assets/voxygen/element/icons/debug_wand_m2.png b/assets/voxygen/element/icons/debug_wand_m2.png new file mode 100644 index 0000000000..c0b53ecf35 --- /dev/null +++ b/assets/voxygen/element/icons/debug_wand_m2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50277d1222dd1b25ded80edc443830deb74db368a66dac5c0398112b9e4618cb +size 900 diff --git a/assets/voxygen/element/icons/debug_wand_m2.vox b/assets/voxygen/element/icons/debug_wand_m2.vox deleted file mode 100644 index 91bb7626c9..0000000000 --- a/assets/voxygen/element/icons/debug_wand_m2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b58de07685de2a912cd7f11cd627af86d19d7efb060b2b92d74f74031b12a5f -size 59241 diff --git a/assets/voxygen/element/icons/feet.vox b/assets/voxygen/element/icons/feet.vox deleted file mode 100644 index 20127bc7e0..0000000000 --- a/assets/voxygen/element/icons/feet.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a20ba6cc66e585069fddeacdafd89746504ee6ac81e57fcfa2a34293b81cc24 -size 61212 diff --git a/assets/voxygen/element/icons/gem.vox b/assets/voxygen/element/icons/gem.vox deleted file mode 100644 index 4a346ed2bf..0000000000 --- a/assets/voxygen/element/icons/gem.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0eeda19e2850ef3b521cb6a4d7d2ea9c85bc7c141ef01abf589880cc3738b234 -size 62236 diff --git a/assets/voxygen/element/icons/hands.vox b/assets/voxygen/element/icons/hands.vox deleted file mode 100644 index 3f47c0c3a3..0000000000 --- a/assets/voxygen/element/icons/hands.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cc139fac19e456c4ed91df21fd41f5c8ef868bfd968055ff66d4ff8acb7c3b5 -size 61644 diff --git a/assets/voxygen/element/icons/head.vox b/assets/voxygen/element/icons/head.vox deleted file mode 100644 index de41bf0327..0000000000 --- a/assets/voxygen/element/icons/head.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5beedc43d289152ecbe622f36bb203fa0b39ff51cf1c77e7ef59fddfa075b4ee -size 63728 diff --git a/assets/voxygen/element/icons/item_flower.png b/assets/voxygen/element/icons/item_flower.png deleted file mode 100644 index 80ecd5f523..0000000000 --- a/assets/voxygen/element/icons/item_flower.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3630ed8f161514e1fb5960c0faa59c88f1be17aae9bacc26f935b7ffc18332f9 -size 13979 diff --git a/assets/voxygen/element/icons/item_mushroom.vox b/assets/voxygen/element/icons/item_mushroom.vox deleted file mode 100644 index afb453857f..0000000000 --- a/assets/voxygen/element/icons/item_mushroom.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d777456ff641f2e4a0b3e87caa01b264cc93ec9554ed123c42ee91729ba6589 -size 57847 diff --git a/assets/voxygen/element/icons/legs.vox b/assets/voxygen/element/icons/legs.vox deleted file mode 100644 index 85375ee204..0000000000 --- a/assets/voxygen/element/icons/legs.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62817a15ea83e0af343bce8eac4260cd0a1c5386cea227ad1ca1b7ae488b1439 -size 60140 diff --git a/assets/voxygen/element/icons/mainhand.vox b/assets/voxygen/element/icons/mainhand.vox deleted file mode 100644 index 68d68bf9d7..0000000000 --- a/assets/voxygen/element/icons/mainhand.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b29577ae26134a468e767001ac69929e1ad656af694bda38b75e4bee83da673d -size 15844 diff --git a/assets/voxygen/element/icons/necklace.vox b/assets/voxygen/element/icons/necklace.vox deleted file mode 100644 index 7712027800..0000000000 --- a/assets/voxygen/element/icons/necklace.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f6c06b002a1d836fe8921dbe2888232c47040a120efb8617f26846cd9a1af21 -size 59564 diff --git a/assets/voxygen/element/icons/offhand.vox b/assets/voxygen/element/icons/offhand.vox deleted file mode 100644 index 4e65802558..0000000000 --- a/assets/voxygen/element/icons/offhand.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fc29c53975102582cf938181311f0ada6a2c7c9e044f9a4d0883ab9c899fc4e -size 19088 diff --git a/assets/voxygen/element/icons/ring.vox b/assets/voxygen/element/icons/ring.vox deleted file mode 100644 index cddf5b7483..0000000000 --- a/assets/voxygen/element/icons/ring.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c73f9198c986bce203d62afaeeb5690a4009cb9b0b731eb99775a36b3932466 -size 19496 diff --git a/assets/voxygen/element/icons/shoulders.vox b/assets/voxygen/element/icons/shoulders.vox deleted file mode 100644 index bc260ac9f8..0000000000 --- a/assets/voxygen/element/icons/shoulders.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b277676fd12242532f0002c074df50066da54accf6e2b54d94c65ca3ac0b2107 -size 60428 diff --git a/assets/voxygen/element/icons/skill_charge.vox b/assets/voxygen/element/icons/skill_charge.vox deleted file mode 100644 index a9bffe8990..0000000000 --- a/assets/voxygen/element/icons/skill_charge.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bec1cad802a5751cfa9cd4d4d0159adb51e4af3e67ced65db25fcaff059e0b6f -size 57497 diff --git a/assets/voxygen/element/icons/skill_charge_2.png b/assets/voxygen/element/icons/skill_charge_2.png new file mode 100644 index 0000000000..a6cca701f6 --- /dev/null +++ b/assets/voxygen/element/icons/skill_charge_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8db97a822c66a4f2a7045518ddef3af9015388b5184a856f44f81c6be8884cb4 +size 1408 diff --git a/assets/voxygen/element/icons/skill_charge_2.vox b/assets/voxygen/element/icons/skill_charge_2.vox deleted file mode 100644 index d81971f6c4..0000000000 --- a/assets/voxygen/element/icons/skill_charge_2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02751d68177ade46c3692a7abdc64f6ad222f41bab01dcb0be8beb49f91b3ae4 -size 63221 diff --git a/assets/voxygen/element/icons/skill_charge_3.png b/assets/voxygen/element/icons/skill_charge_3.png new file mode 100644 index 0000000000..e4b0404ee7 --- /dev/null +++ b/assets/voxygen/element/icons/skill_charge_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7beb4d4f02c645e24956391ea1b1900724f62cee8a03dc7e0732e288ab5485fd +size 1448 diff --git a/assets/voxygen/element/icons/skill_charge_3.vox b/assets/voxygen/element/icons/skill_charge_3.vox deleted file mode 100644 index dc30739204..0000000000 --- a/assets/voxygen/element/icons/skill_charge_3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af880f99099b027bad51aa2e16ea622012d9f99a3ce3691909a041f5afa1c927 -size 63217 diff --git a/assets/voxygen/element/icons/skill_slice_2.png b/assets/voxygen/element/icons/skill_slice_2.png new file mode 100644 index 0000000000..6d1c8b295f --- /dev/null +++ b/assets/voxygen/element/icons/skill_slice_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f2f61e5942a5b2f079c2dafebe0860cbd66e4bf2b9b87e2be104ca47220c474 +size 758 diff --git a/assets/voxygen/element/icons/skill_slice_2.vox b/assets/voxygen/element/icons/skill_slice_2.vox deleted file mode 100644 index 565f4a2280..0000000000 --- a/assets/voxygen/element/icons/skill_slice_2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b86b496d708546a05dca97b53805061b4c6d430fa5ff34b22400e08dccc2ae64 -size 62249 diff --git a/assets/voxygen/element/icons/skull.png b/assets/voxygen/element/icons/skull.png new file mode 100644 index 0000000000..5b86367acf --- /dev/null +++ b/assets/voxygen/element/icons/skull.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:912330f19920dbe6a90c9e22cba4624c3900ceb98850b3f623ff136f421f3435 +size 340 diff --git a/assets/voxygen/element/icons/skull.vox b/assets/voxygen/element/icons/skull.vox deleted file mode 100644 index 024f888038..0000000000 --- a/assets/voxygen/element/icons/skull.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1708cf57ec4d132e3478f86aef7083d37cf85b890a2ddcf4278d8b5d4394f53d -size 57720 diff --git a/assets/voxygen/element/icons/skull_2.png b/assets/voxygen/element/icons/skull_2.png new file mode 100644 index 0000000000..9c7b1696d9 --- /dev/null +++ b/assets/voxygen/element/icons/skull_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a2b2d4093520f1513b0909e808f50390a80a093170bf2d0583fbf65a2f21c51 +size 310 diff --git a/assets/voxygen/element/icons/skull_2.vox b/assets/voxygen/element/icons/skull_2.vox deleted file mode 100644 index 140ab7bf2c..0000000000 --- a/assets/voxygen/element/icons/skull_2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9ddbabd913b6b5afaf2d9344b457cdd9068ee5a1f019141c3f13e364b463dda -size 57784 diff --git a/assets/voxygen/element/icons/staff_m1.png b/assets/voxygen/element/icons/staff_m1.png new file mode 100644 index 0000000000..3955caf46a --- /dev/null +++ b/assets/voxygen/element/icons/staff_m1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b743bbccb12309114e55a35d21b196f6a97b458d4ea208b48654019c2d24e90 +size 795 diff --git a/assets/voxygen/element/icons/staff_m1.vox b/assets/voxygen/element/icons/staff_m1.vox deleted file mode 100644 index ae5682d692..0000000000 --- a/assets/voxygen/element/icons/staff_m1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d80d1b075793a3e120cddd98b1f85742e0462e0c403cfaf9d8260a7c8fda045 -size 58444 diff --git a/assets/voxygen/element/icons/staff_m2.png b/assets/voxygen/element/icons/staff_m2.png new file mode 100644 index 0000000000..f22841c798 --- /dev/null +++ b/assets/voxygen/element/icons/staff_m2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:813f0d30ac437525faa2adb022ce4f57d1beac2ec60d0e9b671c16111eef379c +size 1091 diff --git a/assets/voxygen/element/icons/staff_m2.vox b/assets/voxygen/element/icons/staff_m2.vox deleted file mode 100644 index 74fb309158..0000000000 --- a/assets/voxygen/element/icons/staff_m2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1dd296878391652f6c5151cee6eba5bf003e07360ecbe08f342f7ac631d103d -size 60360 diff --git a/assets/voxygen/element/icons/tabard.vox b/assets/voxygen/element/icons/tabard.vox deleted file mode 100644 index 69999e3228..0000000000 --- a/assets/voxygen/element/icons/tabard.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fae087fbbddc39faf126b7a7ae80301f331c048677fbd047d790918043c29e9 -size 62188 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ee846de0da..f9c40cf4ec 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -55,10 +55,10 @@ (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4, ), // Other - Utility(Collar): VoxTrans( + Utility(Collar): Png( "element.icons.collar", - (0.0, 0.0, 0.0), (-90.0, 180.0, 10.0), 1.3, ), + // Armor // Assassin Set Armor(Chest(Assassin)): VoxTrans( diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index 9c051b8b6c..78e99a9a54 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -375,6 +375,7 @@ impl Item { "common.items.collar", "common.items.weapons.starter_sword", "common.items.weapons.starter_axe", + "common.items.weapons.staff_nature", "common.items.weapons.starter_hammer", "common.items.weapons.starter_bow", "common.items.weapons.starter_staff", diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 9a1ffd7d18..1bf0638ecc 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -103,27 +103,11 @@ image_ids! { fireplace: "voxygen.element.misc_bg.fireplace", // Skill Icons - twohsword_m1: "voxygen.element.icons.2hsword_m1", - twohsword_m2: "voxygen.element.icons.2hsword_m2", - twohhammer_m1: "voxygen.element.icons.2hhammer_m1", - twohhammer_m2: "voxygen.element.icons.2hhammer_m2", - twohaxe_m1: "voxygen.element.icons.2haxe_m1", - twohaxe_m2: "voxygen.element.icons.2haxe_m2", - bow_m1: "voxygen.element.icons.bow_m1", bow_m2: "voxygen.element.icons.bow_m2", - staff_m1: "voxygen.element.icons.staff_m1", - staff_m2: "voxygen.element.icons.staff_m2", - flyingrod_m1: "voxygen.element.icons.debug_wand_m1", - flyingrod_m2: "voxygen.element.icons.debug_wand_m2", - charge: "voxygen.element.icons.skill_charge_3", // Icons flower: "voxygen.element.icons.item_flower", grass: "voxygen.element.icons.item_grass", - apple: "voxygen.element.icons.item_apple", - mushroom: "voxygen.element.icons.item_mushroom", - skull: "voxygen.element.icons.skull", - skull_2: "voxygen.element.icons.skull_2", // Map indicator_mmap: "voxygen.element.buttons.indicator_mmap", @@ -202,6 +186,25 @@ image_ids! { ////////////////////////////////////////////////////////////////////////////////////////////////////// + // Skill Icons + twohsword_m1: "voxygen.element.icons.2hsword_m1", + twohsword_m2: "voxygen.element.icons.2hsword_m2", + twohhammer_m1: "voxygen.element.icons.2hhammer_m1", + twohhammer_m2: "voxygen.element.icons.2hhammer_m2", + twohaxe_m1: "voxygen.element.icons.2haxe_m1", + twohaxe_m2: "voxygen.element.icons.2haxe_m2", + bow_m1: "voxygen.element.icons.bow_m1", + //bow_m2: "voxygen.element.icons.bow_m2", + staff_m1: "voxygen.element.icons.staff_m1", + staff_m2: "voxygen.element.icons.staff_m2", + flyingrod_m1: "voxygen.element.icons.debug_wand_m1", + flyingrod_m2: "voxygen.element.icons.debug_wand_m2", + charge: "voxygen.element.icons.skill_charge_3", + + // Other Icons + skull: "voxygen.element.icons.skull", + skull_2: "voxygen.element.icons.skull_2", + // Map map_bg: "voxygen.element.misc_bg.map_bg", map_frame: "voxygen.element.misc_bg.map_frame", diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index c8fa8ea2f4..68da07b996 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -19,11 +19,12 @@ use conrod_core::{ widget::{self, Button, Image, Rectangle, Text}, widget_ids, Color, Colorable, Positionable, Sizeable, Widget, WidgetCommon, }; -//use const_tweaker::tweak; -use std::time::{Duration, Instant}; // <- REMOVE THIS BEFORE MERGE! -/*#[tweak(min = 0.5, max = 1.0, step = 0.01)] -const ALPHA: f32 = 0.90;*/ +use std::time::{Duration, Instant}; +/* +use const_tweaker::tweak; +#[tweak(min = 0.0, max = 1.0, step = 0.01)] +const RGB: f32 = 0.1;*/ widget_ids! { struct Ids { @@ -608,9 +609,9 @@ impl<'a> Widget for Skillbar<'a> { ToolKind::Bow(_) => self.imgs.bow_m1, ToolKind::Staff(_) => self.imgs.staff_m1, ToolKind::Debug(DebugKind::Boost) => self.imgs.flyingrod_m1, - _ => self.imgs.twohaxe_m1, + _ => self.imgs.nothing, }, - _ => self.imgs.twohaxe_m1, + _ => self.imgs.nothing, }, ) // Insert Icon here .w( @@ -704,21 +705,20 @@ impl<'a> Widget for Skillbar<'a> { match self.loadout.active_item.as_ref().map(|i| &i.item.kind) { Some(ItemKind::Tool(ToolData { kind, .. })) => match kind { ToolKind::Sword(_) => self.imgs.charge, - ToolKind::Hammer(_) => self.imgs.twohhammer_m2, - ToolKind::Axe(_) => self.imgs.twohaxe_m2, - ToolKind::Bow(_) => self.imgs.bow_m2, + ToolKind::Hammer(_) => self.imgs.nothing, + ToolKind::Axe(_) => self.imgs.nothing, + ToolKind::Bow(_) => self.imgs.nothing, ToolKind::Staff(StaffKind::Sceptre) => self.imgs.heal_0, ToolKind::Staff(_) => self.imgs.staff_m2, ToolKind::Debug(DebugKind::Boost) => self.imgs.flyingrod_m2, - _ => self.imgs.twohaxe_m2, + _ => self.imgs.nothing, }, - _ => self.imgs.twohaxe_m2, + _ => self.imgs.nothing, }, ) // Insert Icon here .w( match self.loadout.active_item.as_ref().map(|i| &i.item.kind) { Some(ItemKind::Tool(ToolData { kind, .. })) => match kind { - ToolKind::Bow(_) => 30.0 * scale, ToolKind::Staff(_) => 30.0 * scale, _ => 38.0 * scale, }, @@ -728,7 +728,6 @@ impl<'a> Widget for Skillbar<'a> { .h( match self.loadout.active_item.as_ref().map(|i| &i.item.kind) { Some(ItemKind::Tool(ToolData { kind, .. })) => match kind { - ToolKind::Bow(_) => 30.0 * scale, ToolKind::Staff(_) => 30.0 * scale, _ => 38.0 * scale, }, @@ -736,14 +735,21 @@ impl<'a> Widget for Skillbar<'a> { }, ) .middle_of(state.ids.m2_slot_bg) - .color( + .image_color( match self.loadout.active_item.as_ref().map(|i| &i.item.kind) { Some(ItemKind::Tool(ToolData { kind, .. })) => match kind { ToolKind::Sword(_) => { if self.energy.current() as f64 >= 200.0 { Color::Rgba(1.0, 1.0, 1.0, 1.0) } else { - Color::Rgba(0.4, 0.4, 0.4, 1.0) + Color::Rgba(0.3, 0.3, 0.3, 0.8) + } + }, + ToolKind::Staff(StaffKind::Sceptre) => { + if self.energy.current() as f64 >= 400.0 { + Color::Rgba(1.0, 1.0, 1.0, 1.0) + } else { + Color::Rgba(0.3, 0.3, 0.3, 0.8) } }, _ => Color::Rgba(1.0, 1.0, 1.0, 1.0), @@ -844,7 +850,7 @@ impl<'a> Widget for Skillbar<'a> { .color(if self.energy.current() as f64 >= 500.0 { Some(Color::Rgba(1.0, 1.0, 1.0, 1.0)) } else { - Some(Color::Rgba(0.4, 0.4, 0.4, 1.0)) + Some(Color::Rgba(0.3, 0.3, 0.3, 0.8)) }) .middle_of(state.ids.slot1_bg) .set(state.ids.slot1_icon, ui);