diff options
| -rw-r--r-- | locale/en.ini | 2 | ||||
| -rw-r--r-- | server/src/entity/tutorial.rs | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/locale/en.ini b/locale/en.ini index ce1561c3..697cab3c 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -180,12 +180,14 @@ s.bot.frank=Frank Miller s.tutorial.prevent_burning=Take this before it burns s.tutorial.take_now=Take this item quickly! s.tutorial.active=Interact here for {0}s +s.tutorial.active_cuttingboard=Cut the item to slices here s.tutorial.clear_tile=Clear this tile s.tutorial.error=Tutorial code handle this recipe yet. s.tutorial.finished=Tutorial finished! s.tutorial.hold_interact=Hold interact s.tutorial.interact_empty=Interact with an empty counter s.tutorial.interact=Interact here +s.tutorial.interact_plate=Add the item to this plate s.tutorial.pickup=Take this item. s.tutorial.put_away=Put away this item for later s.tutorial.put_on=Place on {0} diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs index 44971e27..1d28f13e 100644 --- a/server/src/entity/tutorial.rs +++ b/server/src/entity/tutorial.rs @@ -271,7 +271,16 @@ impl<'a> StepContext<'a> { } => { let apos = self.aquire_placed_item(*a)?; self.aquire_item(*b)?; - return Err((Some(apos), trm!("s.tutorial.interact"))); + let aname = self.ent.game.data.item_name(*a); + let bname = self.ent.game.data.item_name(*b); + return Err(( + Some(apos), + if aname.starts_with("plate:") || bname.starts_with("plate:") { + trm!("s.tutorial.interact_plate") + } else { + trm!("s.tutorial.interact") + }, + )); } Recipe::Instant { tile: None, @@ -298,7 +307,11 @@ impl<'a> StepContext<'a> { self.aquire_item(*input)?; return Err(( Some(pos), - trm!("s.tutorial.active", s = format!("{:.01}", 1. / speed)), + if self.ent.game.data.tile_name(*tile) == "cuttingboard" { + trm!("s.tutorial.active_cuttingboard") + } else { + trm!("s.tutorial.active", s = format!("{:.01}", 1. / speed)) + }, )); } } |