other tweak.

This commit is contained in:
2015-07-28 18:48:36 -07:00
parent 5f351e3fd0
commit e1deb01e05
2 changed files with 15 additions and 12 deletions

View File

@@ -1 +1 @@
{:sound-volume 39.0, :music-volume 86.0} {:sound-volume 82.0, :music-volume 86.0}

View File

@@ -81,16 +81,19 @@
(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/play-animation entities :ego :squat) (if-not (get-in @entities [:state :plaques-read :sword])
(actions/do-dialogue entities (do
:ego "'A noble choice to be a knight,\nBe a hero, do what's right.'" (actions/talk entities :ego "There's a plaque here.")
:ego "'There's no need to shove,\nTo find your true love,'" (actions/play-animation entities :ego :squat)
:ego "'Because maidens love guys with might.'" (actions/do-dialogue entities
:ego "Awesome!" :ego "'A noble choice to be a knight,\nBe a hero, do what's right.'"
:ego "If I become a knight, maybe Georgia McGorgeous will love me!") :ego "'There's no need to shove,\nTo find your true love,'"
(when-not (get-in @entities [:state :plaques-read :sword]) :ego "'Because maidens love guys with might.'"
(actions/in-love entities)) :ego "Awesome!"
:ego "If I become a knight, maybe Georgia McGorgeous will love me!")
(actions/in-love entities))
(actions/talk entities :ego "I can't get through that glass!"))
(actions/stop-walking entities :ego :face :right) (actions/stop-walking entities :ego :face :right)
(when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?])
(face-fairy entities) (face-fairy entities)
@@ -491,5 +494,5 @@
(if (actions/has-item? entities :shovel) (if (actions/has-item? entities :shovel)
(update-in entities [:room :entities] dissoc :shovel) (update-in entities [:room :entities] dissoc :shovel)
entities) entities)
(assoc-in entities [:room :wind-sound :id] (sound! (get-in entities [:room :wind-sound :sound]) :loop 0.175)))) (assoc-in entities [:room :wind-sound :id] (sound! (get-in entities [:room :wind-sound :sound]) :loop 0.2))))
:start-pos [140 55]))) :start-pos [140 55])))