[Merged by Bors] - feat: re-add camera shake to items.

core/src/elements/crate_item.rs

@@ -260,6 +260,7 @@ fn update_thrown_crates(
             let atlas = breaking_atlas.clone();
 
             audio_events.play(break_sound.clone(), *break_sound_volume);
+
             commands.add(
                 move |mut entities: ResMut<Entities>,
                       mut transforms: CompMut<Transform>,

core/src/elements/grenade.rs

@@ -172,6 +172,7 @@ fn update_lit_grenades(
     element_assets: BevyAssets<ElementMeta>,
     transforms: CompMut<Transform>,
     mut audio_events: ResMut<AudioEvents>,
+    mut trauma_events: ResMut<CameraTraumaEvents>,
     mut lit_grenades: CompMut<LitGrenade>,
     mut bodies: CompMut<KinematicBody>,
     mut hydrated: CompMut<MapElementHydrated>,
@@ -255,6 +256,8 @@ fn update_lit_grenades(
         if grenade.age >= *fuse_time {
             audio_events.play(explosion_sound.clone(), *explosion_volume);
 
+            trauma_events.send(5.0);
+
             // Cause the item to respawn by un-hydrating it's spawner.
             hydrated.remove(**spawner);
             let mut explosion_transform = *transforms.get(entity).unwrap();

core/src/elements/kick_bomb.rs

@@ -173,6 +173,7 @@ fn update_lit_kick_bombs(
     collision_world: CollisionWorld,
     player_indexes: Comp<PlayerIdx>,
     mut audio_events: ResMut<AudioEvents>,
+    mut trauma_events: ResMut<CameraTraumaEvents>,
     mut lit_grenades: CompMut<LitKickBomb>,
     mut sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
@@ -269,6 +270,8 @@ fn update_lit_kick_bombs(
         if kick_bomb.age >= *fuse_time || should_explode {
             audio_events.play(explosion_sound.clone(), *explosion_volume);
 
+            trauma_events.send(7.5);
+
             // Cause the item to respawn by un-hydrating it's spawner.
             hydrated.remove(**spawner);
             let mut explosion_transform = *transforms.get(entity).unwrap();

core/src/elements/mine.rs

@@ -154,6 +154,7 @@ fn update_thrown_mines(
     element_handles: Comp<ElementHandle>,
     element_assets: BevyAssets<ElementMeta>,
     mut audio_events: ResMut<AudioEvents>,
+    mut trauma_events: ResMut<CameraTraumaEvents>,
     mut thrown_mines: CompMut<ThrownMine>,
     mut animated_sprites: CompMut<AnimatedSprite>,
     mut hydrated: CompMut<MapElementHydrated>,
@@ -211,6 +212,8 @@ fn update_thrown_mines(
         if !colliding_with_players.is_empty() && thrown_mine.age >= *arm_delay {
             let mine_transform = *transforms.get(entity).unwrap();
 
+            trauma_events.send(6.0);
+
             for player in &colliding_with_players {
                 commands.add(PlayerCommand::kill(
                     *player,

core/src/map.rs

@@ -101,7 +101,7 @@ fn spawn_map(
             ent,
             CameraShake {
                 center: (map.tile_size * (map.grid_size / 2).as_vec2()).extend(0.0),
-                ..CameraShake::new(6.0, glam::vec2(3.0, 3.0), 1.0)
+                ..CameraShake::new(2.0, glam::vec2(20.0, 20.0), 1.0, 1.0)
             },
         );
         cameras.insert(ent, default());