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

Healing staff

Browse Source
This commit is contained in:
timokoesters 2020-03-24 22:03:11 +01:00
parent 2465d7acf2
commit f9668943e9
9 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,10 @@ use std::time::Duration;
#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)] #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
pub enum CharacterAbility { pub enum CharacterAbility {
BasicMelee { BasicMelee {
energy_cost: u32,
buildup_duration: Duration, buildup_duration: Duration,
recover_duration: Duration, recover_duration: Duration,
base_damage: u32, base_healthchange: i32,
range: f32, range: f32,
max_angle: f32, max_angle: f32,
}, },
@ -69,6 +70,13 @@ impl CharacterAbility {
.try_change_by(-300, EnergySource::Ability) .try_change_by(-300, EnergySource::Ability)
.is_ok() .is_ok()
}, },
CharacterAbility::BasicMelee { energy_cost, .. } => {
!data.physics.in_fluid
&& update
.energy
.try_change_by(-(*energy_cost as i32), EnergySource::Ability)
.is_ok()
},
CharacterAbility::BasicRanged { energy_cost, .. } => { CharacterAbility::BasicRanged { energy_cost, .. } => {
!data.physics.in_fluid !data.physics.in_fluid
&& update && update
@ -110,14 +118,15 @@ impl From<&CharacterAbility> for CharacterState {
CharacterAbility::BasicMelee { CharacterAbility::BasicMelee {
buildup_duration, buildup_duration,
recover_duration, recover_duration,
base_damage, base_healthchange,
range, range,
max_angle, max_angle,
energy_cost: _,
} => CharacterState::BasicMelee(basic_melee::Data { } => CharacterState::BasicMelee(basic_melee::Data {
exhausted: false, exhausted: false,
buildup_duration: *buildup_duration, buildup_duration: *buildup_duration,
recover_duration: *recover_duration, recover_duration: *recover_duration,
base_damage: *base_damage, base_healthchange: *base_healthchange,
range: *range, range: *range,
max_angle: *max_angle, max_angle: *max_angle,
}), }),

2
common/src/comp/character_state.rs
View File

@ -127,7 +127,7 @@ impl Component for CharacterState {
#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct Attacking { pub struct Attacking {
pub base_damage: u32, pub base_healthchange: i32,
pub range: f32, pub range: f32,
pub max_angle: f32, pub max_angle: f32,
pub applied: bool, pub applied: bool,

36
common/src/comp/inventory/item.rs
View File

@ -76,16 +76,18 @@ impl ToolData {
base_damage: 20, base_damage: 20,
}], }],
Axe(_) => vec![BasicMelee { Axe(_) => vec![BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(700), buildup_duration: Duration::from_millis(700),
recover_duration: Duration::from_millis(100), recover_duration: Duration::from_millis(100),
base_damage: 8, base_healthchange: -8,
range: 3.5, range: 3.5,
max_angle: 30.0, max_angle: 30.0,
}], }],
Hammer(_) => vec![BasicMelee { Hammer(_) => vec![BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(700), buildup_duration: Duration::from_millis(700),
recover_duration: Duration::from_millis(300), recover_duration: Duration::from_millis(300),
base_damage: 10, base_healthchange: -10,
range: 3.5, range: 3.5,
max_angle: 60.0, max_angle: 60.0,
}], }],
@ -112,21 +114,19 @@ impl ToolData {
projectile_gravity: Some(Gravity(0.1)), projectile_gravity: Some(Gravity(0.1)),
}], }],
Dagger(_) => vec![BasicMelee { Dagger(_) => vec![BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(100), buildup_duration: Duration::from_millis(100),
recover_duration: Duration::from_millis(400), recover_duration: Duration::from_millis(400),
base_damage: 5, base_healthchange: -5,
range: 3.5, range: 3.5,
max_angle: 60.0, max_angle: 60.0,
}], }],
Staff(_) => vec![ Staff(StaffKind::BasicStaff) => vec![
//Intended behaviour for the healing sceptre: M1 -> Heal a single target (not a
// projectile, just a heal for the target.) Optional: Green flash of the healed
// target. M2: Heal everyone around the caster, including the
// caster
BasicMelee { BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(0), buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(300), recover_duration: Duration::from_millis(300),
base_damage: 1, base_healthchange: -1,
range: 10.0, range: 10.0,
max_angle: 45.0, max_angle: 45.0,
}, },
@ -185,6 +185,24 @@ impl ToolData {
projectile_gravity: None, projectile_gravity: None,
}, },
], ],
Staff(StaffKind::Sceptre) => vec![
BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(300),
base_healthchange: -1,
range: 10.0,
max_angle: 45.0,
},
BasicMelee {
energy_cost: 350,
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(1000),
base_healthchange: 15,
range: 10.0,
max_angle: 45.0,
},
],
Shield(_) => vec![BasicBlock], Shield(_) => vec![BasicBlock],
Debug(kind) => match kind { Debug(kind) => match kind {
DebugKind::Boost => vec![ DebugKind::Boost => vec![

12
common/src/states/basic_melee.rs
View File

@ -11,8 +11,8 @@ pub struct Data {
pub buildup_duration: Duration, pub buildup_duration: Duration,
/// How long the state has until exiting /// How long the state has until exiting
pub recover_duration: Duration, pub recover_duration: Duration,
/// Base damage /// Base damage (negative) or healing (positive)
pub base_damage: u32, pub base_healthchange: i32,
/// Max range /// Max range
pub range: f32, pub range: f32,
/// Max angle (45.0 will give you a 90.0 angle window) /// Max angle (45.0 will give you a 90.0 angle window)
@ -35,7 +35,7 @@ impl CharacterBehavior for Data {
.checked_sub(Duration::from_secs_f32(data.dt.0)) .checked_sub(Duration::from_secs_f32(data.dt.0))
.unwrap_or_default(), .unwrap_or_default(),
recover_duration: self.recover_duration, recover_duration: self.recover_duration,
base_damage: self.base_damage, base_healthchange: self.base_healthchange,
range: self.range, range: self.range,
max_angle: self.max_angle, max_angle: self.max_angle,
exhausted: false, exhausted: false,
@ -43,7 +43,7 @@ impl CharacterBehavior for Data {
} else if !self.exhausted { } else if !self.exhausted {
// Hit attempt // Hit attempt
data.updater.insert(data.entity, Attacking { data.updater.insert(data.entity, Attacking {
base_damage: self.base_damage, base_healthchange: self.base_healthchange,
range: self.range, range: self.range,
max_angle: self.max_angle.to_radians(), max_angle: self.max_angle.to_radians(),
applied: false, applied: false,
@ -53,7 +53,7 @@ impl CharacterBehavior for Data {
update.character = CharacterState::BasicMelee(Data { update.character = CharacterState::BasicMelee(Data {
buildup_duration: self.buildup_duration, buildup_duration: self.buildup_duration,
recover_duration: self.recover_duration, recover_duration: self.recover_duration,
base_damage: self.base_damage, base_healthchange: self.base_healthchange,
range: self.range, range: self.range,
max_angle: self.max_angle, max_angle: self.max_angle,
exhausted: true, exhausted: true,
@ -66,7 +66,7 @@ impl CharacterBehavior for Data {
.recover_duration .recover_duration
.checked_sub(Duration::from_secs_f32(data.dt.0)) .checked_sub(Duration::from_secs_f32(data.dt.0))
.unwrap_or_default(), .unwrap_or_default(),
base_damage: self.base_damage, base_healthchange: self.base_healthchange,
range: self.range, range: self.range,
max_angle: self.max_angle, max_angle: self.max_angle,
exhausted: true, exhausted: true,

2
common/src/states/dash_melee.rs
View File

@ -53,7 +53,7 @@ impl CharacterBehavior for Data {
} else if !self.exhausted { } else if !self.exhausted {
// Hit attempt // Hit attempt
data.updater.insert(data.entity, Attacking { data.updater.insert(data.entity, Attacking {
base_damage: self.base_damage, base_healthchange: -(self.base_damage as i32),
range: 3.5, range: 3.5,
max_angle: 180_f32.to_radians(), max_angle: 180_f32.to_radians(),
applied: false, applied: false,

2
common/src/states/timed_combo.rs
View File

@ -52,7 +52,7 @@ impl CharacterBehavior for Data {
else if !self.stage_exhausted { else if !self.stage_exhausted {
// Swing hits // Swing hits
data.updater.insert(data.entity, Attacking { data.updater.insert(data.entity, Attacking {
base_damage: self.base_damage * (self.stage as u32 + 1), base_healthchange: -((self.base_damage * (self.stage as u32 + 1)) as i32),
range: 3.5, range: 3.5,
max_angle: 75_f32.to_radians(), max_angle: 75_f32.to_radians(),
applied: false, applied: false,

2
common/src/states/triple_strike.rs
View File

@ -91,7 +91,7 @@ impl CharacterBehavior for Data {
// Try to deal damage in second half of stage // Try to deal damage in second half of stage
data.updater.insert(data.entity, Attacking { data.updater.insert(data.entity, Attacking {
base_damage: dmg, base_healthchange: -(dmg as i32),
range: 3.5, range: 3.5,
max_angle: 180_f32.to_radians(), max_angle: 180_f32.to_radians(),
applied: false, applied: false,

15
common/src/sys/combat.rs
View File

@ -99,28 +99,33 @@ impl<'a> System<'a> for Sys {
&& ori2.angle_between(pos_b2 - pos2) < attack.max_angle + (rad_b / pos2.distance(pos_b2)).atan() && ori2.angle_between(pos_b2 - pos2) < attack.max_angle + (rad_b / pos2.distance(pos_b2)).atan()
{ {
// Weapon gives base damage // Weapon gives base damage
let mut dmg = attack.base_damage; let mut healthchange = attack.base_healthchange;
// NPCs do less damage: // NPCs do less damage:
if agent_maybe.is_some() { if agent_maybe.is_some() {
dmg = (dmg / 2).max(1); if healthchange > 0 {
healthchange = (healthchange / 2).max(1);
}
if healthchange < 0 {
healthchange = (healthchange / 2).min(-1);
}
} }
if rand::random() { if rand::random() {
dmg += 1; healthchange = (healthchange as f32 * 1.2) as i32;
} }
// Block // Block
if character_b.is_block() if character_b.is_block()
&& ori_b.0.angle_between(pos.0 - pos_b.0) < BLOCK_ANGLE.to_radians() / 2.0 && ori_b.0.angle_between(pos.0 - pos_b.0) < BLOCK_ANGLE.to_radians() / 2.0
{ {
dmg = (dmg as f32 * (1.0 - BLOCK_EFFICIENCY)) as u32 healthchange = (healthchange as f32 * (1.0 - BLOCK_EFFICIENCY)) as i32
} }
server_emitter.emit(ServerEvent::Damage { server_emitter.emit(ServerEvent::Damage {
uid: *uid_b, uid: *uid_b,
change: HealthChange { change: HealthChange {
amount: -(dmg as i32), amount: healthchange,
cause: HealthSource::Attack { by: *uid }, cause: HealthSource::Attack { by: *uid },
}, },
}); });

6
server/src/sys/terrain.rs
View File

@ -207,9 +207,10 @@ impl<'a> System<'a> for Sys {
// We need the empty item so npcs can attack // We need the empty item so npcs can attack
item: Item::empty(), item: Item::empty(),
ability1: Some(CharacterAbility::BasicMelee { ability1: Some(CharacterAbility::BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(0), buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(300), recover_duration: Duration::from_millis(300),
base_damage: 2, base_healthchange: -2,
range: 3.5, range: 3.5,
max_angle: 60.0, max_angle: 60.0,
}), }),
@ -303,9 +304,10 @@ impl<'a> System<'a> for Sys {
"common.items.weapons.zweihander_sword_0", "common.items.weapons.zweihander_sword_0",
), ),
ability1: Some(CharacterAbility::BasicMelee { ability1: Some(CharacterAbility::BasicMelee {
energy_cost: 0,
buildup_duration: Duration::from_millis(800), buildup_duration: Duration::from_millis(800),
recover_duration: Duration::from_millis(200), recover_duration: Duration::from_millis(200),
base_damage: 13, base_healthchange: -13,
range: 3.5, range: 3.5,
max_angle: 60.0, max_angle: 60.0,
}), }),