aboutsummaryrefslogtreecommitdiff
path: root/server/src/entity
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-12-14 19:37:47 +0100
committermetamuffin <metamuffin@disroot.org>2025-12-14 19:37:47 +0100
commit15fbfe0693191bbb5b5de8d2ecfdd8bfc4b8be4d (patch)
treec54f1bb7e7fb764d9a77a49e5e4d265668290977 /server/src/entity
parent54e6a3348de36ed6b195a8738035d5a5998f7af0 (diff)
downloadhurrycurry-15fbfe0693191bbb5b5de8d2ecfdd8bfc4b8be4d.tar
hurrycurry-15fbfe0693191bbb5b5de8d2ecfdd8bfc4b8be4d.tar.bz2
hurrycurry-15fbfe0693191bbb5b5de8d2ecfdd8bfc4b8be4d.tar.zst
Add demand sink entity (close #532)
Diffstat (limited to 'server/src/entity')
-rw-r--r--server/src/entity/demand_sink.rs46
-rw-r--r--server/src/entity/mod.rs24
2 files changed, 59 insertions, 11 deletions
diff --git a/server/src/entity/demand_sink.rs b/server/src/entity/demand_sink.rs
new file mode 100644
index 00000000..a653fe3e
--- /dev/null
+++ b/server/src/entity/demand_sink.rs
@@ -0,0 +1,46 @@
+/*
+ Hurry Curry! - a game about cooking
+ Copyright (C) 2025 Hurry Curry! Contributors
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, version 3 of the License only.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+use crate::entity::{Entity, EntityContext};
+use anyhow::Result;
+use hurrycurry_locale::TrError;
+use hurrycurry_protocol::glam::IVec2;
+
+pub struct DemandSink {
+ pub pos: IVec2,
+}
+impl Entity for DemandSink {
+ fn tick(&mut self, c: EntityContext<'_>) -> Result<(), TrError> {
+ let Some(tile) = c.game.tiles.get(&self.pos) else {
+ return Ok(());
+ };
+ let Some(item) = &tile.item else {
+ return Ok(());
+ };
+ if let Some(demand) = c.game.data.demands.iter().find(|d| d.input == item.kind) {
+ c.game.score.demands_completed += 1;
+ c.game.score.points += demand.points;
+ *c.score_changed = true
+ // TODO satisfied effect
+ } else {
+ // No effect
+ }
+ c.game.set_item(self.pos, None);
+ Ok(())
+ }
+}
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 279826a9..6e1a618c 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -15,21 +15,22 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-pub mod book;
+mod book;
pub mod bot;
-pub mod campaign;
-pub mod conveyor;
-pub mod customers;
-pub mod environment_effect;
-pub mod item_portal;
-pub mod pedestrians;
-pub mod player_portal;
-pub mod tag_minigame;
-pub mod tram;
+mod campaign;
+mod conveyor;
+mod customers;
+mod demand_sink;
+mod environment_effect;
+mod item_portal;
+mod pedestrians;
+mod player_portal;
+mod tag_minigame;
+mod tram;
pub mod tutorial;
use crate::{
- entity::{pedestrians::Pedestrians, tag_minigame::TagMinigame},
+ entity::{demand_sink::DemandSink, pedestrians::Pedestrians, tag_minigame::TagMinigame},
scoreboard::ScoreboardStore,
};
use anyhow::Result;
@@ -168,5 +169,6 @@ pub fn construct_entity(decl: &EntityDecl) -> DynEntity {
cooldown: 0.,
speed: speed.unwrap_or(0.6),
}),
+ EntityDecl::DemandSink { pos } => Box::new(DemandSink { pos }),
}
}