refactor environment effects

1 files changed, 7 insertions, 5 deletions

diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index d042d458..747dd6b7 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -17,14 +17,15 @@
 */
 pub mod conveyor;
 pub mod customers;
+pub mod environment_effect;
 pub mod item_portal;
 pub mod player_portal;
-pub mod weather;
 
 use crate::{data::ItemTileRegistry, game::Game, interaction::Recipe};
 use anyhow::{anyhow, Result};
 use conveyor::Conveyor;
 use customers::{demands::generate_demands, Customers};
+use environment_effect::{EnvironmentEffect, EnvironmentEffectController};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     ItemIndex, PacketC, TileIndex,
@@ -33,7 +34,6 @@ 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<()>;
@@ -56,7 +56,7 @@ entities!(
     ItemPortal,
     PlayerPortal,
     Customers,
-    WeatherController
+    EnvironmentEffectController
 );
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -79,7 +79,7 @@ pub enum EntityDecl {
         to: Vec2,
     },
     Customers {},
-    Weather {},
+    EnvironmentEffect(EnvironmentEffect),
 }
 
 pub fn construct_entity(
@@ -134,6 +134,8 @@ pub fn construct_entity(
                 .collect();
             Entity::Customers(Customers::new(chairs, demands)?)
         }
-        EntityDecl::Weather {} => Entity::WeatherController(WeatherController::default()),
+        EntityDecl::EnvironmentEffect(config) => {
+            Entity::EnvironmentEffectController(EnvironmentEffectController::new(config))
+        }
     })
 }