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

fix(bow): adds bow icon art

Browse Source
This commit is contained in:
Timo Koesters 2019-10-05 21:51:08 +00:00 committed by Monty Marz
parent 954881d84d
commit f3787879d3
19 changed files with 100 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/icons/bow_m1.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/bow_m2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/font/haxrcorp_4089_cyrillic_altgr.ttf (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/font/pf_ronda_seven.ttf (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/font/pf_ronda_seven_bold.ttf (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/hair/elf/female-15.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/hair/human/female-15.vox (Stored with Git LFS)
View File

Binary file not shown.

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

@ -39,7 +39,7 @@
Some(("figure.hair.human.female-15", (0, 1, -5))),
Some(("figure.hair.human.female-16", (1, 1, 1))),
Some(("figure.hair.human.female-17", (1, -2, -2))),
Some(("figure.hair.human.female-18", (1, 0, -7))),
//Some(("figure.hair.human.female-18", (1, 0, -7))),
Some(("figure.hair.human.female-19", (-5, 0, -1))),
],
beard: [None],
@ -115,7 +115,7 @@
Some(("figure.hair.elf.female-15", (1, 0, -6))),
Some(("figure.hair.elf.female-16", (2, 0, 0))),
Some(("figure.hair.elf.female-17", (2, -3, -2))),
Some(("figure.hair.elf.female-18", (2, -1, -7))),
//Some(("figure.hair.elf.female-18", (2, -1, -7))),
Some(("figure.hair.elf.female-19", (2, 0, -2))),
Some(("figure.hair.elf.female-20", (1, -3, 0))),
Some(("figure.hair.elf.female-21", (-4, -1, -1))),

4
common/src/comp/body/humanoid.rs
View File

@ -334,9 +334,9 @@ impl Race {
(Race::Danari, BodyType::Male) => 1,
(Race::Dwarf, BodyType::Female) => 1,
(Race::Dwarf, BodyType::Male) => 3,
(Race::Elf, BodyType::Female) => 22,
(Race::Elf, BodyType::Female) => 21,
(Race::Elf, BodyType::Male) => 1,
(Race::Human, BodyType::Female) => 20,
(Race::Human, BodyType::Female) => 19,
(Race::Human, BodyType::Male) => 3,
(Race::Orc, BodyType::Female) => 1,
(Race::Orc, BodyType::Male) => 2,

2
voxygen/src/hud/character_window.rs
View File

@ -146,7 +146,7 @@ impl<'a> Widget for CharacterWindow<'a> {
// TODO: Use an actual character name.
Text::new("Character Name")
.mid_top_with_margin_on(state.charwindow_frame, 6.0)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.font_size(14)
.color(TEXT_COLOR)
.set(state.charwindow_title, ui);

2
voxygen/src/hud/img_ids.rs
View File

@ -104,6 +104,8 @@ image_ids! {
twohhammer_m2: "voxygen.element.icons.2hhammer_m2",
twohaxe_m1: "voxygen.element.icons.2haxe_m1",
twohaxe_m2: "voxygen.element.icons.2haxe_m2",
bow_m1: "voxygen.element.icons.bow_m1",
bow_m2: "voxygen.element.icons.bow_m2",
flyingrod_m1: "voxygen.element.icons.debug_wand_m1",
flyingrod_m2: "voxygen.element.icons.debug_wand_m2",

2
voxygen/src/hud/minimap.rs
View File

@ -201,7 +201,7 @@ impl<'a> Widget for MiniMap<'a> {
Some(chunk) => Text::new(chunk.meta().name())
.mid_top_with_margin_on(state.ids.mmap_frame, 0.0)
.font_size(18)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.mmap_location, ui),
None => Text::new(" ")

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

@ -136,12 +136,11 @@ widget_ids! {
font_ids! {
pub struct Fonts {
opensans: "voxygen.font.pf_ronda_seven",
opensans: "voxygen.font.OpenSans-Regular",
metamorph: "voxygen.font.Metamorphous-Regular",
alkhemi: "voxygen.font.Alkhemikal",
ronda_b: "voxygen.font.pf_ronda_seven_bold",
wizard: "voxygen.font.wizard",
ronda:"voxygen.font.pf_ronda_seven",
cyri:"voxygen.font.haxrcorp_4089_cyrillic_altgr",
}
}

2
voxygen/src/hud/quest.rs
View File

@ -95,7 +95,7 @@ impl<'a> Widget for Quest<'a> {
// TODO: Use an actual character name.
Text::new("Quest")
.mid_top_with_margin_on(state.quest_frame, 6.0)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.font_size(14)
.color(TEXT_COLOR)
.set(state.quest_title, ui);

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

@ -3,7 +3,7 @@ use super::{
/*FOCUS_COLOR, RAGE_COLOR,*/ HP_COLOR, LOW_HP_COLOR, MANA_COLOR, TEXT_COLOR, XP_COLOR,
};
use crate::GlobalState;
use common::comp::{item::Tool, Item, Stats};
use common::comp::{item::Debug, item::Tool, Item, Stats};
use conrod_core::{
color,
widget::{self, Button, Image, Rectangle, Text},
@ -229,7 +229,7 @@ impl<'a> Widget for Skillbar<'a> {
Text::new(&level_up_text)
.middle_of(state.ids.level_align)
.font_size(30)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(1.0, 1.0, 1.0, fade_level))
.set(state.ids.level_message, ui);
Image::new(self.imgs.level_up)
@ -249,7 +249,7 @@ impl<'a> Widget for Skillbar<'a> {
Text::new("You Died")
.mid_top_with_margin_on(ui.window, 60.0)
.font_size(40)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
.set(state.ids.death_message_1_bg, ui);
Text::new(&format!(
@ -258,14 +258,14 @@ impl<'a> Widget for Skillbar<'a> {
))
.mid_bottom_with_margin_on(state.ids.death_message_1, -30.0)
.font_size(15)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
.set(state.ids.death_message_2_bg, ui);
Text::new("You Died")
.top_left_with_margins_on(state.ids.death_message_1_bg, -2.0, -2.0)
.font_size(40)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(CRITICAL_HP_COLOR)
.set(state.ids.death_message_1, ui);
Text::new(&format!(
@ -302,13 +302,13 @@ impl<'a> Widget for Skillbar<'a> {
Text::new(&level)
.bottom_left_with_margins_on(state.ids.xp_bar_left, 3.5 * scale, 4.0 * scale)
.font_size(10)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
.set(state.ids.level_text, ui);
Text::new(&next_level)
.bottom_right_with_margins_on(state.ids.xp_bar_right, 3.5 * scale, 4.0 * scale)
.font_size(10)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(1.0, 1.0, 1.0, 1.0))
.set(state.ids.next_level_text, ui);
// M1 Slot
@ -376,7 +376,7 @@ impl<'a> Widget for Skillbar<'a> {
4.0 * scale * 1.5,
)
.font_size(17)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
.set(state.ids.level_text, ui);
Text::new(&next_level)
@ -386,7 +386,7 @@ impl<'a> Widget for Skillbar<'a> {
4.0 * scale * 1.5,
)
.font_size(17)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(Color::Rgba(1.0, 1.0, 1.0, fade_xp))
.set(state.ids.next_level_text, ui);
// Alignment for hotbar
@ -411,9 +411,11 @@ impl<'a> Widget for Skillbar<'a> {
Tool::Sword => self.imgs.twohsword_m1,
Tool::Hammer => self.imgs.twohhammer_m1,
Tool::Axe => self.imgs.twohaxe_m1,
_ => self.imgs.flyingrod_m1,
Tool::Bow => self.imgs.bow_m1,
_ => self.imgs.twohaxe_m1,
},
_ => self.imgs.flyingrod_m1,
Some(Item::Debug(Debug::Boost)) => self.imgs.flyingrod_m1,
_ => self.imgs.twohaxe_m1,
}) // Insert Icon here
.w_h(38.0 * scale, 38.0 * scale)
.middle_of(state.ids.m1_slot_bg)
@ -433,9 +435,11 @@ impl<'a> Widget for Skillbar<'a> {
Tool::Sword => self.imgs.twohsword_m2,
Tool::Hammer => self.imgs.twohhammer_m2,
Tool::Axe => self.imgs.twohaxe_m2,
_ => self.imgs.flyingrod_m2,
Tool::Bow => self.imgs.bow_m2,
_ => self.imgs.twohaxe_m2,
},
_ => self.imgs.flyingrod_m2,
Some(Item::Debug(Debug::Boost)) => self.imgs.flyingrod_m2,
_ => self.imgs.twohaxe_m2,
}) // Insert Icon here
.w_h(38.0 * scale, 38.0 * scale)
.middle_of(state.ids.m2_slot_bg)
@ -546,73 +550,73 @@ impl<'a> Widget for Skillbar<'a> {
Text::new("1")
.top_right_with_margins_on(state.ids.slot1_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot1_text, ui);
Text::new("2")
.top_right_with_margins_on(state.ids.slot2_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot2_text, ui);
Text::new("3")
.top_right_with_margins_on(state.ids.slot3_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot3_text, ui);
Text::new("4")
.top_right_with_margins_on(state.ids.slot4_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot4_text, ui);
Text::new("5")
.top_right_with_margins_on(state.ids.slot5_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot5_text, ui);
Text::new("M1")
.top_left_with_margins_on(state.ids.m1_slot, 5.0, 5.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.m1_text, ui);
Text::new("M2")
.top_right_with_margins_on(state.ids.m2_slot, 5.0, 5.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.m2_text, ui);
Text::new("6")
.top_left_with_margins_on(state.ids.slot6_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot6_text, ui);
Text::new("7")
.top_left_with_margins_on(state.ids.slot7_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot7_text, ui);
Text::new("8")
.top_left_with_margins_on(state.ids.slot8_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot8_text, ui);
Text::new("9")
.top_left_with_margins_on(state.ids.slot9_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slot9_text, ui);
Text::new("Q")
.top_left_with_margins_on(state.ids.slotq_bg, 1.0, 1.0)
.font_size(8)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.slotq_text, ui);
};
@ -658,7 +662,7 @@ impl<'a> Widget for Skillbar<'a> {
Text::new(&hp_text)
.mid_top_with_margin_on(state.ids.healthbar_bg, 5.0 * scale)
.font_size(14)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.health_text, ui);
let energy_text = format!(
@ -669,7 +673,7 @@ impl<'a> Widget for Skillbar<'a> {
Text::new(&energy_text)
.mid_top_with_margin_on(state.ids.energybar_bg, 5.0 * scale)
.font_size(14)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.energy_text, ui);
}
@ -679,14 +683,14 @@ impl<'a> Widget for Skillbar<'a> {
Text::new(&hp_text)
.mid_top_with_margin_on(state.ids.healthbar_bg, 5.0 * scale)
.font_size(14)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.health_text, ui);
let energy_text = format!("{}%", energy_percentage as u32);
Text::new(&energy_text)
.mid_top_with_margin_on(state.ids.energybar_bg, 5.0 * scale)
.font_size(14)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(state.ids.energy_text, ui);
}

2
voxygen/src/hud/social.rs
View File

@ -117,7 +117,7 @@ impl<'a> Widget for Social<'a> {
// Title
Text::new("Social")
.mid_top_with_margin_on(ids.social_frame, 6.0)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.font_size(14)
.color(TEXT_COLOR)
.set(ids.social_title, ui);

2
voxygen/src/hud/spell.rs
View File

@ -95,7 +95,7 @@ impl<'a> Widget for Spell<'a> {
// TODO: Use an actual character name.
Text::new("Spell")
.mid_top_with_margin_on(state.spell_frame, 6.0)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.font_size(14)
.color(TEXT_COLOR)
.set(state.spell_title, ui);

51
voxygen/src/menu/char_selection/ui.rs
View File

@ -219,8 +219,7 @@ font_ids! {
opensans: "voxygen.font.OpenSans-Regular",
metamorph: "voxygen.font.Metamorphous-Regular",
alkhemi: "voxygen.font.Alkhemikal",
ronda:"voxygen.font.pf_ronda_seven",
ronda_b: "voxygen.font.pf_ronda_seven_bold",
cyri:"voxygen.font.haxrcorp_4089_cyrillic_altgr",
wizard: "voxygen.font.wizard",
}
}
@ -305,7 +304,7 @@ impl CharSelectionUi {
})
.title_font_size(15)
.desc_font_size(10)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.title_text_color(TEXT_COLOR)
.desc_text_color(TEXT_COLOR_2);
@ -326,7 +325,7 @@ impl CharSelectionUi {
Text::new("Permanently delete this Character?")
.mid_top_with_margin_on(self.ids.info_frame, 40.0)
.font_size(24)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.delete_text, ui_widgets);
if Button::image(self.imgs.button)
@ -336,7 +335,7 @@ impl CharSelectionUi {
.press_image(self.imgs.button_press)
.label_y(Relative::Scalar(2.0))
.label("No")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_font_size(18)
.label_color(TEXT_COLOR)
.set(self.ids.info_no, ui_widgets)
@ -352,7 +351,7 @@ impl CharSelectionUi {
.label_y(Relative::Scalar(2.0))
.label("Yes")
.label_font_size(18)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(Color::Rgba(1.0, 1.0, 1.0, 0.1))
.set(self.ids.info_ok, ui_widgets)
.was_clicked()
@ -396,7 +395,7 @@ impl CharSelectionUi {
Text::new(&client.server_info.name)
.mid_top_with_margin_on(self.ids.server_frame_bg, 5.0)
.font_size(26)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.server_name_text, ui_widgets);
//Change Server
@ -408,7 +407,7 @@ impl CharSelectionUi {
.press_image(self.imgs.button_press)
.label("Change Server")
.label_color(TEXT_COLOR)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_font_size(18)
.label_y(conrod_core::position::Relative::Scalar(3.0))
.set(self.ids.change_server, ui_widgets)
@ -426,7 +425,7 @@ impl CharSelectionUi {
.label("Enter World")
.label_color(TEXT_COLOR)
.label_font_size(26)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_y(conrod_core::position::Relative::Scalar(3.0))
.set(self.ids.enter_world_button, ui_widgets)
.was_clicked()
@ -441,7 +440,7 @@ impl CharSelectionUi {
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Logout")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(conrod_core::position::Relative::Scalar(3.0))
@ -458,7 +457,7 @@ impl CharSelectionUi {
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Create Character")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(conrod_core::position::Relative::Scalar(3.0))
@ -473,7 +472,7 @@ impl CharSelectionUi {
Text::new(version)
.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
.font_size(14)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.version, ui_widgets);
@ -484,7 +483,7 @@ impl CharSelectionUi {
.image_color(Color::Rgba(1.0, 1.0, 1.0, 0.8))
.hover_image(self.imgs.selection)
.press_image(self.imgs.selection)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_y(conrod_core::position::Relative::Scalar(20.0))
.set(self.ids.character_box_1, ui_widgets)
.was_clicked()
@ -504,21 +503,21 @@ impl CharSelectionUi {
Text::new("Human Default")
.top_left_with_margins_on(self.ids.character_box_1, 6.0, 9.0)
.font_size(19)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.character_name_1, ui_widgets);
Text::new("Level 1")
.down_from(self.ids.character_name_1, 4.0)
.font_size(17)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.character_level_1, ui_widgets);
Text::new("Uncanny Valley")
.down_from(self.ids.character_level_1, 4.0)
.font_size(17)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.character_location_1, ui_widgets);
@ -536,21 +535,21 @@ impl CharSelectionUi {
Text::new("Example 2nd Char")
.top_left_with_margins_on(self.ids.character_box_2, 6.0, 9.0)
.font_size(19)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.character_name_2, ui_widgets);
Text::new("Level ??")
.down_from(self.ids.character_name_2, 4.0)
.font_size(17)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.character_level_2, ui_widgets);
Text::new("Plains of Uncertainty")
.down_from(self.ids.character_level_2, 4.0)
.font_size(17)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.character_location_2, ui_widgets);
}
@ -563,7 +562,7 @@ impl CharSelectionUi {
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Back")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(conrod_core::position::Relative::Scalar(3.0))
@ -579,7 +578,7 @@ impl CharSelectionUi {
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Create")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(conrod_core::position::Relative::Scalar(3.0))
@ -602,10 +601,10 @@ impl CharSelectionUi {
.w_h(300.0, 60.0)
.mid_top_with_margin_on(self.ids.name_input, 2.0)
.font_size(26)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.center_justify()
.text_color(TEXT_COLOR)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TRANSPARENT)
.border_color(TRANSPARENT)
.set(self.ids.name_field, ui_widgets)
@ -640,7 +639,7 @@ impl CharSelectionUi {
Text::new("Character Creation")
.mid_top_with_margin_on(self.ids.creation_alignment, 10.0)
.font_size(24)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.bodyrace_text, ui_widgets);
// Alignment
@ -984,7 +983,7 @@ impl CharSelectionUi {
// Sliders
let (metamorph, slider_indicator, slider_range) = (
self.fonts.ronda,
self.fonts.cyri,
self.imgs.slider_indicator,
self.imgs.slider_range,
);
@ -1119,7 +1118,7 @@ impl CharSelectionUi {
Text::new("Beard")
.mid_bottom_with_margin_on(self.ids.accessories_slider, -40.0)
.font_size(18)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR_2)
.set(self.ids.beard_text, ui_widgets);
ImageSlider::discrete(5, 0, 10, self.imgs.nothing, self.imgs.slider_range)

33
voxygen/src/menu/main/ui.rs
View File

@ -99,8 +99,7 @@ font_ids! {
opensans: "voxygen.font.OpenSans-Regular",
metamorph: "voxygen.font.Metamorphous-Regular",
alkhemi: "voxygen.font.Alkhemikal",
ronda:"voxygen.font.pf_ronda_seven",
ronda_b: "voxygen.font.pf_ronda_seven_bold",
cyri:"voxygen.font.haxrcorp_4089_cyrillic_altgr",
wizard: "voxygen.font.wizard",
}
}
@ -229,7 +228,7 @@ impl MainMenuUi {
Text::new(version)
.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
.font_size(14)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.version, ui_widgets);
@ -272,7 +271,7 @@ impl MainMenuUi {
~ The Veloren Devs")
.top_left_with_margins_on(self.ids.disc_window, 110.0, 40.0)
.font_size(26)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.color(TEXT_COLOR)
.set(self.ids.disc_text_2, ui_widgets);
if Button::image(self.imgs.button)
@ -284,7 +283,7 @@ impl MainMenuUi {
.label("Accept")
.label_font_size(22)
.label_color(TEXT_COLOR)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.set(self.ids.disc_button, ui_widgets)
.was_clicked()
{
@ -337,7 +336,7 @@ impl MainMenuUi {
.w_h(290.0, 30.0)
.mid_bottom_with_margin_on(self.ids.username_bg, 44.0 / 2.0)
.font_size(22)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.text_color(TEXT_COLOR)
// transparent background
.color(TRANSPARENT)
@ -366,7 +365,7 @@ impl MainMenuUi {
.w_h(290.0, 30.0)
.mid_bottom_with_margin_on(self.ids.password_bg, 44.0 / 2.0)
.font_size(22)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.text_color(TEXT_COLOR)
// transparent background
.color(TRANSPARENT)
@ -388,7 +387,7 @@ impl MainMenuUi {
let text = Text::new(&popup_data.msg)
.rgba(1.0, 1.0, 1.0, 1.0)
.font_size(25)
.font_id(self.fonts.ronda);
.font_id(self.fonts.cyri);
Rectangle::fill_with([65.0 * 6.0, 100.0], color::TRANSPARENT)
.rgba(0.1, 0.1, 0.1, 1.0)
.parent(ui_widgets.window)
@ -407,7 +406,7 @@ impl MainMenuUi {
.press_image(self.imgs.button_press)
.label_y(Relative::Scalar(2.0))
.label(&popup_data.button_text)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_font_size(15)
.label_color(TEXT_COLOR)
.set(self.ids.button_ok, ui_widgets)
@ -458,7 +457,7 @@ impl MainMenuUi {
.label_y(Relative::Scalar(2.0))
.label(&text)
.label_font_size(20)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR),
ui_widgets,
)
@ -477,7 +476,7 @@ impl MainMenuUi {
.label_y(Relative::Scalar(2.0))
.label("Close")
.label_font_size(20)
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.set(self.ids.servers_close, ui_widgets)
.was_clicked()
@ -497,7 +496,7 @@ impl MainMenuUi {
.w_h(290.0, 30.0)
.mid_bottom_with_margin_on(self.ids.address_bg, 44.0 / 2.0)
.font_size(22)
.font_id(self.fonts.ronda)
.font_id(self.fonts.cyri)
.text_color(TEXT_COLOR)
// transparent background
.color(TRANSPARENT)
@ -521,7 +520,7 @@ impl MainMenuUi {
.down_from(self.ids.address_bg, 20.0)
.align_middle_x_of(self.ids.address_bg)
.label("Login")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(26)
.label_y(Relative::Scalar(5.0))
@ -548,7 +547,7 @@ impl MainMenuUi {
.down_from(self.ids.login_button, 20.0)
.align_middle_x_of(self.ids.address_bg)
.label("Singleplayer")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(22)
.label_y(Relative::Scalar(5.0))
@ -566,7 +565,7 @@ impl MainMenuUi {
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Quit")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
@ -583,7 +582,7 @@ impl MainMenuUi {
//.hover_image(self.imgs.button_hover)
//.press_image(self.imgs.button_press)
.label("Settings")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR_2)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))
@ -600,7 +599,7 @@ impl MainMenuUi {
.hover_image(self.imgs.button_hover)
.press_image(self.imgs.button_press)
.label("Servers")
.label_font_id(self.fonts.ronda)
.label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR)
.label_font_size(20)
.label_y(Relative::Scalar(3.0))