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

Changelog line, final balance tweaks.

Browse Source
This commit is contained in:
Sam 2020-09-25 16:06:51 -05:00
parent 0b80257aa3
commit 51141b2c1a
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Overhauled persistence layer including no longer storing serialized JSON items in the database
- Overhauled representation of blocks to permit fluid and sprite coexistence
- Overhauled sword
- Reworked healing sceptre
### Removed

4
common/src/comp/inventory/item/tool.rs
View File

@ -347,8 +347,8 @@ impl Tool {
col: (0.0, 1.0, 0.0).into(),
..Default::default()
}),
projectile_gravity: Some(Gravity(1.0)),
projectile_speed: 25.0,
projectile_gravity: Some(Gravity(0.5)),
projectile_speed: 40.0,
},
],
Staff(_) => vec![

16
common/src/states/basic_beam.rs
View File

@ -97,17 +97,21 @@ impl CharacterBehavior for Data {
stage_section: StageSection::Cast,
particle_ori: Some(*data.inputs.look_dir),
offset: eye_height * 0.9,
});
}
},
StageSection::Cast => {
if data.inputs.primary.is_pressed() {
let damage = (self.static_data.base_dps as f32 / self.static_data.tick_rate) as u32;
let heal = (self.static_data.base_hps as f32 / self.static_data.tick_rate) as u32;
let energy_regen = (self.static_data.energy_regen as f32 / self.static_data.tick_rate) as u32;
let energy_drain = (self.static_data.energy_drain as f32 / self.static_data.tick_rate) as u32;
let speed = self.static_data.range / self.static_data.beam_duration.as_secs_f32();
let damage =
(self.static_data.base_dps as f32 / self.static_data.tick_rate) as u32;
let heal =
(self.static_data.base_hps as f32 / self.static_data.tick_rate) as u32;
let energy_regen =
(self.static_data.energy_regen as f32 / self.static_data.tick_rate) as u32;
let energy_drain =
(self.static_data.energy_drain 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 {
angle: self.static_data.max_angle.to_radians(),
speed,

4
voxygen/src/scene/particle.rs
View File

@ -360,7 +360,9 @@ impl ParticleMgr {
time + i as f64 / 1000.0,
ParticleMode::HealingBeam,
pos.0 + particle_ori * 0.5 + Vec3::new(0.0, 0.0, b.offset),
pos.0 + particle_ori * b.static_data.range + Vec3::new(0.0, 0.0, b.offset),
pos.0
+ particle_ori * b.static_data.range
+ Vec3::new(0.0, 0.0, b.offset),
));
}
}