Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added handedness to weapon tooltips.

Browse Source
This commit is contained in:
Sam 2021-02-12 19:57:52 -05:00
parent 8f0cca074d
commit 12545dd372
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/common/abilities/weapon_ability_manifest.ron
View File

@ -20,7 +20,6 @@
secondary: "common.abilities.hammer.charged", secondary: "common.abilities.hammer.charged",
skills: [ skills: [
(Some(Hammer(UnlockLeap)), "common.abilities.hammer.leap"), (Some(Hammer(UnlockLeap)), "common.abilities.hammer.leap"),
(Some(Staff(UnlockShockwave)), "common.abilities.staff.fireshockwave"), // test, remove later
], ],
), ),
Bow: ( Bow: (

13
voxygen/src/hud/util.rs
View File

@ -1,6 +1,6 @@
use common::comp::item::{ use common::comp::item::{
armor::{Armor, ArmorKind, Protection}, armor::{Armor, ArmorKind, Protection},
tool::{Tool, ToolKind}, tool::{Hands, Tool, ToolKind},
ItemDesc, ItemKind, ItemDesc, ItemKind,
}; };
use std::{borrow::Cow, fmt::Write}; use std::{borrow::Cow, fmt::Write};
@ -118,13 +118,19 @@ fn tool_desc(tool: &Tool, desc: &str) -> String {
let power = tool.base_power(); let power = tool.base_power();
//let poise_strength = tool.base_poise_strength(); //let poise_strength = tool.base_poise_strength();
let speed = tool.base_speed(); let speed = tool.base_speed();
let hands = match tool.hands {
Hands::OneHand => "One",
Hands::TwoHand => "Two",
};
if !desc.is_empty() { if !desc.is_empty() {
format!( format!(
"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n<Right-Click to use>", "{}-Handed {}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n{}\n\n<Right-Click \
to use>",
// add back when ready for poise // add back when ready for poise
//"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Strength: {:0.1}\n\nSpeed: \ //"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Strength: {:0.1}\n\nSpeed: \
// {:0.1}\n\n{}\n\n<Right-Click to use>", // {:0.1}\n\n{}\n\n<Right-Click to use>",
hands,
kind, kind,
speed * power * 10.0, // Damage per second speed * power * 10.0, // Damage per second
power * 10.0, power * 10.0,
@ -134,10 +140,11 @@ fn tool_desc(tool: &Tool, desc: &str) -> String {
) )
} else { } else {
format!( format!(
"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n<Right-Click to use>", "{}-Handed {}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nSpeed: {:0.1}\n\n<Right-Click to use>",
// add back when ready for poise // add back when ready for poise
//"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Strength: {:0.1}\n\nSpeed: \ //"{}\n\nDPS: {:0.1}\n\nPower: {:0.1}\n\nPoise Strength: {:0.1}\n\nSpeed: \
// {:0.1}\n\n<Right-Click to use>", // {:0.1}\n\n<Right-Click to use>",
hands,
kind, kind,
speed * power * 10.0, // Damage per second speed * power * 10.0, // Damage per second
power * 10.0, power * 10.0,