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

Added healing aura duration skill to voxygen UI

Browse Source
This commit is contained in:
Knightress Paladin 2021-07-10 20:02:25 -07:00
parent b96bb6fc5d
commit 42c3872528
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/skillset/dungeon/tier-5/sceptre.ron
View File

@ -9,7 +9,7 @@
// Heal
Skill((Sceptre(HHeal), Some(1))),
Skill((Sceptre(HStrength), Some(1))),
Skill((Sceptre(HDuration), Some(1))),
Skill((Sceptre(HRange), Some(1))),
Skill((Sceptre(HCost), Some(1))),
// Ward

14
assets/voxygen/i18n/en/skills.ron
View File

@ -54,14 +54,16 @@
"hud.skill.sc_lifesteal_lifesteal": "Convert an additional {boost}% of damage into health{SP}",
"hud.skill.sc_lifesteal_regen_title": "Stamina Regen",
"hud.skill.sc_lifesteal_regen": "Replenish your stamina by an additional {boost}%{SP}",
"hud.skill.sc_heal_title": "Healing Beam",
"hud.skill.sc_heal": "Heal your allies using the blood of your enemies",
"hud.skill.sc_heal_title": "Healing Aura",
"hud.skill.sc_heal": "Heal your allies using the blood of your enemies, requires combo to activate",
"hud.skill.sc_heal_heal_title": "Heal",
"hud.skill.sc_heal_heal": "Increases the amount you heal others by {boost}%{SP}",
"hud.skill.sc_heal_heal": "Increases the amount you heal by {boost}%{SP}",
"hud.skill.sc_heal_cost_title": "Stamina Cost",
"hud.skill.sc_heal_cost": "Healing others requires {boost}% less stamina{SP}",
"hud.skill.sc_heal_range_title": "Range",
"hud.skill.sc_heal_range": "Your beam reachs {boost}% further{SP}",
"hud.skill.sc_heal_cost": "Healing requires {boost}% less stamina{SP}",
"hud.skill.sc_heal_duration_title": "Duration",
"hud.skill.sc_heal_duration": "The effects of your healing aura last {boost}% longer{SP}",
"hud.skill.sc_heal_range_title": "Radius",
"hud.skill.sc_heal_range": "Your healing aura reachs {boost}% further{SP}",
"hud.skill.sc_wardaura_unlock_title": "Warding Aura Unlock",
"hud.skill.sc_wardaura_unlock": "Allows you to ward your allies against enemy attacks{SP}",
"hud.skill.sc_wardaura_strength_title": "Strength",

3
server/src/persistence/json_models.rs
View File

@ -246,8 +246,9 @@ pub fn db_string_to_skill(skill_string: &str) -> comp::skills::Skill {
"Sceptre LLifesteal" => Sceptre(SceptreSkill::LLifesteal),
"Sceptre LRegen" => Sceptre(SceptreSkill::LRegen),
"Sceptre HHeal" => Sceptre(SceptreSkill::HHeal),
"Sceptre HCost" => Sceptre(SceptreSkill::HCost),
"Sceptre HDuration" => Sceptre(SceptreSkill::HDuration),
"Sceptre HRange" => Sceptre(SceptreSkill::HRange),
"Sceptre HCost" => Sceptre(SceptreSkill::HCost),
"Sceptre UnlockAura" => Sceptre(SceptreSkill::UnlockAura),
"Sceptre AStrength" => Sceptre(SceptreSkill::AStrength),
"Sceptre ADuration" => Sceptre(SceptreSkill::ADuration),

8
server/src/sys/agent.rs
View File

@ -2459,10 +2459,10 @@ impl<'a> AgentData<'a> {
// If far enough away, and can see target, check which skill is appropriate to
// use
if self.energy.current() > DESIRED_ENERGY_LEVEL
&& match read_data.combos.get(*self.entity) {
Some(combo) => combo.counter() >= DESIRED_COMBO_LEVEL,
None => false,
}
&& read_data
.combos
.get(*self.entity)
.map_or(false, |c| c.counter() >= DESIRED_COMBO_LEVEL)
&& !read_data.buffs.get(*self.entity).iter().any(|buff| {
buff.iter_kind(BuffKind::Regeneration)
.peekable()

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

@ -144,6 +144,7 @@ widget_ids! {
skill_sceptre_heal_1,
skill_sceptre_heal_2,
skill_sceptre_heal_3,
skill_sceptre_heal_4,
skill_sceptre_aura_0,
skill_sceptre_aura_1,
skill_sceptre_aura_2,
@ -552,7 +553,7 @@ impl<'a> Widget for Diary<'a> {
SelectedSkillTree::Weapon(ToolKind::Hammer) => 5,
SelectedSkillTree::Weapon(ToolKind::Bow) => 4,
SelectedSkillTree::Weapon(ToolKind::Staff) => 5,
SelectedSkillTree::Weapon(ToolKind::Sceptre) => 4,
SelectedSkillTree::Weapon(ToolKind::Sceptre) => 5,
_ => 0,
};
let skills_bot_l = match sel_tab {
@ -1917,10 +1918,10 @@ impl<'a> Widget for Diary<'a> {
&diary_tooltip,
);
self.create_unlock_skill_button(
Skill::Sceptre(HCost),
self.imgs.heal_cost_skill,
Skill::Sceptre(HDuration),
self.imgs.heal_duration_skill,
state.skills_top_r[2],
"sc_heal_cost",
"sc_heal_duration",
state.skill_sceptre_heal_2,
ui,
&mut events,
@ -1928,7 +1929,7 @@ impl<'a> Widget for Diary<'a> {
);
self.create_unlock_skill_button(
Skill::Sceptre(HRange),
self.imgs.heal_distance_skill,
self.imgs.heal_radius_skill,
state.skills_top_r[3],
"sc_heal_range",
state.skill_sceptre_heal_3,
@ -1936,6 +1937,16 @@ impl<'a> Widget for Diary<'a> {
&mut events,
&diary_tooltip,
);
self.create_unlock_skill_button(
Skill::Sceptre(HCost),
self.imgs.heal_cost_skill,
state.skills_top_r[4],
"sc_heal_cost",
state.skill_sceptre_heal_4,
ui,
&mut events,
&diary_tooltip,
);
// Bottom left skills
self.create_unlock_skill_button(
Skill::Sceptre(UnlockAura),