diff --git a/assets/common/abilities/sceptre/healingbeam.ron b/assets/common/abilities/sceptre/healingbeam.ron index 88fc4f02eb..5f040e9224 100644 --- a/assets/common/abilities/sceptre/healingbeam.ron +++ b/assets/common/abilities/sceptre/healingbeam.ron @@ -7,7 +7,7 @@ BasicBeam( tick_rate: 2.0, range: 25.0, max_angle: 1.0, - lifesteal_eff: 0.20, + lifesteal_eff: 0.15, energy_regen: 50, energy_cost: 100, energy_drain: 0, diff --git a/assets/common/abilities/sceptre/healingbomb.ron b/assets/common/abilities/sceptre/healingbomb.ron index 62a19fa567..e653d3931d 100644 --- a/assets/common/abilities/sceptre/healingbomb.ron +++ b/assets/common/abilities/sceptre/healingbomb.ron @@ -1,10 +1,10 @@ BasicRanged( - energy_cost: 400, + energy_cost: 450, buildup_duration: 800, recover_duration: 50, projectile: Heal( - heal: 100.0, - damage: 50.0, + heal: 80.0, + damage: 60.0, radius: 6.0, ), projectile_body: Object(BoltNature), diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron index ef1b8532a1..892b3ab0a4 100644 --- a/assets/voxygen/i18n/en/skills.ron +++ b/assets/voxygen/i18n/en/skills.ron @@ -37,25 +37,25 @@ "hud.skill.sc_projectile_speed_title": "Projectile Speed", "hud.skill.sc_projectile_speed": "Projectile threw 25% faster{SP}", "hud.skill.sc_energy_cost_title" : "Energy Cost", - "hud.skill.sc_energy_cost" : "Decreases energy cost of bomb by 20%{SP}", + "hud.skill.sc_energy_cost" : "Decreases energy cost of bomb by 15%{SP}", "hud.skill.sc_radius_title" : "Radius", - "hud.skill.sc_radius" : "Increases radius by 40%{SP}", + "hud.skill.sc_radius" : "Increases radius by 30%{SP}", "hud.skill.sc_damage_title" : "Damage", - "hud.skill.sc_damage" : "Increases damage by 20%{SP}", + "hud.skill.sc_damage" : "Increases damage of bomb by 20%{SP}", "hud.skill.sc_heal_title" : "Heal", - "hud.skill.sc_heal" : "Increases healing by 20%{SP}", + "hud.skill.sc_heal" : "Increases healing of bomb by 15%{SP}", "hud.skill.sc_heal_cost_title" : "Heal Cost", "hud.skill.sc_heal_cost" : "Use 10% less energy when healing{SP}", "hud.skill.sc_lifesteal_efficiency_title" : "Lifesteal Efficiency", - "hud.skill.sc_lifesteal_efficiency" : "Thieve 50% more health{SP}", + "hud.skill.sc_lifesteal_efficiency" : "Thieve 25% more health{SP}", "hud.skill.sc_range_title" : "Range", - "hud.skill.sc_range" : "Longer beam, by 25%{SP}", + "hud.skill.sc_range" : "Longer beam, by 20%{SP}", "hud.skill.sc_energy_regen_title" : "Energy Regen", "hud.skill.sc_energy_regen" : "Increases energy regen from dealing damage by 10%{SP}", - "hud.skill.sc_damage_title" : "Damage", - "hud.skill.sc_damage" : "Increases damage by 30%{SP}", + "hud.skill.sc_beam_damage_title" : "Beam Damage", + "hud.skill.sc_beam_damage" : "Increases damage from the beam by 25%{SP}", "hud.skill.sc_beam_heal_title" : "Beam Heal", - "hud.skill.sc_beam_heal" : "Increased healing from the beam by 20%{SP}", + "hud.skill.sc_beam_heal" : "Increased healing from the beam by 15%{SP}", // Staff "hud.skill.st_shockwave_range_title" : "Shockwave Range", "hud.skill.st_shockwave_range" : "throw things that used to be out of reach, range increased 20%{SP}", diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index 99b411ebd8..4006deffc9 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -975,19 +975,19 @@ impl CharacterAbility { .. } => { if let Ok(Some(level)) = skillset.skill_level(Sceptre(BHeal)) { - *base_hps = (*base_hps as f32 * 1.2_f32.powi(level.into())) as u32; + *base_hps = (*base_hps as f32 * 1.15_f32.powi(level.into())) as u32; } if let Ok(Some(level)) = skillset.skill_level(Sceptre(BDamage)) { - *base_dps = (*base_dps as f32 * 1.3_f32.powi(level.into())) as u32; + *base_dps = (*base_dps as f32 * 1.25_f32.powi(level.into())) as u32; } if let Ok(Some(level)) = skillset.skill_level(Sceptre(BRange)) { - let range_mod = 1.25_f32.powi(level.into()); + let range_mod = 1.20_f32.powi(level.into()); *range *= range_mod; // Duration modified to keep velocity constant *beam_duration = (*beam_duration as f32 * range_mod) as u64; } if let Ok(Some(level)) = skillset.skill_level(Sceptre(BLifesteal)) { - *lifesteal_eff *= 1.5_f32.powi(level.into()); + *lifesteal_eff *= 1.25_f32.powi(level.into()); } if let Ok(Some(level)) = skillset.skill_level(Sceptre(BRegen)) { *energy_regen = @@ -1017,14 +1017,14 @@ impl CharacterAbility { .skill_level(Sceptre(PRadius)) .unwrap_or(None) .unwrap_or(0); - let heal = 1.2_f32.powi(heal_level.into()); + let heal = 1.15_f32.powi(heal_level.into()); let power = 1.2_f32.powi(damage_level.into()); - let range = 1.4_f32.powi(range_level.into()); + let range = 1.3_f32.powi(range_level.into()); *projectile = projectile.modified_projectile(power, 1_f32, range, heal); } if let Ok(Some(level)) = skillset.skill_level(Sceptre(PCost)) { *energy_cost = - (*energy_cost as f32 * 0.8_f32.powi(level.into())) as u32; + (*energy_cost as f32 * 0.85_f32.powi(level.into())) as u32; } if let Ok(Some(level)) = skillset.skill_level(Sceptre(PProjSpeed)) { *projectile_speed *= 1.25_f32.powi(level.into()); diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index 3c961f81db..78c5753c9b 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -3142,9 +3142,9 @@ impl<'a> Widget for Diary<'a> { ) .with_tooltip( self.tooltip_manager, - &self.localized_strings.get("hud.skill.sc_damage_title"), + &self.localized_strings.get("hud.skill.sc_beam_damage_title"), &add_sp_cost_tooltip( - &self.localized_strings.get("hud.skill.sc_damage"), + &self.localized_strings.get("hud.skill.sc_beam_damage"), skill, &self.stats.skill_set, &self.localized_strings,