tutorials/roguelike-game
1
0
Fork 0
Code Releases Activity

Complete section 3.7

Browse Source
This commit is contained in:
Timothy Warren 2021-12-01 10:14:30 -05:00
parent 4011e7d7d3
commit 06e7311523
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/visibility_system.rs
View File

@ -1,20 +1,28 @@
use crate::{Map, Player, Position, Viewshed}; use crate::{
components::Hidden, components::Name, game_log::GameLog, Map, Player, Position, Viewshed,
};
use rltk::{field_of_view, Point}; use rltk::{field_of_view, Point};
use specs::prelude::*; use specs::prelude::*;
pub struct VisibilitySystem {} pub struct VisibilitySystem {}
impl<'a> System<'a> for VisibilitySystem { impl<'a> System<'a> for VisibilitySystem {
#[allow(clippy::type_complexity)]
type SystemData = ( type SystemData = (
WriteExpect<'a, Map>, WriteExpect<'a, Map>,
Entities<'a>, Entities<'a>,
WriteStorage<'a, Viewshed>, WriteStorage<'a, Viewshed>,
WriteStorage<'a, Position>, ReadStorage<'a, Position>,
ReadStorage<'a, Player>, ReadStorage<'a, Player>,
WriteStorage<'a, Hidden>,
WriteExpect<'a, rltk::RandomNumberGenerator>,
WriteExpect<'a, GameLog>,
ReadStorage<'a, Name>,
); );
fn run(&mut self, data: Self::SystemData) { fn run(&mut self, data: Self::SystemData) {
let (mut map, entities, mut viewshed, pos, player) = data; let (mut map, entities, mut viewshed, pos, player, mut hidden, mut rng, mut log, names) =
data;
for (ent, viewshed, pos) in (&entities, &mut viewshed, &pos).join() { for (ent, viewshed, pos) in (&entities, &mut viewshed, &pos).join() {
if viewshed.dirty { if viewshed.dirty {
@ -31,10 +39,24 @@ impl<'a> System<'a> for VisibilitySystem {
for t in map.visible_tiles.iter_mut() { for t in map.visible_tiles.iter_mut() {
*t = false *t = false
} }
for vis in viewshed.visible_tiles.iter() { for vis in viewshed.visible_tiles.iter() {
let idx = map.xy_idx(vis.x, vis.y); let idx = map.xy_idx(vis.x, vis.y);
map.revealed_tiles[idx] = true; map.revealed_tiles[idx] = true;
map.visible_tiles[idx] = true; map.visible_tiles[idx] = true;
// Chance to reveal hidden things
for e in map.tile_content[idx].iter() {
if let Some(_maybe_hidden) = hidden.get(*e) {
if rng.roll_dice(1, 24) == 1 {
if let Some(name) = names.get(*e) {
log.append(format!("You spotted a {}.", &name.name));
}
hidden.remove(*e);
}
}
}
} }
} }
} }