|
1 | | -use crate::{ |
2 | | - components::{Direction, Player, PlayerPosition, Velocity, Wall}, |
3 | | - constants::PLAYER_LAYER, |
4 | | - events::*, |
5 | | - player::move_or_turn, |
6 | | - utils::vecs_xy_intersect, |
7 | | -}; |
8 | | -use bevy::prelude::*; |
9 | | -use bevy::{ |
10 | | - ecs::{Query, ResMut, SystemStage, With}, |
11 | | - sprite::ColorMaterial, |
12 | | -}; |
13 | | -use rand::{seq::SliceRandom, thread_rng}; |
14 | | - |
15 | | -#[derive(Bundle)] |
16 | | -pub struct CreatureBundle { |
17 | | - creature: Creature, |
18 | | - direction: Direction, |
19 | | - velocity: Velocity, |
20 | | -} |
21 | | - |
22 | | -impl Default for CreatureBundle { |
23 | | - fn default() -> Self { |
24 | | - Self { |
25 | | - creature: Creature, |
26 | | - direction: Direction::Right, |
27 | | - velocity: Velocity { |
28 | | - current: 0.0, |
29 | | - max: 1.0, |
30 | | - }, |
31 | | - } |
32 | | - } |
33 | | -} |
34 | | - |
35 | | -pub struct CreatureMaterial(pub Handle<ColorMaterial>); |
36 | | - |
37 | | -pub struct Creature; |
38 | | - |
39 | | -// could be done with a crate |
40 | | -const DIRECTIONS: [Direction; 4] = [ |
41 | | - Direction::Up, |
42 | | - Direction::Down, |
43 | | - Direction::Left, |
44 | | - Direction::Right, |
45 | | -]; |
46 | | - |
47 | | -fn creature_movement( |
48 | | - mut query: Query<(&Velocity, &mut Direction, &mut Transform), With<Creature>>, |
49 | | - wall_pos_query: Query<&Transform, With<Wall>>, |
50 | | -) { |
51 | | - let turn_probability = 0.02; |
52 | | - for (_, mut direction, mut creature_position) in query.iter_mut() { |
53 | | - let mut rng = thread_rng(); |
54 | | - |
55 | | - match move_or_turn( |
56 | | - &creature_position.translation.truncate(), |
57 | | - &direction, |
58 | | - &wall_pos_query, |
59 | | - ) { |
60 | | - Some(new_position) => { |
61 | | - if rand::random::<f32>() < turn_probability { |
62 | | - // only change ocassionally |
63 | | - *direction = *DIRECTIONS.choose(&mut rng).unwrap() |
64 | | - } |
65 | | - creature_position.translation = new_position.extend(PLAYER_LAYER); |
66 | | - } |
67 | | - None => { |
68 | | - // always change. Yes, need to filter out current position |
69 | | - *direction = *DIRECTIONS.choose(&mut rng).unwrap(); |
70 | | - } |
71 | | - } |
72 | | - } |
73 | | -} |
74 | | - |
75 | | -pub trait CreatureSystems { |
76 | | - fn creature_systems(&mut self) -> &mut Self; |
77 | | -} |
78 | | -impl CreatureSystems for SystemStage { |
79 | | - fn creature_systems(&mut self) -> &mut Self { |
80 | | - self.add_system(creature_player_collision.system()) |
81 | | - .add_system(creature_movement.system()) |
82 | | - } |
83 | | -} |
84 | | - |
85 | | -fn creature_player_collision( |
86 | | - mut player_query: Query<&mut PlayerPosition, With<Player>>, |
87 | | - mut creature_query: Query<&mut Transform, With<Creature>>, |
88 | | - mut game_over_events: ResMut<Events<GameOverEvent>>, |
89 | | -) { |
90 | | - for player in player_query.iter_mut() { |
91 | | - let player_pos = &player.truncate(); |
92 | | - for creature_transform in creature_query.iter_mut() { |
93 | | - if vecs_xy_intersect(&creature_transform.translation.truncate(), player_pos) { |
94 | | - game_over_events.send(GameOverEvent(GameOverType::Defeat)); |
95 | | - // TODO: stop the game (stop movement system?) |
96 | | - } |
97 | | - } |
98 | | - } |
99 | | -} |
| 1 | +use crate::{ |
| 2 | + components::{Direction, Player, PlayerPosition, Stop, Velocity, Wall}, |
| 3 | + constants::PLAYER_LAYER, |
| 4 | + events::*, |
| 5 | + player::move_or_turn, |
| 6 | + ui::DrawBlinkTimer, |
| 7 | + utils::vecs_xy_intersect, |
| 8 | +}; |
| 9 | +use bevy::prelude::*; |
| 10 | +use bevy::{ |
| 11 | + ecs::{Query, ResMut, SystemStage, With}, |
| 12 | + sprite::ColorMaterial, |
| 13 | +}; |
| 14 | +use rand::{seq::SliceRandom, thread_rng}; |
| 15 | + |
| 16 | +#[derive(Bundle)] |
| 17 | +pub struct CreatureBundle { |
| 18 | + creature: Creature, |
| 19 | + direction: Direction, |
| 20 | + velocity: Velocity, |
| 21 | +} |
| 22 | + |
| 23 | +impl Default for CreatureBundle { |
| 24 | + fn default() -> Self { |
| 25 | + Self { |
| 26 | + creature: Creature, |
| 27 | + direction: Direction::Right, |
| 28 | + velocity: Velocity { |
| 29 | + current: 0.0, |
| 30 | + max: 1.0, |
| 31 | + }, |
| 32 | + } |
| 33 | + } |
| 34 | +} |
| 35 | + |
| 36 | +pub struct CreatureMaterial(pub Handle<ColorMaterial>); |
| 37 | + |
| 38 | +pub struct Creature; |
| 39 | + |
| 40 | +// could be done with a crate |
| 41 | +const DIRECTIONS: [Direction; 4] = [ |
| 42 | + Direction::Up, |
| 43 | + Direction::Down, |
| 44 | + Direction::Left, |
| 45 | + Direction::Right, |
| 46 | +]; |
| 47 | + |
| 48 | +fn creature_movement( |
| 49 | + mut query: Query<(&Velocity, &mut Direction, &mut Transform), With<Creature>>, |
| 50 | + wall_pos_query: Query<&Transform, With<Wall>>, |
| 51 | +) { |
| 52 | + let turn_probability = 0.02; |
| 53 | + for (_, mut direction, mut creature_position) in query.iter_mut() { |
| 54 | + let mut rng = thread_rng(); |
| 55 | + |
| 56 | + match move_or_turn( |
| 57 | + &creature_position.translation.truncate(), |
| 58 | + &direction, |
| 59 | + &wall_pos_query, |
| 60 | + ) { |
| 61 | + Some(new_position) => { |
| 62 | + if rand::random::<f32>() < turn_probability { |
| 63 | + // only change ocassionally |
| 64 | + *direction = *DIRECTIONS.choose(&mut rng).unwrap() |
| 65 | + } |
| 66 | + creature_position.translation = new_position.extend(PLAYER_LAYER); |
| 67 | + } |
| 68 | + None => { |
| 69 | + // always change. Yes, need to filter out current position |
| 70 | + *direction = *DIRECTIONS.choose(&mut rng).unwrap(); |
| 71 | + } |
| 72 | + } |
| 73 | + } |
| 74 | +} |
| 75 | + |
| 76 | +pub trait CreatureSystems { |
| 77 | + fn creature_systems(&mut self) -> &mut Self; |
| 78 | +} |
| 79 | +impl CreatureSystems for SystemStage { |
| 80 | + fn creature_systems(&mut self) -> &mut Self { |
| 81 | + self.add_system(creature_player_collision.system()) |
| 82 | + .add_system(creature_movement.system()) |
| 83 | + .add_system(despawn_player.system()) |
| 84 | + } |
| 85 | +} |
| 86 | + |
| 87 | +fn creature_player_collision( |
| 88 | + commands: &mut Commands, |
| 89 | + mut player_query: Query<(Entity, &mut PlayerPosition), With<Player>>, |
| 90 | + mut creature_query: Query<&mut Transform, With<Creature>>, |
| 91 | + mut game_over_events: ResMut<Events<GameOverEvent>>, |
| 92 | +) { |
| 93 | + for (entity, player) in player_query.iter_mut() { |
| 94 | + let player_pos = &player.truncate(); |
| 95 | + for creature_transform in creature_query.iter_mut() { |
| 96 | + if vecs_xy_intersect(&creature_transform.translation.truncate(), player_pos) { |
| 97 | + commands.insert(entity, StopAndFlashing::default()); |
| 98 | + game_over_events.send(GameOverEvent(GameOverType::Defeat)); |
| 99 | + // TODO: stop the game (stop movement system?) |
| 100 | + } |
| 101 | + } |
| 102 | + } |
| 103 | +} |
| 104 | + |
| 105 | +#[derive(Bundle)] |
| 106 | +struct StopAndFlashing(Stop, DrawBlinkTimer, Timer); |
| 107 | +impl Default for StopAndFlashing { |
| 108 | + fn default() -> Self { |
| 109 | + Self( |
| 110 | + Stop, |
| 111 | + DrawBlinkTimer(Timer::from_seconds(0.2, true)),//TODO:Slow here |
| 112 | + Timer::from_seconds(3.0, false), |
| 113 | + ) |
| 114 | + } |
| 115 | +} |
| 116 | +fn despawn_player( |
| 117 | + commands: &mut Commands, |
| 118 | + time: Res<Time>, |
| 119 | + mut query: Query<(Entity, &mut Timer), (With<Stop>, With<DrawBlinkTimer>)>, |
| 120 | +) { |
| 121 | + for (entity, mut timer) in query.iter_mut() { |
| 122 | + if timer.tick(time.delta_seconds()).just_finished() { |
| 123 | + commands.despawn_recursive(entity); |
| 124 | + } |
| 125 | + } |
| 126 | +} |
0 commit comments