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

Addressed first round of feedback on sword overhaul.

Browse Source
This commit is contained in:
Sam
2020-09-12 11:46:21 -05:00
parent c99e4c3c18
commit b06ab250cc
10 changed files with 170 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ pub enum CharacterAbilityType {
ChargedRanged,
DashMelee,
BasicBlock,
ComboMelee,
ComboMelee(u32),
LeapMelee,
SpinMelee,
GroundShockwave,
@ -35,7 +35,7 @@ impl From<&CharacterState> for CharacterAbilityType {
CharacterState::DashMelee(_) => Self::DashMelee,
CharacterState::BasicBlock => Self::BasicBlock,
CharacterState::LeapMelee(_) => Self::LeapMelee,
CharacterState::ComboMelee(_) => Self::ComboMelee,
CharacterState::ComboMelee(data) => Self::ComboMelee(data.stage),
CharacterState::SpinMelee(_) => Self::SpinMelee,
CharacterState::ChargedRanged(_) => Self::ChargedRanged,
CharacterState::GroundShockwave(_) => Self::ChargedRanged,
@ -85,6 +85,7 @@ pub enum CharacterAbility {
swing_duration: Duration,
recover_duration: Duration,
infinite_charge: bool,
is_interruptible: bool,
},
BasicBlock,
Roll,
@ -95,6 +96,7 @@ pub enum CharacterAbility {
energy_increase: u32,
speed_increase: f32,
max_speed_increase: f32,
is_interruptible: bool,
},
LeapMelee {
energy_cost: u32,
@ -334,6 +336,7 @@ impl From<&CharacterAbility> for CharacterState {
swing_duration,
recover_duration,
infinite_charge,
is_interruptible,
} => CharacterState::DashMelee(dash_melee::Data {
static_data: dash_melee::StaticData {
base_damage: *base_damage,
@ -349,6 +352,7 @@ impl From<&CharacterAbility> for CharacterState {
charge_duration: *charge_duration,
swing_duration: *swing_duration,
recover_duration: *recover_duration,
is_interruptible: *is_interruptible,
},
end_charge: false,
timer: Duration::default(),
@ -367,6 +371,7 @@ impl From<&CharacterAbility> for CharacterState {
energy_increase,
speed_increase,
max_speed_increase,
is_interruptible,
} => CharacterState::ComboMelee(combo_melee::Data {
stage: 1,
num_stages: stage_data.len() as u32,
@ -380,6 +385,7 @@ impl From<&CharacterAbility> for CharacterState {
next_stage: false,
speed_increase: 1.0 - *speed_increase,
max_speed_increase: *max_speed_increase - 1.0,
is_interruptible: *is_interruptible,
}),
CharacterAbility::LeapMelee {
energy_cost: _,