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 i18n, change SCT Blocked col and string

Browse Source
This commit is contained in:
Monty
2021-04-25 00:01:01 +02:00
committed by Sam
parent 6294b3c5ff
commit c59f11ef6e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/voxygen/i18n/en/gameinput.ron
View File

@ -4,7 +4,8 @@
( (
string_map: { string_map: {
"gameinput.primary": "Basic Attack", "gameinput.primary": "Basic Attack",
"gameinput.secondary": "Secondary Attack/Block/Aim", "gameinput.secondary": "Secondary Attack",
"gameinput.block": "Block",
"gameinput.slot1": "Hotbar Slot 1", "gameinput.slot1": "Hotbar Slot 1",
"gameinput.slot2": "Hotbar Slot 2", "gameinput.slot2": "Hotbar Slot 2",
"gameinput.slot3": "Hotbar Slot 3", "gameinput.slot3": "Hotbar Slot 3",

10
voxygen/src/hud/mod.rs
View File

@ -1373,7 +1373,7 @@ impl Hud {
1.0 1.0
}; };
Text::new("Blocked") Text::new(&i18n.get("hud.sct.block"))
.font_size(font_size) .font_size(font_size)
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.color(Color::Rgba(0.0, 0.0, 0.0, fade)) .color(Color::Rgba(0.0, 0.0, 0.0, fade))
@ -1382,10 +1382,10 @@ impl Hud {
ui_widgets.win_h * (tweak!(-0.3)) + y - tweak!(3.0), ui_widgets.win_h * (tweak!(-0.3)) + y - tweak!(3.0),
) )
.set(player_sct_bg_id, ui_widgets); .set(player_sct_bg_id, ui_widgets);
Text::new("Blocked") Text::new(&i18n.get("hud.sct.block"))
.font_size(font_size) .font_size(font_size)
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.color(Color::Rgba(tweak!(0.9), tweak!(0.85), tweak!(0.2), fade)) .color(Color::Rgba(tweak!(0.69), tweak!(0.82), tweak!(0.88), fade))
.x_y( .x_y(
ui_widgets.win_w * (tweak!(0.0)), ui_widgets.win_w * (tweak!(0.0)),
ui_widgets.win_h * (tweak!(-0.3)) + y, ui_widgets.win_h * (tweak!(-0.3)) + y,
@ -3656,8 +3656,8 @@ pub fn get_buff_desc(buff: BuffKind, localized_strings: &Localization) -> &str {
pub fn get_buff_time(buff: BuffInfo) -> String { pub fn get_buff_time(buff: BuffInfo) -> String {
if let Some(dur) = buff.dur { if let Some(dur) = buff.dur {
format!("Remaining: {:.0}s", dur.as_secs_f32()) format!("{:.0}s", dur.as_secs_f32())
} else { } else {
"Permanent".to_string() "".to_string()
} }
} }