diff options
Diffstat (limited to 'server/src/entity')
-rw-r--r-- | server/src/entity/mod.rs | 12 | ||||
-rw-r--r-- | server/src/entity/weather.rs | 51 |
2 files changed, 62 insertions, 1 deletions
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs index ad0bde6f..d042d458 100644 --- a/server/src/entity/mod.rs +++ b/server/src/entity/mod.rs @@ -19,6 +19,7 @@ pub mod conveyor; pub mod customers; pub mod item_portal; pub mod player_portal; +pub mod weather; use crate::{data::ItemTileRegistry, game::Game, interaction::Recipe}; use anyhow::{anyhow, Result}; @@ -32,6 +33,7 @@ use item_portal::ItemPortal; use player_portal::PlayerPortal; use serde::{Deserialize, Serialize}; use std::collections::{HashMap, HashSet, VecDeque}; +use weather::WeatherController; pub trait EntityT: Clone { fn tick(&mut self, game: &mut Game, packet_out: &mut VecDeque<PacketC>, dt: f32) -> Result<()>; @@ -49,7 +51,13 @@ macro_rules! entities { }; } -entities!(Conveyor, ItemPortal, PlayerPortal, Customers); +entities!( + Conveyor, + ItemPortal, + PlayerPortal, + Customers, + WeatherController +); #[derive(Debug, Clone, Deserialize, Serialize)] #[serde(rename_all = "snake_case")] @@ -71,6 +79,7 @@ pub enum EntityDecl { to: Vec2, }, Customers {}, + Weather {}, } pub fn construct_entity( @@ -125,5 +134,6 @@ pub fn construct_entity( .collect(); Entity::Customers(Customers::new(chairs, demands)?) } + EntityDecl::Weather {} => Entity::WeatherController(WeatherController::default()), }) } diff --git a/server/src/entity/weather.rs b/server/src/entity/weather.rs new file mode 100644 index 00000000..79ac364f --- /dev/null +++ b/server/src/entity/weather.rs @@ -0,0 +1,51 @@ +use super::EntityT; +use crate::{game::Game, InterpolateExt}; +use hurrycurry_protocol::PacketC; +use rand::{random, seq::IndexedRandom, thread_rng}; +use std::{ + collections::VecDeque, + time::{Duration, Instant}, +}; + +#[derive(Clone, Debug)] +pub struct WeatherController { + next_event: Instant, + event: usize, +} + +impl Default for WeatherController { + fn default() -> Self { + Self { + next_event: Instant::now() + Duration::from_secs(10), + event: Default::default(), + } + } +} +impl EntityT for WeatherController { + fn tick( + &mut self, + game: &mut Game, + _packet_out: &mut VecDeque<PacketC>, + dt: f32, + ) -> anyhow::Result<()> { + if self.next_event < Instant::now() { + self.next_event += Duration::from_secs_f32(30. + random::<f32>() * 40.); + if self.event > 0 { + self.event = 0; + } else { + self.event = *[0, 0, 1, 2].choose(&mut thread_rng()).unwrap(); + } + } + + let (rain, wind) = match self.event { + 0 => (0., 0.), + 1 => (0.7, 0.), + 2 => (0., 0.7), + _ => (1., 1.), + }; + game.environment.wind.exp_to(wind, dt * 0.05); + game.environment.rain.exp_to(rain, dt * 0.15); + eprintln!("{:#?}", game.environment); + Ok(()) + } +} |