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

Re-shape General ST UI

Browse Source
This commit is contained in:
juliancoffee 2024-03-19 12:23:59 +02:00
parent 90454b1287
commit 7e4dcfd95a
2 changed files with 9 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/voxygen/i18n/en/hud/skills.ftl
View File

@ -17,10 +17,6 @@ hud-skill-sp_available =
hud-skill-not_unlocked = Not yet unlocked
hud-skill-req_sp = {"\u000A"}Requires { $number } SP
hud-skill-set_as_exp_bar = Track progress on experience bar
hud-skill-health_title = Health
hud-skill-health = Gives you the ability to withstand attacks.
hud-skill-energy_title = Energy
hud-skill-energy = Your main resource for actions.
hud-skill-unlck_sword_title = Sword proficiency
hud-skill-unlck_sword = Unlocks the sword skill tree.{ $SP }
@ -34,8 +30,6 @@ hud-skill-unlck_staff_title = Staff proficiency
hud-skill-unlck_staff = Unlocks the staff skill tree.{ $SP }
hud-skill-unlck_sceptre_title = Sceptre proficiency
hud-skill-unlck_sceptre = Unlocks the sceptre skill tree.{ $SP }
hud-skill-dodge_title = Dodge
hud-skill-dodge = Dodging grants temporary immunity to attacks while you're rolling.
hud-skill-climbing_title = Climbing
hud-skill-climbing = Ability to climb surfaces.
hud-skill-climbing_cost_title = Climbing Cost

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

@ -1373,9 +1373,9 @@ impl<'a> Diary<'a> {
// Number of skills per rectangle per weapon, start counting at 0
// Maximum of 9 skills/8 indices
let skills_top_l = 2;
let skills_top_r = 6;
let skills_bot_l = 4;
let skills_top_l = 6;
let skills_top_r = 0;
let skills_bot_l = 0;
let skills_bot_r = 5;
self.setup_state_for_skill_icons(
@ -1419,86 +1419,42 @@ impl<'a> Diary<'a> {
// 3 0 4
// 8 2 7
// Bottom left skills
SkillIcon::Descriptive {
title: "hud-skill-health_title",
desc: "hud-skill-health",
image: self.imgs.health_plus_skill,
position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
id: state.ids.skill_general_stat_0,
},
SkillIcon::Descriptive {
title: "hud-skill-energy_title",
desc: "hud-skill-energy",
image: self.imgs.energy_plus_skill,
position: MidTopWithMarginOn(state.ids.skills_top_l[1], 3.0),
id: state.ids.skill_general_stat_1,
},
// Top right skills
SkillIcon::Unlockable {
skill: Skill::UnlockGroup(Weapon(Sword)),
image: self.imgs.unlock_sword_skill,
position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
id: state.ids.skill_general_tree_0,
},
SkillIcon::Unlockable {
skill: Skill::UnlockGroup(Weapon(Axe)),
image: self.imgs.unlock_axe_skill,
position: MidTopWithMarginOn(state.ids.skills_top_r[1], 3.0),
position: MidTopWithMarginOn(state.ids.skills_top_l[1], 3.0),
id: state.ids.skill_general_tree_1,
},
SkillIcon::Unlockable {
skill: Skill::UnlockGroup(Weapon(Hammer)),
image: self.imgs.unlock_hammer_skill,
position: MidTopWithMarginOn(state.ids.skills_top_r[2], 3.0),
position: MidTopWithMarginOn(state.ids.skills_top_l[2], 3.0),
id: state.ids.skill_general_tree_2,
},
SkillIcon::Unlockable {
skill: Skill::UnlockGroup(Weapon(Bow)),
image: self.imgs.unlock_bow_skill,
position: MidTopWithMarginOn(state.ids.skills_top_r[3], 3.0),
position: MidTopWithMarginOn(state.ids.skills_top_l[3], 3.0),
id: state.ids.skill_general_tree_3,
},
SkillIcon::Unlockable {
skill: Skill::UnlockGroup(Weapon(Staff)),
image: self.imgs.unlock_staff_skill0,
position: MidTopWithMarginOn(state.ids.skills_top_r[4], 3.0),
position: MidTopWithMarginOn(state.ids.skills_top_l[4], 3.0),
id: state.ids.skill_general_tree_4,
},
SkillIcon::Unlockable {
skill: Skill::UnlockGroup(Weapon(Sceptre)),
image: self.imgs.unlock_sceptre_skill,
position: MidTopWithMarginOn(state.ids.skills_top_r[5], 3.0),
position: MidTopWithMarginOn(state.ids.skills_top_l[5], 3.0),
id: state.ids.skill_general_tree_5,
},
// Bottom left skills
SkillIcon::Descriptive {
title: "hud-skill-dodge_title",
desc: "hud-skill-dodge",
image: self.imgs.skill_dodge_skill,
position: MidTopWithMarginOn(state.ids.skills_bot_l[0], 3.0),
id: state.ids.skill_general_roll_0,
},
SkillIcon::Descriptive {
title: "hud-skill-dodge_title",
desc: "hud-skill-dodge",
image: self.imgs.utility_cost_skill,
position: MidTopWithMarginOn(state.ids.skills_bot_l[1], 3.0),
id: state.ids.skill_general_roll_1,
},
SkillIcon::Descriptive {
title: "hud-skill-dodge_title",
desc: "hud-skill-dodge",
image: self.imgs.utility_speed_skill,
position: MidTopWithMarginOn(state.ids.skills_bot_l[2], 3.0),
id: state.ids.skill_general_roll_2,
},
SkillIcon::Descriptive {
title: "hud-skill-dodge_title",
desc: "hud-skill-dodge",
image: self.imgs.utility_duration_skill,
position: MidTopWithMarginOn(state.ids.skills_bot_l[3], 3.0),
id: state.ids.skill_general_roll_3,
},
// Bottom right skills
SkillIcon::Descriptive {
title: "hud-skill-climbing_title",