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

Combo now only increases when landing a hit.

Browse Source
This commit is contained in:
Sam 2020-09-11 14:34:00 -05:00
parent 2aac008b90
commit 6dede05a0e
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/ability.rs
View File

@ -375,8 +375,8 @@ impl From<&CharacterAbility> for CharacterState {
timer: Duration::default(),
stage_section: StageSection::Buildup,
next_stage: false,
speed_increase: *speed_increase,
max_speed_increase: *max_speed_increase,
speed_increase: 1.0 - *speed_increase,
max_speed_increase: *max_speed_increase - 1.0,
}),
CharacterAbility::LeapMelee {
energy_cost: _,

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

@ -162,8 +162,8 @@ impl Tool {
initial_energy_gain: 0,
max_energy_gain: 100,
energy_increase: 20,
speed_increase: 0.9,
max_speed_increase: 0.8,
speed_increase: 0.05,
max_speed_increase: 1.8,
},
DashMelee {
energy_cost: 200,
@ -177,8 +177,8 @@ impl Tool {
forward_speed: 4.0,
buildup_duration: Duration::from_millis(200),
charge_duration: Duration::from_millis(400),
infinite_charge: true,
recover_duration: Duration::from_millis(750),
infinite_charge: true,
},
],
Axe(_) => vec![

24
common/src/states/combo_melee.rs
View File

@ -86,7 +86,7 @@ impl CharacterBehavior for Data {
energy_increase: self.energy_increase,
timer: self
.timer
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi((self.combo / self.num_stages) as i32))) * data.dt.0))
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi(self.combo as i32))) * data.dt.0))
.unwrap_or_default(),
stage_section: self.stage_section,
next_stage: self.next_stage,
@ -145,7 +145,7 @@ impl CharacterBehavior for Data {
energy_increase: self.energy_increase,
timer: self
.timer
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi((self.combo / self.num_stages) as i32))) * data.dt.0))
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi(self.combo as i32))) * data.dt.0))
.unwrap_or_default(),
stage_section: self.stage_section,
next_stage: self.next_stage,
@ -184,7 +184,7 @@ impl CharacterBehavior for Data {
energy_increase: self.energy_increase,
timer: self
.timer
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi((self.combo / self.num_stages) as i32))) * data.dt.0))
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi(self.combo as i32))) * data.dt.0))
.unwrap_or_default(),
stage_section: self.stage_section,
next_stage: true,
@ -202,7 +202,7 @@ impl CharacterBehavior for Data {
energy_increase: self.energy_increase,
timer: self
.timer
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi((self.combo / self.num_stages) as i32))) * data.dt.0))
.checked_add(Duration::from_secs_f32((1.0 + self.max_speed_increase * (1.0 - self.speed_increase.powi(self.combo as i32))) * data.dt.0))
.unwrap_or_default(),
stage_section: self.stage_section,
next_stage: self.next_stage,
@ -215,7 +215,7 @@ impl CharacterBehavior for Data {
update.character = CharacterState::ComboMelee(Data {
stage: (self.stage % self.num_stages) + 1,
num_stages: self.num_stages,
combo: self.combo + 1,
combo: self.combo,
stage_data: self.stage_data.clone(),
initial_energy_gain: self.initial_energy_gain,
max_energy_gain: self.max_energy_gain,
@ -240,6 +240,20 @@ impl CharacterBehavior for Data {
.max_energy_gain
.min(self.initial_energy_gain + self.combo * self.energy_increase)
as i32;
update.character = CharacterState::ComboMelee(Data {
stage: self.stage,
num_stages: self.num_stages,
combo: self.combo + 1,
stage_data: self.stage_data.clone(),
initial_energy_gain: self.initial_energy_gain,
max_energy_gain: self.max_energy_gain,
energy_increase: self.energy_increase,
timer: self.timer,
stage_section: self.stage_section,
next_stage: self.next_stage,
speed_increase: self.speed_increase,
max_speed_increase: self.max_speed_increase,
});
data.updater.remove::<Attacking>(data.entity);
update.energy.change_by(energy, EnergySource::HitEnemy);
}