From 45217915911ddf1b5ea6a8ff36c2394fd755fcc6 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 26 Apr 2020 01:44:56 +0000 Subject: [PATCH] UI Fixes --- assets/common/items/apple.ron | 4 +- assets/common/items/armor/back/admin.ron | 4 +- assets/common/items/armor/back/short_0.ron | 2 +- assets/common/items/armor/belt/assassin.ron | 2 +- .../common/items/armor/belt/cloth_blue_0.ron | 2 +- .../common/items/armor/belt/cloth_green_0.ron | 2 +- .../items/armor/belt/cloth_purple_0.ron | 2 +- assets/common/items/armor/belt/leather_0.ron | 2 +- assets/common/items/armor/belt/plate_0.ron | 2 +- assets/common/items/armor/chest/assassin.ron | 2 +- .../common/items/armor/chest/cloth_blue_0.ron | 2 +- .../items/armor/chest/cloth_green_0.ron | 2 +- .../items/armor/chest/cloth_purple_0.ron | 2 +- assets/common/items/armor/chest/leather_0.ron | 2 +- .../items/armor/chest/plate_green_0.ron | 2 +- assets/common/items/armor/foot/assassin.ron | 2 +- .../common/items/armor/foot/cloth_blue_0.ron | 2 +- .../common/items/armor/foot/cloth_green_0.ron | 2 +- .../items/armor/foot/cloth_purple_0.ron | 2 +- assets/common/items/armor/foot/leather_0.ron | 2 +- assets/common/items/armor/foot/plate_0.ron | 2 +- assets/common/items/armor/hand/assassin.ron | 2 +- .../common/items/armor/hand/cloth_blue_0.ron | 2 +- .../common/items/armor/hand/cloth_green_0.ron | 2 +- .../items/armor/hand/cloth_purple_0.ron | 2 +- assets/common/items/armor/hand/leather_0.ron | 2 +- assets/common/items/armor/hand/plate_0.ron | 2 +- .../common/items/armor/head/assa_mask_0.ron | 2 +- assets/common/items/armor/head/leather_0.ron | 2 +- assets/common/items/armor/neck/neck_0.ron | 2 +- assets/common/items/armor/pants/assassin.ron | 2 +- .../common/items/armor/pants/cloth_blue_0.ron | 2 +- .../items/armor/pants/cloth_green_0.ron | 2 +- .../items/armor/pants/cloth_purple_0.ron | 2 +- assets/common/items/armor/pants/green_0.ron | 2 +- assets/common/items/armor/pants/leather_0.ron | 2 +- .../items/armor/pants/plate_green_0.ron | 2 +- assets/common/items/armor/ring/ring_0.ron | 2 +- .../common/items/armor/shoulder/assassin.ron | 2 +- .../items/armor/shoulder/cloth_blue_0.ron | 2 +- .../items/armor/shoulder/cloth_green_0.ron | 2 +- .../items/armor/shoulder/cloth_purple_0.ron | 2 +- .../common/items/armor/shoulder/leather_0.ron | 2 +- .../common/items/armor/shoulder/leather_1.ron | 2 +- .../common/items/armor/shoulder/plate_0.ron | 2 +- .../items/armor/starter/rugged_chest.ron | 2 +- .../items/armor/starter/rugged_pants.ron | 2 +- .../common/items/armor/starter/sandals_0.ron | 2 +- assets/common/items/armor/tabard/admin.ron | 4 +- assets/common/items/cheese.ron | 4 +- assets/common/items/coconut.ron | 4 +- assets/common/items/collar.ron | 2 +- .../debug/{admin_tabard.ron => admin.ron} | 3 +- assets/common/items/debug/admin_back.ron | 3 +- assets/common/items/debug/green_0.ron | 5 - assets/common/items/debug/leather_0.ron | 8 - assets/common/items/debug/neck_0.ron | 8 - .../debug/{plate_belt.ron => plate_0.ron} | 2 +- assets/common/items/debug/plate_feet.ron | 2 +- .../{plate_chest.ron => plate_green_0.ron} | 2 +- .../{plate_legs.ron => plate_green_legs.ron} | 2 +- .../debug/{plate_hands.ron => plate_hand.ron} | 2 +- assets/common/items/debug/plate_shoulder.ron | 2 +- assets/common/items/debug/ring_0.ron | 8 - assets/common/items/mushroom.ron | 4 +- assets/common/items/potion_minor.ron | 4 +- assets/common/items/velorite.ron | 4 +- assets/common/items/veloritefrag.ron | 4 +- assets/common/items/weapons/hammer_1.ron | 4 +- assets/common/items/weapons/shield_1.ron | 2 +- assets/common/items/weapons/short_sword_0.ron | 3 +- assets/common/items/weapons/staff_1.ron | 4 +- assets/common/items/weapons/staff_nature.ron | 3 +- assets/common/items/weapons/starter_axe.ron | 4 +- assets/common/items/weapons/starter_bow.ron | 4 +- .../common/items/weapons/starter_dagger.ron | 4 +- .../common/items/weapons/starter_hammer.ron | 4 +- assets/common/items/weapons/starter_staff.ron | 4 +- assets/common/items/weapons/starter_sword.ron | 4 +- assets/common/items/weapons/wood_sword.ron | 3 +- .../items/weapons/zweihander_sword_0.ron | 3 +- assets/voxygen/element/buttons/bag/closed.vox | 3 - .../element/buttons/bag/closed_hover.vox | 3 - .../element/buttons/bag/closed_press.vox | 3 - assets/voxygen/element/buttons/bag/open.vox | 3 - .../element/buttons/bag/open_hover.vox | 3 - .../element/buttons/bag/open_press.vox | 3 - assets/voxygen/element/buttons/button.vox | 3 - .../voxygen/element/buttons/button_dark.vox | 3 - .../element/buttons/button_dark_hover.vox | 3 - .../element/buttons/button_dark_press.vox | 3 - .../voxygen/element/buttons/button_hover.vox | 3 - .../element/buttons/button_mmap_closed.vox | 3 - .../buttons/button_mmap_closed_hover.vox | 3 - .../buttons/button_mmap_closed_press.vox | 3 - .../element/buttons/button_mmap_open.vox | 3 - .../buttons/button_mmap_open_hover.vox | 3 - .../buttons/button_mmap_open_press.vox | 3 - .../voxygen/element/buttons/button_press.vox | 3 - assets/voxygen/element/buttons/button_red.vox | 3 - .../element/buttons/button_red_hover.vox | 3 - .../element/buttons/button_red_press.vox | 3 - assets/voxygen/element/buttons/grid_inv.vox | 3 - .../element/buttons/indicator_mmap.vox | 3 - .../element/buttons/indicator_mmap_2.vox | 3 - .../element/buttons/indicator_mmap_3.vox | 3 - .../element/buttons/indicator_mmap_small.vox | 3 - assets/voxygen/element/buttons/input.vox | 3 - assets/voxygen/element/buttons/inv_slot.vox | 3 - .../voxygen/element/buttons/inv_slot_sel.vox | 3 - assets/voxygen/element/buttons/map.png | 3 + assets/voxygen/element/buttons/map.vox | 3 - assets/voxygen/element/buttons/map_hover.png | 3 + assets/voxygen/element/buttons/map_hover.vox | 3 - assets/voxygen/element/buttons/map_press.png | 3 + assets/voxygen/element/buttons/map_press.vox | 3 - assets/voxygen/element/buttons/settings.png | 3 + assets/voxygen/element/buttons/settings.vox | 3 - .../element/buttons/settings_hover.png | 3 + .../element/buttons/settings_hover.vox | 3 - .../element/buttons/settings_press.png | 3 + .../element/buttons/settings_press.vox | 3 - assets/voxygen/element/buttons/social.png | 3 + assets/voxygen/element/buttons/social.vox | 3 - .../voxygen/element/buttons/social_hover.png | 3 + .../voxygen/element/buttons/social_hover.vox | 3 - .../voxygen/element/buttons/social_press.png | 3 + .../voxygen/element/buttons/social_press.vox | 3 - assets/voxygen/element/buttons/spellbook.png | 3 + assets/voxygen/element/buttons/spellbook.vox | 3 - .../element/buttons/spellbook_hover.png | 3 + .../element/buttons/spellbook_hover.vox | 3 - .../element/buttons/spellbook_press.png | 3 + .../element/buttons/spellbook_press.vox | 3 - assets/voxygen/element/buttons/x.vox | 3 - assets/voxygen/element/buttons/x_hover.vox | 3 - assets/voxygen/element/buttons/x_press.vox | 3 - assets/voxygen/element/frames/disclaimer.png | 3 + assets/voxygen/element/frames/disclaimer.vox | 3 - assets/voxygen/i18n/de_DE.ron | 12 +- assets/voxygen/i18n/en.ron | 11 +- voxygen/examples/character_renderer.rs | 1 + voxygen/src/hud/buttons.rs | 332 ++++++++++++------ voxygen/src/hud/img_ids.rs | 43 +-- voxygen/src/hud/mod.rs | 40 +-- voxygen/src/hud/settings_window.rs | 52 ++- voxygen/src/hud/skillbar.rs | 6 +- voxygen/src/menu/char_selection/mod.rs | 5 + voxygen/src/menu/main/ui.rs | 2 +- voxygen/src/scene/figure/mod.rs | 15 +- voxygen/src/scene/mod.rs | 3 + voxygen/src/scene/simple.rs | 1 + voxygen/src/session.rs | 10 + voxygen/src/settings.rs | 2 + voxygen/src/window.rs | 12 +- 155 files changed, 485 insertions(+), 459 deletions(-) rename assets/common/items/debug/{admin_tabard.ron => admin.ron} (59%) delete mode 100644 assets/common/items/debug/green_0.ron delete mode 100644 assets/common/items/debug/leather_0.ron delete mode 100644 assets/common/items/debug/neck_0.ron rename assets/common/items/debug/{plate_belt.ron => plate_0.ron} (71%) rename assets/common/items/debug/{plate_chest.ron => plate_green_0.ron} (64%) rename assets/common/items/debug/{plate_legs.ron => plate_green_legs.ron} (73%) rename assets/common/items/debug/{plate_hands.ron => plate_hand.ron} (72%) delete mode 100644 assets/common/items/debug/ring_0.ron delete mode 100644 assets/voxygen/element/buttons/bag/closed.vox delete mode 100644 assets/voxygen/element/buttons/bag/closed_hover.vox delete mode 100644 assets/voxygen/element/buttons/bag/closed_press.vox delete mode 100644 assets/voxygen/element/buttons/bag/open.vox delete mode 100644 assets/voxygen/element/buttons/bag/open_hover.vox delete mode 100644 assets/voxygen/element/buttons/bag/open_press.vox delete mode 100644 assets/voxygen/element/buttons/button.vox delete mode 100644 assets/voxygen/element/buttons/button_dark.vox delete mode 100644 assets/voxygen/element/buttons/button_dark_hover.vox delete mode 100644 assets/voxygen/element/buttons/button_dark_press.vox delete mode 100644 assets/voxygen/element/buttons/button_hover.vox delete mode 100644 assets/voxygen/element/buttons/button_mmap_closed.vox delete mode 100644 assets/voxygen/element/buttons/button_mmap_closed_hover.vox delete mode 100644 assets/voxygen/element/buttons/button_mmap_closed_press.vox delete mode 100644 assets/voxygen/element/buttons/button_mmap_open.vox delete mode 100644 assets/voxygen/element/buttons/button_mmap_open_hover.vox delete mode 100644 assets/voxygen/element/buttons/button_mmap_open_press.vox delete mode 100644 assets/voxygen/element/buttons/button_press.vox delete mode 100644 assets/voxygen/element/buttons/button_red.vox delete mode 100644 assets/voxygen/element/buttons/button_red_hover.vox delete mode 100644 assets/voxygen/element/buttons/button_red_press.vox delete mode 100644 assets/voxygen/element/buttons/grid_inv.vox delete mode 100644 assets/voxygen/element/buttons/indicator_mmap.vox delete mode 100644 assets/voxygen/element/buttons/indicator_mmap_2.vox delete mode 100644 assets/voxygen/element/buttons/indicator_mmap_3.vox delete mode 100644 assets/voxygen/element/buttons/indicator_mmap_small.vox delete mode 100644 assets/voxygen/element/buttons/input.vox delete mode 100644 assets/voxygen/element/buttons/inv_slot.vox delete mode 100644 assets/voxygen/element/buttons/inv_slot_sel.vox create mode 100644 assets/voxygen/element/buttons/map.png delete mode 100644 assets/voxygen/element/buttons/map.vox create mode 100644 assets/voxygen/element/buttons/map_hover.png delete mode 100644 assets/voxygen/element/buttons/map_hover.vox create mode 100644 assets/voxygen/element/buttons/map_press.png delete mode 100644 assets/voxygen/element/buttons/map_press.vox create mode 100644 assets/voxygen/element/buttons/settings.png delete mode 100644 assets/voxygen/element/buttons/settings.vox create mode 100644 assets/voxygen/element/buttons/settings_hover.png delete mode 100644 assets/voxygen/element/buttons/settings_hover.vox create mode 100644 assets/voxygen/element/buttons/settings_press.png delete mode 100644 assets/voxygen/element/buttons/settings_press.vox create mode 100644 assets/voxygen/element/buttons/social.png delete mode 100644 assets/voxygen/element/buttons/social.vox create mode 100644 assets/voxygen/element/buttons/social_hover.png delete mode 100644 assets/voxygen/element/buttons/social_hover.vox create mode 100644 assets/voxygen/element/buttons/social_press.png delete mode 100644 assets/voxygen/element/buttons/social_press.vox create mode 100644 assets/voxygen/element/buttons/spellbook.png delete mode 100644 assets/voxygen/element/buttons/spellbook.vox create mode 100644 assets/voxygen/element/buttons/spellbook_hover.png delete mode 100644 assets/voxygen/element/buttons/spellbook_hover.vox create mode 100644 assets/voxygen/element/buttons/spellbook_press.png delete mode 100644 assets/voxygen/element/buttons/spellbook_press.vox delete mode 100644 assets/voxygen/element/buttons/x.vox delete mode 100644 assets/voxygen/element/buttons/x_hover.vox delete mode 100644 assets/voxygen/element/buttons/x_press.vox create mode 100644 assets/voxygen/element/frames/disclaimer.png delete mode 100644 assets/voxygen/element/frames/disclaimer.vox diff --git a/assets/common/items/apple.ron b/assets/common/items/apple.ron index 7179502e22..f49626db5e 100644 --- a/assets/common/items/apple.ron +++ b/assets/common/items/apple.ron @@ -1,8 +1,6 @@ Item( name: "Apple", - description: "Red and juicy. - -Restores 20 Health.", + description: "Restores 20 Health\n\nRed and juicy\n\n", kind: Consumable( kind: Apple, effect: Health(( diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/back/admin.ron index 04b45466e3..f07273b7c6 100644 --- a/assets/common/items/armor/back/admin.ron +++ b/assets/common/items/armor/back/admin.ron @@ -1,8 +1,6 @@ Item( name: "Admin's Cape", - description: " - With great power comes - great responsibility. ", + description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility.\n\n", kind: Armor( kind: Back(Admin), stats: (20), diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/back/short_0.ron index 953cb40e13..f1759c553d 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: "", + description: "Back\n\nArmor: 0\n\n", kind: Armor( kind: Back(Short0), stats: (20), diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/belt/assassin.ron index e6bb45044e..dc086baa18 100644 --- a/assets/common/items/armor/belt/assassin.ron +++ b/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", kind: Armor( kind: Belt(Assassin), stats: (20), diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/belt/cloth_blue_0.ron index 8b62419ff7..1faaafb7f3 100644 --- a/assets/common/items/armor/belt/cloth_blue_0.ron +++ b/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", kind: Armor( kind: Belt(ClothBlue0), stats: (20), diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/belt/cloth_green_0.ron index c3424f7817..15be2149ea 100644 --- a/assets/common/items/armor/belt/cloth_green_0.ron +++ b/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", kind: Armor( kind: Belt(ClothGreen0), stats: (20), diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/belt/cloth_purple_0.ron index 5f55a20c09..7060fd9c83 100644 --- a/assets/common/items/armor/belt/cloth_purple_0.ron +++ b/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", kind: Armor( kind: Belt(ClothPurple0), stats: (20), diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/belt/leather_0.ron index b3cf347584..6ca49af665 100644 --- a/assets/common/items/armor/belt/leather_0.ron +++ b/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", kind: Armor( kind: Belt(Leather0), stats: (20), diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/belt/plate_0.ron index 2c18113d1a..f1269346f1 100644 --- a/assets/common/items/armor/belt/plate_0.ron +++ b/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", kind: Armor( kind: Belt(Plate0), stats: (20), diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/chest/assassin.ron index 66fc865695..ba969ddd30 100644 --- a/assets/common/items/armor/chest/assassin.ron +++ b/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", kind: Armor( kind: Chest(Assassin), stats: (20), diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/chest/cloth_blue_0.ron index 289bf4bdc5..a36d093faf 100644 --- a/assets/common/items/armor/chest/cloth_blue_0.ron +++ b/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", kind: Armor( kind: Chest(ClothBlue0), stats: (20), diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/chest/cloth_green_0.ron index a52fc12a19..0098c1b869 100644 --- a/assets/common/items/armor/chest/cloth_green_0.ron +++ b/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", kind: Armor( kind: Chest(ClothGreen0), stats: (20), diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/chest/cloth_purple_0.ron index 728e5f5c85..fef6404226 100644 --- a/assets/common/items/armor/chest/cloth_purple_0.ron +++ b/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", kind: Armor( kind: Chest(ClothPurple0), stats: (20), diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/chest/leather_0.ron index 48408e3674..1135163213 100644 --- a/assets/common/items/armor/chest/leather_0.ron +++ b/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", kind: Armor( kind: Chest(Leather0), 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 92bb5fb664..aabc7ab943 100644 --- a/assets/common/items/armor/chest/plate_green_0.ron +++ b/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", kind: Armor( kind: Chest(PlateGreen0), stats: (20), diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/foot/assassin.ron index 13b587a306..6fd150c332 100644 --- a/assets/common/items/armor/foot/assassin.ron +++ b/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", kind: Armor( kind: Foot(Assassin), stats: (20), diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/foot/cloth_blue_0.ron index 31b70750f9..77c9b299db 100644 --- a/assets/common/items/armor/foot/cloth_blue_0.ron +++ b/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", kind: Armor( kind: Foot(ClothBlue0), stats: (20), diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/foot/cloth_green_0.ron index 117b19aad9..b2eccab1f2 100644 --- a/assets/common/items/armor/foot/cloth_green_0.ron +++ b/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", kind: Armor( kind: Foot(ClothGreen0), stats: (20), diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/foot/cloth_purple_0.ron index a80c44de89..77db769d55 100644 --- a/assets/common/items/armor/foot/cloth_purple_0.ron +++ b/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", kind: Armor( kind: Foot(ClothPurple0), stats: (20), diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/foot/leather_0.ron index 6ca6a07fc7..7e811efc3a 100644 --- a/assets/common/items/armor/foot/leather_0.ron +++ b/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", kind: Armor( kind: Foot(Leather0), stats: (20), diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/foot/plate_0.ron index 12f95dcd4e..21dc0fe27c 100644 --- a/assets/common/items/armor/foot/plate_0.ron +++ b/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", kind: Armor( kind: Foot(Plate0), stats: (20), diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/hand/assassin.ron index 19a09a3177..8e923a13d4 100644 --- a/assets/common/items/armor/hand/assassin.ron +++ b/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", kind: Armor( kind: Hand(Assassin), stats: (20), diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/hand/cloth_blue_0.ron index 88496cbce3..f692f8123f 100644 --- a/assets/common/items/armor/hand/cloth_blue_0.ron +++ b/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", kind: Armor( kind: Hand(ClothBlue0), stats: (20), diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/hand/cloth_green_0.ron index a3452335c4..5a20af9f12 100644 --- a/assets/common/items/armor/hand/cloth_green_0.ron +++ b/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", kind: Armor( kind: Hand(ClothGreen0), stats: (20), diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/hand/cloth_purple_0.ron index 840694163c..f4c99713f6 100644 --- a/assets/common/items/armor/hand/cloth_purple_0.ron +++ b/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", kind: Armor( kind: Hand(ClothPurple0), stats: (20), diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/hand/leather_0.ron index e4b62e3a72..d19024f3e7 100644 --- a/assets/common/items/armor/hand/leather_0.ron +++ b/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", kind: Armor( kind: Hand(Leather0), stats: (20), diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/hand/plate_0.ron index 1fdbb6d6da..516aab8625 100644 --- a/assets/common/items/armor/hand/plate_0.ron +++ b/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", kind: Armor( kind: Hand(Plate0), stats: (20), diff --git a/assets/common/items/armor/head/assa_mask_0.ron b/assets/common/items/armor/head/assa_mask_0.ron index 34f242c778..236ea82ef3 100644 --- a/assets/common/items/armor/head/assa_mask_0.ron +++ b/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", kind: Armor( kind: Head(AssaMask0), stats: (20), diff --git a/assets/common/items/armor/head/leather_0.ron b/assets/common/items/armor/head/leather_0.ron index aa0ffd33d6..c568860917 100644 --- a/assets/common/items/armor/head/leather_0.ron +++ b/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", kind: Armor( kind: Head(Leather0), stats: (20), diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/neck/neck_0.ron index 28125345bc..d170113336 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: "", + description: "Neck\n\nArmor: 0\n\n", kind: Armor( kind: Neck(Neck0), stats: (20), diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/pants/assassin.ron index b5bb2c28ab..3fce548e9a 100644 --- a/assets/common/items/armor/pants/assassin.ron +++ b/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", kind: Armor( kind: Pants(Assassin), stats: (20), diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron index 9ef245a09a..2b0dc7e163 100644 --- a/assets/common/items/armor/pants/cloth_blue_0.ron +++ b/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", kind: Armor( kind: Pants(ClothBlue0), stats: (20), diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron index 3782ac2617..b184717ccf 100644 --- a/assets/common/items/armor/pants/cloth_green_0.ron +++ b/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", kind: Armor( kind: Pants(ClothGreen0), stats: (20), diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron index 770961a1fe..f37662b7db 100644 --- a/assets/common/items/armor/pants/cloth_purple_0.ron +++ b/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", kind: Armor( kind: Pants(ClothPurple0), stats: (20), diff --git a/assets/common/items/armor/pants/green_0.ron b/assets/common/items/armor/pants/green_0.ron index 5fee632d92..c08d850d75 100644 --- a/assets/common/items/armor/pants/green_0.ron +++ b/assets/common/items/armor/pants/green_0.ron @@ -1,6 +1,6 @@ Item( name: "Hunting Pants", - description: "", + description: "Legs\n\nArmor: 0\n\n", kind: Armor( kind: Pants(Green), stats: (20), diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/pants/leather_0.ron index 507ab116c0..8eb99060d7 100644 --- a/assets/common/items/armor/pants/leather_0.ron +++ b/assets/common/items/armor/pants/leather_0.ron @@ -1,6 +1,6 @@ Item( name: "Swift Pants", - description: "", + description: "Legs\n\nArmor: 0\n\n", kind: Armor( kind: Pants(Leather0), 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 51c3620338..3194cac534 100644 --- a/assets/common/items/armor/pants/plate_green_0.ron +++ b/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", kind: Armor( kind: Pants(PlateGreen0), stats: (20), diff --git a/assets/common/items/armor/ring/ring_0.ron b/assets/common/items/armor/ring/ring_0.ron index d094e21af8..d0448912f3 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: "Barely fits your finger.", + description: "Ring\n\nBarely fits your finger.\n\n", kind: Armor( kind: Ring(Ring0), stats: (20), diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/shoulder/assassin.ron index ea92efbec5..bff3ac8131 100644 --- a/assets/common/items/armor/shoulder/assassin.ron +++ b/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", kind: Armor( kind: Shoulder(Assassin), stats: (20), diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron index 2ec65be894..7c19790bd8 100644 --- a/assets/common/items/armor/shoulder/cloth_blue_0.ron +++ b/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", kind: Armor( kind: Shoulder(ClothBlue0), stats: (20), diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron index 539b3a7063..b3362a8d82 100644 --- a/assets/common/items/armor/shoulder/cloth_green_0.ron +++ b/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", kind: Armor( kind: Shoulder(ClothGreen0), stats: (20), diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron index 308759e2b8..ecf434a9b3 100644 --- a/assets/common/items/armor/shoulder/cloth_purple_0.ron +++ b/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", kind: Armor( kind: Shoulder(ClothPurple0), stats: (20), diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/shoulder/leather_0.ron index a145debbeb..82e18d2d45 100644 --- a/assets/common/items/armor/shoulder/leather_0.ron +++ b/assets/common/items/armor/shoulder/leather_0.ron @@ -1,6 +1,6 @@ Item( name: "Leather Pauldrons", - description: "", + description: "Shoulders\n\nArmor: 0\n\n", kind: Armor( kind: Shoulder(Leather0), stats: (20), diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/shoulder/leather_1.ron index ce066e63a0..1237ac242c 100644 --- a/assets/common/items/armor/shoulder/leather_1.ron +++ b/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", kind: Armor( kind: Shoulder(Leather1), stats: (20), diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/shoulder/plate_0.ron index 3323278ecb..f6d3cc8590 100644 --- a/assets/common/items/armor/shoulder/plate_0.ron +++ b/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", kind: Armor( kind: Shoulder(Plate0), stats: (20), diff --git a/assets/common/items/armor/starter/rugged_chest.ron b/assets/common/items/armor/starter/rugged_chest.ron index 63ff3e0835..d559dd6dec 100644 --- a/assets/common/items/armor/starter/rugged_chest.ron +++ b/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", kind: Armor( kind: Chest(Rugged0), stats: (20), diff --git a/assets/common/items/armor/starter/rugged_pants.ron b/assets/common/items/armor/starter/rugged_pants.ron index 6212774135..0444aeb665 100644 --- a/assets/common/items/armor/starter/rugged_pants.ron +++ b/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", kind: Armor( kind: Pants(Rugged0), stats: (20), diff --git a/assets/common/items/armor/starter/sandals_0.ron b/assets/common/items/armor/starter/sandals_0.ron index 6f4105fb26..3d2201aa19 100644 --- a/assets/common/items/armor/starter/sandals_0.ron +++ b/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", kind: Armor( kind: Foot(Sandal0), stats: (20), diff --git a/assets/common/items/armor/tabard/admin.ron b/assets/common/items/armor/tabard/admin.ron index 5bb3fd22fb..4ad17edb50 100644 --- a/assets/common/items/armor/tabard/admin.ron +++ b/assets/common/items/armor/tabard/admin.ron @@ -1,8 +1,6 @@ Item( name: "Admin's Tabard", - description: " - With great power comes - great responsibility. ", + description: "Tabard\n\nWith great power comes\ngreat responsibility.\n\n", kind: Armor( kind: Tabard(Admin), stats: (20), diff --git a/assets/common/items/cheese.ron b/assets/common/items/cheese.ron index 9cb95fcbf8..e7a9fef76f 100644 --- a/assets/common/items/cheese.ron +++ b/assets/common/items/cheese.ron @@ -1,8 +1,6 @@ Item( name: "Dwarven Cheese", - description: "Aromatic and nutritious. - -Restores 15 Health.", + description: "Restores 15 Health\n\nAromatic and nutritious\n\n", kind: Consumable( kind: Cheese, effect: Health(( diff --git a/assets/common/items/coconut.ron b/assets/common/items/coconut.ron index 219af26991..3bd37115f9 100644 --- a/assets/common/items/coconut.ron +++ b/assets/common/items/coconut.ron @@ -1,8 +1,6 @@ Item( name: "Coconut", - description: "Reliable source of water and fat. - -Restores 30 health.", + description: "Restores 30 health\n\nReliable source of water and fat\n\n", kind: Consumable( kind: Coconut, effect: Health(( diff --git a/assets/common/items/collar.ron b/assets/common/items/collar.ron index 5226dd0c0a..378fe47d56 100644 --- a/assets/common/items/collar.ron +++ b/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", kind: Utility( kind: Collar, ), diff --git a/assets/common/items/debug/admin_tabard.ron b/assets/common/items/debug/admin.ron similarity index 59% rename from assets/common/items/debug/admin_tabard.ron rename to assets/common/items/debug/admin.ron index 9ad427f3ed..d1741be6b5 100644 --- a/assets/common/items/debug/admin_tabard.ron +++ b/assets/common/items/debug/admin.ron @@ -1,7 +1,6 @@ Item( name: "Admin's Tabard", - description: "With great power comes - great responsibility. ", + description: "Tabard\n\nWith great power comes\ngreat responsibility. ", kind: Armor( kind: Tabard(Admin), stats: (20), diff --git a/assets/common/items/debug/admin_back.ron b/assets/common/items/debug/admin_back.ron index fc8f427533..dbdfed10f3 100644 --- a/assets/common/items/debug/admin_back.ron +++ b/assets/common/items/debug/admin_back.ron @@ -1,7 +1,6 @@ Item( name: "Admin's Cape", - description: "With great power comes - great responsibility. ", + description: "Back\n\nArmor: 0\n\nWith great power comes\ngreat responsibility. ", kind: Armor( kind: Back(Admin), stats: (20), diff --git a/assets/common/items/debug/green_0.ron b/assets/common/items/debug/green_0.ron deleted file mode 100644 index ea7d5cbcc7..0000000000 --- a/assets/common/items/debug/green_0.ron +++ /dev/null @@ -1,5 +0,0 @@ -Item( - name: "Lime Zest Lantern", - description: "It has an opening that could fit a ring...", - kind: Lantern(Green0), -) diff --git a/assets/common/items/debug/leather_0.ron b/assets/common/items/debug/leather_0.ron deleted file mode 100644 index aa0ffd33d6..0000000000 --- a/assets/common/items/debug/leather_0.ron +++ /dev/null @@ -1,8 +0,0 @@ -Item( - name: "Swift Leather Cap", - description: "WIP", - kind: Armor( - kind: Head(Leather0), - stats: (20), - ), -) diff --git a/assets/common/items/debug/neck_0.ron b/assets/common/items/debug/neck_0.ron deleted file mode 100644 index 4dbd32ae6f..0000000000 --- a/assets/common/items/debug/neck_0.ron +++ /dev/null @@ -1,8 +0,0 @@ -Item( - name: "Plain Necklace", - description: "WIP", - kind: Armor( - kind: Neck(Neck0), - stats: (20), - ), -) diff --git a/assets/common/items/debug/plate_belt.ron b/assets/common/items/debug/plate_0.ron similarity index 71% rename from assets/common/items/debug/plate_belt.ron rename to assets/common/items/debug/plate_0.ron index 2c18113d1a..c7195ae78f 100644 --- a/assets/common/items/debug/plate_belt.ron +++ b/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), diff --git a/assets/common/items/debug/plate_feet.ron b/assets/common/items/debug/plate_feet.ron index 12f95dcd4e..9cb67b8a09 100644 --- a/assets/common/items/debug/plate_feet.ron +++ b/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), diff --git a/assets/common/items/debug/plate_chest.ron b/assets/common/items/debug/plate_green_0.ron similarity index 64% rename from assets/common/items/debug/plate_chest.ron rename to assets/common/items/debug/plate_green_0.ron index 92bb5fb664..23b22609a1 100644 --- a/assets/common/items/debug/plate_chest.ron +++ b/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), diff --git a/assets/common/items/debug/plate_legs.ron b/assets/common/items/debug/plate_green_legs.ron similarity index 73% rename from assets/common/items/debug/plate_legs.ron rename to assets/common/items/debug/plate_green_legs.ron index 51c3620338..2502369711 100644 --- a/assets/common/items/debug/plate_legs.ron +++ b/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), diff --git a/assets/common/items/debug/plate_hands.ron b/assets/common/items/debug/plate_hand.ron similarity index 72% rename from assets/common/items/debug/plate_hands.ron rename to assets/common/items/debug/plate_hand.ron index 1fdbb6d6da..3f3e122290 100644 --- a/assets/common/items/debug/plate_hands.ron +++ b/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), diff --git a/assets/common/items/debug/plate_shoulder.ron b/assets/common/items/debug/plate_shoulder.ron index 3323278ecb..75035d21ab 100644 --- a/assets/common/items/debug/plate_shoulder.ron +++ b/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), diff --git a/assets/common/items/debug/ring_0.ron b/assets/common/items/debug/ring_0.ron deleted file mode 100644 index 8544765246..0000000000 --- a/assets/common/items/debug/ring_0.ron +++ /dev/null @@ -1,8 +0,0 @@ -Item( - name: "Scratched Ring", - description: "WIP", - kind: Armor( - kind: Ring(Ring0), - stats: (20), - ), -) diff --git a/assets/common/items/mushroom.ron b/assets/common/items/mushroom.ron index 09702079e9..c5ed02c43a 100644 --- a/assets/common/items/mushroom.ron +++ b/assets/common/items/mushroom.ron @@ -1,8 +1,6 @@ Item( name: "Mushroom", - description: "Hopefully this one is not poisonous. - -Restores 10 Health.", + description: "Restores 10 Health\n\nHopefully this one is not poisonous\n\n", kind: Consumable( kind: Mushroom, effect: Health(( diff --git a/assets/common/items/potion_minor.ron b/assets/common/items/potion_minor.ron index aaf0b948c9..9d835fb242 100644 --- a/assets/common/items/potion_minor.ron +++ b/assets/common/items/potion_minor.ron @@ -1,8 +1,6 @@ Item( name: "Minor Potion", - description: "Restores a small amount of Health. - -Restores 50 Health.", + description: "Restores 50 Health\n\n", kind: Consumable( kind: PotionMinor, effect: Health(( diff --git a/assets/common/items/velorite.ron b/assets/common/items/velorite.ron index 2cefef40b0..88ff4392b6 100644 --- a/assets/common/items/velorite.ron +++ b/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. - -Increases Exp by 20.", + description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times\n\n", kind: Consumable( kind: Velorite, effect: Xp(20), diff --git a/assets/common/items/veloritefrag.ron b/assets/common/items/veloritefrag.ron index d29abf6a4f..31a2035bd2 100644 --- a/assets/common/items/veloritefrag.ron +++ b/assets/common/items/veloritefrag.ron @@ -1,8 +1,6 @@ Item( name: "Velorite Fragment", - description: "Small runes sparkle on its surface. - -Increases Exp by 10.", + description: "Increases Exp by 10\n\nSmall runes sparkle on its surface\n\n", kind: Consumable( kind: VeloriteFrag, effect: Xp(10), diff --git a/assets/common/items/weapons/hammer_1.ron b/assets/common/items/weapons/hammer_1.ron index 12573ab023..02ba5d1069 100644 --- a/assets/common/items/weapons/hammer_1.ron +++ b/assets/common/items/weapons/hammer_1.ron @@ -1,8 +1,6 @@ Item( name: "Crude Mallet", - description: "Breaks bones like sticks and stones. - \n - Power: 20", + description: "Two-Hand Hammer\n\nPower: 10-12\n\nBreaks bones like sticks and stones.\n\n", kind: Tool( ( kind: Hammer(BasicHammer), diff --git a/assets/common/items/weapons/shield_1.ron b/assets/common/items/weapons/shield_1.ron index 83a4157942..6b4014ce7a 100644 --- a/assets/common/items/weapons/shield_1.ron +++ b/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), diff --git a/assets/common/items/weapons/short_sword_0.ron b/assets/common/items/weapons/short_sword_0.ron index f6ac3ffa0e..cdec6c999e 100644 --- a/assets/common/items/weapons/short_sword_0.ron +++ b/assets/common/items/weapons/short_sword_0.ron @@ -1,7 +1,6 @@ Item( name: "Vicious Gladius", - description: " - Power: 15", + description: "Two-Hand Sword\n\nPower: 2-10\n\n", kind: Tool( ( kind: Sword(Short0), diff --git a/assets/common/items/weapons/staff_1.ron b/assets/common/items/weapons/staff_1.ron index 220497d481..5fb37f87b6 100644 --- a/assets/common/items/weapons/staff_1.ron +++ b/assets/common/items/weapons/staff_1.ron @@ -1,8 +1,6 @@ Item( name: "Humble Stick", - description: "Walking stick with a sharpened end. - - Power: 6", + description: "Two-Hand Staff\n\nPower: 2-10\n\nWalking stick with a sharpened end\n\n", kind: Tool( ( kind: Staff(BasicStaff), diff --git a/assets/common/items/weapons/staff_nature.ron b/assets/common/items/weapons/staff_nature.ron index d4c76c6b3a..11764ac526 100644 --- a/assets/common/items/weapons/staff_nature.ron +++ b/assets/common/items/weapons/staff_nature.ron @@ -1,7 +1,6 @@ Item( name: "Sceptre of Regeneration", - description: " Infused by the power of Nature. - Power: 25", + description: "Healing-Sceptre\n\nPower 15-18\n\nHeals your allies with the power of nature.\n\n", kind: Tool( ( kind: Staff(Sceptre), diff --git a/assets/common/items/weapons/starter_axe.ron b/assets/common/items/weapons/starter_axe.ron index 9c82e4901f..7f8fc50946 100644 --- a/assets/common/items/weapons/starter_axe.ron +++ b/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. - - Power: 15", + description: "Two-Hand Axe\n\nPower 3-14\n\nEvery dent tells the story of a chopped tree.\n\n", kind: Tool( ( kind: Axe(BasicAxe), diff --git a/assets/common/items/weapons/starter_bow.ron b/assets/common/items/weapons/starter_bow.ron index fb88134255..4dcc9ed424 100644 --- a/assets/common/items/weapons/starter_bow.ron +++ b/assets/common/items/weapons/starter_bow.ron @@ -1,8 +1,6 @@ Item( name: "Uneven Bow", - description: "Someone carved his initials into it... - - Power: 15", + description: "Bow\n\nPower: 5\n\nSomeone carved his initials into it...\n\n", kind: Tool( ( kind: Bow(BasicBow), diff --git a/assets/common/items/weapons/starter_dagger.ron b/assets/common/items/weapons/starter_dagger.ron index 6be38613bd..c4bd8891e6 100644 --- a/assets/common/items/weapons/starter_dagger.ron +++ b/assets/common/items/weapons/starter_dagger.ron @@ -1,8 +1,6 @@ Item( name: "Sharp Kitchen Knife", - description: "Great for cutting meat. - - Power: 15", + description: "WIP", kind: Tool( ( kind: Dagger(BasicDagger), diff --git a/assets/common/items/weapons/starter_hammer.ron b/assets/common/items/weapons/starter_hammer.ron index feb59a5da1..5e707614af 100644 --- a/assets/common/items/weapons/starter_hammer.ron +++ b/assets/common/items/weapons/starter_hammer.ron @@ -1,8 +1,6 @@ Item( name: "Sturdy Old Hammer", - description: "'Property of...' The rest is missing. - - Power: 15", + description: "Two-Hand Hammer\n\nPower: 10-12\n\n'Property of...' The rest is missing.\n\n", kind: Tool( ( kind: Hammer(BasicHammer), diff --git a/assets/common/items/weapons/starter_staff.ron b/assets/common/items/weapons/starter_staff.ron index 9f19fe2000..8b8e8d6f88 100644 --- a/assets/common/items/weapons/starter_staff.ron +++ b/assets/common/items/weapons/starter_staff.ron @@ -1,8 +1,6 @@ Item( name: "Gnarled Rod", - description: "Smells like resin and magic. - - Power: 20", + description: "Firestaff\n\nPower: 1-13\n\nSmells like resin and magic.\n\n", kind: Tool( ( kind: Staff(BasicStaff), diff --git a/assets/common/items/weapons/starter_sword.ron b/assets/common/items/weapons/starter_sword.ron index 4dab78f166..0348998a8e 100644 --- a/assets/common/items/weapons/starter_sword.ron +++ b/assets/common/items/weapons/starter_sword.ron @@ -1,8 +1,6 @@ Item( name: "Battered Sword", - description: "Held together by Rust and hope. - - Power: 15", + description: "Two-Hand Sword\n\nPower: 2-10\n\nHeld together by Rust and hope.\n\n", kind: Tool( ( kind: Sword(BasicSword), diff --git a/assets/common/items/weapons/wood_sword.ron b/assets/common/items/weapons/wood_sword.ron index a766b88c19..038468636c 100644 --- a/assets/common/items/weapons/wood_sword.ron +++ b/assets/common/items/weapons/wood_sword.ron @@ -1,7 +1,6 @@ Item( name: "Wooden Training Sword", - description: " - Power: 15", + description: "Two-Hand Sword\n\nPower: 2-10\n\n", kind: Tool( ( kind: Sword(WoodTraining), diff --git a/assets/common/items/weapons/zweihander_sword_0.ron b/assets/common/items/weapons/zweihander_sword_0.ron index 32f8e9ca1e..a3bc54faa4 100644 --- a/assets/common/items/weapons/zweihander_sword_0.ron +++ b/assets/common/items/weapons/zweihander_sword_0.ron @@ -1,7 +1,6 @@ Item( name: "Sturdy Bihander", - description: " - Power: 15", + description: "Two-Hand Sword\n\nPower: 2-10\n\n", kind: Tool( ( kind: Sword(Zweihander0), diff --git a/assets/voxygen/element/buttons/bag/closed.vox b/assets/voxygen/element/buttons/bag/closed.vox deleted file mode 100644 index 299670695d..0000000000 --- a/assets/voxygen/element/buttons/bag/closed.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ea53827c28caf3bc7d841d6f56d9fe1dec4d1b29947c7cb75312d5b7e9e73ed -size 5204 diff --git a/assets/voxygen/element/buttons/bag/closed_hover.vox b/assets/voxygen/element/buttons/bag/closed_hover.vox deleted file mode 100644 index 63934430c9..0000000000 --- a/assets/voxygen/element/buttons/bag/closed_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a450efd67036668e7e0ef3bbe31d8e71bebf2eae8058410aa8486fb94b14a535 -size 48312 diff --git a/assets/voxygen/element/buttons/bag/closed_press.vox b/assets/voxygen/element/buttons/bag/closed_press.vox deleted file mode 100644 index c654b1394d..0000000000 --- a/assets/voxygen/element/buttons/bag/closed_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:736b5a06b771e14093fd97f826966b94ab5bc337708b995fd248ad7adc9caab4 -size 48436 diff --git a/assets/voxygen/element/buttons/bag/open.vox b/assets/voxygen/element/buttons/bag/open.vox deleted file mode 100644 index 84bc65d2c7..0000000000 --- a/assets/voxygen/element/buttons/bag/open.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5835377b03f459163c14c6e0d5ef34f87b713cf1e5b8e019de67c2c15589949 -size 48436 diff --git a/assets/voxygen/element/buttons/bag/open_hover.vox b/assets/voxygen/element/buttons/bag/open_hover.vox deleted file mode 100644 index 4f8096042e..0000000000 --- a/assets/voxygen/element/buttons/bag/open_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:687e1dda41b48ea7c93acdf2befd575c33c848d41e7c0b67a75c53ec18f5b12e -size 5824 diff --git a/assets/voxygen/element/buttons/bag/open_press.vox b/assets/voxygen/element/buttons/bag/open_press.vox deleted file mode 100644 index fee2a07265..0000000000 --- a/assets/voxygen/element/buttons/bag/open_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c30b3698834867c1fd7be58dee17d36960a301109e28d1b1690ac44466337f06 -size 7200 diff --git a/assets/voxygen/element/buttons/button.vox b/assets/voxygen/element/buttons/button.vox deleted file mode 100644 index 9f6756bdfe..0000000000 --- a/assets/voxygen/element/buttons/button.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c389f374873606f85c68b326649996a6869f77ee1b47d10bd8bc76b80434b1bb -size 33040 diff --git a/assets/voxygen/element/buttons/button_dark.vox b/assets/voxygen/element/buttons/button_dark.vox deleted file mode 100644 index 71d180ea1e..0000000000 --- a/assets/voxygen/element/buttons/button_dark.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26192224ff0ea57a404f27abf56b3ba83741b81cbd5c8cbadbd624cdab1aae7c -size 2464 diff --git a/assets/voxygen/element/buttons/button_dark_hover.vox b/assets/voxygen/element/buttons/button_dark_hover.vox deleted file mode 100644 index 058a9bec5a..0000000000 --- a/assets/voxygen/element/buttons/button_dark_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fac0deafddf1e96155b17e6db0eb827fe312feb17dfa3af872b598790bcd5e0b -size 45571 diff --git a/assets/voxygen/element/buttons/button_dark_press.vox b/assets/voxygen/element/buttons/button_dark_press.vox deleted file mode 100644 index c961fe8561..0000000000 --- a/assets/voxygen/element/buttons/button_dark_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba942fe7ab30c39a5b6ec98c13012bcb97602ab66ec9e71c2769baf8ced114be -size 45027 diff --git a/assets/voxygen/element/buttons/button_hover.vox b/assets/voxygen/element/buttons/button_hover.vox deleted file mode 100644 index e1b955adcc..0000000000 --- a/assets/voxygen/element/buttons/button_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41e0097895b34a0c664c9318c04fb5c1f00e4c9319be69a90658f0386ed83316 -size 33040 diff --git a/assets/voxygen/element/buttons/button_mmap_closed.vox b/assets/voxygen/element/buttons/button_mmap_closed.vox deleted file mode 100644 index ef103bbc19..0000000000 --- a/assets/voxygen/element/buttons/button_mmap_closed.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26bab9c8354e012f3975232e22cd949adbd0cc0198be45c83c2f7d3345cf79b3 -size 2156 diff --git a/assets/voxygen/element/buttons/button_mmap_closed_hover.vox b/assets/voxygen/element/buttons/button_mmap_closed_hover.vox deleted file mode 100644 index 67c7ff173a..0000000000 --- a/assets/voxygen/element/buttons/button_mmap_closed_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50320cab07079b0af941b8b72ab48d60dfb7b62bc4939c6186ff2915cf27617c -size 56639 diff --git a/assets/voxygen/element/buttons/button_mmap_closed_press.vox b/assets/voxygen/element/buttons/button_mmap_closed_press.vox deleted file mode 100644 index ec5d0def60..0000000000 --- a/assets/voxygen/element/buttons/button_mmap_closed_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aefe32fb5d1828435d5e01e1fad7ad55655bf06c45c8c3a3797a73e270d3c637 -size 56639 diff --git a/assets/voxygen/element/buttons/button_mmap_open.vox b/assets/voxygen/element/buttons/button_mmap_open.vox deleted file mode 100644 index f3fce68eae..0000000000 --- a/assets/voxygen/element/buttons/button_mmap_open.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30edd32396c41aa161534d25331f8e66c9d3960ac7865b8847b4b089c0854d28 -size 56639 diff --git a/assets/voxygen/element/buttons/button_mmap_open_hover.vox b/assets/voxygen/element/buttons/button_mmap_open_hover.vox deleted file mode 100644 index 502b754f66..0000000000 --- a/assets/voxygen/element/buttons/button_mmap_open_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5e0e535124dfea41c5fa3cbdb37e0b944bc09c4270357b276bced575342137e -size 56639 diff --git a/assets/voxygen/element/buttons/button_mmap_open_press.vox b/assets/voxygen/element/buttons/button_mmap_open_press.vox deleted file mode 100644 index ad745adb8e..0000000000 --- a/assets/voxygen/element/buttons/button_mmap_open_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf079403a3062a5fa66fe31eaa651a65de88255c4778dc3f66c580051bcd27c7 -size 56639 diff --git a/assets/voxygen/element/buttons/button_press.vox b/assets/voxygen/element/buttons/button_press.vox deleted file mode 100644 index 1170e0c96e..0000000000 --- a/assets/voxygen/element/buttons/button_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dc3bc940ed1766761e14a2f9e9ba4e728ab1e9c5d0a8015fca8c7b67c1d6563 -size 87924 diff --git a/assets/voxygen/element/buttons/button_red.vox b/assets/voxygen/element/buttons/button_red.vox deleted file mode 100644 index e2684157e4..0000000000 --- a/assets/voxygen/element/buttons/button_red.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48b4e15bdd2d0260ac99e31991d535c18be134ff6458f829c2c3a20c5f3e6cca -size 2136 diff --git a/assets/voxygen/element/buttons/button_red_hover.vox b/assets/voxygen/element/buttons/button_red_hover.vox deleted file mode 100644 index 7afc7055cc..0000000000 --- a/assets/voxygen/element/buttons/button_red_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:895ae3f3d9c759d33df3d9e9bbf3776860c72265fe06ef2ebf75ea933d4d0cf4 -size 2136 diff --git a/assets/voxygen/element/buttons/button_red_press.vox b/assets/voxygen/element/buttons/button_red_press.vox deleted file mode 100644 index c96fc13391..0000000000 --- a/assets/voxygen/element/buttons/button_red_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5adc91b069ecaa603c73207affe3c08b5aa32bedf7b943c08f696ff7917c701a -size 1880 diff --git a/assets/voxygen/element/buttons/grid_inv.vox b/assets/voxygen/element/buttons/grid_inv.vox deleted file mode 100644 index 5f079abee8..0000000000 --- a/assets/voxygen/element/buttons/grid_inv.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f99d8145adc57abf88b2f14547c70f19c1271783e18c92151f7964e4014ca5ad -size 51813 diff --git a/assets/voxygen/element/buttons/indicator_mmap.vox b/assets/voxygen/element/buttons/indicator_mmap.vox deleted file mode 100644 index b1a6233f9b..0000000000 --- a/assets/voxygen/element/buttons/indicator_mmap.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e647033fe3c7370a0dbf5b923c8efbe5839e4d485a12c5c3c21084936d34355 -size 56692 diff --git a/assets/voxygen/element/buttons/indicator_mmap_2.vox b/assets/voxygen/element/buttons/indicator_mmap_2.vox deleted file mode 100644 index 63da2b0477..0000000000 --- a/assets/voxygen/element/buttons/indicator_mmap_2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c503390eed517f975dbc4e55b40cad10e4337a1b35b26e344d8fa5fe38a7813e -size 56772 diff --git a/assets/voxygen/element/buttons/indicator_mmap_3.vox b/assets/voxygen/element/buttons/indicator_mmap_3.vox deleted file mode 100644 index b0dd4025d8..0000000000 --- a/assets/voxygen/element/buttons/indicator_mmap_3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:571d8fa25a8ad7e9cf02fcab951dd94cfae360b8ae480b0307aded8bcbc57949 -size 56772 diff --git a/assets/voxygen/element/buttons/indicator_mmap_small.vox b/assets/voxygen/element/buttons/indicator_mmap_small.vox deleted file mode 100644 index 0079616acd..0000000000 --- a/assets/voxygen/element/buttons/indicator_mmap_small.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:693433aa99787746d40b02be5996748f346434bbaf2fdab194e71be7d9cb5633 -size 60583 diff --git a/assets/voxygen/element/buttons/input.vox b/assets/voxygen/element/buttons/input.vox deleted file mode 100644 index 41e5b4c782..0000000000 --- a/assets/voxygen/element/buttons/input.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a670737646549a560b5011deefb02c295e1970eb2373b0adbef991451931f974 -size 69840 diff --git a/assets/voxygen/element/buttons/inv_slot.vox b/assets/voxygen/element/buttons/inv_slot.vox deleted file mode 100644 index dc60c1323b..0000000000 --- a/assets/voxygen/element/buttons/inv_slot.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab46da914aa73fd0a7aff023883cd5392d01f0609383d4c143d5c3680b65250a -size 57195 diff --git a/assets/voxygen/element/buttons/inv_slot_sel.vox b/assets/voxygen/element/buttons/inv_slot_sel.vox deleted file mode 100644 index ebe08ff289..0000000000 --- a/assets/voxygen/element/buttons/inv_slot_sel.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ddf8f91a8229e95b3de37f22435a8570f0f5992f9593815c6a1bd8d8320236a -size 57307 diff --git a/assets/voxygen/element/buttons/map.png b/assets/voxygen/element/buttons/map.png new file mode 100644 index 0000000000..c2d7b81d35 --- /dev/null +++ b/assets/voxygen/element/buttons/map.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0082f32cedc0faa653cc7136ee9aef787554debbfc35c9826dd7b1bbc1401395 +size 592 diff --git a/assets/voxygen/element/buttons/map.vox b/assets/voxygen/element/buttons/map.vox deleted file mode 100644 index c312afc426..0000000000 --- a/assets/voxygen/element/buttons/map.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b35f69ff8693e2377f803eee719fbe9098a4d435b73f4f8e6762561b9645605a -size 5032 diff --git a/assets/voxygen/element/buttons/map_hover.png b/assets/voxygen/element/buttons/map_hover.png new file mode 100644 index 0000000000..e91365ad80 --- /dev/null +++ b/assets/voxygen/element/buttons/map_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5273856d9dc98f92ded7497872eb3a047df4ac28613be23f86b607baded7c126 +size 591 diff --git a/assets/voxygen/element/buttons/map_hover.vox b/assets/voxygen/element/buttons/map_hover.vox deleted file mode 100644 index 32176718c0..0000000000 --- a/assets/voxygen/element/buttons/map_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70e4d08e01cc463a28df7f0ca26126ab0dd69fd9e7a0f3b8c4fca8bfe7e829cf -size 5032 diff --git a/assets/voxygen/element/buttons/map_press.png b/assets/voxygen/element/buttons/map_press.png new file mode 100644 index 0000000000..9402bc3d5d --- /dev/null +++ b/assets/voxygen/element/buttons/map_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5e3aa89297a9fc6b04bfa36d890f7bfa767854183615ccdbbd286e01fb202a8 +size 589 diff --git a/assets/voxygen/element/buttons/map_press.vox b/assets/voxygen/element/buttons/map_press.vox deleted file mode 100644 index e3272ca19d..0000000000 --- a/assets/voxygen/element/buttons/map_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d981354922d7a96ab9ac2445e70e69c028f828030e8ad8b8aa8d7ec26e2aab28 -size 5032 diff --git a/assets/voxygen/element/buttons/settings.png b/assets/voxygen/element/buttons/settings.png new file mode 100644 index 0000000000..ffc51c2934 --- /dev/null +++ b/assets/voxygen/element/buttons/settings.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b681c4f08958a62151e4f9453cd6f3cc0346c24b7a187671c3db365d6b9206e6 +size 751 diff --git a/assets/voxygen/element/buttons/settings.vox b/assets/voxygen/element/buttons/settings.vox deleted file mode 100644 index 72c4d84e5e..0000000000 --- a/assets/voxygen/element/buttons/settings.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29812068f642f1cdb04d180a685ad8c4f871f22260a9a471d0621b3bbf992a33 -size 5968 diff --git a/assets/voxygen/element/buttons/settings_hover.png b/assets/voxygen/element/buttons/settings_hover.png new file mode 100644 index 0000000000..d0fbebc449 --- /dev/null +++ b/assets/voxygen/element/buttons/settings_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c739332f7c10ddbbc7c539d4aed96d3b88e50894aa3e0ec20433c6439b5e5032 +size 698 diff --git a/assets/voxygen/element/buttons/settings_hover.vox b/assets/voxygen/element/buttons/settings_hover.vox deleted file mode 100644 index f33e352350..0000000000 --- a/assets/voxygen/element/buttons/settings_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:935c119010814abe54b247ef3c669b4c085bc5d78d98e98876c6115964b98402 -size 5980 diff --git a/assets/voxygen/element/buttons/settings_press.png b/assets/voxygen/element/buttons/settings_press.png new file mode 100644 index 0000000000..7a54ab6e36 --- /dev/null +++ b/assets/voxygen/element/buttons/settings_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18a888bfdde7251413a744f7cc110bee685d4b454bb23fdb9caee14d7eb36efd +size 682 diff --git a/assets/voxygen/element/buttons/settings_press.vox b/assets/voxygen/element/buttons/settings_press.vox deleted file mode 100644 index 90eaa41d78..0000000000 --- a/assets/voxygen/element/buttons/settings_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e371b2add365f33a55dc069e8d2161e3426c651664cab27dd9106d2d1e1678b3 -size 5980 diff --git a/assets/voxygen/element/buttons/social.png b/assets/voxygen/element/buttons/social.png new file mode 100644 index 0000000000..9463a36214 --- /dev/null +++ b/assets/voxygen/element/buttons/social.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:886c38c7c0a8f8e96f6d0332bc7572cd5df6f8175d1c901434e2712f9cac4419 +size 496 diff --git a/assets/voxygen/element/buttons/social.vox b/assets/voxygen/element/buttons/social.vox deleted file mode 100644 index b9e66c6ffc..0000000000 --- a/assets/voxygen/element/buttons/social.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a60016489728bc4e81e12f32af4dc4f040bedcd59a13c02893e2f039be028ec0 -size 2840 diff --git a/assets/voxygen/element/buttons/social_hover.png b/assets/voxygen/element/buttons/social_hover.png new file mode 100644 index 0000000000..864154d96f --- /dev/null +++ b/assets/voxygen/element/buttons/social_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0587b272342b0af3344b3789e2297b109bbd1e53e2dfff6b83baacd8df386ee4 +size 464 diff --git a/assets/voxygen/element/buttons/social_hover.vox b/assets/voxygen/element/buttons/social_hover.vox deleted file mode 100644 index 71a98b552c..0000000000 --- a/assets/voxygen/element/buttons/social_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ead1f5d677cd81373473f7fdc99e536e7e3c42fe4e4e71ae82931b2e53c9c4b -size 2840 diff --git a/assets/voxygen/element/buttons/social_press.png b/assets/voxygen/element/buttons/social_press.png new file mode 100644 index 0000000000..ff15b328d1 --- /dev/null +++ b/assets/voxygen/element/buttons/social_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca47fb24d46831b28d1f62d36447ba76fcadd2ef2282e6114b2497c0869da357 +size 464 diff --git a/assets/voxygen/element/buttons/social_press.vox b/assets/voxygen/element/buttons/social_press.vox deleted file mode 100644 index 6450a0daff..0000000000 --- a/assets/voxygen/element/buttons/social_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:181bac69ce0a6b6fe0fe0a213d15059b6bd247854c41b38a41f309c447729a25 -size 2840 diff --git a/assets/voxygen/element/buttons/spellbook.png b/assets/voxygen/element/buttons/spellbook.png new file mode 100644 index 0000000000..420d16f860 --- /dev/null +++ b/assets/voxygen/element/buttons/spellbook.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00c0dfe80b6f452810125f741b7aadcb1f3ff1bf1ac2826cb2eebf72dd024180 +size 555 diff --git a/assets/voxygen/element/buttons/spellbook.vox b/assets/voxygen/element/buttons/spellbook.vox deleted file mode 100644 index 6776f5a3b8..0000000000 --- a/assets/voxygen/element/buttons/spellbook.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4a91167ae5c4dc4ce1691fabb981b82be569c18ea2982e5c26f3516b5f0d645 -size 3732 diff --git a/assets/voxygen/element/buttons/spellbook_hover.png b/assets/voxygen/element/buttons/spellbook_hover.png new file mode 100644 index 0000000000..2405436633 --- /dev/null +++ b/assets/voxygen/element/buttons/spellbook_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fefcc75f95e12cdb16841ac97d67290cad083cbf839efb892555dd08c0c0745f +size 547 diff --git a/assets/voxygen/element/buttons/spellbook_hover.vox b/assets/voxygen/element/buttons/spellbook_hover.vox deleted file mode 100644 index b7c85a2bba..0000000000 --- a/assets/voxygen/element/buttons/spellbook_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db394d0eb8fc5b57275e2096f6b6095ec0084a46b52f3aaf1e1360797df6bc45 -size 3732 diff --git a/assets/voxygen/element/buttons/spellbook_press.png b/assets/voxygen/element/buttons/spellbook_press.png new file mode 100644 index 0000000000..b3a2c0e9c5 --- /dev/null +++ b/assets/voxygen/element/buttons/spellbook_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:022d3650d55eece9c4850dff0dddfde4e3e7f02484d16409df42a0146c1c3f25 +size 545 diff --git a/assets/voxygen/element/buttons/spellbook_press.vox b/assets/voxygen/element/buttons/spellbook_press.vox deleted file mode 100644 index 93017324a0..0000000000 --- a/assets/voxygen/element/buttons/spellbook_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62a9c112ba24e4f4d1cad3fe485c5f3baf078db4df73861b986e9411f2dda2c5 -size 3732 diff --git a/assets/voxygen/element/buttons/x.vox b/assets/voxygen/element/buttons/x.vox deleted file mode 100644 index 9086a70699..0000000000 --- a/assets/voxygen/element/buttons/x.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f604ac7fa307a80bed9dff02e5bb631d537e83e2081ff881bb0821a101dd4cd -size 237548 diff --git a/assets/voxygen/element/buttons/x_hover.vox b/assets/voxygen/element/buttons/x_hover.vox deleted file mode 100644 index 811fd46aba..0000000000 --- a/assets/voxygen/element/buttons/x_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cdfd73c7628c1411cb9f8f1db1f252df6bc0398a4b18307bb94df1d5909dce0 -size 237548 diff --git a/assets/voxygen/element/buttons/x_press.vox b/assets/voxygen/element/buttons/x_press.vox deleted file mode 100644 index d1fd6c1902..0000000000 --- a/assets/voxygen/element/buttons/x_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c90869707c6e86520957d5ee983b36090aa248b38493d222860c5edea078f6f6 -size 237548 diff --git a/assets/voxygen/element/frames/disclaimer.png b/assets/voxygen/element/frames/disclaimer.png new file mode 100644 index 0000000000..207351d44d --- /dev/null +++ b/assets/voxygen/element/frames/disclaimer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:889361f3fba747de0cc10f0c0047f6a1609b3f8f1f5f43070d5e14ae946a6598 +size 246 diff --git a/assets/voxygen/element/frames/disclaimer.vox b/assets/voxygen/element/frames/disclaimer.vox deleted file mode 100644 index 8678b5038a..0000000000 --- a/assets/voxygen/element/frames/disclaimer.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92ec5235cd7687043b69cc545de939ba07d786f7822e4df4eec66a155fae734f -size 71908 diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron index c2b672e579..01a9c63ecf 100644 --- a/assets/voxygen/i18n/de_DE.ron +++ b/assets/voxygen/i18n/de_DE.ron @@ -100,19 +100,17 @@ VoxygenLocalization( Bevor es losgeht noch einige Infos: -Dies ist eine frühe Alpha. Ihr werdet auf Bugs, unfertiges Gameplay und Mechaniken, sowie fehlende Features sto�en. +Dies ist eine frühe Alpha. Ihr werdet auf Bugs, unfertiges Gameplay und Mechaniken, sowie fehlende Features stoßen. Für konstruktives Feedback und Bug-Reports könnt ihr uns via Reddit, Gitlab oder unseren Discord Server kontaktieren. -Veloren hat die GPL 3 Open-Source Lizenz. Das heißt ihr könnt es kostenlos spielen, aber auch modifizieren (solange die Mods auch die selbe Lizenz tragen) und das Spiel an andere weiterschicken. +Veloren hat die GPL 3 Open-Source Lizenz. Das heißt ihr könnt es kostenlos spielen, +aber auch modifizieren (solange die Mods auch die selbe Lizenz tragen) und das Spiel an andere weiterschicken. Veloren ist ein Non-Profit Community Projekt und jeder Mitarbeiter entwickelt es als Hobby in seiner Freizeit. Wenn euch die Idee gefällt, dann schließt euch doch einfach unserem Dev- oder Art-Team an! -Voxel RPGs haben sich (Genau wie First Person Shooter, die lange nur Doom-Klone genannt wurden) zu einem eigenen Genre entwickelt. -Dieses Spiel ist alles andere, als ein Klon bereits vorhandener Spiele und wird sich in seine ganz eigene Richtung entwickeln. - Danke, dass ihr euch die Zeit genommen habt diese Zeilen zu lesen und wir hoffen, dass euch Veloren gefällt! ~ Die Entwickler"#, @@ -244,16 +242,18 @@ Viel Spaß in der Welt von Veloren, Abenteurer!"#, "hud.settings.values": "Werte", "hud.settings.percentages": "Prozent", "hud.settings.chat": "Chat", - "hud.settings.background_transparency": "Hintergrund Sichtbarkeit", + "hud.settings.background_transparency": "Hintergrund Kontrast", "hud.settings.pan_sensitivity": "Schwenk Sensibilität", "hud.settings.zoom_sensitivity": "Zoom Sensibilität", "hud.settings.invert_scroll_zoom": "Scroll-Zoom invertieren", "hud.settings.invert_mouse_y_axis": "Maus Y-Achse invertieren", + "hud.settings.enable_mouse_smoothing": "Kamera Glättung", "hud.settings.free_look_behavior": "Freies Umsehen", "hud.settings.view_distance": "Gelände Sichtweite", "hud.settings.sprites_view_distance": "Objekt Sichtweite", + "hud.settings.figures_view_distance": "Einheiten Sichtweite", "hud.settings.maximum_fps": "Maximale FPS", "hud.settings.fov": "Sichtfeld (Grad)", "hud.settings.gamma": "Gamma", diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index ef5b00b544..b846ba0039 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -54,7 +54,7 @@ VoxygenLocalization( "common.interface": "Interface", "common.gameplay": "Gameplay", "common.controls": "Controls", - "common.video": "Video", + "common.video": "Graphics", "common.sound": "Sound", "common.resume": "Resume", "common.characters": "Characters", @@ -102,14 +102,14 @@ Is the client up to date?"#, Before you dive into the fun, please keep a few things in mind: - This is a very early alpha. Expect bugs, extremely unfinished gameplay, unpolished mechanics, and missing features. + - If you have constructive feedback or bug reports, you can contact us via Reddit, GitLab, or our community Discord server. + - Veloren is licensed under the GPL 3 open-source licence. That means you're free to play, modify, and redistribute the game however you wish (provided derived work is also under GPL 3). + - Veloren is a non-profit community project, and everybody working on it is a volunteer. If you like what you see, you're welcome to join the development or art teams! -- 'Voxel RPG' is a genre in its own right. First-person shooters used to be called Doom clones. - -Like them, we're trying to build a niche. This game is not a clone, and its development will diverge from existing games in the future. Thanks for taking the time to read this notice, we hope you enjoy the game! @@ -251,6 +251,7 @@ Enjoy your stay in the World of Veloren."#, "hud.settings.view_distance": "View Distance", "hud.settings.sprites_view_distance": "Sprites View Distance", + "hud.settings.figures_view_distance": "Entities View Distance", "hud.settings.maximum_fps": "Maximum FPS", "hud.settings.fov": "Field of View (deg)", "hud.settings.gamma": "Gamma", @@ -276,7 +277,7 @@ Enjoy your stay in the World of Veloren."#, "hud.social.faction": "Faction", "hud.social.play_online_fmt": "{nb_player} player(s) online", - "hud.spell": "Spell", + "hud.spell": "Spells", "hud.free_look_indicator": "Free look active", diff --git a/voxygen/examples/character_renderer.rs b/voxygen/examples/character_renderer.rs index a26255d38d..72e26def69 100644 --- a/voxygen/examples/character_renderer.rs +++ b/voxygen/examples/character_renderer.rs @@ -54,6 +54,7 @@ fn main() { body: Some(body.clone()), gamma: 1.0, mouse_smoothing: true, + figure_lod_render_distance: 250.0, }; scene.camera_mut().set_focus_pos(Vec3::unit_z() * 0.8); scene.camera_mut().set_distance(1.5); diff --git a/voxygen/src/hud/buttons.rs b/voxygen/src/hud/buttons.rs index 926436bc68..a2b6921d32 100644 --- a/voxygen/src/hud/buttons.rs +++ b/voxygen/src/hud/buttons.rs @@ -1,57 +1,83 @@ -use super::{img_ids::Imgs, Windows, BLACK, CRITICAL_HP_COLOR, LOW_HP_COLOR, TEXT_COLOR}; -use crate::ui::{fonts::ConrodVoxygenFonts, ToggleButton}; +use super::{ + img_ids::{Imgs, ImgsRot}, + BLACK, CRITICAL_HP_COLOR, LOW_HP_COLOR, TEXT_COLOR, +}; +use crate::{ + i18n::VoxygenLocalization, + ui::{fonts::ConrodVoxygenFonts, ImageFrame, Tooltip, TooltipManager, Tooltipable}, + window::GameInput, + GlobalState, +}; use client::Client; +use common::comp::Stats; use conrod_core::{ - widget::{self, Button, Image, Text}, - widget_ids, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon, + widget::{self, Button, Text}, + widget_ids, Color, Colorable, Positionable, Sizeable, Widget, WidgetCommon, }; widget_ids! { struct Ids { bag, bag_text, - bag_space_bg, + bag_text_bg, bag_space, + bag_space_bg, bag_show_map, map_button, + map_text, + map_text_bg, settings_button, + settings_text, + settings_text_bg, social_button, social_button_bg, + social_text, + social_text_bg, spellbook_button, spellbook_button_bg, + spellbook_text, + spellbook_text_bg, } } - +const TOOLTIP_UPSHIFT: f64 = 40.0; #[derive(WidgetCommon)] pub struct Buttons<'a> { client: &'a Client, - open_windows: &'a Windows, - show_map: bool, show_bag: bool, - imgs: &'a Imgs, fonts: &'a ConrodVoxygenFonts, #[conrod(common_builder)] common: widget::CommonBuilder, + global_state: &'a GlobalState, + rot_imgs: &'a ImgsRot, + tooltip_manager: &'a mut TooltipManager, + localized_strings: &'a std::sync::Arc, + stats: &'a Stats, } impl<'a> Buttons<'a> { pub fn new( client: &'a Client, - open_windows: &'a Windows, - show_map: bool, show_bag: bool, imgs: &'a Imgs, fonts: &'a ConrodVoxygenFonts, + global_state: &'a GlobalState, + rot_imgs: &'a ImgsRot, + tooltip_manager: &'a mut TooltipManager, + localized_strings: &'a std::sync::Arc, + stats: &'a Stats, ) -> Self { Self { client, - open_windows, - show_map, show_bag, imgs, fonts, common: widget::CommonBuilder::default(), + global_state, + rot_imgs, + tooltip_manager, + localized_strings, + stats, } } } @@ -88,33 +114,71 @@ impl<'a> Widget for Buttons<'a> { Some(inv) => inv, None => return None, }; - + let localized_strings = self.localized_strings; + let button_tooltip = Tooltip::new({ + // Edge images [t, b, r, l] + // Corner images [tr, tl, br, bl] + let edge = &self.rot_imgs.tt_side; + let corner = &self.rot_imgs.tt_corner; + ImageFrame::new( + [edge.cw180, edge.none, edge.cw270, edge.cw90], + [corner.none, corner.cw270, corner.cw90, corner.cw180], + Color::Rgba(0.08, 0.07, 0.04, 1.0), + 5.0, + ) + }) + .title_font_size(self.fonts.cyri.scale(15)) + .parent(ui.window) + .desc_font_size(self.fonts.cyri.scale(12)) + .title_text_color(TEXT_COLOR) + .font_id(self.fonts.cyri.conrod_id) + .desc_text_color(TEXT_COLOR); // Bag - if !self.show_map { - if self.show_bag - != ToggleButton::new(self.show_bag, self.imgs.bag, self.imgs.bag_open) - .bottom_right_with_margins_on(ui.window, 5.0, 5.0) - .hover_images(self.imgs.bag_hover, self.imgs.bag_open_hover) - .press_images(self.imgs.bag_press, self.imgs.bag_open_press) - .w_h(420.0 / 10.0, 480.0 / 10.0) - .set(state.ids.bag, ui) - { - return Some(Event::ToggleBag); - } - - Text::new("B") + if Button::image(if !self.show_bag { + self.imgs.bag + } else { + self.imgs.bag_open + }) + .bottom_right_with_margins_on(ui.window, 5.0, 5.0) + .hover_image(if !self.show_bag { + self.imgs.bag_hover + } else { + self.imgs.bag_open_hover + }) + .press_image(if !self.show_bag { + self.imgs.bag_press + } else { + self.imgs.bag_open_press + }) + .w_h(420.0 / 10.0, 480.0 / 10.0) + .with_tooltip( + self.tooltip_manager, + &localized_strings + .get("hud.bag.inventory") + .replace("{playername}", &self.stats.name.to_string().as_str()), + "", + &button_tooltip, + ) + .bottom_offset(55.0) + .set(state.ids.bag, ui) + .was_clicked() + { + return Some(Event::ToggleBag); + }; + if let Some(bag) = &self + .global_state + .settings + .controls + .get_binding(GameInput::Bag) + { + Text::new(bag.to_string().as_str()) .bottom_right_with_margins_on(state.ids.bag, 0.0, 0.0) .font_size(10) .font_id(self.fonts.cyri.conrod_id) - .color(TEXT_COLOR) - .set(state.ids.bag_text, ui); - } else { - Image::new(self.imgs.bag) - .bottom_right_with_margins_on(ui.window, 5.0, 5.0) - .w_h(420.0 / 10.0, 480.0 / 10.0) - .set(state.ids.bag_show_map, ui); - Text::new("B") - .bottom_right_with_margins_on(state.ids.bag, 0.0, 0.0) + .color(BLACK) + .set(state.ids.bag_text_bg, ui); + Text::new(bag.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.bag_text_bg, 1.0, 1.0) .font_size(10) .font_id(self.fonts.cyri.conrod_id) .color(TEXT_COLOR) @@ -144,100 +208,156 @@ impl<'a> Widget for Buttons<'a> { }) .set(state.ids.bag_space, ui); } - - // 0 Settings + // Settings if Button::image(self.imgs.settings) .w_h(29.0, 25.0) .bottom_right_with_margins_on(ui.window, 5.0, 57.0) .hover_image(self.imgs.settings_hover) .press_image(self.imgs.settings_press) - .label("N") - .label_font_id(self.fonts.cyri.conrod_id) - .label_font_size(10) - .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(-7.0)) - .label_x(conrod_core::position::Relative::Scalar(10.0)) + .with_tooltip( + self.tooltip_manager, + &localized_strings.get("common.settings"), + "", + &button_tooltip, + ) + .bottom_offset(TOOLTIP_UPSHIFT) .set(state.ids.settings_button, ui) .was_clicked() { return Some(Event::ToggleSettings); }; + if let Some(settings) = &self + .global_state + .settings + .controls + .get_binding(GameInput::Settings) + { + Text::new(settings.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.settings_button, 0.0, 0.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(BLACK) + .set(state.ids.settings_text_bg, ui); + Text::new(settings.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.settings_text_bg, 1.0, 1.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.settings_text, ui); + }; - Image::new(self.imgs.social_button) + // Social + if Button::image(self.imgs.social) .w_h(25.0, 25.0) .left_from(state.ids.settings_button, 10.0) - .set(state.ids.social_button_bg, ui); - - // 2 Map + .hover_image(self.imgs.social_hover) + .press_image(self.imgs.social_press) + .with_tooltip( + self.tooltip_manager, + &localized_strings.get("hud.social"), + "", + &button_tooltip, + ) + .bottom_offset(TOOLTIP_UPSHIFT) + .set(state.ids.social_button, ui) + .was_clicked() + { + return Some(Event::ToggleSocial); + } + if let Some(social) = &self + .global_state + .settings + .controls + .get_binding(GameInput::Social) + { + Text::new(social.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.social_button, 0.0, 0.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(BLACK) + .set(state.ids.social_text_bg, ui); + Text::new(social.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.social_text_bg, 1.0, 1.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.social_text, ui); + }; + // Map if Button::image(self.imgs.map_button) .w_h(22.0, 25.0) - .left_from(state.ids.social_button_bg, 10.0) + .left_from(state.ids.social_button, 10.0) .hover_image(self.imgs.map_hover) .press_image(self.imgs.map_press) - .label("M") - .label_font_id(self.fonts.cyri.conrod_id) - .label_font_size(10) - .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(-7.0)) - .label_x(conrod_core::position::Relative::Scalar(10.0)) + .with_tooltip( + self.tooltip_manager, + &localized_strings.get("hud.map.map_title"), + "", + &button_tooltip, + ) + .bottom_offset(TOOLTIP_UPSHIFT) .set(state.ids.map_button, ui) .was_clicked() { return Some(Event::ToggleMap); }; - - // Other Windows can only be accessed when `Settings` is closed. - // Opening `Settings` will close all other Windows, including the `Bag`. - // Opening the `Map` won't close the previously displayed windows. - Image::new(self.imgs.social) - .w_h(25.0, 25.0) - .left_from(state.ids.settings_button, 10.0) - .set(state.ids.social_button_bg, ui); - Image::new(self.imgs.spellbook_button) - .w_h(28.0, 25.0) - .left_from(state.ids.map_button, 10.0) - .set(state.ids.spellbook_button_bg, ui); - // Other Windows can only be accessed when `Settings` is closed. - // Opening `Settings` will close all other Windows, including the `Bag`. - // Opening the `Map` won't close the previously displayed windows. - if !(*self.open_windows == Windows::Settings) && self.show_map == false { - // 1 Social - if Button::image(self.imgs.social) - .w_h(25.0, 25.0) - .left_from(state.ids.settings_button, 10.0) - .hover_image(self.imgs.social_hover) - .press_image(self.imgs.social_press) - .label("O") - .label_font_id(self.fonts.cyri.conrod_id) - .label_font_size(10) - .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(-7.0)) - .label_x(conrod_core::position::Relative::Scalar(10.0)) - .set(state.ids.social_button, ui) - .was_clicked() - { - return Some(Event::ToggleSocial); - } - - // 3 Spellbook - if Button::image(self.imgs.spellbook_button) - .w_h(28.0, 25.0) - .left_from(state.ids.map_button, 10.0) - .hover_image(self.imgs.spellbook_hover) - .press_image(self.imgs.spellbook_press) - .label("P") - .label_font_id(self.fonts.cyri.conrod_id) - .label_font_size(10) - .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(-7.0)) - .label_x(conrod_core::position::Relative::Scalar(10.0)) - .set(state.ids.spellbook_button, ui) - .was_clicked() - { - return Some(Event::ToggleSpell); - } + if let Some(map) = &self + .global_state + .settings + .controls + .get_binding(GameInput::Map) + { + Text::new(map.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.map_button, 0.0, 0.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(BLACK) + .set(state.ids.map_text_bg, ui); + Text::new(map.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.map_text_bg, 1.0, 1.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.map_text, ui); } + // Spellbook + if Button::image(self.imgs.spellbook_button) + .w_h(28.0, 25.0) + .left_from(state.ids.map_button, 10.0) + .hover_image(self.imgs.spellbook_hover) + .press_image(self.imgs.spellbook_press) + .with_tooltip( + self.tooltip_manager, + &localized_strings.get("hud.spell"), + "", + &button_tooltip, + ) + .bottom_offset(TOOLTIP_UPSHIFT) + .set(state.ids.spellbook_button, ui) + .was_clicked() + { + return Some(Event::ToggleSpell); + } + if let Some(spell) = &self + .global_state + .settings + .controls + .get_binding(GameInput::Spellbook) + { + Text::new(spell.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.spellbook_button, 0.0, 0.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(BLACK) + .set(state.ids.spellbook_text_bg, ui); + Text::new(spell.to_string().as_str()) + .bottom_right_with_margins_on(state.ids.spellbook_text_bg, 1.0, 1.0) + .font_size(10) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.spellbook_text, ui); + } None } } diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 867202305e..11f8fcc76b 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -65,12 +65,6 @@ image_ids! { flower: "voxygen.element.icons.item_flower", grass: "voxygen.element.icons.item_grass", - // Minimap - - // Map - indicator_mmap_2: "voxygen.element.buttons.indicator_mmap_2", - indicator_mmap_3: "voxygen.element.buttons.indicator_mmap_3", - // Checkboxes and Radio buttons check: "voxygen.element.buttons.radio.inactive", check_mo: "voxygen.element.buttons.radio.inactive_hover", @@ -83,26 +77,6 @@ image_ids! { checkbox_checked: "voxygen.element.buttons.checkbox.active", checkbox_checked_mo: "voxygen.element.buttons.checkbox.hover", - // Grid - grid: "voxygen.element.buttons.grid", - grid_hover: "voxygen.element.buttons.grid", - grid_press: "voxygen.element.buttons.grid", - - settings: "voxygen.element.buttons.settings", - settings_hover: "voxygen.element.buttons.settings_hover", - settings_press: "voxygen.element.buttons.settings_press", - - social: "voxygen.element.buttons.social", - social_hover: "voxygen.element.buttons.social_hover", - social_press: "voxygen.element.buttons.social_press", - - map_button: "voxygen.element.buttons.map", - map_hover: "voxygen.element.buttons.map_hover", - map_press: "voxygen.element.buttons.map_press", - - spellbook_button: "voxygen.element.buttons.spellbook", - spellbook_hover: "voxygen.element.buttons.spellbook_hover", - spellbook_press: "voxygen.element.buttons.spellbook_press", // Charwindow xp_charwindow: "voxygen.element.frames.xp_charwindow", @@ -120,6 +94,23 @@ image_ids! { ////////////////////////////////////////////////////////////////////////////////////////////////////// + // Buttons + + settings: "voxygen.element.buttons.settings", + settings_hover: "voxygen.element.buttons.settings_hover", + settings_press: "voxygen.element.buttons.settings_press", + + social: "voxygen.element.buttons.social", + social_hover: "voxygen.element.buttons.social_hover", + social_press: "voxygen.element.buttons.social_press", + + map_button: "voxygen.element.buttons.map", + map_hover: "voxygen.element.buttons.map_hover", + map_press: "voxygen.element.buttons.map_press", + + spellbook_button: "voxygen.element.buttons.spellbook", + spellbook_hover: "voxygen.element.buttons.spellbook_hover", + spellbook_press: "voxygen.element.buttons.spellbook_press", // Skillbar level_up: "voxygen.element.misc_bg.level_up", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 8f59fef80f..4b8f951c89 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -211,6 +211,7 @@ pub enum Event { ToggleSmoothPan(bool), AdjustViewDistance(u32), AdjustSpriteRenderDistance(u32), + AdjustFigureLoDRenderDistance(u32), AdjustMusicVolume(f32), AdjustSfxVolume(f32), ChangeAudioDevice(String), @@ -1580,24 +1581,6 @@ impl Hud { .middle_of(ui_widgets.window) .w_h(1260.0, 519.0) .set(self.ids.help, ui_widgets); - // Show tips - /*if Button::image(self.imgs.button) - .w_h(120.0, 50.0) - .hover_image(self.imgs.button_hover) - .press_image(self.imgs.button_press) - .label(&self.voxygen_i18n.get("common.close")) - .label_font_size(self.fonts.cyri.scale(20)) - .label_font_id(self.fonts.cyri.conrod_id) - .label_color(TEXT_COLOR) - .mid_bottom_with_margin_on(self.ids.help, 20.0) - .set(self.ids.button_help3, ui_widgets) - .was_clicked() - { - self.show.help = false; - self.show.intro = false; - self.intro = false; - self.intro_2 = true; - };*/ // X-button if Button::image(self.imgs.close_button) .w_h(40.0, 40.0) @@ -1613,13 +1596,22 @@ impl Hud { } // Bag button and nearby icons + let ecs = client.state().ecs(); + let stats = ecs.read_storage::(); + let player_stats = match stats.get(client.entity()) { + Some(stats) => stats, + None => return events, + }; match Buttons::new( client, - &self.show.open_windows, - self.show.map, self.show.bag, &self.imgs, &self.fonts, + global_state, + &self.rot_imgs, + tooltip_manager, + &self.voxygen_i18n, + &player_stats, ) .set(self.ids.buttons, ui_widgets) { @@ -1650,7 +1642,10 @@ impl Hud { if self.show.bag { let ecs = client.state().ecs(); let stats = ecs.read_storage::(); - let player_stats = stats.get(client.entity()).unwrap(); + let player_stats = match stats.get(client.entity()) { + Some(stats) => stats, + None => return events, + }; match Bag::new( client, &self.imgs, @@ -1805,6 +1800,9 @@ impl Hud { settings_window::Event::AdjustSpriteRenderDistance(view_distance) => { events.push(Event::AdjustSpriteRenderDistance(view_distance)); }, + settings_window::Event::AdjustFigureLoDRenderDistance(view_distance) => { + events.push(Event::AdjustFigureLoDRenderDistance(view_distance)); + }, settings_window::Event::CrosshairTransp(crosshair_transp) => { events.push(Event::CrosshairTransp(crosshair_transp)); }, diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs index d37a053b7f..803cbd794d 100644 --- a/voxygen/src/hud/settings_window.rs +++ b/voxygen/src/hud/settings_window.rs @@ -92,6 +92,9 @@ widget_ids! { sprite_dist_slider, sprite_dist_text, sprite_dist_value, + figure_dist_slider, + figure_dist_text, + figure_dist_value, max_fps_slider, max_fps_text, max_fps_value, @@ -213,6 +216,7 @@ pub enum Event { ToggleSmoothPan(bool), AdjustViewDistance(u32), AdjustSpriteRenderDistance(u32), + AdjustFigureLoDRenderDistance(u32), AdjustFOV(u16), AdjustGamma(f32), AdjustWindowSize([u16; 2]), @@ -1246,7 +1250,7 @@ impl<'a> Widget for SettingsWindow<'a> { self.imgs.checkbox_checked, ) .w_h(18.0, 18.0) - .right_from(state.ids.mouse_zoom_invert_button, 175.0) + .right_from(state.ids.mouse_zoom_invert_label, 10.0) .hover_images(self.imgs.checkbox_mo, self.imgs.checkbox_checked_mo) .press_images(self.imgs.checkbox_press, self.imgs.checkbox_checked) .set(state.ids.mouse_y_invert_button, ui); @@ -1276,7 +1280,7 @@ impl<'a> Widget for SettingsWindow<'a> { self.imgs.checkbox_checked, ) .w_h(18.0, 18.0) - .right_from(state.ids.mouse_y_invert_button, 175.0) + .right_from(state.ids.mouse_y_invert_label, 10.0) .hover_images(self.imgs.checkbox_mo, self.imgs.checkbox_checked_mo) .press_images(self.imgs.checkbox_press, self.imgs.checkbox_checked) .set(state.ids.smooth_pan_toggle_button, ui); @@ -1653,6 +1657,50 @@ impl<'a> Widget for SettingsWindow<'a> { .font_id(self.fonts.cyri.conrod_id) .color(TEXT_COLOR) .set(state.ids.sprite_dist_value, ui); + // Figure VD + if let Some(new_val) = ImageSlider::discrete( + self.global_state + .settings + .graphics + .figure_lod_render_distance, + 50, + 500, + self.imgs.slider_indicator, + self.imgs.slider, + ) + .w_h(104.0, 22.0) + .right_from(state.ids.sprite_dist_slider, 50.0) + .track_breadth(12.0) + .slider_length(10.0) + .pad_track((5.0, 5.0)) + .set(state.ids.figure_dist_slider, ui) + { + events.push(Event::AdjustFigureLoDRenderDistance(new_val)); + } + Text::new( + &self + .localized_strings + .get("hud.settings.figures_view_distance"), + ) + .up_from(state.ids.figure_dist_slider, 8.0) + .font_size(self.fonts.cyri.scale(14)) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.figure_dist_text, ui); + + Text::new(&format!( + "{}", + self.global_state + .settings + .graphics + .figure_lod_render_distance + )) + .right_from(state.ids.figure_dist_slider, 8.0) + .font_size(self.fonts.cyri.scale(14)) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.figure_dist_value, ui); + // AaMode Text::new(&self.localized_strings.get("hud.settings.antialiasing_mode")) .down_from(state.ids.gamma_slider, 8.0) diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index c3a9ee7386..df9667409b 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -790,7 +790,11 @@ impl<'a> Widget for Skillbar<'a> { .1 .get(i) .map(|item| (item.name(), item.description())), - hotbar::SlotContents::Ability3 => Some(("Something something fireball", "")), + hotbar::SlotContents::Ability3 => Some(( + "Firebomb", + "\nWhirls a big fireball into the air. \nExplodes the ground and does\na \ + big amount of damage", + )), }) }; const SLOT_TOOLTIP_UPSHIFT: f64 = 70.0; diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs index c05eca5ad3..558f5ff527 100644 --- a/voxygen/src/menu/char_selection/mod.rs +++ b/voxygen/src/menu/char_selection/mod.rs @@ -107,6 +107,11 @@ impl PlayState for CharSelectionState { body: humanoid_body.clone(), gamma: global_state.settings.graphics.gamma, mouse_smoothing: global_state.settings.gameplay.smooth_pan_enable, + figure_lod_render_distance: global_state + .settings + .graphics + .figure_lod_render_distance + as f32, }; self.scene .maintain(global_state.window.renderer_mut(), scene_data); diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs index 10a9bc2117..69554960ed 100644 --- a/voxygen/src/menu/main/ui.rs +++ b/voxygen/src/menu/main/ui.rs @@ -83,7 +83,6 @@ image_ids! { v_logo: "voxygen.element.v_logo", - disclaimer: "voxygen.element.frames.disclaimer", info_frame: "voxygen.element.frames.info_frame_2", banner: "voxygen.element.frames.banner", @@ -98,6 +97,7 @@ image_ids! { input_bg_top: "voxygen.element.misc_bg.textbox_top", input_bg_mid: "voxygen.element.misc_bg.textbox_mid", input_bg_bot: "voxygen.element.misc_bg.textbox_bot", + disclaimer: "voxygen.element.frames.disclaimer", diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 5bee0eb0bb..16d46855de 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -1401,6 +1401,7 @@ impl FigureMgr { lights: &Consts, shadows: &Consts, camera: &Camera, + figure_lod_render_distance: f32, ) { let ecs = state.ecs(); @@ -1436,6 +1437,7 @@ impl FigureMgr { loadout, false, pos.0, + figure_lod_render_distance, ); } } @@ -1451,6 +1453,7 @@ impl FigureMgr { lights: &Consts, shadows: &Consts, camera: &Camera, + figure_lod_render_distance: f32, ) { let ecs = state.ecs(); @@ -1484,6 +1487,7 @@ impl FigureMgr { loadout, true, pos.0, + figure_lod_render_distance, ); } } @@ -1502,6 +1506,7 @@ impl FigureMgr { loadout: Option<&Loadout>, is_player: bool, pos: Vec3, + figure_lod_render_distance: f32, ) { let player_camera_mode = if is_player { camera.get_mode() @@ -1714,14 +1719,16 @@ impl FigureMgr { ) }), } { - const FIGURE_LOW_LOD_DIST: f32 = 150.0; - const FIGURE_MID_LOD_DIST: f32 = 85.0; + let figure_low_detail_distance = figure_lod_render_distance * 0.75; + let figure_mid_detail_distance = figure_lod_render_distance * 0.5; let model = if pos.distance_squared(camera.get_focus_pos()) - > FIGURE_LOW_LOD_DIST.powf(2.0) + > figure_low_detail_distance.powf(2.0) { &model[2] - } else if pos.distance_squared(camera.get_focus_pos()) > FIGURE_MID_LOD_DIST.powf(2.0) { + } else if pos.distance_squared(camera.get_focus_pos()) + > figure_mid_detail_distance.powf(2.0) + { &model[1] } else { &model[0] diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs index 44c55e2617..8641f2127e 100644 --- a/voxygen/src/scene/mod.rs +++ b/voxygen/src/scene/mod.rs @@ -77,6 +77,7 @@ pub struct SceneData<'a> { pub gamma: f32, pub mouse_smoothing: bool, pub sprite_render_distance: f32, + pub figure_lod_render_distance: f32, } impl Scene { @@ -406,6 +407,7 @@ impl Scene { &self.lights, &self.shadows, &self.camera, + scene_data.figure_lod_render_distance, ); // Render the skybox. @@ -420,6 +422,7 @@ impl Scene { &self.lights, &self.shadows, &self.camera, + scene_data.figure_lod_render_distance, ); self.terrain.render_translucent( diff --git a/voxygen/src/scene/simple.rs b/voxygen/src/scene/simple.rs index 2f53408569..d400d69c53 100644 --- a/voxygen/src/scene/simple.rs +++ b/voxygen/src/scene/simple.rs @@ -79,6 +79,7 @@ pub struct SceneData { pub tick: u64, pub body: Option, pub gamma: f32, + pub figure_lod_render_distance: f32, pub mouse_smoothing: bool, } diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs index c0e725a43e..eb04196759 100644 --- a/voxygen/src/session.rs +++ b/voxygen/src/session.rs @@ -573,6 +573,11 @@ impl PlayState for SessionState { sprite_render_distance; global_state.settings.save_to_file_warn(); }, + HudEvent::AdjustFigureLoDRenderDistance(figure_lod_render_distance) => { + global_state.settings.graphics.figure_lod_render_distance = + figure_lod_render_distance; + global_state.settings.save_to_file_warn(); + }, HudEvent::CrosshairTransp(crosshair_transp) => { global_state.settings.gameplay.crosshair_transp = crosshair_transp; global_state.settings.save_to_file_warn(); @@ -717,6 +722,11 @@ impl PlayState for SessionState { mouse_smoothing: global_state.settings.gameplay.smooth_pan_enable, sprite_render_distance: global_state.settings.graphics.sprite_render_distance as f32, + figure_lod_render_distance: global_state + .settings + .graphics + .figure_lod_render_distance + as f32, }; // Runs if either in a multiplayer server or the singleplayer server is unpaused diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs index 3c4f44c19a..cd55b2e556 100644 --- a/voxygen/src/settings.rs +++ b/voxygen/src/settings.rs @@ -549,6 +549,7 @@ impl Default for Log { pub struct GraphicsSettings { pub view_distance: u32, pub sprite_render_distance: u32, + pub figure_lod_render_distance: u32, pub max_fps: u32, pub fov: u16, pub gamma: f32, @@ -564,6 +565,7 @@ impl Default for GraphicsSettings { Self { view_distance: 10, sprite_render_distance: 250, + figure_lod_render_distance: 250, max_fps: 60, fov: 50, gamma: 1.0, diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs index 45ef3bc0e3..c43ab6a05f 100644 --- a/voxygen/src/window.rs +++ b/voxygen/src/window.rs @@ -323,10 +323,10 @@ impl fmt::Display for KeyMouse { Key(NavigateBackward) => "Navigate Backward", Key(NextTrack) => "Next Track", Key(NoConvert) => "Non Convert", - Key(NumpadComma) => "Numpad ,", - Key(NumpadEnter) => "Numpad Enter", - Key(NumpadEquals) => "Numpad =", - Key(OEM102) => "OEM 102", + Key(NumpadComma) => "Num ,", + Key(NumpadEnter) => "Num Enter", + Key(NumpadEquals) => "Num =", + Key(OEM102) => "<", Key(Period) => ".", Key(PlayPause) => "Play / Pause", Key(Power) => "Power", @@ -340,7 +340,7 @@ impl fmt::Display for KeyMouse { Key(Slash) => "/", Key(Sleep) => "Sleep", Key(Stop) => "Media Stop", - Key(Subtract) => "Numpad -", + Key(Subtract) => "Num -", Key(Sysrq) => "Sysrq", Key(Tab) => "Tab", Key(Underline) => "_", @@ -361,7 +361,7 @@ impl fmt::Display for KeyMouse { Key(Cut) => "Cut", Mouse(MouseButton::Left) => "Mouse Left", Mouse(MouseButton::Right) => "Mouse Right", - Mouse(MouseButton::Middle) => "Mouse Middle-Click", + Mouse(MouseButton::Middle) => "Middle-Click", Mouse(MouseButton::Other(button)) => return write!(f, "Unknown Mouse Button: {:?}", button), })