add shotgun and fix up collision layers
This commit is contained in:
parent
ad4a2cf393
commit
87fcc35a49
8 changed files with 92 additions and 31 deletions
|
|
@ -9,7 +9,7 @@ use bevy::prelude::*;
|
|||
use building::{BuildingInfo, BuildingPreview, PREVIEW_ALPHA, PopulatePlacedBuilding};
|
||||
use combat::{
|
||||
Defense, Health,
|
||||
projectiles::{Fire, Projectile, ProjectileLauncher, get_launch_vector},
|
||||
projectiles::{Fire, Projectile, ProjectileLauncher, get_shotgun_launch_vectors},
|
||||
};
|
||||
use combat_damagers::ContactDamage;
|
||||
use resources::Cost;
|
||||
|
|
@ -106,6 +106,7 @@ fn populate(
|
|||
5.0,
|
||||
Vec3::Y * (SIZE.y as f32 + 0.5),
|
||||
Duration::from_secs(10),
|
||||
10.0_f32.to_radians(),
|
||||
),
|
||||
Mesh3d(res.mesh.clone()),
|
||||
MeshMaterial3d(res.material.clone()),
|
||||
|
|
@ -114,20 +115,25 @@ fn populate(
|
|||
}
|
||||
|
||||
fn on_fire(trigger: Trigger<Fire>, mut commands: Commands, res: Res<BuildingResources>) {
|
||||
commands.spawn((
|
||||
RigidBody::Dynamic,
|
||||
trigger.event().team,
|
||||
Health::new(1.0),
|
||||
ContactDamage::projectile(5.0, f32::INFINITY),
|
||||
Transform::from_translation(trigger.event().spawn_pos),
|
||||
Projectile::from(&trigger.event().launcher),
|
||||
LinearVelocity(get_launch_vector(
|
||||
trigger.event().spawn_pos,
|
||||
trigger.event().target_pos,
|
||||
5.0,
|
||||
)),
|
||||
res.projectile_collider.clone(),
|
||||
MeshMaterial3d(res.projectile_material.clone()),
|
||||
Mesh3d(res.projectile_mesh.clone()),
|
||||
));
|
||||
for v in get_shotgun_launch_vectors(
|
||||
trigger.event().spawn_pos,
|
||||
trigger.event().target_pos,
|
||||
5.0,
|
||||
trigger.event().launcher.spread,
|
||||
5,
|
||||
) {
|
||||
commands.spawn((
|
||||
RigidBody::Dynamic,
|
||||
trigger.event().team,
|
||||
Health::new(1.0),
|
||||
ContactDamage::projectile(5.0, f32::INFINITY),
|
||||
Transform::from_translation(trigger.event().spawn_pos),
|
||||
Projectile::from(&trigger.event().launcher),
|
||||
Projectile::collision_layers(trigger.event().team),
|
||||
LinearVelocity(v),
|
||||
res.projectile_collider.clone(),
|
||||
MeshMaterial3d(res.projectile_material.clone()),
|
||||
Mesh3d(res.projectile_mesh.clone()),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue