fix: kick bomb randomness (#902)

Closes #720

## Changes

- Shorter fuse time: 4s, same as grenade
- Less bouncy
- Explodes on the third kick from a player

Author: nelson137

assets/elements/item/kick_bomb/kick_bomb.yaml

@@ -1,5 +1,5 @@
-fuse_time: 8s
-kick_velocity: [10, 6]
+fuse_time: 4s
+kick_velocity: [10, 2]
 throw_velocity: 10
 damage_region_size: [60, 60]
 damage_region_lifetime: 0.6
@@ -20,7 +20,7 @@ body_diameter: 26
 grab_offset: [5, -2]
 fin_anim: grab_2
 can_rotate: true
-bounciness: 0.6
+bounciness: 0.2
 angular_velocity: 0.1
 # arm_delay: 0.02
 arm_delay: 500ms

src/core/elements/kick_bomb.rs

@@ -48,6 +48,8 @@ pub struct IdleKickBomb;
 pub struct LitKickBomb {
     arm_delay: Timer,
     fuse_time: Timer,
+    kicking: bool,
+    kicks: u32,
 }
 
 fn hydrate(
@@ -178,6 +180,8 @@ fn update_idle_kick_bombs(
                         LitKickBomb {
                             arm_delay: Timer::new(arm_delay, TimerMode::Once),
                             fuse_time: Timer::new(fuse_time, TimerMode::Once),
+                            kicking: false,
+                            kicks: 0,
                         },
                     );
                 },
@@ -199,8 +203,6 @@ fn update_lit_kick_bombs(
     mut sprites: CompMut<AtlasSprite>,
     mut bodies: CompMut<KinematicBody>,
     mut hydrated: CompMut<MapElementHydrated>,
-    mut attachments: CompMut<PlayerBodyAttachment>,
-    mut player_layers: CompMut<PlayerLayers>,
     player_inventories: PlayerInventories,
     mut transforms: CompMut<Transform>,
     mut commands: Commands,
@@ -214,7 +216,6 @@ fn update_lit_kick_bombs(
         let element_meta = assets.get(element_handle.0);
         let asset = assets.get(element_meta.data);
         let Ok(KickBombMeta {
-            grab_offset,
             explosion_sound,
             explosion_volume,
             kick_velocity,
@@ -224,7 +225,6 @@ fn update_lit_kick_bombs(
             explosion_atlas,
             explosion_fps,
             explosion_frames,
-            fin_anim,
             ..
         }) = asset.try_cast_ref()
         else {
@@ -234,59 +234,65 @@ fn update_lit_kick_bombs(
         kick_bomb.fuse_time.tick(time.delta());
         kick_bomb.arm_delay.tick(time.delta());
 
-        let mut should_explode = false;
-        // If the item is being held
-        if let Some(Inv { player, .. }) = player_inventories.find_item(entity) {
-            let body = bodies.get_mut(entity).unwrap();
-            player_layers.get_mut(player).unwrap().fin_anim = *fin_anim;
+        let should_explode = 'should_explode: {
+            if kick_bomb.fuse_time.finished() {
+                break 'should_explode true;
+            }
 
-            // Deactivate held items
-            body.is_deactivated = true;
+            // If the item is being held
+            if player_inventories.find_item(entity).is_some() {
+                kick_bomb.kicking = false;
+                break 'should_explode false;
+            }
 
-            // Attach to the player
-            attachments.insert(
-                entity,
-                PlayerBodyAttachment {
-                    player,
-                    sync_color: false,
-                    sync_animation: false,
-                    head: false,
-                    offset: grab_offset.extend(1.0),
-                },
-            );
-        }
-        // The item is on the ground
-        else if let Some(player_entity) = collision_world
-            .actor_collisions_filtered(entity, |e| invincibles.get(e).is_none())
-            .into_iter()
-            .find(|&x| player_indexes.contains(x))
-        {
-            let body = bodies.get_mut(entity).unwrap();
-            let translation = transforms.get_mut(entity).unwrap().translation;
+            // If the item is colliding with a non-invincible player
+            if let Some(player_entity) = collision_world
+                .actor_collisions_filtered(entity, |e| !invincibles.contains(e))
+                .into_iter()
+                .find(|&x| player_indexes.contains(x))
+            {
+                if !std::mem::replace(&mut kick_bomb.kicking, true) {
+                    kick_bomb.kicks += 1;
+                }
+
+                // Explode on the 3rd kick.
+                // Dropping the bomb is detected as a kick so we explode when
+                // the counter reaches 4.
+                if kick_bomb.kicks > 3 {
+                    break 'should_explode true;
+                }
 
-            let player_sprite = sprites.get_mut(player_entity).unwrap();
-            let player_translation = transforms.get(player_entity).unwrap().translation;
+                let body = bodies.get_mut(entity).unwrap();
+                let translation = transforms.get_mut(entity).unwrap().translation;
 
-            let player_standing_left = player_translation.x <= translation.x;
+                let player_sprite = sprites.get_mut(player_entity).unwrap();
+                let player_translation = transforms.get(player_entity).unwrap().translation;
 
-            if body.velocity.x == 0.0 {
-                body.velocity = *kick_velocity;
-                if player_sprite.flip_x {
-                    body.velocity.x *= -1.0;
+                let player_standing_left = player_translation.x <= translation.x;
+
+                if body.velocity.x == 0.0 {
+                    body.velocity = *kick_velocity;
+                    if player_sprite.flip_x {
+                        body.velocity.x *= -1.0;
+                    }
+                } else if player_standing_left && !player_sprite.flip_x {
+                    body.velocity.x = kick_velocity.x;
+                    body.velocity.y = kick_velocity.y;
+                } else if !player_standing_left && player_sprite.flip_x {
+                    body.velocity.x = -kick_velocity.x;
+                    body.velocity.y = kick_velocity.y;
+                } else if kick_bomb.arm_delay.finished() {
+                    break 'should_explode true;
                 }
-            } else if player_standing_left && !player_sprite.flip_x {
-                body.velocity.x = kick_velocity.x;
-                body.velocity.y = kick_velocity.y;
-            } else if !player_standing_left && player_sprite.flip_x {
-                body.velocity.x = -kick_velocity.x;
-                body.velocity.y = kick_velocity.y;
-            } else if kick_bomb.arm_delay.finished() {
-                should_explode = true;
+            } else {
+                kick_bomb.kicking = false;
             }
-        }
+
+            false
+        };
 
         // If it's time to explode
-        if kick_bomb.fuse_time.finished() || should_explode {
+        if should_explode {
             audio_events.play(*explosion_sound, *explosion_volume);
 
             trauma_events.send(7.5);