From d51ca289c36a3d6b3dc1a24cee29a36b18d23c0c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 9 Nov 2015 09:58:28 -0800 Subject: [PATCH] ego faces shopkeep. --- desktop/src-common/advent/screens/rooms/inside_antique.clj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index d95cc108..6024d430 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -16,6 +16,10 @@ "Ralphie" "Arthur" "Barney" "Harry" "Gus" "Mortimer" "Walt"]) (defn do-antique-dialogue [entities] + (if (< (get-in @entities [:room :entities :ego :x]) + (get-in @entities [:room :entities :shopkeep :x])) + (actions/do-stop entities :ego :face :right) + (actions/do-stop entities :ego :face :left)) (actions/do-dialogue entities :shopkeep "Oh, hello there." :shopkeep "Can I help you?") @@ -68,7 +72,7 @@ "Is there anything here you will sell?" {:run #(actions/respond entities % :shopkeep "No, not until my son returns.") - :choices #(-> % zip/left zip/left)} + :choices son-choices} (if (get-in @entities [:state :opened-blinds?]) "Since I got some light in here, will you open up shop?" "If I get some light in here, will you open up shop?")