diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index ecab72fb..7391082f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -373,32 +373,38 @@ :wool (actions/get-script entities (walk-to-player entities) (if (= :wool (get-in @entities [:state :current-riddle])) - (do (actions/update-state entities (fn [s] (assoc s :current-riddle :balloon))) + (do (actions/play-animation entities :ego :idea) + (actions/update-state entities (fn [s] (assoc s :current-riddle :balloon))) (actions/remove-item entities :wool) (actions/do-dialogue entities - :game-player "That's right! Now for your second riddle:" + :ego "Wool is white as snow, but it keeps you warm." + :game-player "Good job, Tick! Now for your second riddle:" :game-player "'Filled with air, light as a feather,\nIf you want to keep it, best have a tether.'" :ego "Okay. Be back soon.")) (actions/do-dialogue entities :ego "What about this?" :game-player "No, that's not the solution. Keep looking."))) :balloon (actions/get-script entities (walk-to-player entities) (if (= :balloon (get-in @entities [:state :current-riddle])) - (do (actions/update-state entities (fn [s] (assoc s :current-riddle :frog-legs))) + (do (actions/play-animation entities :ego :idea) + (actions/update-state entities (fn [s] (assoc s :current-riddle :frog-legs))) (actions/remove-item entities :balloon) (actions/do-dialogue entities - :game-player "That's right! Now for your third riddle:" + :ego "A balloon is light as a feather." + :game-player "That's right, Tick! Now for your third riddle:" :game-player "'Hippity-hop, I'd jump so high,\nWithout these springs, can't harm a fly.'" :ego "Okay. Be back soon.")) (actions/do-dialogue entities :ego "What about this?" :game-player "No, that's not the solution. Keep looking."))) :frog-legs (actions/get-script entities (walk-to-player entities) (if (= :frog-legs (get-in @entities [:state :current-riddle])) - (do (actions/update-state entities (fn [s] (assoc s :current-riddle :done))) + (do (actions/play-animation entities :ego :idea) + (actions/update-state entities (fn [s] (assoc s :current-riddle :done))) (actions/remove-item entities :frog-legs) (actions/do-dialogue entities + :ego "What about these frog legs? They jump pretty far." :game-player "Wow! That's right!" - :game-player "You, sir, have proven yourself worthy of my trophy." + :game-player "You, Tick, have proven yourself worthy of my trophy." :game-player "Even I, Brian O'Brainy, am impressed with your wisdom." :game-player "Take it, and go in wisdom.") (actions/give entities :trophy) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index a6905845..b9de7d34 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -142,7 +142,7 @@ :wizard "... a ..." :wizard "... a frog!" :ego "Okay, okay! I'm leaving.") - (actions/transition-background entities :outside-house [257 90]) + (actions/transition-background entities :outside-house [257 90] :face :left) (actions/do-dialogue entities :ego "I guess he's really upset with me." :ego "I wonder if I can convince him to let me stay..."))} "You're still cross about my stealing your magic cowboy hat?" @@ -153,7 +153,7 @@ :wizard "And you little pipsqueak stole it from me!" :wizard "That's why I bought my Magi-Safe 5000, to keep out intruders like you." :wizard "Now leave, before I get really angry!.") - (actions/transition-background entities :outside-house [257 90]) + (actions/transition-background entities :outside-house [257 90] :face :left) (actions/do-dialogue entities :ego "I guess he's really upset with me." :ego "I wonder if I can convince him to let me stay..."))} "Even an old hoot like you needs a kick in the pants every now and again." @@ -165,14 +165,14 @@ :wizard "When you have a bod like man, you can hardly go to the grocery store without being noticed." :wizard "But no. Your looks, however good they may be, don't give you the right to teach me a lesson." :wizard "Now please leave me in peace.") - (actions/transition-background entities :outside-house [257 90]) + (actions/transition-background entities :outside-house [257 90] :face :left) (actions/talk entities :ego "Gandarf is pretty upset, but I bet he can be reasoned with."))} "My good standing within the community?" {:run #(do (actions/respond entities % :wizard "Ha! Good standing?" :wizard "You're the neighborhood cheat and everyone knows it." :wizard "Now please leave me in peace.") - (actions/transition-background entities :outside-house [257 90]) + (actions/transition-background entities :outside-house [257 90] :face :left) (actions/talk entities :ego "Gandarf is pretty upset, but I bet he can be reasoned with."))} "I'm going to be a knight! That counts for something doesn't it?" {:run #(do (actions/respond entities % @@ -209,7 +209,7 @@ {:run #(do (actions/respond entities % :wizard "While your goal sounds noble, no amount of bizarre conversation tree searching will earn my respect." :wizard "Now please leave.") - (actions/transition-background entities :outside-house [257 90]) + (actions/transition-background entities :outside-house [257 90] :face :left) (actions/talk entities :ego "If only Gandarf could be tricked into seeing the valiant side of me..."))}]}]}]} "You're not happy to see me, Gandarf?" {:run #(actions/respond entities % :wizard "Of course not, you little brat. You've made my life a living hell!") @@ -217,7 +217,7 @@ "Goodbye, Gandarf!" {:run #(do (actions/respond entities % :wizard "Now scram!") - (actions/transition-background entities :outside-house [257 90]))}]})) + (actions/transition-background entities :outside-house [257 90] :face :left))}]})) (defn talk-to-gandarf-outside [entities] @@ -317,7 +317,7 @@ (rooms/make :music {:day :town-2 :night :night} :update-fn jump-around :interactions - {:door {:box [258 100 281 160] + {:door {:box [250 100 281 160] :script (actions/get-unsaved-script entities