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

adjusted death message, fixed repair bench text

Browse Source
This commit is contained in:
Monty Marz 2023-04-01 13:14:48 +02:00 committed by Sam
parent a68ef7af30
commit 29a7520a48
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/voxygen/i18n/en/hud/misc.ftl
View File

@ -13,6 +13,7 @@ hud-press_key_to_toggle_lantern_fmt = [{ $key }] Lantern
hud-press_key_to_show_debug_info_fmt = Press { $key } to show debug info
hud-press_key_to_toggle_keybindings_fmt = Press { $key } to toggle keybindings
hud-press_key_to_toggle_debug_info_fmt = Press { $key } to toggle debug info
hud_items_lost_dur = Your equipped items have lost Durability.
hud-press_key_to_respawn = Press { $key } to respawn at the last campfire you visited.
hud-tutorial_btn = Tutorial
hud-tutorial_click_here = Press [ { $key } ] to free your cursor and click this button!

4
assets/voxygen/voxel/humanoid_armor_head_manifest.ron
View File

@ -447,7 +447,7 @@
color: None
),
(Danari, Male, "common.items.armor.misc.head.straw"): (
vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)),
vox_spec: ("armor.misc.head.straw", (-2.0, -4.0, 7.0)),
color: None
),
(Danari, Female, "common.items.armor.misc.head.straw"): (
@ -463,7 +463,7 @@
color: None
),
(Orc, Male, "common.items.armor.misc.head.straw"): (
vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 8.0)),
vox_spec: ("armor.misc.head.straw", (-3.0, -4.0, 7.0)),
color: None
),
(Orc, Female, "common.items.armor.misc.head.straw"): (

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

@ -5082,6 +5082,7 @@ pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) ->
SpriteKind::Anvil => "hud-crafting-anvil",
SpriteKind::Cauldron => "hud-crafting-cauldron",
SpriteKind::CookingPot => "hud-crafting-cooking_pot",
SpriteKind::RepairBench => "hud-crafting-repair_bench",
SpriteKind::CraftingBench => "hud-crafting-crafting_bench",
SpriteKind::Forge => "hud-crafting-forge",
SpriteKind::Loom => "hud-crafting-loom",

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

@ -47,6 +47,8 @@ widget_ids! {
death_message_2,
death_message_1_bg,
death_message_2_bg,
death_message_3,
death_message_3_bg,
death_bg,
// Level up message
level_up,
@ -436,6 +438,12 @@ impl<'a> Skillbar<'a> {
.font_id(self.fonts.cyri.conrod_id)
.color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
.set(state.ids.death_message_2_bg, ui);
Text::new(&self.localized_strings.get_msg("hud_items_lost_dur"))
.mid_bottom_with_margin_on(state.ids.death_message_2_bg, -50.0)
.font_size(self.fonts.cyri.scale(30))
.font_id(self.fonts.cyri.conrod_id)
.color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
.set(state.ids.death_message_3_bg, ui);
Text::new(&self.localized_strings.get_msg("hud-you_died"))
.bottom_left_with_margins_on(state.ids.death_message_1_bg, 2.0, 2.0)
.font_size(self.fonts.cyri.scale(50))
@ -448,6 +456,12 @@ impl<'a> Skillbar<'a> {
.font_id(self.fonts.cyri.conrod_id)
.color(CRITICAL_HP_COLOR)
.set(state.ids.death_message_2, ui);
Text::new(&self.localized_strings.get_msg("hud_items_lost_dur"))
.bottom_left_with_margins_on(state.ids.death_message_3_bg, 2.0, 2.0)
.font_size(self.fonts.cyri.scale(30))
.font_id(self.fonts.cyri.conrod_id)
.color(CRITICAL_HP_COLOR)
.set(state.ids.death_message_3, ui);
}
}