[Merged by Bors] - feat: add kick_bomb to jumpy core.

Cargo.toml

@@ -1,80 +1,67 @@
 [package]
-name = "jumpy"
-version = "0.5.1"
-description = "A tactical 2D shooter"
-authors = ["The Fish Fight Game & Spicy Lobster Developers"]
-license = "MIT OR Apache-2.0"
-edition = "2021"
+authors     = ["The Fish Fight Game & Spicy Lobster Developers"]
 default-run = "jumpy"
+description = "A tactical 2D shooter"
+edition     = "2021"
+license     = "MIT OR Apache-2.0"
+name        = "jumpy"
+version     = "0.5.1"
 
 [workspace]
-members = [
-    ".",
-    "core",
-]
+members = [".", "core"]
 
 [features]
 default = ["render"]
-render = [
-    "bevy/x11",
-    "bevy/png",
-    "bevy/filesystem_watcher",
-    "bevy/bevy_gilrs",
-]
+render  = ["bevy/x11", "bevy/png", "bevy/filesystem_watcher", "bevy/bevy_gilrs"]
 
 [dependencies]
 
-anyhow = "1.0.58"
-async-channel = "1.7.1"
-base64 = "0.21.0"
-bevy-inspector-egui = { version = "0.17.0" }
-bevy_egui = "0.19.0"
-bevy_fluent = "0.5.0"
-bevy_framepace = "0.11.0"
-bevy_kira_audio = { version = "0.13.0", features = ["ogg"], default-features = false }
-bevy_prototype_lyon = "0.7.2"
-bevy_tweening = { version = "0.6.0", default-features = false }
-bones_bevy_asset = "0.1.0"
-bones_bevy_renderer = "0.1.0"
-bones_lib = { version = "0.1.0", features = ["bevy"] }
-bytemuck = "1.12.3"
-clap = { version = "4.0.18", features = ["derive", "env"] }
-directories = "4.0.1"
-egui_extras = "0.20.0"
-either = "1.8.0"
-fluent = "0.16.0"
-fluent_content = "0.0.3"
-fnv = "1.0.7"
-futures-lite = "1.12.0"
-getrandom = { version = "0.2", features = ["js"] }
-iyes_loopless = "0.9.1"
-jumpy_core = { path = "./core" }
+anyhow                 = "1.0.58"
+async-channel          = "1.7.1"
+base64                 = "0.21.0"
+bevy-inspector-egui    = { version = "0.17.0" }
+bevy_egui              = "0.19.0"
+bevy_fluent            = "0.5.0"
+bevy_framepace         = "0.11.0"
+bevy_kira_audio        = { version = "0.13.0", features = ["ogg"], default-features = false }
+bevy_prototype_lyon    = "0.7.2"
+bevy_tweening          = { version = "0.6.0", default-features = false }
+bones_bevy_asset       = "0.1.0"
+bones_bevy_renderer    = "0.1.0"
+bones_lib              = { version = "0.1.0", features = ["bevy"] }
+bytemuck               = "1.12.3"
+clap                   = { version = "4.0.18", features = ["derive", "env"] }
+directories            = "4.0.1"
+egui_extras            = "0.20.0"
+either                 = "1.8.0"
+fluent                 = "0.16.0"
+fluent_content         = "0.0.3"
+fnv                    = "1.0.7"
+futures-lite           = "1.12.0"
+getrandom              = { version = "0.2", features = ["js"] }
+iyes_loopless          = "0.9.1"
+jumpy_core             = { path = "./core" }
 leafwing-input-manager = { version = "0.8.0", default-features = false }
-log = { version = "0.4.17", features = ["release_max_level_debug"] }
-normalize-path = "0.2.0"
-once_cell = "1.17.0"
-rand = "0.8.5"
-serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.89"
-serde_yaml = "0.9.2"
-thiserror = "1.0.31"
-tracing = { version = "0.1.37", features = ["release_max_level_debug"] }
-type_ulid = "0.1.0"
-unic-langid = "0.9.0"
+log                    = { version = "0.4.17", features = ["release_max_level_debug"] }
+normalize-path         = "0.2.0"
+once_cell              = "1.17.0"
+rand                   = "0.8.5"
+serde                  = { version = "1.0.137", features = ["derive"] }
+serde_json             = "1.0.89"
+serde_yaml             = "0.9.2"
+thiserror              = "1.0.31"
+tracing                = { version = "0.1.37", features = ["release_max_level_debug"] }
+type_ulid              = "0.1.0"
+unic-langid            = "0.9.0"
 
 [dependencies.bevy]
