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

Add support for splicing numbers into skill desc

Browse Source
This commit is contained in:
juliancoffee
2021-07-02 02:33:56 +03:00
parent 274acae939
commit 67f22baed5
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
voxygen/src/hud/diary.rs
View File

@ -17,7 +17,7 @@ use conrod_core::{
use client::{self, Client}; use client::{self, Client};
use common::comp::{ use common::comp::{
item::tool::ToolKind, item::tool::ToolKind,
skills::{self, Skill}, skills::{self, Boost, BoostValue, Skill},
SkillSet, SkillSet,
}; };
@ -2110,15 +2110,34 @@ fn skill_tree_from_str(string: &str) -> Option<SelectedSkillTree> {
} }
} }
fn add_sp_cost_tooltip<'a>( /// Formats skill description, e.g.
tooltip: &'a str, ///
/// "Increase max health by {boost}{SP}"
///
/// turns into
///
/// """
/// Increase max health by 5
///
/// Requires 4 SP
/// """
fn format_skill_description<'a>(
raw_description: &'a str,
skill: Skill, skill: Skill,
skill_set: &'a skills::SkillSet, skill_set: &'a skills::SkillSet,
localized_strings: &'a Localization, localized_strings: &'a Localization,
) -> String { ) -> String {
let boost = skill.boost();
let with_values = match boost {
BoostValue::Number(x) => {
let value = x.abs();
raw_description.replace("{boost}", &value.to_string())
},
BoostValue::NonDescriptive => raw_description.to_owned(),
};
match skill_set.skill_level(skill) { match skill_set.skill_level(skill) {
Ok(level) if level == skill.max_level() => tooltip.replace("{SP}", ""), Ok(level) if level == skill.max_level() => with_values.replace("{SP}", ""),
_ => tooltip.replace( _ => with_values.replace(
"{SP}", "{SP}",
&localized_strings &localized_strings
.get("hud.skill.req_sp") .get("hud.skill.req_sp")
@ -2148,7 +2167,7 @@ impl<'a> Diary<'a> {
skill: Skill, skill: Skill,
id: Id, id: Id,
conrod_widget_id: conrod_core::widget::id::Id, conrod_widget_id: conrod_core::widget::id::Id,
skill_name: &str, skill_key: &str,
widget_id: widget::Id, widget_id: widget::Id,
ui: &mut UiCell, ui: &mut UiCell,
events: &mut Vec<Event>, events: &mut Vec<Event>,
@ -2166,11 +2185,11 @@ impl<'a> Diary<'a> {
self.tooltip_manager, self.tooltip_manager,
&self &self
.localized_strings .localized_strings
.get(&format!("hud.skill.{}_title", skill_name)), .get(&format!("hud.skill.{}_title", skill_key)),
&add_sp_cost_tooltip( &format_skill_description(
&self &self
.localized_strings .localized_strings
.get(&format!("hud.skill.{}", skill_name)), .get(&format!("hud.skill.{}", skill_key)),
skill, skill,
&self.skill_set, &self.skill_set,
&self.localized_strings, &self.localized_strings,