diff options
Diffstat (limited to 'server/src/entity')
| -rw-r--r-- | server/src/entity/conveyor.rs | 33 | ||||
| -rw-r--r-- | server/src/entity/mod.rs | 56 | ||||
| -rw-r--r-- | server/src/entity/portal.rs | 46 |
3 files changed, 110 insertions, 25 deletions
diff --git a/server/src/entity/conveyor.rs b/server/src/entity/conveyor.rs index 4d11ffe1..2d56c144 100644 --- a/server/src/entity/conveyor.rs +++ b/server/src/entity/conveyor.rs @@ -21,13 +21,15 @@ use crate::{ game::{interact_effect, Tile}, }; use anyhow::{anyhow, Result}; -use hurrycurry_protocol::{glam::IVec2, ItemLocation, PacketC}; +use hurrycurry_protocol::{glam::IVec2, ItemIndex, ItemLocation, PacketC}; use std::collections::{HashMap, VecDeque}; -#[derive(Debug, Default, Clone)] +#[derive(Debug, Clone)] pub struct Conveyor { pub(super) from: IVec2, pub(super) to: IVec2, + pub(super) filter_tile: Option<IVec2>, + pub(super) filter_item: Option<ItemIndex>, pub(super) cooldown: f32, pub(super) max_cooldown: f32, } @@ -41,17 +43,36 @@ impl EntityT for Conveyor { tiles: &mut HashMap<IVec2, Tile>, dt: f32, ) -> Result<()> { - let [from, to] = tiles - .get_many_mut([&self.from, &self.to]) - .ok_or(anyhow!("conveyor does ends in itself"))?; + let from = tiles + .get(&self.from) + .ok_or(anyhow!("conveyor from missing"))?; + + if let Some(from_item) = from.item.as_ref() { + let filter = if let Some(t) = &self.filter_tile { + let filter_tile = tiles.get(t).ok_or(anyhow!("conveyor filter missing"))?; + filter_tile.item.as_ref().map(|e| e.kind) + } else if let Some(i) = &self.filter_item { + Some(*i) + } else { + None + }; + + if let Some(filter) = filter { + if from_item.kind != filter { + return Ok(()); + } + } - if from.item.is_some() { self.cooldown += dt; if self.cooldown < self.max_cooldown { return Ok(()); } self.cooldown = 0.; + let [from, to] = tiles + .get_many_mut([&self.from, &self.to]) + .ok_or(anyhow!("conveyor does ends in itself"))?; + interact_effect( data, true, diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs index 925ed5f4..a1f690a3 100644 --- a/server/src/entity/mod.rs +++ b/server/src/entity/mod.rs @@ -16,10 +16,15 @@ */ pub mod conveyor; -use crate::{data::Gamedata, game::Tile}; +pub mod portal; +use crate::{ + data::{Gamedata, ItemTileRegistry}, + game::Tile, +}; use anyhow::{anyhow, Result}; use conveyor::Conveyor; use hurrycurry_protocol::{glam::IVec2, PacketC}; +use portal::Portal; use serde::{Deserialize, Serialize}; use std::collections::{HashMap, VecDeque}; @@ -34,43 +39,54 @@ pub trait EntityT: Clone { ) -> Result<()>; } -#[derive(Debug, Clone)] -pub enum Entity { - Conveyor(Conveyor), -} -impl EntityT for Entity { - fn tick( - &mut self, - data: &Gamedata, - points: &mut i64, - packet_out: &mut VecDeque<PacketC>, - tiles: &mut HashMap<IVec2, Tile>, - dt: f32, - ) -> Result<()> { - match self { - Entity::Conveyor(x) => x.tick(data, points, packet_out, tiles, dt), +macro_rules! entities { + ($($e:ident),*) => { + #[derive(Debug, Clone)] + pub enum Entity { $($e($e)),* } + impl EntityT for Entity { + fn tick(&mut self, data: &Gamedata, points: &mut i64, packet_out: &mut VecDeque<PacketC>, tiles: &mut HashMap<IVec2, Tile>, dt: f32) -> Result<()> { + match self { $(Entity::$e(x) => x.tick(data, points, packet_out, tiles, dt)),*, } + } } - } + }; } +entities!(Conveyor, Portal); + #[derive(Debug, Clone, Deserialize, Serialize)] #[serde(rename_all = "snake_case")] pub enum EntityDecl { Conveyor { from: Option<IVec2>, to: Option<IVec2>, + filter_dir: Option<IVec2>, + filter: Option<String>, dir: Option<IVec2>, speed: Option<f32>, }, + Portal { + from: Option<IVec2>, + to: IVec2, + }, } -pub fn construct_entity(pos: Option<IVec2>, decl: &EntityDecl) -> Result<Entity> { +pub fn construct_entity( + pos: Option<IVec2>, + decl: &EntityDecl, + reg: &ItemTileRegistry, +) -> Result<Entity> { Ok(match decl.to_owned() { + EntityDecl::Portal { from, to } => Entity::Portal(Portal { + from: from.or(pos).ok_or(anyhow!("no portla start"))?, + to, + }), EntityDecl::Conveyor { from, to, speed, dir, + filter, + filter_dir, } => { let from = from.or(pos).ok_or(anyhow!("conveyor has no start"))?; let to = to @@ -80,7 +96,9 @@ pub fn construct_entity(pos: Option<IVec2>, decl: &EntityDecl) -> Result<Entity> from, to, max_cooldown: 1. / speed.unwrap_or(2.), - ..Default::default() + filter_tile: filter_dir.map(|o| to + o), + filter_item: filter.map(|name| reg.register_item(name)), + cooldown: 0., }) } }) diff --git a/server/src/entity/portal.rs b/server/src/entity/portal.rs new file mode 100644 index 00000000..e0195b9f --- /dev/null +++ b/server/src/entity/portal.rs @@ -0,0 +1,46 @@ +use super::EntityT; +use crate::{ + data::Gamedata, + game::{interact_effect, Tile}, +}; +use anyhow::{anyhow, Result}; +use hurrycurry_protocol::{glam::IVec2, ItemLocation, PacketC}; +use std::collections::{HashMap, VecDeque}; + +#[derive(Debug, Default, Clone)] +pub struct Portal { + pub(super) from: IVec2, + pub(super) to: IVec2, +} + +impl EntityT for Portal { + fn tick( + &mut self, + data: &Gamedata, + points: &mut i64, + packet_out: &mut VecDeque<PacketC>, + tiles: &mut HashMap<IVec2, Tile>, + _dt: f32, + ) -> Result<()> { + let [from, to] = tiles + .get_many_mut([&self.from, &self.to]) + .ok_or(anyhow!("conveyor does ends in itself"))?; + + if from.item.is_some() { + interact_effect( + data, + true, + &mut to.item, + ItemLocation::Tile(self.to), + &mut from.item, + ItemLocation::Tile(self.from), + Some(to.kind), + packet_out, + points, + true, + ); + } + + Ok(()) + } +} |