diff options
author | metamuffin <metamuffin@disroot.org> | 2024-09-28 21:19:48 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-09-28 21:19:48 +0200 |
commit | 8a1afe4b7e3b62b70fac8be35ef91a8b09e1f0e3 (patch) | |
tree | 8a8260e95a85a9c3a9648d2a4a8d59449fb70462 | |
parent | 35eb57cd6d21487c8b3babe1d72946422f1f5314 (diff) | |
download | hurrycurry-8a1afe4b7e3b62b70fac8be35ef91a8b09e1f0e3.tar hurrycurry-8a1afe4b7e3b62b70fac8be35ef91a8b09e1f0e3.tar.bz2 hurrycurry-8a1afe4b7e3b62b70fac8be35ef91a8b09e1f0e3.tar.zst |
handle unknown order in tutorial; fix #191
-rw-r--r-- | locale/en.ini | 1 | ||||
-rw-r--r-- | server/src/entity/tutorial.rs | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/locale/en.ini b/locale/en.ini index b55152d5..ce1561c3 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -192,6 +192,7 @@ s.tutorial.put_on=Place on {0} s.tutorial.take=Take {0} from here s.tutorial.serve=Serve the meal here s.tutorial.wait_finish=... +s.tutorial.accept_order=Approach the customer take their order s.replay.cannot_join=Replays cannot be joined. s.campaign.unlock_condition=To unlock: %n%n{0} s.campaign.list_helper=- {0}%n - {1} diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs index 3189687b..44971e27 100644 --- a/server/src/entity/tutorial.rs +++ b/server/src/entity/tutorial.rs @@ -211,6 +211,13 @@ impl<'a> StepContext<'a> { } } fn fulfil_demand(&mut self, item: ItemIndex) -> Result<(), (Option<IVec2>, Message)> { + if self.ent.game.data.item_name(item) == "unknown-order" { + return if let Some(pos) = self.find_demand(item) { + Err((Some(pos), trm!("s.tutorial.accept_order"))) + } else { + Ok(()) + }; + } if !*self.had_aquired_target { self.prevent_burning()?; self.aquire_item(item)?; |