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

Add attack buildup duration (Delay before hit)

Browse Source
This commit is contained in:
timokoesters 2019-08-26 21:15:49 +02:00
parent 72564cf8b4
commit 74677784c0
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,10 @@ use std::time::Duration;
use vek::*;
pub const WIELD_DURATION: Duration = Duration::from_millis(300);
pub const ATTACK_DURATION: Duration = Duration::from_millis(300);
pub const ATTACK_DURATION: Duration = Duration::from_millis(500);
// Delay before hit
const PREPARE_DURATION: Duration = Duration::from_millis(100);
const BASE_DMG: i32 = 10;
const BLOCK_EFFICIENCY: f32 = 0.9;
@ -52,14 +55,32 @@ impl<'a> System<'a> for Sys {
): Self::SystemData,
) {
// Attacks
for (entity, uid, pos, ori, controller) in
for (entity, uid, pos, ori, _) in
(&entities, &uids, &positions, &orientations, &controllers).join()
{
// Go through all other entities
if let Some(Attack { time_left, applied }) =
&mut character_states.get(entity).map(|c| c.action)
let (deal_damage, should_end) = if let Some(Attack { time_left, applied }) =
&mut character_states.get_mut(entity).map(|c| &mut c.action)
{
if !*applied {
*time_left = time_left
.checked_sub(Duration::from_secs_f32(dt.0))
.unwrap_or_default();
if !*applied && ATTACK_DURATION - *time_left > PREPARE_DURATION {
*applied = true;
(true, false)
} else if *time_left == Duration::default() {
(false, true)
} else {
(false, false)
}
} else {
(false, false)
};
if deal_damage {
if let Some(Attack { time_left, applied }) =
&character_states.get(entity).map(|c| c.action)
{
// Go through all other entities
for (b, pos_b, ori_b, character_b, mut vel_b, stat_b) in (
&entities,
&positions,
@ -101,24 +122,13 @@ impl<'a> System<'a> for Sys {
}
}
}
}
if let Some(Attack { time_left, applied }) =
&mut character_states.get_mut(entity).map(|c| &mut c.action)
{
// Only attack once
*applied = true;
if *time_left == Duration::default() {
if let Some(character) = &mut character_states.get_mut(entity) {
character.action = Wield {
time_left: Duration::default(),
};
}
} else {
*time_left = time_left
.checked_sub(Duration::from_secs_f32(dt.0))
.unwrap_or_default();
}
if should_end {
if let Some(character) = &mut character_states.get_mut(entity) {
character.action = Wield {
time_left: Duration::default(),
};
}
}