Remove unused assets

benfrankel · Jul 29, 2024 · 81a8ec6 · 81a8ec6
1 parent c50b630
commit 81a8ec6
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 18 deletions.
diff --git a/assets/audio/sfx/24787__young_daddy__clap-mix2.ogg b/assets/audio/sfx/24787__young_daddy__clap-mix2.ogg
diff --git a/assets/audio/sfx/24787__young_daddy__clap-mix2.wav b/assets/audio/sfx/24787__young_daddy__clap-mix2.wav
diff --git a/assets/audio/sfx/Projectile Hits Player-02.ogg b/assets/audio/sfx/Projectile Hits Player-02.ogg
diff --git a/assets/audio/sfx/Projectile Hits Player-02.wav b/assets/audio/sfx/Projectile Hits Player-02.wav
diff --git a/assets/audio/sfx/UI Click_1.ogg b/assets/audio/sfx/UI Click_1.ogg
diff --git a/assets/audio/sfx/UI Click_1.wav b/assets/audio/sfx/UI Click_1.wav
diff --git a/assets/image/card/icon/cacophony.png b/assets/image/card/icon/cacophony.png
diff --git a/assets/image/card/icon/triplet.png b/assets/image/card/icon/triplet.png
diff --git a/assets/image/vfx/bubble.png b/assets/image/vfx/bubble.png
diff --git a/assets/mockup/cards.aseprite b/assets/mockup/cards.aseprite
diff --git a/assets/mockup/dance_party.png b/assets/mockup/dance_party.png
diff --git a/assets/mockup/pyrious.aseprite → assets/mockup/game.aseprite b/assets/mockup/pyrious.aseprite → assets/mockup/game.aseprite
diff --git a/assets/mockup/ingame.aseprite b/assets/mockup/ingame.aseprite
diff --git a/assets/mockup/levelup.aseprite b/assets/mockup/levelup.aseprite
diff --git a/src/game/actor/enemy.rs b/src/game/actor/enemy.rs
@@ -39,7 +39,7 @@ pub fn enemy(key: impl Into<String>) -> 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
@@ -57,7 +57,7 @@ pub fn player(key: impl Into<String>) -> 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
@@ -106,28 +106,18 @@ pub struct PlayingAssets {
     pub sfx_restart: Handle<AudioSource>,
     #[asset(path = "audio/sfx/Level Up_1.ogg")]
     pub sfx_level_up: Handle<AudioSource>,
-    #[asset(path = "audio/sfx/Projectile Hits Player-02.ogg")]
-    pub sfx_hurt: Handle<AudioSource>,
     #[asset(path = "audio/sfx/UI Hover.ogg")]
+    pub sfx_ui_click_fail: Handle<AudioSource>,
+    #[asset(path = "audio/sfx/UI Hover_1.ogg")]
     pub sfx_ui_click: Handle<AudioSource>,
     #[asset(path = "audio/sfx/UI Click.ogg")]
     pub sfx_ui_hover: Handle<AudioSource>,
-    #[asset(path = "audio/sfx/UI Hover_1.ogg")]
-    pub sfx_ui_click1: Handle<AudioSource>,
-    #[asset(path = "audio/sfx/UI Click_1.ogg")]
-    pub sfx_ui_hover1: Handle<AudioSource>,
     #[asset(path = "audio/sfx/Movement.ogg")]
-    pub sfx_movement: Handle<AudioSource>,
+    pub sfx_player_hurt: Handle<AudioSource>,
 
     // CC0 assets from freesound.org:
-    #[asset(path = "audio/sfx/24787__young_daddy__clap-mix2.ogg")]
-    pub sfx_clap: Handle<AudioSource>,
     #[asset(path = "audio/sfx/102130__noirpantalon__hard_subby_kick.ogg")]
-    pub sfx_kick: Handle<AudioSource>,
-    #[asset(path = "audio/sfx/137105__chaosportal__finger-snap-01.ogg")]
-    pub sfx_snap0: Handle<AudioSource>,
-    #[asset(path = "audio/sfx/444407__mootmcnoodles__slap.ogg")]
-    pub sfx_snap1: Handle<AudioSource>,
+    pub sfx_enemy_hurt: Handle<AudioSource>,
 }
 
 impl Configure for PlayingAssets {

diff --git 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
diff --git 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));
             },