From 9b7edcf32f2ed00fa75a0f84895b7f871c3a6759 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 24 Jan 2021 23:47:10 -0500 Subject: [PATCH] Changed how beams determined the energy regen and energy cost. --- assets/common/abilities/sceptre/healingbeam.ron | 4 ++-- common/src/states/basic_beam.rs | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/assets/common/abilities/sceptre/healingbeam.ron b/assets/common/abilities/sceptre/healingbeam.ron index 5f040e9224..e107e03306 100644 --- a/assets/common/abilities/sceptre/healingbeam.ron +++ b/assets/common/abilities/sceptre/healingbeam.ron @@ -8,7 +8,7 @@ BasicBeam( range: 25.0, max_angle: 1.0, lifesteal_eff: 0.15, - energy_regen: 50, - energy_cost: 100, + energy_regen: 25, + energy_cost: 50, energy_drain: 0, ) \ No newline at end of file diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index 1891bf81d2..07bac71c76 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -127,10 +127,6 @@ impl CharacterBehavior for Data { source: DamageSource::Healing, value: self.static_data.base_hps as f32 / self.static_data.tick_rate, }; - let energy_regen = - (self.static_data.energy_regen as f32 / self.static_data.tick_rate) as u32; - let energy_cost = - (self.static_data.energy_cost as f32 / self.static_data.tick_rate) as u32; let speed = self.static_data.range / self.static_data.beam_duration.as_secs_f32(); let properties = beam::Properties { @@ -141,8 +137,8 @@ impl CharacterBehavior for Data { (Some(GroupTarget::InGroup), heal), ], lifesteal_eff: self.static_data.lifesteal_eff, - energy_regen, - energy_cost, + energy_regen: self.static_data.energy_regen, + energy_cost: self.static_data.energy_cost, duration: self.static_data.beam_duration, owner: Some(*data.uid), };