|
@@ -1,6 +1,6 @@
|
|
extern crate specs;
|
|
extern crate specs;
|
|
use specs::prelude::*;
|
|
use specs::prelude::*;
|
|
-use super::{Viewshed, Monster, Map, Position, WantsToMelee, RunState};
|
|
|
|
|
|
+use super::{Viewshed, Monster, Map, Position, WantsToMelee, RunState, Confusion};
|
|
extern crate rltk;
|
|
extern crate rltk;
|
|
use rltk::{Point};
|
|
use rltk::{Point};
|
|
|
|
|
|
@@ -16,33 +16,47 @@ impl<'a> System<'a> for MonsterAI {
|
|
WriteStorage<'a, Viewshed>,
|
|
WriteStorage<'a, Viewshed>,
|
|
ReadStorage<'a, Monster>,
|
|
ReadStorage<'a, Monster>,
|
|
WriteStorage<'a, Position>,
|
|
WriteStorage<'a, Position>,
|
|
- WriteStorage<'a, WantsToMelee>);
|
|
|
|
|
|
+ WriteStorage<'a, WantsToMelee>,
|
|
|
|
+ WriteStorage<'a, Confusion>);
|
|
|
|
|
|
fn run(&mut self, data : Self::SystemData) {
|
|
fn run(&mut self, data : Self::SystemData) {
|
|
- let (mut map, player_pos, player_entity, runstate, entities, mut viewshed, monster, mut position, mut wants_to_melee) = data;
|
|
|
|
|
|
+ let (mut map, player_pos, player_entity, runstate, entities, mut viewshed, monster, mut position, mut wants_to_melee, mut confused) = data;
|
|
|
|
|
|
if *runstate != RunState::MonsterTurn { return; }
|
|
if *runstate != RunState::MonsterTurn { return; }
|
|
|
|
|
|
for (entity, mut viewshed,_monster,mut pos) in (&entities, &mut viewshed, &monster, &mut position).join() {
|
|
for (entity, mut viewshed,_monster,mut pos) in (&entities, &mut viewshed, &monster, &mut position).join() {
|
|
- let distance = rltk::DistanceAlg::Pythagoras.distance2d(Point::new(pos.x, pos.y), *player_pos);
|
|
|
|
- if distance < 1.5 {
|
|
|
|
- wants_to_melee.insert(entity, WantsToMelee{ target: *player_entity }).expect("Unable to insert attack");
|
|
|
|
|
|
+ let mut can_act = true;
|
|
|
|
+
|
|
|
|
+ let is_confused = confused.get_mut(entity);
|
|
|
|
+ if let Some(i_am_confused) = is_confused {
|
|
|
|
+ i_am_confused.turns -= 1;
|
|
|
|
+ if i_am_confused.turns < 1 {
|
|
|
|
+ confused.remove(entity);
|
|
|
|
+ }
|
|
|
|
+ can_act = false;
|
|
}
|
|
}
|
|
- else if viewshed.visible_tiles.contains(&*player_pos) {
|
|
|
|
- // Path to the player
|
|
|
|
- let path = rltk::a_star_search(
|
|
|
|
- map.xy_idx(pos.x, pos.y) as i32,
|
|
|
|
- map.xy_idx(player_pos.x, player_pos.y) as i32,
|
|
|
|
- &mut *map
|
|
|
|
- );
|
|
|
|
- if path.success && path.steps.len()>1 {
|
|
|
|
- let mut idx = map.xy_idx(pos.x, pos.y);
|
|
|
|
- map.blocked[idx] = false;
|
|
|
|
- pos.x = path.steps[1] % map.width;
|
|
|
|
- pos.y = path.steps[1] / map.width;
|
|
|
|
- idx = map.xy_idx(pos.x, pos.y);
|
|
|
|
- map.blocked[idx] = true;
|
|
|
|
- viewshed.dirty = true;
|
|
|
|
|
|
+
|
|
|
|
+ if can_act {
|
|
|
|
+ let distance = rltk::DistanceAlg::Pythagoras.distance2d(Point::new(pos.x, pos.y), *player_pos);
|
|
|
|
+ if distance < 1.5 {
|
|
|
|
+ wants_to_melee.insert(entity, WantsToMelee{ target: *player_entity }).expect("Unable to insert attack");
|
|
|
|
+ }
|
|
|
|
+ else if viewshed.visible_tiles.contains(&*player_pos) {
|
|
|
|
+ // Path to the player
|
|
|
|
+ let path = rltk::a_star_search(
|
|
|
|
+ map.xy_idx(pos.x, pos.y) as i32,
|
|
|
|
+ map.xy_idx(player_pos.x, player_pos.y) as i32,
|
|
|
|
+ &mut *map
|
|
|
|
+ );
|
|
|
|
+ if path.success && path.steps.len()>1 {
|
|
|
|
+ let mut idx = map.xy_idx(pos.x, pos.y);
|
|
|
|
+ map.blocked[idx] = false;
|
|
|
|
+ pos.x = path.steps[1] % map.width;
|
|
|
|
+ pos.y = path.steps[1] / map.width;
|
|
|
|
+ idx = map.xy_idx(pos.x, pos.y);
|
|
|
|
+ map.blocked[idx] = true;
|
|
|
|
+ viewshed.dirty = true;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|