From 2e0bc148def741fad227801b54ba7ce4f30d31d3 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sun, 9 Nov 2014 09:59:40 -0800 Subject: [PATCH] must return items. --- .../advent/screens/rooms/inside_antique.clj | 14 +++++++++++++- 1 file changed, 13 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 066eb481..5a59a1cd 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -63,7 +63,10 @@ {:run #(actions/respond entities % :shopkeep "No. *sigh* That's not it.")} (when ((get-in @entities [:state :clues]) :name) "Herb.") - {:run #(do (actions/respond entities % :shopkeep "Yes, that's it!") + {:run #(do (actions/respond entities % + :shopkeep "Yes, that's it!" + :shopkeep "You must have really met my son!" + :shopkeep "Of course you can keep the teddy bear.") (actions/give entities items/teddy))}]}]} "How's life in the antique shop biz?" {:run #(actions/respond entities % @@ -86,12 +89,19 @@ {:down {:box [60 0 290 25] :cursor :down :script (actions/get-script entities + (when ((set (get-in @entities [:state :inventory])) items/portrait) + (actions/walk-to entities :ego [222 3]) + (actions/talk entities :shopkeep "Excuse me sonny. Please return my belongings before you leave.") + (actions/walk-to entities :ego [136 80] :face :left) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities items/portrait)) (actions/walk-to entities :ego [222 3]) (actions/transition-background entities :inside-castle [182 90]))} :window {:box [212 130 256 180] :script (actions/get-script entities (actions/talk entities :ego "It's a nice, big window.")) :scripts {:portrait (actions/get-script entities + (actions/walk-to entities :ego [151 60] :face :right) (actions/play-animation entities :ego :reach) (actions/talk entities :ego "The portrait says 'Herb' on the back.") (actions/update-state entities (fn [state] (update-in state [:clues] #(conj % :name)) )))}}} @@ -106,6 +116,8 @@ :x 109 :y 120 :script (actions/get-script entities + (actions/walk-to entities :ego [136 80] :face :left) + (actions/play-animation entities :ego :reach) (actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.") (actions/remove-entity entities :portrait) (actions/give entities items/portrait)))}