From 4a9314f235bd3c556cec4f70177d8f7438d59559 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 11 Mar 2026 21:18:12 +0100 Subject: buttons server-side code --- server/src/entity/book.rs | 41 ---------------------------------- server/src/entity/button.rs | 54 +++++++++++++++++++++++++++++++++++++++++++++ server/src/entity/mod.rs | 6 ++--- 3 files changed, 57 insertions(+), 44 deletions(-) delete mode 100644 server/src/entity/book.rs create mode 100644 server/src/entity/button.rs (limited to 'server/src') diff --git a/server/src/entity/book.rs b/server/src/entity/book.rs deleted file mode 100644 index e8456591..00000000 --- a/server/src/entity/book.rs +++ /dev/null @@ -1,41 +0,0 @@ -/* - 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 . - -*/ -use super::{Entity, EntityContext}; -use anyhow::Result; -use hurrycurry_locale::TrError; -use hurrycurry_protocol::{ItemLocation, Menu, PacketC, PlayerID, glam::IVec2}; - -#[derive(Debug, Clone)] -pub struct Book(pub IVec2); - -impl Entity for Book { - fn interact( - &mut self, - c: EntityContext<'_>, - pos: Option, - _player: PlayerID, - ) -> Result { - if pos == Some(ItemLocation::Tile(self.0)) { - if let Some(r) = c.replies { - r.push(PacketC::Menu(Menu::Book(c.serverdata.book.clone()))); - } - return Ok(true); - } - Ok(false) - } -} diff --git a/server/src/entity/button.rs b/server/src/entity/button.rs new file mode 100644 index 00000000..74726253 --- /dev/null +++ b/server/src/entity/button.rs @@ -0,0 +1,54 @@ +/* + 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 . + +*/ +use super::{Entity, EntityContext}; +use anyhow::Result; +use hurrycurry_data::entities::ButtonAction; +use hurrycurry_locale::TrError; +use hurrycurry_protocol::{ItemLocation, Menu, PacketC, PlayerID, glam::IVec2}; + +#[derive(Debug, Clone)] +pub struct Button { + pub pos: IVec2, + pub action: ButtonAction, +} + +impl Entity for Button { + fn interact( + &mut self, + c: EntityContext<'_>, + pos: Option, + _player: PlayerID, + ) -> Result { + if pos == Some(ItemLocation::Tile(self.pos)) { + match self.action { + ButtonAction::Book => { + c.replies + .unwrap() + .push(PacketC::Menu(Menu::Book(c.serverdata.book.clone()))); + } + ButtonAction::VoteYes => {} + ButtonAction::VoteNo => {} + ButtonAction::MapSelector => { + c.replies.unwrap().push(PacketC::Menu(Menu::MapSelector)); + } + } + return Ok(true); + } + Ok(false) + } +} diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs index 8a78202b..604daf98 100644 --- a/server/src/entity/mod.rs +++ b/server/src/entity/mod.rs @@ -15,8 +15,8 @@ along with this program. If not, see . */ -mod book; pub mod bot; +mod button; mod campaign; mod conveyor; mod ctf_minigame; @@ -39,7 +39,7 @@ use crate::{ scoreboard::ScoreboardStore, }; use anyhow::Result; -use book::Book; +use button::Button; use campaign::{Gate, Map}; use conveyor::Conveyor; use customers::Customers; @@ -111,7 +111,7 @@ pub fn construct_entity(decl: &EntityDecl) -> DynEntity { tag_item, blocker_tile, } => Box::new(TagMinigame::new(tag_item, blocker_tile)), - EntityDecl::Book { pos } => Box::new(Book(pos)), + EntityDecl::Button { pos, action } => Box::new(Button { pos, action }), EntityDecl::ItemPortal { from, to } => Box::new(ItemPortal { from, to }), EntityDecl::PlayerPortal { from, to } => Box::new(PlayerPortal { from, to }), EntityDecl::Conveyor { from, to, speed } => Box::new(Conveyor { -- cgit v1.3