-version = "0.9.1"
 default-features = false
-features = [
-    "x11",
-    "png",
-    "filesystem_watcher",
-    "bevy_gilrs"
-]
+features         = ["x11", "png", "filesystem_watcher", "bevy_gilrs"]
+version          = "0.9.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2.83"
-web-sys = { version = "0.3", features = ["Window","Location","Storage"] } 
+web-sys      = { version = "0.3", features = ["Window", "Location", "Storage"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 mimalloc = { version = "0.1.32", default-features = false }
@@ -83,5 +70,5 @@ mimalloc = { version = "0.1.32", default-features = false }
 opt-level = 3 # Set this to 3 if the game becomes slow to respond during gameplay
 
 [profile.release]
-lto = true
-codegen-units = 1 # Improved rapier physics perf, so it might help other stuff, too
+codegen-units = 1    # Improved rapier physics perf, so it might help other stuff, too
+lto           = true

assets/elements/item/kick_bomb/kick_bomb.element.yaml

@@ -13,7 +13,9 @@ builtin: !KickBomb
   explosion_frames: 12
   explosion_fps: 8
   explosion_sound: ./explosion.ogg
+  explosion_volume: 0.1
 
+  fuse_sound_volume: 0.1
   fuse_sound: ./fuse.ogg
 
   body_size: [30, 30]
@@ -22,4 +24,5 @@ builtin: !KickBomb
   can_rotate: true
   bounciness: 0.6
   angular_velocity: 0.1
-  arm_delay: 0.02
+  # arm_delay: 0.02
+  arm_delay: 0.5

assets/map/levels/level1.map.yaml

@@ -1268,8 +1268,8 @@ layers:
             - 593.5
           element: /elements/item/sword/sword.element.yaml
         - pos:
-            - 171.5714
-            - 409.5
+            - 370.0
+            - 350.5
           element: /elements/item/kick_bomb/kick_bomb.element.yaml
   - id: spawners
     kind: !element

core/Cargo.toml

@@ -1,27 +1,25 @@
 [package]
-name = "jumpy_core"
-version = "0.1.0"
 edition = "2021"
+name    = "jumpy_core"
+version = "0.1.0"
 
 [dependencies]
 bones_bevy_asset = "0.1.0"
-bones_lib = { version = "0.1.0", features = ["serde"] }
-type_ulid = "0.1.0"
+bones_lib        = { version = "0.1.0", features = ["serde"] }
+type_ulid        = "0.1.0"
 
-bytemuck = { version = "1.12.3", features = ["derive"] }
-glam = { version = "0.22.0", features = ["bytemuck"] }
-serde = { version = "1.0.152", features = ["derive"] }
-tracing = "0.1.37"
-hex = "0.4.3"
+bytemuck       = { version = "1.12.3", features = ["derive"] }
 csscolorparser = "0.6.2"
+glam           = { version = "0.22.0", features = ["bytemuck"] }
+hex            = "0.4.3"
+serde          = { version = "1.0.152", features = ["derive"] }
+tracing        = "0.1.37"
 
 [dependencies.bevy]
-version = "0.9.0"
 default-features = false
-features = [
-    "bevy_asset"
-]
+features         = ["bevy_asset"]
+version          = "0.9.0"
 
 [dependencies.turborand]
-version = "0.8"
-features = ["atomic"]
+features = ["atomic"]
+version  = "0.8"

core/src/elements.rs

@@ -3,6 +3,7 @@ use crate::prelude::*;
 pub mod crab;
 pub mod decoration;
 pub mod grenade;
+pub mod kick_bomb;
 pub mod player_spawner;
 pub mod sproinger;
 pub mod sword;
@@ -24,4 +25,5 @@ pub fn install(session: &mut GameSession) {
     sword::install(session);
     grenade::install(session);
     crab::install(session);
+    kick_bomb::install(session);
 }