Add sound effect for combat.

Cargo.toml

@@ -9,7 +9,7 @@ opt-level = 3
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "*"
+bevy = { version = "*", features = [ "wav" ] }
 rand = "*"
 winit = "0.27.5"
 image = "*"

src/combat_system/melee.rs

@@ -1,4 +1,4 @@
-use crate::prelude::*;
+use crate::{prelude::*, initializations::load::SoundEffect};
 
 pub fn combat_system_melee(
     mut commands: Commands,
@@ -104,24 +104,36 @@ fn do_melee_damage(
     attacked_entity: Entity,
     body1: &PhysicalBody,
     body2: &mut PhysicalBody,
+    asset_server: &Res<AssetServer>
 ) {
-    body2.attributes.health -=
+    let damage =
         1 +
         (body1.attributes.strength - body2.attributes.constitution).max(0).min(20) +
         (body1.skillset.brawling.level()).max(0).min(20)
         ;
+    body2.attributes.health -= damage;
     if body2.attributes.health <= 0 {
         commands.entity(attacked_entity).despawn_recursive();
     }
     body2.danger = Some(Danger {
         danger_type: DangerType::Attacked,
         danger_source: attacker_entity,
     });
+
+    // Play a sound effect.
+    commands.spawn((
+        AudioBundle {
+            source: asset_server.load("RPG Sound Pack/battle/swing.wav"),
+            settings: PlaybackSettings::ONCE.with_volume(bevy::audio::Volume::new_relative(0.1)),
+        },
+        SoundEffect,
+    ));
 }
 pub fn attacked_entities_system(
     mut commands: Commands,
     attacked_query: Query<(Entity, &Attacked), With<Attacked>>,
     mut physical_bodies: Query<(Entity, &mut PhysicalBody)>,
+    asset_server: Res<AssetServer>
 ) {
     for (attacked_entity, attack_info) in attacked_query.iter() {
         commands.entity(attacked_entity).remove::<Attacked>();
@@ -139,7 +151,7 @@ pub fn attacked_entities_system(
         // Now do the damage to the attacked body.
         for (entity, mut physical_body) in physical_bodies.iter_mut() {
             if entity == attacked_entity {
-                do_melee_damage(&mut commands, attacker_entity, attacked_entity, &attacker_physical_body, &mut physical_body);
+                do_melee_damage(&mut commands, attacker_entity, attacked_entity, &attacker_physical_body, &mut physical_body, &asset_server);
             }
         }
     }

src/initializations/load.rs

@@ -16,4 +16,19 @@ pub fn load_font(
     mut font_handle: ResMut<MyFont>,
 ) {
     *font_handle = MyFont(asset_server.load("fonts/Helvetica.ttf"));
-}
+}
+pub fn load_sfx(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>
+) {
+    // commands.spawn((
+    //     AudioBundle {
+    //         source: asset_server.load("RPG Sound Pack/battle/swing.wav"),
+    //         settings: PlaybackSettings::ONCE.paused().with_volume(bevy::audio::Volume::new_relative(0.5)),
+    //     },
+    //     SoundEffect,
+    // ));
+}
+
+#[derive(Component)]
+pub struct SoundEffect;

src/main.rs

@@ -1,36 +1,6 @@
-// use bevy::time::FixedTimestep;
 mod prelude;
 pub use crate::prelude::*;
 
-// #[mod_use(
-//     biome,
-//     button_system,
-//     combat_system,
-//     components,
-//     constants,
-//     interface,
-//     load,
-//     main_menu,
-//     map,
-//     monstergenerator_system,
-//     moverandom_system,
-//     movetoward_system,
-//     namegiving_system,
-//     names_system,
-//     needs,
-//     pause,
-//     resources,
-//     seasons,
-//     selection_systems,
-//     spoilage_system,
-//     startup,
-//     statusdisplay_system,
-//     task_system,
-//     text_system,
-//     thinking_system,
-//     unitgenerator_system,
-//     window_system
-// )]
 mod button_system;
 use button_system::*;
 mod combat_system;
@@ -84,10 +54,7 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(BiomePlugin)
         .add_systems(
-            PreStartup, (load_sprites, load_font)
-        )
-        .add_systems(
-            PreStartup, (load_sprites, load_font)
+            PreStartup, (load_sprites, load_font, load_sfx)
         )
         // .add_startup_system_to_stage(StartupStage::PreStartup, load_sprites)
         // .add_startup_system_to_stage(StartupStage::PreStartup, load_font)

src/unitgenerator_system.rs

@@ -14,7 +14,7 @@ pub fn spawn_unit_from_template(
     position: Position,
     sprite_sheet: &Res<SpriteSheet>,
     template: &UnitTemplate,
-) {
+) -> Entity {
     let sprite =  TextureAtlasSprite::new(template.actor_type.sprite_index());
     commands
         .spawn(SpriteSheetBundle {
@@ -39,7 +39,7 @@ pub fn spawn_unit_from_template(
             attributes: template.attributes.clone(),
         } )
         .insert( Brain { ..default() } )
-        ;
+        .id()
 }
 
 pub struct UnitTemplate {