simple missile ability and sound (#38)
This commit is contained in:
@@ -9,7 +9,7 @@
|
|||||||
/*07*/(key:"green grocer", range:60, ammo: 10, damage: 25),
|
/*07*/(key:"green grocer", range:60, ammo: 10, damage: 25),
|
||||||
/*08*/(key:"highland hammer thrower", ability:Thrown, ammo: 10, damage: 25, range:80, projectile:"hammer"),
|
/*08*/(key:"highland hammer thrower", ability:Thrown, ammo: 10, damage: 25, range:80, projectile:"hammer"),
|
||||||
/*09*/(key:"legionnaire", ability:Gun, ammo: 25, range:60, damage: 13),
|
/*09*/(key:"legionnaire", ability:Gun, ammo: 25, range:60, damage: 13),
|
||||||
/*10*/(key:"mig pilot", ability:Gun, ammo: 5, range:60, damage:100, controls:Plane),
|
/*10*/(key:"mig pilot", ability:Missile, ammo: 5, range:60, damage:100, controls:Plane),
|
||||||
/*11*/(key:"nanny", ability:Thrown, range:60),
|
/*11*/(key:"nanny", ability:Thrown, range:60),
|
||||||
/*12*/(key:"panic attack"),
|
/*12*/(key:"panic attack"),
|
||||||
/*13*/(key:"salty sea dog"),
|
/*13*/(key:"salty sea dog"),
|
||||||
|
|||||||
BIN
assets/models/projectiles/missile.glb
Normal file
BIN
assets/models/projectiles/missile.glb
Normal file
Binary file not shown.
BIN
assets/sfx/abilities/missile-explosion.ogg
Normal file
BIN
assets/sfx/abilities/missile-explosion.ogg
Normal file
Binary file not shown.
224
src/abilities/missile.rs
Normal file
224
src/abilities/missile.rs
Normal file
@@ -0,0 +1,224 @@
|
|||||||
|
use super::TriggerMissile;
|
||||||
|
use crate::{
|
||||||
|
GameState,
|
||||||
|
billboards::Billboard,
|
||||||
|
heads_database::HeadsDatabase,
|
||||||
|
hitpoints::Hit,
|
||||||
|
loading_assets::GameAssets,
|
||||||
|
physics_layers::GameLayer,
|
||||||
|
sounds::PlaySound,
|
||||||
|
utils::{global_observer, sprite_3d_animation::AnimationTimer},
|
||||||
|
};
|
||||||
|
use avian3d::prelude::*;
|
||||||
|
use bevy::{pbr::NotShadowCaster, prelude::*};
|
||||||
|
use bevy_polyline::prelude::*;
|
||||||
|
use bevy_sprite3d::{Sprite3dBuilder, Sprite3dParams};
|
||||||
|
use std::f32::consts::PI;
|
||||||
|
|
||||||
|
const MAX_SHOT_AGES: f32 = 5.;
|
||||||
|
|
||||||
|
#[derive(Component)]
|
||||||
|
struct MissileProjectile {
|
||||||
|
time: f32,
|
||||||
|
damage: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Event, Debug)]
|
||||||
|
struct Explosion {
|
||||||
|
position: Vec3,
|
||||||
|
radius: f32,
|
||||||
|
damage: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Resource)]
|
||||||
|
struct ShotAssets {
|
||||||
|
image: Handle<Image>,
|
||||||
|
layout: Handle<TextureAtlasLayout>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn plugin(app: &mut App) {
|
||||||
|
app.add_systems(OnEnter(GameState::Playing), setup);
|
||||||
|
app.add_systems(
|
||||||
|
Update,
|
||||||
|
(shot_collision, update, timeout).run_if(in_state(GameState::Playing)),
|
||||||
|
);
|
||||||
|
|
||||||
|
global_observer!(app, on_trigger_missile);
|
||||||
|
global_observer!(app, on_explosion);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn on_explosion(
|
||||||
|
explosion: Trigger<Explosion>,
|
||||||
|
mut commands: Commands,
|
||||||
|
spatial_query: SpatialQuery,
|
||||||
|
) {
|
||||||
|
let explosion = explosion.event();
|
||||||
|
let intersections = {
|
||||||
|
spatial_query.shape_intersections(
|
||||||
|
&Collider::sphere(explosion.radius),
|
||||||
|
explosion.position,
|
||||||
|
Quat::default(),
|
||||||
|
&SpatialQueryFilter::default().with_mask(LayerMask(
|
||||||
|
GameLayer::Npc.to_bits() | GameLayer::Player.to_bits(),
|
||||||
|
)),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
for entity in intersections.iter() {
|
||||||
|
if let Some(mut e) = commands.get_entity(*entity) {
|
||||||
|
e.trigger(Hit {
|
||||||
|
damage: explosion.damage,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn setup(mut commands: Commands, assets: Res<GameAssets>, mut sprite_params: Sprite3dParams) {
|
||||||
|
let layout = TextureAtlasLayout::from_grid(UVec2::splat(256), 7, 6, None, None);
|
||||||
|
let texture_atlas_layout = sprite_params.atlas_layouts.add(layout);
|
||||||
|
|
||||||
|
commands.insert_resource(ShotAssets {
|
||||||
|
image: assets.impact_atlas.clone(),
|
||||||
|
layout: texture_atlas_layout,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn on_trigger_missile(
|
||||||
|
trigger: Trigger<TriggerMissile>,
|
||||||
|
mut commands: Commands,
|
||||||
|
query_transform: Query<&Transform>,
|
||||||
|
time: Res<Time>,
|
||||||
|
mut polyline_materials: ResMut<Assets<PolylineMaterial>>,
|
||||||
|
mut polylines: ResMut<Assets<Polyline>>,
|
||||||
|
heads_db: Res<HeadsDatabase>,
|
||||||
|
assets: Res<GameAssets>,
|
||||||
|
gltf_assets: Res<Assets<Gltf>>,
|
||||||
|
) {
|
||||||
|
let state = trigger.event().0;
|
||||||
|
|
||||||
|
let rotation = if let Some(target) = state.target {
|
||||||
|
let t = query_transform
|
||||||
|
.get(target)
|
||||||
|
.expect("target must have transform");
|
||||||
|
Transform::from_translation(state.pos)
|
||||||
|
.looking_at(t.translation, Vec3::Y)
|
||||||
|
.rotation
|
||||||
|
} else {
|
||||||
|
state.rot.mul_quat(Quat::from_rotation_y(PI))
|
||||||
|
};
|
||||||
|
|
||||||
|
let head = heads_db.head_stats(state.head);
|
||||||
|
|
||||||
|
let mut t = Transform::from_translation(state.pos).with_rotation(rotation);
|
||||||
|
t.translation += t.forward().as_vec3() * 3.0;
|
||||||
|
|
||||||
|
let mesh = assets.projectiles["missile.glb"].clone();
|
||||||
|
let asset = gltf_assets.get(&mesh).unwrap();
|
||||||
|
|
||||||
|
commands
|
||||||
|
.spawn((
|
||||||
|
Name::new("projectile-missle"),
|
||||||
|
MissileProjectile {
|
||||||
|
time: time.elapsed_secs(),
|
||||||
|
damage: head.damage,
|
||||||
|
},
|
||||||
|
Collider::capsule_endpoints(0.5, Vec3::new(0., 0., 0.), Vec3::new(0., 0., -3.)),
|
||||||
|
CollisionLayers::new(
|
||||||
|
LayerMask(GameLayer::Projectile.to_bits()),
|
||||||
|
LayerMask(state.target_layer.to_bits() | GameLayer::Level.to_bits()),
|
||||||
|
),
|
||||||
|
Sensor,
|
||||||
|
Visibility::default(),
|
||||||
|
t,
|
||||||
|
))
|
||||||
|
.with_child((
|
||||||
|
Transform::from_rotation(Quat::from_rotation_x(PI / 2.).inverse())
|
||||||
|
.with_scale(Vec3::splat(0.04)),
|
||||||
|
SceneRoot(asset.scenes[0].clone()),
|
||||||
|
))
|
||||||
|
.with_child(PolylineBundle {
|
||||||
|
polyline: PolylineHandle(polylines.add(Polyline {
|
||||||
|
vertices: vec![Vec3::Z * 4., Vec3::Z * 0.],
|
||||||
|
})),
|
||||||
|
material: PolylineMaterialHandle(polyline_materials.add(PolylineMaterial {
|
||||||
|
width: 12.0,
|
||||||
|
color: LinearRgba::rgb(0.9, 0.9, 0.),
|
||||||
|
perspective: false,
|
||||||
|
..default()
|
||||||
|
})),
|
||||||
|
..default()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update(mut query: Query<&mut Transform, With<MissileProjectile>>) {
|
||||||
|
for mut transform in query.iter_mut() {
|
||||||
|
let forward = transform.forward();
|
||||||
|
transform.translation += forward * 3.;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn timeout(mut commands: Commands, query: Query<(Entity, &MissileProjectile)>, time: Res<Time>) {
|
||||||
|
let current_time = time.elapsed_secs();
|
||||||
|
|
||||||
|
for (e, MissileProjectile { time, .. }) in query.iter() {
|
||||||
|
if current_time > time + MAX_SHOT_AGES {
|
||||||
|
commands.entity(e).despawn_recursive();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn shot_collision(
|
||||||
|
mut commands: Commands,
|
||||||
|
mut collision_event_reader: EventReader<CollisionStarted>,
|
||||||
|
query_shot: Query<(&MissileProjectile, &Transform)>,
|
||||||
|
assets: Res<ShotAssets>,
|
||||||
|
mut sprite_params: Sprite3dParams,
|
||||||
|
) {
|
||||||
|
for CollisionStarted(e1, e2) in collision_event_reader.read() {
|
||||||
|
if !query_shot.contains(*e1) && !query_shot.contains(*e2) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let shot_entity = if query_shot.contains(*e1) { *e1 } else { *e2 };
|
||||||
|
|
||||||
|
let Ok((shot_pos, damage)) = query_shot
|
||||||
|
.get(shot_entity)
|
||||||
|
.map(|(projectile, t)| (t.translation, projectile.damage))
|
||||||
|
else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
commands.trigger(PlaySound::MissileExplosion);
|
||||||
|
|
||||||
|
commands.entity(shot_entity).despawn_recursive();
|
||||||
|
|
||||||
|
commands.trigger(Explosion {
|
||||||
|
damage,
|
||||||
|
position: shot_pos,
|
||||||
|
radius: 6.,
|
||||||
|
});
|
||||||
|
|
||||||
|
let texture_atlas = TextureAtlas {
|
||||||
|
layout: assets.layout.clone(),
|
||||||
|
index: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
commands
|
||||||
|
.spawn(
|
||||||
|
Sprite3dBuilder {
|
||||||
|
image: assets.image.clone(),
|
||||||
|
pixels_per_metre: 16.,
|
||||||
|
alpha_mode: AlphaMode::Blend,
|
||||||
|
unlit: true,
|
||||||
|
..default()
|
||||||
|
}
|
||||||
|
.bundle_with_atlas(&mut sprite_params, texture_atlas),
|
||||||
|
)
|
||||||
|
.insert((
|
||||||
|
Billboard,
|
||||||
|
Transform::from_translation(shot_pos),
|
||||||
|
NotShadowCaster,
|
||||||
|
AnimationTimer::new(Timer::from_seconds(0.01, TimerMode::Repeating)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
mod arrow;
|
mod arrow;
|
||||||
mod gun;
|
mod gun;
|
||||||
|
mod missile;
|
||||||
mod thrown;
|
mod thrown;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
@@ -31,6 +32,7 @@ pub enum HeadAbility {
|
|||||||
Arrow,
|
Arrow,
|
||||||
Thrown,
|
Thrown,
|
||||||
Gun,
|
Gun,
|
||||||
|
Missile,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Reflect, Clone, Copy)]
|
#[derive(Debug, Reflect, Clone, Copy)]
|
||||||
@@ -69,11 +71,14 @@ pub struct TriggerGun(pub TriggerData);
|
|||||||
pub struct TriggerArrow(pub TriggerData);
|
pub struct TriggerArrow(pub TriggerData);
|
||||||
#[derive(Event, Reflect)]
|
#[derive(Event, Reflect)]
|
||||||
pub struct TriggerThrow(pub TriggerData);
|
pub struct TriggerThrow(pub TriggerData);
|
||||||
|
#[derive(Event, Reflect)]
|
||||||
|
pub struct TriggerMissile(pub TriggerData);
|
||||||
|
|
||||||
pub fn plugin(app: &mut App) {
|
pub fn plugin(app: &mut App) {
|
||||||
app.add_plugins(gun::plugin);
|
app.add_plugins(gun::plugin);
|
||||||
app.add_plugins(thrown::plugin);
|
app.add_plugins(thrown::plugin);
|
||||||
app.add_plugins(arrow::plugin);
|
app.add_plugins(arrow::plugin);
|
||||||
|
app.add_plugins(missile::plugin);
|
||||||
|
|
||||||
global_observer!(app, on_trigger_state);
|
global_observer!(app, on_trigger_state);
|
||||||
}
|
}
|
||||||
@@ -132,6 +137,7 @@ fn on_trigger_state(
|
|||||||
match ability {
|
match ability {
|
||||||
HeadAbility::Thrown => commands.trigger(TriggerThrow(trigger_state)),
|
HeadAbility::Thrown => commands.trigger(TriggerThrow(trigger_state)),
|
||||||
HeadAbility::Gun => commands.trigger(TriggerGun(trigger_state)),
|
HeadAbility::Gun => commands.trigger(TriggerGun(trigger_state)),
|
||||||
|
HeadAbility::Missile => commands.trigger(TriggerMissile(trigger_state)),
|
||||||
HeadAbility::Arrow => commands.trigger(TriggerArrow(trigger_state)),
|
HeadAbility::Arrow => commands.trigger(TriggerArrow(trigger_state)),
|
||||||
HeadAbility::None => (),
|
HeadAbility::None => (),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -48,6 +48,9 @@ pub struct AudioAssets {
|
|||||||
#[asset(path = "sfx/effects/head_drop.ogg")]
|
#[asset(path = "sfx/effects/head_drop.ogg")]
|
||||||
pub head_drop: Handle<AudioSource>,
|
pub head_drop: Handle<AudioSource>,
|
||||||
|
|
||||||
|
#[asset(path = "sfx/abilities/missile-explosion.ogg")]
|
||||||
|
pub missile_explosion: Handle<AudioSource>,
|
||||||
|
|
||||||
#[asset(path = "sfx/hit", collection(typed))]
|
#[asset(path = "sfx/hit", collection(typed))]
|
||||||
pub hit: Vec<Handle<AudioSource>>,
|
pub hit: Vec<Handle<AudioSource>>,
|
||||||
#[asset(path = "sfx/heads", collection(mapped, typed))]
|
#[asset(path = "sfx/heads", collection(mapped, typed))]
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ pub enum PlaySound {
|
|||||||
HeadDrop,
|
HeadDrop,
|
||||||
Selection,
|
Selection,
|
||||||
Invalid,
|
Invalid,
|
||||||
|
MissileExplosion,
|
||||||
Reloaded,
|
Reloaded,
|
||||||
CashHeal,
|
CashHeal,
|
||||||
Crossbow,
|
Crossbow,
|
||||||
@@ -56,6 +57,7 @@ fn on_spawn_sounds(
|
|||||||
PlaySound::CashHeal => assets.cash_heal.clone(),
|
PlaySound::CashHeal => assets.cash_heal.clone(),
|
||||||
PlaySound::HeadDrop => assets.head_drop.clone(),
|
PlaySound::HeadDrop => assets.head_drop.clone(),
|
||||||
PlaySound::HeadCollect => assets.head_collect.clone(),
|
PlaySound::HeadCollect => assets.head_collect.clone(),
|
||||||
|
PlaySound::MissileExplosion => assets.missile_explosion.clone(),
|
||||||
PlaySound::Backpack { open } => {
|
PlaySound::Backpack { open } => {
|
||||||
if *open {
|
if *open {
|
||||||
assets.backpack_open.clone()
|
assets.backpack_open.clone()
|
||||||
|
|||||||
Reference in New Issue
Block a user