diff --git a/desktop/settings.edn b/desktop/settings.edn index a9a80a90..77771130 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 52.0, :music-volume 88.0} \ No newline at end of file +{:sound-volume 100.0, :music-volume 53.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 9b11e782..fdcc7803 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -85,6 +85,7 @@ (actions/in-love entities) (actions/stop-walking entities :ego :face :right) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (face-fairy entities) (actions/do-dialogue entities :fairy-godfather "Tick, I told you that you can't be a knight." :fairy-godfather "I think you'd be much better suited for a more menial job." @@ -106,6 +107,7 @@ (actions/play-animation entities :ego :sigh) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (face-fairy entities) (actions/talk entities :ego "So can I at least slay ghouls with this broom?") (actions/stop-walking entities :ego :face :left) (actions/do-dialogue entities :fairy-godfather "Not quite, young Tick." @@ -125,6 +127,7 @@ :ego "'Gals dislike guys who bury souls.'") (actions/play-animation entities :ego :sigh) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) + (face-fairy entities) (actions/do-dialogue entities :fairy-godfather "Don't be dismayed, young Tick." :fairy-godfather "Remember, these destinies can't be mistaken." @@ -165,24 +168,24 @@ :fairy-godfather "These, young Tick, represent the potential destinies for your life." :fairy-godfather "They have been selected since the dawn of time." :fairy-godfather "These destinies are never mistaken." - :ego "Soo, I've been destined to be a shovel since the dawn of time?" + :ego "So, I've been destined to be a shovel since the dawn of time?" :fairy-godfather "No, no, no!") (actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path)) - (actions/walk-straight-to entities :fairy-godfather [87 120] :speed 3.0 :update-baseline? false) + (actions/walk-straight-to entities :fairy-godfather [87 120] :speed 1.75 :update-baseline? false) (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :path (catmull-rom-spline (map #(apply vector-2* %) [[87 120] [87 124]]) true)))) (actions/do-dialogue entities :fairy-godfather "This shovel represents the job of grave-digger." :fairy-godfather "A simple job, for a simple fellow." :ego "Hey! " :ego "I'm not simple.") (actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path)) - (actions/walk-straight-to entities :fairy-godfather [260 120] :speed 3.0 :update-baseline? false) + (actions/walk-straight-to entities :fairy-godfather [260 120] :speed 1.75 :update-baseline? false) (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :path (catmull-rom-spline (map #(apply vector-2* %) [[260 120] [260 124]]) true)))) (actions/do-dialogue entities :fairy-godfather "Next, we have the broom, representing the humble job of a janitor." :ego "I'm not going to be a janitor!" :ego "I'm going to take the sword and be a knight!" :fairy-godfather "Hmm? Sword?") (actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path)) - (actions/walk-straight-to entities :fairy-godfather [192 120] :speed 3.0 :update-baseline? false) + (actions/walk-straight-to entities :fairy-godfather [192 120] :speed 1.75 :update-baseline? false) (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :path (catmull-rom-spline (map #(apply vector-2* %) [[192 118] [192 124]]) true)))) (actions/do-dialogue entities :fairy-godfather "Sword...?" @@ -249,10 +252,17 @@ :fairy-godfather "Let me go check it out.") (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] dissoc :path))) (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] )) + (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) (actions/do-dialogue entities :fairy-godfather "Young Tick, you must choose your destiny!") (actions/present-choices entities {:choices ["What if I don't like any of these choices?" {:run #(do (actions/respond entities % diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 037b4f22..945fbfc2 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -346,7 +346,7 @@ (if (= :night (get-in @entities [:state :time])) (actions/talk entities :ego "It's locked.") (do (actions/transition-background entities :inside-house [237 0] :between (fn [s e] - (if (= 1 (rand-int 3)) + (if (= 1 (rand-int 10)) (assoc-in e [:room :entities :experiment] (get-in e [:room :experiment])) e))) (when (get-in @entities [:room :entities :experiment]) @@ -419,7 +419,8 @@ (walk-to-sheep entities) (actions/talk entities :ego "Come on girl, get the grass!") (actions/play-animation entities :ego :reach) - (actions/talk entities :ego "I think she's not interested.")) + (actions/talk entities :ego "I think she's not interested.") + (leave-sheep entities)) :carrot (actions/get-script entities (walk-to-sheep entities) (actions/talk entities :ego "Come on girl, get the carrot!")