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

Prevent explosion damage going through walls

Browse Source
This commit is contained in:
Joshua Barretto 2023-05-21 15:30:18 +01:00
parent 796dce81af
commit b730766106
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/events/entity_manipulation.rs
View File

@ -768,6 +768,8 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
// TODO: Faster RNG? // TODO: Faster RNG?
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
// TODO: Process terrain destruction first so that entities don't get protected
// by terrain that gets destroyed?
'effects: for effect in explosion.effects { 'effects: for effect in explosion.effects {
match effect { match effect {
RadiusEffect::TerrainDestruction(power, new_color) => { RadiusEffect::TerrainDestruction(power, new_color) => {
@ -911,6 +913,7 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
let players = &ecs.read_storage::<Player>(); let players = &ecs.read_storage::<Player>();
let buffs = &ecs.read_storage::<comp::Buffs>(); let buffs = &ecs.read_storage::<comp::Buffs>();
let stats = &ecs.read_storage::<comp::Stats>(); let stats = &ecs.read_storage::<comp::Stats>();
let terrain = ecs.read_resource::<TerrainGrid>();
for ( for (
entity_b, entity_b,
pos_b, pos_b,
@ -930,6 +933,8 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
.join() .join()
.filter(|(_, _, h, _)| !h.is_dead) .filter(|(_, _, h, _)| !h.is_dead)
{ {
let dist_sqrd = pos.distance_squared(pos_b.0);
// Check if it is a hit // Check if it is a hit
let strength = if let Some(body) = body_b_maybe { let strength = if let Some(body) = body_b_maybe {
cylinder_sphere_strength( cylinder_sphere_strength(
@ -940,10 +945,15 @@ pub fn handle_explosion(server: &Server, pos: Vec3<f32>, explosion: Explosion, o
*body, *body,
) )
} else { } else {
let distance_squared = pos.distance_squared(pos_b.0); 1.0 - dist_sqrd / explosion.radius.powi(2)
1.0 - distance_squared / explosion.radius.powi(2)
}; };
if strength > 0.0 {
// Cast a ray from the explosion to the entity to check visibility
if strength > 0.0
&& (terrain.ray(pos, pos_b.0).until(Block::is_opaque).cast().0 + 0.1)
.powi(2)
>= dist_sqrd
{
// See if entities are in the same group // See if entities are in the same group
let same_group = owner_entity let same_group = owner_entity
.and_then(|e| groups.get(e)) .and_then(|e| groups.get(e))