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

Headshots from above are less precise, headshots from below are no longer precise.

Browse Source
This commit is contained in:
Sam 2023-11-11 16:05:23 -05:00
parent 17904d9387
commit 49756ac37c
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/combat.rs
View File

@ -52,6 +52,7 @@ pub const BEAM_DURATION_PRECISION: f32 = 2.5;
pub const MAX_BACK_FLANK_PRECISION: f32 = 0.75; pub const MAX_BACK_FLANK_PRECISION: f32 = 0.75;
pub const MAX_SIDE_FLANK_PRECISION: f32 = 0.25; pub const MAX_SIDE_FLANK_PRECISION: f32 = 0.25;
pub const MAX_HEADSHOT_PRECISION: f32 = 1.0; pub const MAX_HEADSHOT_PRECISION: f32 = 1.0;
pub const MAX_TOP_HEADSHOT_PRECISION: f32 = 0.5;
pub const MAX_BEAM_DUR_PRECISION: f32 = 0.25; pub const MAX_BEAM_DUR_PRECISION: f32 = 0.25;
pub const MAX_MELEE_POISE_PRECISION: f32 = 0.5; pub const MAX_MELEE_POISE_PRECISION: f32 = 0.5;

36
common/systems/src/projectile.rs
View File

@ -364,10 +364,10 @@ fn dispatch_hit(
let head_bottom_pos = head_top_pos.with_z( let head_bottom_pos = head_top_pos.with_z(
head_top_pos.z - target_height * combat::PROJECTILE_HEADSHOT_PROPORTION, head_top_pos.z - target_height * combat::PROJECTILE_HEADSHOT_PROPORTION,
); );
let headshot = if (curr_pos.z < head_bottom_pos.z && last_pos.z < head_bottom_pos.z) if (curr_pos.z < head_bottom_pos.z && last_pos.z < head_bottom_pos.z)
|| (curr_pos.z > head_top_pos.z && last_pos.z > head_top_pos.z) || (curr_pos.z > head_top_pos.z && last_pos.z > head_top_pos.z)
{ {
false None
} else if curr_pos.z > head_top_pos.z } else if curr_pos.z > head_top_pos.z
|| curr_pos.z < head_bottom_pos.z || curr_pos.z < head_bottom_pos.z
|| last_pos.z > head_top_pos.z || last_pos.z > head_top_pos.z
@ -381,9 +381,24 @@ fn dispatch_hit(
let t = (head_bottom_pos.z - last_pos.z) / vel.z; let t = (head_bottom_pos.z - last_pos.z) / vel.z;
last_pos + vel * t last_pos + vel * t
}; };
head_top_pos.distance_squared(proj_top_intersection) < target_radius.powi(2) let intersected_bottom = head_bottom_pos
|| head_bottom_pos.distance_squared(proj_bottom_intersection) .distance_squared(proj_bottom_intersection)
< target_radius.powi(2) < target_radius.powi(2);
let intersected_top = head_top_pos.distance_squared(proj_top_intersection)
< target_radius.powi(2);
let hit_head = intersected_bottom || intersected_top;
let hit_from_bottom = last_pos.z < head_bottom_pos.z && intersected_bottom;
let hit_from_top = last_pos.z > head_top_pos.z && intersected_top;
// If projectile from bottom, do not award precision damage because it trivial
// to get from up close If projectile from top, reduce
// precision damage to mitigate cheesing benefits
if !hit_head || hit_from_bottom {
None
} else if hit_from_top {
Some(combat::MAX_TOP_HEADSHOT_PRECISION)
} else {
Some(combat::MAX_HEADSHOT_PRECISION)
}
} else { } else {
let trajectory = LineSegment3 { let trajectory = LineSegment3 {
start: last_pos, start: last_pos,
@ -393,12 +408,11 @@ fn dispatch_hit(
head_bottom_pos.z head_bottom_pos.z
+ target_height * combat::PROJECTILE_HEADSHOT_PROPORTION * 0.5, + target_height * combat::PROJECTILE_HEADSHOT_PROPORTION * 0.5,
); );
trajectory.distance_to_point(head_middle_pos) < target_radius if trajectory.distance_to_point(head_middle_pos) < target_radius {
}; Some(combat::MAX_HEADSHOT_PRECISION)
if headshot { } else {
Some(combat::MAX_HEADSHOT_PRECISION) None
} else { }
None
} }
}; };