aboutsummaryrefslogtreecommitdiff
path: root/server/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'server/protocol')
-rw-r--r--server/protocol/src/book.rs3
-rw-r--r--server/protocol/src/helpers.rs4
2 files changed, 3 insertions, 4 deletions
diff --git a/server/protocol/src/book.rs b/server/protocol/src/book.rs
index 15c239a1..73b14c07 100644
--- a/server/protocol/src/book.rs
+++ b/server/protocol/src/book.rs
@@ -36,8 +36,8 @@ pub enum BookPage {
paragraphs: Vec<Message>,
},
Recipe {
+ title: Message,
description: Message,
- instruction: Message,
diagram: Diagram,
},
}
@@ -70,4 +70,3 @@ pub struct DiagramEdge {
pub dst: usize,
pub label: Option<Message>,
}
-
diff --git a/server/protocol/src/helpers.rs b/server/protocol/src/helpers.rs
index 542f7754..b5c0e82b 100644
--- a/server/protocol/src/helpers.rs
+++ b/server/protocol/src/helpers.rs
@@ -2,7 +2,7 @@ use crate::{Gamedata, Hand, ItemIndex, ItemLocation, PlayerID, Recipe, RecipeInd
use std::fmt::Display;
impl Gamedata {
- pub fn tile_name(&self, index: TileIndex) -> &String {
+ pub fn tile_name(&self, index: TileIndex) -> &str {
&self.tile_names[index.0]
}
pub fn is_tile_colliding(&self, index: TileIndex) -> bool {
@@ -11,7 +11,7 @@ impl Gamedata {
pub fn is_tile_interactable(&self, index: TileIndex) -> bool {
self.tile_interact[index.0]
}
- pub fn item_name(&self, index: ItemIndex) -> &String {
+ pub fn item_name(&self, index: ItemIndex) -> &str {
&self.item_names[index.0]
}
pub fn recipe(&self, index: RecipeIndex) -> &Recipe {