diff options
Diffstat (limited to 'server/src/entity')
-rw-r--r-- | server/src/entity/book.rs | 3 | ||||
-rw-r--r-- | server/src/entity/campaign.rs | 10 | ||||
-rw-r--r-- | server/src/entity/mod.rs | 4 | ||||
-rw-r--r-- | server/src/entity/tutorial.rs | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/server/src/entity/book.rs b/server/src/entity/book.rs index 9c1192da..11ec847b 100644 --- a/server/src/entity/book.rs +++ b/server/src/entity/book.rs @@ -16,6 +16,7 @@ */ use super::{Entity, EntityContext}; +use crate::TrError; use anyhow::Result; use hurrycurry_protocol::{glam::IVec2, Menu, PacketC, PlayerID}; @@ -28,7 +29,7 @@ impl Entity for Book { c: EntityContext<'_>, pos: Option<IVec2>, _player: PlayerID, - ) -> Result<bool> { + ) -> Result<bool, TrError> { if pos == Some(self.0) { c.packet_out.push_back(PacketC::Menu(Menu::Book)); return Ok(true); diff --git a/server/src/entity/campaign.rs b/server/src/entity/campaign.rs index 934f7542..5d669a4d 100644 --- a/server/src/entity/campaign.rs +++ b/server/src/entity/campaign.rs @@ -16,7 +16,7 @@ */ use super::{Entity, EntityContext}; -use crate::{scoreboard::ScoreboardStore, server::GameServerExt}; +use crate::{scoreboard::ScoreboardStore, server::GameServerExt, trm, TrError}; use anyhow::Result; use hurrycurry_protocol::{ glam::{IVec2, Vec2}, @@ -79,10 +79,14 @@ impl Entity for Gate { c: EntityContext<'_>, pos: Option<IVec2>, _player: PlayerID, - ) -> Result<bool> { + ) -> Result<bool, TrError> { if !self.unlocked && pos == Some(self.location) { c.packet_out.push_back(PacketC::ServerMessage { - text: format!("To unlock: \n\n{}", self.condition.show(c.scoreboard)), + message: trm!( + "s.campaign.unlock_condition", + s = self.condition.show(c.scoreboard) // TODO localize + ), + error: false, }); return Ok(true); } diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs index f87dbb32..532031d5 100644 --- a/server/src/entity/mod.rs +++ b/server/src/entity/mod.rs @@ -25,7 +25,7 @@ pub mod item_portal; pub mod player_portal; pub mod tutorial; -use crate::{data::ItemTileRegistry, scoreboard::ScoreboardStore}; +use crate::{data::ItemTileRegistry, scoreboard::ScoreboardStore, TrError}; use anyhow::{anyhow, Result}; use book::Book; use campaign::{Gate, GateCondition, Map}; @@ -68,7 +68,7 @@ pub trait Entity { _c: EntityContext<'_>, _pos: Option<IVec2>, _player: PlayerID, - ) -> Result<bool> { + ) -> Result<bool, TrError> { Ok(false) } } diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs index fba43fd0..9b2146d2 100644 --- a/server/src/entity/tutorial.rs +++ b/server/src/entity/tutorial.rs @@ -1,4 +1,4 @@ -use crate::trm; +use crate::{trm, TrError}; use super::{Entity, EntityContext}; use anyhow::Result; @@ -70,7 +70,7 @@ impl Entity for Tutorial { _c: EntityContext<'_>, _pos: Option<IVec2>, _player: PlayerID, - ) -> Result<bool> { + ) -> Result<bool, TrError> { Ok(false) } } |