From 82c8c938586abd89a587ed9bc4cf9af078ac323d Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 15 Jun 2016 18:22:51 -0700 Subject: [PATCH] a little better feedback for bull/flies mixup. --- .../advent/screens/rooms/outside_castle.clj | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 268339c9..754c460d 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -317,6 +317,13 @@ (utils/remove-interaction :wares) add-note-if-necessary)) +(defn feed-bull [entities] + (actions/walk-to entities :ego [168 150] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities :grass) + (actions/talk entities :ego "Eww! He slobbered on my hand.") + (actions/give entities :slobber)) + (defn make [screen] (let [peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])] @@ -424,12 +431,7 @@ :ego "Farmer Doug feeds him a wild high-protein grass diet to keep him in tiptop shape." :ego "Phew! His stench has attracted a lot of flies.")) :scripts #(condp = % - :grass (actions/get-script entities - (actions/walk-to entities :ego [168 150] :face :right) - (actions/play-animation entities :ego :reach) - (actions/remove-item entities :grass) - (actions/talk entities :ego "Eww! He slobbered on my hand.") - (actions/give entities :slobber)) + :grass (actions/get-script entities (feed-bull entities)) :carrot (actions/get-script entities (actions/walk-to entities :ego [168 150] :face :right) (actions/do-dialogue entities @@ -440,7 +442,7 @@ (actions/walk-to entities :ego [168 150] :face :right) (actions/do-dialogue entities :ego "I don't thing Angus is interested." - :ego "Farmer Doug only feeds him a wild high-protein grass.")) + :ego "Those flies sure seem to like the stench!")) :flask-1-strength (actions/get-script entities (actions/do-dialogue entities :ego "He's buff enough as it is!" @@ -468,7 +470,8 @@ :anim flies-stand :anim-start 0 :baseline 240 - :scripts {:sack-lunch (actions/get-script entities + :scripts {:grass (actions/get-script entities (feed-bull entities)) + :sack-lunch (actions/get-script entities (actions/walk-to entities :ego [168 150] :face :right) (actions/talk entities :ego "Maybe I can catch some of these flies.") (actions/remove-item entities :sack-lunch)