diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index abd3e40f..adaddfba 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -61,4 +61,3 @@ + step backwards creep + snore + shoot slinger's - + diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index e334b7d9..abe7c428 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -171,14 +171,18 @@ (actions/do-dialogue entities :ego "Huh?") (actions/talk entities :fairy-godfather "... Tiiiiccckk ...") (Thread/sleep 500) - (actions/do-dialogue entities :ego "Who is that?") + (actions/present-choices entities {:choices ["Who is that?" + {:run #(actions/talk entities :ego %)} + "What do you want from me?" + {:run #(actions/talk entities :ego %)} + "Show yourself!" + {:run #(actions/talk entities :ego %)}]}) (actions/talk entities :fairy-godfather "Taaaaaaaaaaaaaaaaaa-") (sound! (sound "dream/appear.ogg") :play (utils/current-sound-volume)) (particle-effect! (get-in @entities [:room :entities :magic]) :reset) (particle-effect! (get-in @entities [:room :entities :magic]) :start) (fade-in entities) - (actions/transition-music entities :dream) - (Thread/sleep 100) + (actions/transition-music entities :dream :duration 0.25 ) (actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!") (Thread/sleep 1500) (actions/talk entities :ego "Oh no! The grim reaper!" :anim :frustrated-talk) @@ -200,9 +204,13 @@ (actions/do-dialogue entities :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 "So, I've been destined to be a shovel since the dawn of time?" - :fairy-godfather "No, no, no!") + :fairy-godfather "These destinies are never mistaken.") + (actions/present-choices entities {:choices ["So I'm destined to be a shovel?" + {:run #(actions/talk entities :ego %)} + "So I'm destined to be a broom?" + {:run #(actions/talk entities :ego %)} + "So I'm destined to be a sword?" + {:run #(actions/talk entities :ego %)}]}) (actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path)) (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)))) @@ -215,17 +223,17 @@ (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!" + :ego "What about that sword?" :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 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...?" - :fairy-godfather "Uh, oh. That's not right." + :fairy-godfather "Uh, oh. There must be some mistake." :fairy-godfather "Ahem." :fairy-godfather "You must choose between being a janitor and grave-digger." - :ego "But I want to be a knight!" + :ego "But I want that sword, and be a knight!" :ego "And you said that these destinies are never mistaken!" :fairy-godfather "Nevermind that." :fairy-godfather "Choose the broom or shovel, and cast it into the pit of fate."