From c5e855d73e0d1c77379910d9de3c66ea05ed2e5c Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Mon, 18 May 2015 08:19:06 -0700 Subject: [PATCH] less chees. --- .../src-common/advent/screens/rooms/dream.clj | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index fdcc7803..77312490 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -72,6 +72,13 @@ (can-skip? [this screen entities] false))) + +(defn face-fairy [entities] + (if (< (get-in @entities [:room :entities :fairy-godfather :x]) + (get-in @entities [:room :entities :ego :x])) + (actions/do-stop entities :ego :face :left) + (actions/do-stop entities :ego :face :right))) + (defn read-sword-plaque [entities] (actions/walk-to entities :ego [168 76] :face :left) (actions/talk entities :ego "There's a plaque here.") @@ -254,12 +261,6 @@ (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :distracted? true))) (actions/walk-straight-to entities :fairy-godfather [211 210] :face :left)) -(defn face-fairy [entities] - (if (< (get-in @entities [:room :entities :fairy-godfather :x]) - (get-in @entities [:room :entities :ego :x])) - (actions/do-stop entities :ego :face :left) - (actions/do-stop entities :ego :face :right))) - (defn talk-to-fairy [entities] (do (face-fairy entities) @@ -279,8 +280,8 @@ :ego "I saw a, um...")) :choices ["... a dragon!" {:run #(distract entities % "dragon")} - "... a flying zebra!" - {:run #(distract entities % "flying zebra")} + "... a ghost!" + {:run #(distract entities % "ghost")} "... a fairy godfather-eating plant!" {:run #(distract entities % "fairy godfather-eating plant")}] } @@ -360,8 +361,9 @@ (actions/remove-item entities :dream-sword) (actions/remove-item entities :broom) (actions/remove-item entities :shovel) - (actions/transition-background entities :inside-castle [79 145] :time 5.0) + (actions/transition-background entities :inside-castle [92 150] :time 8.0) (actions/resume-camera entities) + (actions/walk-straight-to entities :ego [79 145] :stop? false) (actions/walk-to entities :ego [159 74]) (actions/do-dialogue entities :ego "Man! What a dream!"