update kickball

assets/elements/item/cannonball/cannonball.atlas.yaml

@@ -0,0 +1,4 @@
+image: ./cannonball.png
+tile_size: [17, 17]
+rows: 1
+columns: 1

assets/elements/item/cannonball/cannonball.element.yaml

@@ -0,0 +1,3 @@
+name: Cannonball
+category: Weapons
+data: kick_bomb.yaml

assets/elements/item/cannonball/explosion.atlas.yaml

@@ -0,0 +1,4 @@
+image: ./explosion.png
+tile_size: [144, 112]
+rows: 1
+columns: 11

assets/elements/item/cannonball/kick_bomb.yaml

@@ -0,0 +1,32 @@
+fuse_time: 4s
+kick_velocity: [0.0, 0.0]
+kickable: false
+throw_velocity: 800
+damage_region_size: [60, 60]
+damage_region_lifetime: 0.5
+
+atlas: ./cannonball.atlas.yaml
+
+explosion_atlas: ./explosion.atlas.yaml
+explosion_lifetime: 1.0
+explosion_frames: 12
+explosion_fps: 8
+explosion_sound: ./explosion.ogg
+explosion_volume: 0.1
+explode_on_contact: true
+
+lit_frames_start: 0
+lit_frames_end: 1
+lit_fps: 1.0
+
+fuse_sound: ./fuse.ogg
+fuse_sound_volume: 0.1
+
+body_diameter: 16
+grab_offset: [5, -2]
+fin_anim: grab_2
+can_rotate: true
+bounciness: 0.4
+angular_velocity: 0.1
+# arm_delay: 0.02
+arm_delay: 1000ms

assets/elements/item/kick_bomb/kick_bomb.yaml

@@ -1,5 +1,6 @@
 fuse_time: 4s
 kick_velocity: [600.0, 120.0]
+kickable: true
 throw_velocity: 600
 damage_region_size: [60, 60]
 damage_region_lifetime: 0.6
@@ -12,6 +13,11 @@ explosion_frames: 12
 explosion_fps: 8
 explosion_sound: ./explosion.ogg
 explosion_volume: 0.1
+explode_on_contact: false
+
+lit_frames_start: 3
+lit_frames_end: 5
+lit_fps: 8.0
 
 fuse_sound_volume: 0.1
 fuse_sound: ./fuse.ogg

src/core/elements/kick_bomb.rs

@@ -10,12 +10,16 @@ pub struct KickBombMeta {
     pub damage_region_size: Vec2,
     pub damage_region_lifetime: f32,
     pub kick_velocity: Vec2,
+    pub kickable: bool,
     pub throw_velocity: f32,
     pub explosion_lifetime: f32,
     pub explosion_frames: u32,
     pub explosion_fps: f32,
     pub explosion_sound: Handle<AudioSource>,
     pub explosion_volume: f64,
+    pub lit_frames_start: u32,
+    pub lit_frames_end: u32,
+    pub lit_fps: f32,
     pub fuse_sound: Handle<AudioSource>,
     pub fuse_sound_volume: f64,
     /// The time in seconds before a grenade explodes
@@ -27,6 +31,7 @@ pub struct KickBombMeta {
     pub bounciness: f32,
     pub angular_velocity: f32,
     pub arm_delay: Duration,
+    pub explode_on_contact: bool,
 }
 
 pub fn game_plugin(_game: &mut Game) {
@@ -212,15 +217,21 @@ fn update_idle_kick_bombs(
             fuse_sound_volume,
             arm_delay,
             fuse_time,
+            lit_frames_start,
+            lit_frames_end,
+            lit_fps,
             ..
         } = *kick_bomb_meta;
 
         if items_used.remove(entity).is_some() {
             audio_center.play_sound(fuse_sound, fuse_sound_volume);
             let animated_sprite = animated_sprites.get_mut(entity).unwrap();
-            animated_sprite.frames = [3, 4, 5].into_iter().collect();
+            animated_sprite.frames = ( lit_frames_start..lit_frames_end ).into_iter().collect();
+            // animated_sprite.frames = [lit_frames_start..lit_frames_end];
+            // animated_sprite.frames = lit_frames.into_iter().collect();
+            // animated_sprite.frames = lit_frames.clone();
             animated_sprite.repeat = true;
-            animated_sprite.fps = 8.0;
+            animated_sprite.fps = lit_fps;
             commands.add(
                 move |mut idle: CompMut<IdleKickBomb>, mut lit: CompMut<LitKickBomb>| {
                     idle.remove(entity);
@@ -265,7 +276,9 @@ fn update_lit_kick_bombs(
         let KickBombMeta {
             explosion_sound,
             explosion_volume,
+            explode_on_contact,
             kick_velocity,
+            kickable,
             damage_region_lifetime,
             damage_region_size,
             explosion_lifetime,
@@ -283,55 +296,74 @@ fn update_lit_kick_bombs(
                 break 'should_explode true;
             }
 
-            // If the item is being held
-            if player_inventories.find_item(entity).is_some() {
-                kick_bomb.kicking = false;
-                break 'should_explode false;
-            }
+            if explode_on_contact {
+                let players = entities
+                    .iter_with(&player_indexes)
+                    .map(|x| x.0)
+                    .collect::<Vec<_>>();
 
-            // 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;
-                }
+                let colliding_with_players = collision_world
+                    .actor_collisions_filtered(entity, |e| {
+                        players.contains(&e) && invincibles.get(e).is_none()
+                    })
+                    .into_iter()
+                    .collect::<Vec<_>>();
 
-                // 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 {
+                if !colliding_with_players.is_empty() && kick_bomb.arm_delay.finished() {
                     break 'should_explode true;
                 }
+            }
 
-                let body = bodies.get_mut(entity).unwrap();
-                let translation = transforms.get_mut(entity).unwrap().translation;
+            // If the item is being held
+            if player_inventories.find_item(entity).is_some() {
+                kick_bomb.kicking = false;
+                break 'should_explode false;
+            }
 
-                let player_sprite = sprites.get_mut(player_entity).unwrap();
-                let player_translation = transforms.get(player_entity).unwrap().translation;
+            if kickable {
+                // 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;
+                    }
 
-                let player_standing_left = player_translation.x <= translation.x;
+                    // 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;
+                    }
 
-                if body.velocity.x == 0.0 {
-                    body.velocity = kick_velocity;
-                    if player_sprite.flip_x {
-                        body.velocity.x *= -1.0;
+                    let body = bodies.get_mut(entity).unwrap();
+                    let translation = transforms.get_mut(entity).unwrap().translation;
+
+                    let player_sprite = sprites.get_mut(player_entity).unwrap();
+                    let player_translation = transforms.get(player_entity).unwrap().translation;
+
+                    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() {
-                    break 'should_explode true;
+                } else {
+                    kick_bomb.kicking = false;
                 }
-            } else {
-                kick_bomb.kicking = false;
             }
-
             false
         };