lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Speed with TURN_COST and slight randomisation to reduce predictability

Browse source
This commit is contained in:
Llywelwyn 2023-07-31 05:07:41 +01:00
parent dce40ac741
commit aac6e0ad02
12 changed files with 200 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bystander_ai_system.rs
View file

@ -1,4 +1,4 @@
use super::{gamelog, Bystander, EntityMoved, Map, Name, Point, Position, Quips, RunState, Viewshed};
use super::{gamelog, Bystander, EntityMoved, Map, Name, Point, Position, Quips, TakingTurn, Viewshed};
use specs::prelude::*;
pub struct BystanderAI {}
@ -7,7 +7,6 @@ impl<'a> System<'a> for BystanderAI {
#[allow(clippy::type_complexity)]
type SystemData = (
WriteExpect<'a, Map>,
ReadExpect<'a, RunState>,
Entities<'a>,
WriteStorage<'a, Viewshed>,
ReadStorage<'a, Bystander>,
@ -17,12 +16,12 @@ impl<'a> System<'a> for BystanderAI {
ReadExpect<'a, Point>,
WriteStorage<'a, Quips>,
ReadStorage<'a, Name>,
ReadStorage<'a, TakingTurn>,
);
fn run(&mut self, data: Self::SystemData) {
let (
mut map,
runstate,
entities,
mut viewshed,
bystander,
@ -32,13 +31,11 @@ impl<'a> System<'a> for BystanderAI {
player_pos,
mut quips,
names,
turns,
) = data;
if *runstate != RunState::MonsterTurn {
return;
}
for (entity, mut viewshed, _bystander, mut pos) in (&entities, &mut viewshed, &bystander, &mut position).join()
for (entity, mut viewshed, _bystander, mut pos, _turn) in
(&entities, &mut viewshed, &bystander, &mut position, &turns).join()
{
// Possibly quip
let quip = quips.get_mut(entity);