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 stealth stat to Bag UI. NOTE: Needs icon.

Browse Source
This commit is contained in:
holychowders
2022-05-10 10:31:45 -05:00
parent 8c72ed9012
commit ff905fab95
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/voxygen/i18n/en/hud/bag.ron
View File

@ -34,6 +34,7 @@
"hud.bag.combat_rating": "Combat Rating", "hud.bag.combat_rating": "Combat Rating",
"hud.bag.protection": "Protection", "hud.bag.protection": "Protection",
"hud.bag.stun_res": "Stun Resilience", "hud.bag.stun_res": "Stun Resilience",
"hud.bag.stealth_from_items": "Stealth from Items",
"hud.bag.combat_rating_desc": "Calculated from your\nequipment and health.", "hud.bag.combat_rating_desc": "Calculated from your\nequipment and health.",
"hud.bag.protection_desc": "Damage reduction through armor", "hud.bag.protection_desc": "Damage reduction through armor",
"hud.bag.stun_res_desc": "Resilience against being stunned by consecutive hits.\nRegenerates like Energy.", "hud.bag.stun_res_desc": "Resilience against being stunned by consecutive hits.\nRegenerates like Energy.",

14
voxygen/src/hud/bag.rs
View File

@ -18,7 +18,7 @@ use crate::{
use client::Client; use client::Client;
use common::{ use common::{
assets::AssetExt, assets::AssetExt,
combat::{combat_rating, Damage}, combat::{combat_rating, perception_dist_multiplier_from_stealth, Damage},
comp::{ comp::{
inventory::InventorySortOrder, inventory::InventorySortOrder,
item::{ItemDef, ItemDesc, MaterialStatManifest, Quality}, item::{ItemDef, ItemDesc, MaterialStatManifest, Quality},
@ -629,12 +629,13 @@ impl<'a> Bag<'a> {
} }
} }
} }
const STATS: [&str; 5] = [ const STATS: [&str; 6] = [
"Health", "Health",
"Energy", "Energy",
"Protection", "Protection",
"Combat Rating", "Combat Rating",
"Stun Resilience", "Stun Resilience",
"Stealth (Items)",
]; ];
pub struct BagState { pub struct BagState {
@ -924,6 +925,8 @@ impl<'a> Widget for Bag<'a> {
"Combat Rating" => self.imgs.combat_rating_ico, "Combat Rating" => self.imgs.combat_rating_ico,
"Protection" => self.imgs.protection_ico, "Protection" => self.imgs.protection_ico,
"Stun Resilience" => self.imgs.stun_res_ico, "Stun Resilience" => self.imgs.stun_res_ico,
// FIXME: Add icon.
// "Stealth (Items)" => self.imgs.stealth_ico,
_ => self.imgs.nothing, _ => self.imgs.nothing,
}) })
.w_h(20.0, 20.0) .w_h(20.0, 20.0)
@ -945,6 +948,11 @@ impl<'a> Widget for Bag<'a> {
"{}", "{}",
(100.0 * Poise::compute_poise_damage_reduction(inventory)) as i32 (100.0 * Poise::compute_poise_damage_reduction(inventory)) as i32
); );
let stealth_from_items_txt = format!(
"{:.1}%",
((1.0 - perception_dist_multiplier_from_stealth(Some(inventory), None))
* 100.0)
);
let btn = if i.0 == 0 { let btn = if i.0 == 0 {
btn.top_left_with_margins_on(state.bg_ids.bg_frame, 55.0, 10.0) btn.top_left_with_margins_on(state.bg_ids.bg_frame, 55.0, 10.0)
} else { } else {
@ -956,6 +964,7 @@ impl<'a> Widget for Bag<'a> {
"Combat Rating" => i18n.get("hud.bag.combat_rating"), "Combat Rating" => i18n.get("hud.bag.combat_rating"),
"Protection" => i18n.get("hud.bag.protection"), "Protection" => i18n.get("hud.bag.protection"),
"Stun Resilience" => i18n.get("hud.bag.stun_res"), "Stun Resilience" => i18n.get("hud.bag.stun_res"),
"Stealth (Items)" => i18n.get("hud.bag.stealth_from_items"),
_ => "", _ => "",
}; };
let tooltip_txt = match i.1 { let tooltip_txt = match i.1 {
@ -978,6 +987,7 @@ impl<'a> Widget for Bag<'a> {
"Combat Rating" => &combat_rating_txt, "Combat Rating" => &combat_rating_txt,
"Protection" => &protection_txt, "Protection" => &protection_txt,
"Stun Resilience" => &stun_res_txt, "Stun Resilience" => &stun_res_txt,
"Stealth (Items)" => &stealth_from_items_txt,
_ => "", _ => "",
}) })
.right_from(state.ids.stat_icons[i.0], 10.0) .right_from(state.ids.stat_icons[i.0], 10.0)