less chees.

This commit is contained in:
2015-05-18 08:19:06 -07:00
parent 3e0f897e08
commit c5e855d73e

View File

@@ -72,6 +72,13 @@
(can-skip? [this screen entities] (can-skip? [this screen entities]
false))) 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] (defn read-sword-plaque [entities]
(actions/walk-to entities :ego [168 76] :face :left) (actions/walk-to entities :ego [168 76] :face :left)
(actions/talk entities :ego "There's a plaque here.") (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/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)) (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] (defn talk-to-fairy [entities]
(do (do
(face-fairy entities) (face-fairy entities)
@@ -279,8 +280,8 @@
:ego "I saw a, um...")) :ego "I saw a, um..."))
:choices ["... a dragon!" :choices ["... a dragon!"
{:run #(distract entities % "dragon")} {:run #(distract entities % "dragon")}
"... a flying zebra!" "... a ghost!"
{:run #(distract entities % "flying zebra")} {:run #(distract entities % "ghost")}
"... a fairy godfather-eating plant!" "... a fairy godfather-eating plant!"
{:run #(distract entities % "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 :dream-sword)
(actions/remove-item entities :broom) (actions/remove-item entities :broom)
(actions/remove-item entities :shovel) (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/resume-camera entities)
(actions/walk-straight-to entities :ego [79 145] :stop? false)
(actions/walk-to entities :ego [159 74]) (actions/walk-to entities :ego [159 74])
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "Man! What a dream!" :ego "Man! What a dream!"