From bdf44b87606c3da38617a2950b3083960b7e852b Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 15 Feb 2016 22:52:57 -0800 Subject: [PATCH] minor dialogue tweaks. --- .../advent/screens/rooms/cat_tree.clj | 8 +++- .../advent/screens/rooms/outside_castle.clj | 6 ++- .../advent/screens/rooms/outside_house.clj | 48 ++++++++++--------- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index 890f5773..7a93f271 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -369,7 +369,13 @@ (actions/do-dialogue entities :ego "A kiss for an inventory item?" :ego "Sounds like the game designer was running out of good ideas.") (steam/set-achievement "KITTY_KISS")) - (actions/talk entities :ego "I guess I'm too far away."))) + (actions/talk entities :ego "I can't get his attention from way down here."))) + :stick (actions/get-script entities + (if (get-in @entities [:room :entities :ladder]) + (actions/do-dialogue entities + :ego "He's still too far for me to poke him." + :ego "Maybe I can encourage him to come down on his own.") + (actions/talk entities :ego "I can't poke him from way down here."))) :default (actions/get-script entities (actions/talk entities :ego "Kitty seems disinterested in it."))}) cat-stand) :grandma (let [gma (assoc (animation->texture screen grandma-stand) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 851d47e8..c68eb0e3 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -472,7 +472,11 @@ (actions/talk entities :ego "I think it's working!") (actions/play-animation entities :ego :squat) (actions/give entities :flies) - (actions/talk entities :ego "Hopefully, they won't fly out of my backpack."))} + (actions/talk entities :ego "Hopefully, they won't fly out of my backpack.")) + :frog-legs (actions/get-script entities + (actions/do-dialogue entities + :ego "It's a little late for a last meal." + :ego "Plus, these are just legs. This frog doesn't even have a mouth."))} )} :note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png") :x 198 :y 66 :baseline 174 diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 0dc8863c..0da967d1 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -699,29 +699,31 @@ :script (actions/get-script entities - (if (actions/has-item? entities :wool) - (actions/talk entities :ego "Maybe I should use the wool I have before taking any more.") - (if (is-sheep-close? @entities) - (do (walk-to-sheep entities) - (actions/play-animation entities :ego :reach) - (actions/update-state entities #(assoc % :wool-count (inc (or (:wool-count %) 0)))) - (when (= 3 (get-in @entities [:state :wool-count])) - (steam/set-achievement "SHEEP_HORDER")) - - (actions/update-entities entities #(update-in - % [:room :entities :sheep] - (fn [s] - (let [which (get-in % [:state :wool-count])] - (assoc s :anim (get s [:stand which])))))) - (actions/give entities :wool) - (actions/talk entities :ego "I guess her wool is shedding.") - ) - (do - (walk-to-sheep entities) - (actions/talk entities :ego "Come here, mama sheep!") - (actions/play-animation entities :ego :sigh) - (actions/talk entities :ego "She's too far away for me to pet her.") - )))) + (if (= 3 (get-in @entities [:state :wool-count])) + (actions/talk entities :ego "Do you think she feels sheepish without any clothes?") + + (if (actions/has-item? entities :wool) + (actions/talk entities :ego "Maybe I should use the wool I have before taking any more.") + (if (is-sheep-close? @entities) + (do (walk-to-sheep entities) + (actions/play-animation entities :ego :reach) + (actions/update-state entities #(assoc % :wool-count (inc (or (:wool-count %) 0)))) + (when (= 3 (get-in @entities [:state :wool-count])) + (steam/set-achievement "SHEEP_HORDER")) + + (actions/update-entities entities #(update-in + % [:room :entities :sheep] + (fn [s] + (let [which (get-in % [:state :wool-count])] + (assoc s :anim (get s [:stand which])))))) + (actions/give entities :wool) + (actions/talk entities :ego "I guess her wool is shedding.")) + (do + (walk-to-sheep entities) + (actions/talk entities :ego "Come here, mama sheep!") + (actions/play-animation entities :ego :sigh) + (actions/talk entities :ego "She's too far away for me to pet her.") + ))))) :scripts #(condp = % :wool (actions/get-script entities (actions/talk entities :ego "She doesn't need it back."))