diff --git a/assets/audio/sfx/24787__young_daddy__clap-mix2.ogg b/assets/audio/sfx/24787__young_daddy__clap-mix2.ogg deleted file mode 100644 index ca82939..0000000 Binary files a/assets/audio/sfx/24787__young_daddy__clap-mix2.ogg and /dev/null differ diff --git a/assets/audio/sfx/24787__young_daddy__clap-mix2.wav b/assets/audio/sfx/24787__young_daddy__clap-mix2.wav deleted file mode 100644 index 9bfa23f..0000000 Binary files a/assets/audio/sfx/24787__young_daddy__clap-mix2.wav and /dev/null differ diff --git a/assets/audio/sfx/Projectile Hits Player-02.ogg b/assets/audio/sfx/Projectile Hits Player-02.ogg deleted file mode 100644 index 8db59d6..0000000 Binary files a/assets/audio/sfx/Projectile Hits Player-02.ogg and /dev/null differ diff --git a/assets/audio/sfx/Projectile Hits Player-02.wav b/assets/audio/sfx/Projectile Hits Player-02.wav deleted file mode 100644 index aa77327..0000000 Binary files a/assets/audio/sfx/Projectile Hits Player-02.wav and /dev/null differ diff --git a/assets/audio/sfx/UI Click_1.ogg b/assets/audio/sfx/UI Click_1.ogg deleted file mode 100644 index 6b19696..0000000 Binary files a/assets/audio/sfx/UI Click_1.ogg and /dev/null differ diff --git a/assets/audio/sfx/UI Click_1.wav b/assets/audio/sfx/UI Click_1.wav deleted file mode 100644 index fda9b2f..0000000 Binary files a/assets/audio/sfx/UI Click_1.wav and /dev/null differ diff --git a/assets/image/card/icon/cacophony.png b/assets/image/card/icon/cacophony.png index 8bddd1c..c9b20b2 100644 Binary files a/assets/image/card/icon/cacophony.png and b/assets/image/card/icon/cacophony.png differ diff --git a/assets/image/card/icon/triplet.png b/assets/image/card/icon/triplet.png index 799dded..ab0cbd5 100644 Binary files a/assets/image/card/icon/triplet.png and b/assets/image/card/icon/triplet.png differ diff --git a/assets/image/vfx/bubble.png b/assets/image/vfx/bubble.png index 5377cd4..304058f 100644 Binary files a/assets/image/vfx/bubble.png and b/assets/image/vfx/bubble.png differ diff --git a/assets/mockup/cards.aseprite b/assets/mockup/cards.aseprite deleted file mode 100644 index dc9b54c..0000000 Binary files a/assets/mockup/cards.aseprite and /dev/null differ diff --git a/assets/mockup/dance_party.png b/assets/mockup/dance_party.png index 1a24cae..ac8a93e 100644 Binary files a/assets/mockup/dance_party.png and b/assets/mockup/dance_party.png differ diff --git a/assets/mockup/pyrious.aseprite b/assets/mockup/game.aseprite similarity index 100% rename from assets/mockup/pyrious.aseprite rename to assets/mockup/game.aseprite diff --git a/assets/mockup/ingame.aseprite b/assets/mockup/ingame.aseprite deleted file mode 100644 index 340e1b8..0000000 Binary files a/assets/mockup/ingame.aseprite and /dev/null differ diff --git a/assets/mockup/levelup.aseprite b/assets/mockup/levelup.aseprite deleted file mode 100644 index 340e1b8..0000000 Binary files a/assets/mockup/levelup.aseprite and /dev/null differ diff --git a/src/game/actor/enemy.rs b/src/game/actor/enemy.rs index 70e6699..46094c5 100644 --- a/src/game/actor/enemy.rs +++ b/src/game/actor/enemy.rs @@ -39,7 +39,7 @@ pub fn enemy(key: impl Into) -> impl EntityCommand { let config = r!(config.get()); let actor = r!(config.enemies.get(&key)).clone(); - (actor, game_root.enemies, assets.sfx_kick.clone()) + (actor, game_root.enemies, assets.sfx_enemy_hurt.clone()) }; world diff --git a/src/game/actor/player.rs b/src/game/actor/player.rs index 6435529..c0dc6d8 100644 --- a/src/game/actor/player.rs +++ b/src/game/actor/player.rs @@ -57,7 +57,7 @@ pub fn player(key: impl Into) -> impl EntityCommand { actor, game_root.players, camera_root.primary, - assets.sfx_movement.clone(), + assets.sfx_player_hurt.clone(), assets.sfx_restart.clone(), assets.bubble.clone(), ) diff --git a/src/screen/playing.rs b/src/screen/playing.rs index fb9ae6b..44ce395 100644 --- a/src/screen/playing.rs +++ b/src/screen/playing.rs @@ -106,28 +106,18 @@ pub struct PlayingAssets { pub sfx_restart: Handle, #[asset(path = "audio/sfx/Level Up_1.ogg")] pub sfx_level_up: Handle, - #[asset(path = "audio/sfx/Projectile Hits Player-02.ogg")] - pub sfx_hurt: Handle, #[asset(path = "audio/sfx/UI Hover.ogg")] + pub sfx_ui_click_fail: Handle, + #[asset(path = "audio/sfx/UI Hover_1.ogg")] pub sfx_ui_click: Handle, #[asset(path = "audio/sfx/UI Click.ogg")] pub sfx_ui_hover: Handle, - #[asset(path = "audio/sfx/UI Hover_1.ogg")] - pub sfx_ui_click1: Handle, - #[asset(path = "audio/sfx/UI Click_1.ogg")] - pub sfx_ui_hover1: Handle, #[asset(path = "audio/sfx/Movement.ogg")] - pub sfx_movement: Handle, + pub sfx_player_hurt: Handle, // CC0 assets from freesound.org: - #[asset(path = "audio/sfx/24787__young_daddy__clap-mix2.ogg")] - pub sfx_clap: Handle, #[asset(path = "audio/sfx/102130__noirpantalon__hard_subby_kick.ogg")] - pub sfx_kick: Handle, - #[asset(path = "audio/sfx/137105__chaosportal__finger-snap-01.ogg")] - pub sfx_snap0: Handle, - #[asset(path = "audio/sfx/444407__mootmcnoodles__slap.ogg")] - pub sfx_snap1: Handle, + pub sfx_enemy_hurt: Handle, } impl Configure for PlayingAssets { diff --git a/src/screen/playing/level_up_menu.rs b/src/screen/playing/level_up_menu.rs index 6c287d8..dee0acf 100644 --- a/src/screen/playing/level_up_menu.rs +++ b/src/screen/playing/level_up_menu.rs @@ -475,7 +475,7 @@ fn card_discard( mut deck_query: Query<&mut Deck>, ) { audio - .play(assets.sfx_ui_click.clone()) + .play(assets.sfx_ui_click_fail.clone()) .with_playback_rate(rand::thread_rng().gen_range(0.8..1.4)); for selection in &deck_display_query { let mut deck = c!(deck_query.get_mut(selection.0)); diff --git a/src/screen/splash/splash.png b/src/screen/splash/splash.png index 2367319..90a8497 100644 Binary files a/src/screen/splash/splash.png and b/src/screen/splash/splash.png differ diff --git a/src/ui/interaction.rs b/src/ui/interaction.rs index af98dc6..c32ea4a 100644 --- a/src/ui/interaction.rs +++ b/src/ui/interaction.rs @@ -117,7 +117,7 @@ fn play_interaction_sfx( }, Interaction::Pressed => { audio - .play(assets.sfx_ui_click1.clone()) + .play(assets.sfx_ui_click.clone()) .with_volume(0.6) .with_playback_rate(rand::thread_rng().gen_range(0.7..1.6)); },