From 73aa491d24aa55566208e8e2c663c504ff3dd6e6 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 1 Feb 2022 02:51:49 -0500 Subject: [PATCH 1/4] Fix monster/player collision issues --- src/main.rs | 2 +- src/resources/map.rs | 21 +++++++++++++++------ src/state.rs | 8 +++----- src/systems/monster_ai_system.rs | 9 ++++----- src/systems/whip_system.rs | 5 +++-- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/main.rs b/src/main.rs index c0c6f0b..af06cc6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -61,7 +61,7 @@ fn main() -> BError { ecs.register::(); ecs.register::(); - let map = Map::from_level(levels::get_level(starting_level)); + let mut map = Map::from_level(levels::get_level(starting_level)); map.spawn_entities(&mut ecs); ecs.insert(map); diff --git a/src/resources/map.rs b/src/resources/map.rs index 6628f77..1d753f9 100644 --- a/src/resources/map.rs +++ b/src/resources/map.rs @@ -80,9 +80,14 @@ impl Map { } } - pub fn spawn_entities(&self, ecs: &mut World) { - for (index, tile) in self.tiles.iter().enumerate() { - let point = self.index_to_point2d(index); + pub fn spawn_entities(&mut self, ecs: &mut World) { + for (index, tile) in self + .tiles + .iter_mut() + .enumerate() + .collect::>() + { + let point = Point::new(index % MAP_WIDTH, index / MAP_WIDTH); match tile { TileType::Player => { let player_entity = ecs @@ -102,6 +107,7 @@ impl Map { .build(); ecs.insert(point); ecs.insert(player_entity); + self.tile_content[index] = Some(player_entity); } TileType::Slow => { let mut rng = RandomNumberGenerator::new(); @@ -174,15 +180,18 @@ impl Map { }); } - pub fn get_tile_content(&self, index: usize) -> Option { + pub fn get_tile_content_at(&self, point: Point) -> Option { + let index = self.point2d_to_index(point); self.tile_content[index] } - pub fn set_tile_content(&mut self, index: usize, entity: Entity) { + pub fn set_tile_content_at(&mut self, point: Point, entity: Entity) { + let index = self.point2d_to_index(point); self.tile_content[index] = Some(entity); } - pub fn clear_tile_content(&mut self, index: usize) { + pub fn clear_tile_content_at(&mut self, point: Point) { + let index = self.point2d_to_index(point); self.tile_content[index] = None; } diff --git a/src/state.rs b/src/state.rs index f866e9c..e063062 100644 --- a/src/state.rs +++ b/src/state.rs @@ -141,15 +141,14 @@ impl State { if map.is_solid(destination) { sound_system.play_sound(sound_effects.blocked.clone()); } else { - if let Some(e) = map.get_tile_content(map.point2d_to_index(destination)) { + if let Some(e) = map.get_tile_content_at(destination) { if let Some(monster) = monsters.get(e) { stats.take_gems(damage_for_kind(monster.kind)); let _ = entities.delete(e); } } - let index = map.point2d_to_index(Point::from(*pos)); - map.clear_tile_content(index); + map.clear_tile_content_at(Point::from(*pos)); pos.x = destination.x; pos.y = destination.y; @@ -158,8 +157,7 @@ impl State { player_pos.x = pos.x; player_pos.y = pos.y; - let index = map.point2d_to_index(destination); - map.set_tile_content(index, player_entity); + map.set_tile_content_at(destination, player_entity); self.ecs.write_resource::().force_tick(); diff --git a/src/systems/monster_ai_system.rs b/src/systems/monster_ai_system.rs index 91694f0..36ed68f 100644 --- a/src/systems/monster_ai_system.rs +++ b/src/systems/monster_ai_system.rs @@ -74,9 +74,10 @@ impl<'a> System<'a> for MonsterAiSystem { y: position.y + delta_y, }; - if let Some(e) = map.get_tile_content(map.point2d_to_index(destination)) { + if let Some(e) = map.get_tile_content_at(destination) { if let Some(_player) = players.get(e) { // TODO: Sound + map.clear_tile_content_at(Point::from(**position)); stats.take_gems(damage_for_kind(monster.kind)); let _ = entities.delete(*entity); } @@ -88,12 +89,10 @@ impl<'a> System<'a> for MonsterAiSystem { let _ = entities.delete(*entity); } _ => { - let index = map.point2d_to_index(Point::from(**position)); - map.clear_tile_content(index); + map.clear_tile_content_at(Point::from(**position)); position.x = destination.x; position.y = destination.y; - let index = map.point2d_to_index(destination); - map.set_tile_content(index, *entity); + map.set_tile_content_at(destination, *entity); } } } diff --git a/src/systems/whip_system.rs b/src/systems/whip_system.rs index 911c583..f9b5ff1 100644 --- a/src/systems/whip_system.rs +++ b/src/systems/whip_system.rs @@ -25,7 +25,7 @@ impl<'a> System<'a> for WhipSystem { fn run(&mut self, data: Self::SystemData) { let ( - map, + mut map, mut stop_clock, mut sound_output, sound_effects, @@ -92,9 +92,10 @@ impl<'a> System<'a> for WhipSystem { }; if let Some(dest) = destination { - if let Some(e) = map.get_tile_content(map.point2d_to_index(dest)) { + if let Some(e) = map.get_tile_content_at(dest) { if let Some(_monster) = monsters.get(e) { let _ = entities.delete(e); + map.clear_tile_content_at(dest); if let Some(sound) = &mut wants_to_whip.sound { sound.control::, _>().stop(); } From b2672904c85e15be1bd46cbc7b3904ff54860bdf Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 1 Feb 2022 02:54:08 -0500 Subject: [PATCH 2/4] Add monster impact sfx --- src/components/monster.rs | 13 ++++++++++- src/resources/sound_effects.rs | 39 ++++++++++++++++++++++++-------- src/state.rs | 15 ++++++++---- src/systems/monster_ai_system.rs | 10 ++++++-- 4 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/components/monster.rs b/src/components/monster.rs index f254f50..7df8a42 100644 --- a/src/components/monster.rs +++ b/src/components/monster.rs @@ -1,4 +1,7 @@ -use crate::vga_color as vga; +use crate::{ + resources::{sound_output::SoundSamples, SoundEffects}, + vga_color as vga, +}; use bracket_lib::prelude::*; use specs::prelude::*; use specs_derive::Component; @@ -47,3 +50,11 @@ pub fn damage_for_kind(kind: MonsterKind) -> u32 { MonsterKind::Fast => 3, } } + +pub fn sound_effect_for_kind(kind: MonsterKind, sound_effects: &SoundEffects) -> SoundSamples { + match kind { + MonsterKind::Slow => sound_effects.slow_hit.clone(), + MonsterKind::Medium => sound_effects.medium_hit.clone(), + MonsterKind::Fast => sound_effects.fast_hit.clone(), + } +} diff --git a/src/resources/sound_effects.rs b/src/resources/sound_effects.rs index 58d2576..3868361 100644 --- a/src/resources/sound_effects.rs +++ b/src/resources/sound_effects.rs @@ -35,19 +35,22 @@ pub struct SoundEffects { pub whipping: SoundSamples, pub whipping_hit: SoundSamples, pub whipping_hit_end: SoundSamples, + pub slow_hit: SoundSamples, + pub medium_hit: SoundSamples, + pub fast_hit: SoundSamples, rng: RandomNumberGenerator, } impl SoundEffects { - pub fn new(ss: &SoundOutput) -> Self { + pub fn new(sound_output: &SoundOutput) -> Self { Self { - startup: ss.render_sound_effect(&SoundEffect { + startup: sound_output.render_sound_effect(&SoundEffect { sounds: vec![Sound { sound_type: SoundType::Sweep(1, 350), duration: Duration::from_secs(1), }], }), - step: ss.render_sound_effect(&SoundEffect { + step: sound_output.render_sound_effect(&SoundEffect { sounds: vec![ Sound { sound_type: SoundType::Noise(350, 900), @@ -63,7 +66,7 @@ impl SoundEffects { }, ], }), - pickup: ss.render_sound_effect(&SoundEffect { + pickup: sound_output.render_sound_effect(&SoundEffect { sounds: vec![ Sound { sound_type: SoundType::Noise(350, 900), @@ -79,7 +82,7 @@ impl SoundEffects { }, ], }), - bad_key: ss.render_sound_effect(&SoundEffect { + bad_key: sound_output.render_sound_effect(&SoundEffect { sounds: iter::once(Sound { sound_type: SoundType::Tone(540), duration: Duration::from_millis(40), @@ -98,7 +101,7 @@ impl SoundEffects { })) .collect(), }), - blocked: ss.render_sound_effect(&SoundEffect { + blocked: sound_output.render_sound_effect(&SoundEffect { sounds: (30..=60) .rev() .step_by(6) @@ -108,13 +111,13 @@ impl SoundEffects { }) .collect(), }), - whipping: ss.render_sound_effect(&SoundEffect { + whipping: sound_output.render_sound_effect(&SoundEffect { sounds: vec![Sound { sound_type: SoundType::Tone(70), duration: Duration::from_secs(3), }], }), - whipping_hit: ss.render_sound_effect(&SoundEffect { + whipping_hit: sound_output.render_sound_effect(&SoundEffect { sounds: vec![ Sound { sound_type: SoundType::Tone(400), @@ -126,12 +129,30 @@ impl SoundEffects { }, ], }), - whipping_hit_end: ss.render_sound_effect(&SoundEffect { + whipping_hit_end: sound_output.render_sound_effect(&SoundEffect { sounds: vec![Sound { sound_type: SoundType::Tone(400), duration: Duration::from_millis(20), }], }), + slow_hit: sound_output.render_sound_effect(&SoundEffect { + sounds: vec![Sound { + sound_type: SoundType::Tone(400), + duration: Duration::from_millis(25), + }], + }), + medium_hit: sound_output.render_sound_effect(&SoundEffect { + sounds: vec![Sound { + sound_type: SoundType::Tone(600), + duration: Duration::from_millis(25), + }], + }), + fast_hit: sound_output.render_sound_effect(&SoundEffect { + sounds: vec![Sound { + sound_type: SoundType::Tone(800), + duration: Duration::from_millis(25), + }], + }), rng: RandomNumberGenerator::new(), } } diff --git a/src/state.rs b/src/state.rs index e063062..d035268 100644 --- a/src/state.rs +++ b/src/state.rs @@ -1,6 +1,7 @@ use std::time::{Duration, Instant}; use crate::components::monster::damage_for_kind; +use crate::components::monster::sound_effect_for_kind; use crate::components::*; use crate::resources::*; use crate::systems::*; @@ -119,7 +120,7 @@ impl State { let monsters = self.ecs.write_storage::(); let mut map = self.ecs.write_resource::(); let mut stats = self.ecs.write_resource::(); - let mut sound_system = self.ecs.write_resource::(); + let mut sound_output = self.ecs.write_resource::(); let wants_to_whips = self.ecs.read_storage::(); for (player_entity, player, pos) in (&entities, &mut players, &mut positions).join() { @@ -139,11 +140,15 @@ impl State { if map.in_bounds(destination) { if map.is_solid(destination) { - sound_system.play_sound(sound_effects.blocked.clone()); + sound_output.play_sound(sound_effects.blocked.clone()); } else { if let Some(e) = map.get_tile_content_at(destination) { if let Some(monster) = monsters.get(e) { stats.take_gems(damage_for_kind(monster.kind)); + sound_output.play_sound(sound_effect_for_kind( + monster.kind, + &sound_effects, + )); let _ = entities.delete(e); } } @@ -161,11 +166,11 @@ impl State { self.ecs.write_resource::().force_tick(); - sound_system.play_sound(sound_effects.step.clone()); + sound_output.play_sound(sound_effects.step.clone()); } } else { - let static_sound = sound_effects.get_new_static_effect(&sound_system); - sound_system.play_sound(static_sound); + let static_sound = sound_effects.get_new_static_effect(&sound_output); + sound_output.play_sound(static_sound); } player.last_moved = now; diff --git a/src/systems/monster_ai_system.rs b/src/systems/monster_ai_system.rs index 36ed68f..d2147a6 100644 --- a/src/systems/monster_ai_system.rs +++ b/src/systems/monster_ai_system.rs @@ -1,9 +1,9 @@ use crate::{ components::{ - monster::{self, damage_for_kind, ticks_for_kind}, + monster::{self, damage_for_kind, sound_effect_for_kind, ticks_for_kind}, Monster, Player, Position, Renderable, }, - resources::{Clock, Map, Stats}, + resources::{Clock, Map, SoundEffects, SoundOutput, Stats}, tile_data::TileType, }; use bracket_lib::{prelude::*, random::RandomNumberGenerator}; @@ -19,6 +19,8 @@ impl<'a> System<'a> for MonsterAiSystem { ReadExpect<'a, Point>, WriteExpect<'a, Map>, WriteExpect<'a, Stats>, + ReadExpect<'a, SoundEffects>, + WriteExpect<'a, SoundOutput>, WriteStorage<'a, Monster>, WriteStorage<'a, Position>, WriteStorage<'a, Renderable>, @@ -33,6 +35,8 @@ impl<'a> System<'a> for MonsterAiSystem { player_pos, mut map, mut stats, + sound_effects, + mut sound_output, mut monsters, mut positions, mut renderables, @@ -79,6 +83,8 @@ impl<'a> System<'a> for MonsterAiSystem { // TODO: Sound map.clear_tile_content_at(Point::from(**position)); stats.take_gems(damage_for_kind(monster.kind)); + sound_output + .play_sound(sound_effect_for_kind(monster.kind, &sound_effects)); let _ = entities.delete(*entity); } } else { From b62f2759de6f67ce60511e00d8166556a40d4e7d Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 1 Feb 2022 02:56:45 -0500 Subject: [PATCH 3/4] Add score for touching/whipping monsters --- src/resources/mod.rs | 4 ++++ src/state.rs | 1 + src/systems/whip_system.rs | 9 ++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/resources/mod.rs b/src/resources/mod.rs index 08af502..df734a6 100644 --- a/src/resources/mod.rs +++ b/src/resources/mod.rs @@ -70,4 +70,8 @@ impl Stats { true } } + + pub fn add_score(&mut self, score: u32) { + self.score += score; + } } diff --git a/src/state.rs b/src/state.rs index d035268..45232c9 100644 --- a/src/state.rs +++ b/src/state.rs @@ -144,6 +144,7 @@ impl State { } else { if let Some(e) = map.get_tile_content_at(destination) { if let Some(monster) = monsters.get(e) { + stats.add_score(damage_for_kind(monster.kind)); stats.take_gems(damage_for_kind(monster.kind)); sound_output.play_sound(sound_effect_for_kind( monster.kind, diff --git a/src/systems/whip_system.rs b/src/systems/whip_system.rs index f9b5ff1..4ffe493 100644 --- a/src/systems/whip_system.rs +++ b/src/systems/whip_system.rs @@ -4,8 +4,8 @@ use bracket_lib::prelude::*; use specs::prelude::*; use crate::{ - components::{Monster, Position, WantsToWhip}, - resources::{Map, SoundEffects, SoundOutput, StopClock}, + components::{monster::damage_for_kind, Monster, Position, WantsToWhip}, + resources::{Map, SoundEffects, SoundOutput, Stats, StopClock}, }; pub struct WhipSystem {} @@ -17,6 +17,7 @@ impl<'a> System<'a> for WhipSystem { WriteExpect<'a, StopClock>, WriteExpect<'a, SoundOutput>, ReadExpect<'a, SoundEffects>, + WriteExpect<'a, Stats>, ReadStorage<'a, Position>, WriteStorage<'a, WantsToWhip>, WriteStorage<'a, Monster>, @@ -29,6 +30,7 @@ impl<'a> System<'a> for WhipSystem { mut stop_clock, mut sound_output, sound_effects, + mut stats, positions, mut wants_to_whips, monsters, @@ -93,7 +95,8 @@ impl<'a> System<'a> for WhipSystem { if let Some(dest) = destination { if let Some(e) = map.get_tile_content_at(dest) { - if let Some(_monster) = monsters.get(e) { + if let Some(monster) = monsters.get(e) { + stats.add_score(damage_for_kind(monster.kind)); let _ = entities.delete(e); map.clear_tile_content_at(dest); if let Some(sound) = &mut wants_to_whip.sound { From 82c4358ac73e4c29e1c194ae8e8ae1b631cbb6dc Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 1 Feb 2022 03:01:21 -0500 Subject: [PATCH 4/4] Allow monsters to break blocks --- src/resources/map.rs | 5 +++++ src/systems/monster_ai_system.rs | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/resources/map.rs b/src/resources/map.rs index 1d753f9..b9bb6a2 100644 --- a/src/resources/map.rs +++ b/src/resources/map.rs @@ -236,6 +236,11 @@ impl Map { self.tiles[self.point2d_to_index(point)] } + pub fn get_tile_at_mut(&mut self, point: Point) -> &mut TileType { + let index = self.point2d_to_index(point); + &mut self.tiles[index] + } + pub fn set_tile_at(&mut self, point: Point, tile: TileType) { let index = self.point2d_to_index(point); self.tiles[index] = tile; diff --git a/src/systems/monster_ai_system.rs b/src/systems/monster_ai_system.rs index d2147a6..231f8be 100644 --- a/src/systems/monster_ai_system.rs +++ b/src/systems/monster_ai_system.rs @@ -88,10 +88,12 @@ impl<'a> System<'a> for MonsterAiSystem { let _ = entities.delete(*entity); } } else { - match map.get_tile_at(destination) { + let tile = map.get_tile_at_mut(destination); + match tile { TileType::Wall => {} TileType::Block => { // TODO: Sound + *tile = TileType::Floor; let _ = entities.delete(*entity); } _ => {