From 1b71d12d0a13d351f7b90f06273bf2aaa792bbcf Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 21 Apr 2015 07:52:57 -0700 Subject: [PATCH] adding love. --- desktop/src-common/advent/actions.clj | 6 ++++++ desktop/src-common/advent/screens/rooms/dream.clj | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index e2861b7c..75fc7584 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -731,3 +731,9 @@ entities) (can-skip? [this screen entities] false))) + + +(defn in-love [entities] + (transition-music entities :love :duration 1.0) + (play-animation entities :ego :love) + (transition-music entities nil :duration 1.0)) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 99e93cf9..6a4529c6 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -81,6 +81,7 @@ :ego "'Because maidens love guys with might.'" :ego "Awesome!" :ego "If I become a knight, maybe Georgia McGorgeous will love me!") + (actions/in-love entities) (actions/stop-walking entities :ego :face :right) (actions/do-dialogue entities :fairy-godfather "Tick, I told you that you can't be a knight." @@ -276,10 +277,6 @@ :interactions {:pit {:box [54 0 219 36] :script (actions/get-script entities (actions/walk-to entities :ego [154 41]) - - (actions/transition-music entities :love :duration 1.0) - (actions/play-animation entities :ego :love) - (actions/transition-music entities nil :duration 1.0) (actions/talk entities :ego "Wow! That's a long way down.")) :scripts {:shovel (actions/get-script entities (actions/walk-to entities :ego [154 41]) @@ -336,7 +333,8 @@ (actions/do-dialogue entities :ego "Man! What a dream!" :ego "If I only really could be a knight." - :ego "Then I'd be able to win Georgia McGorgeous' heart.")) + :ego "Then I'd be able to win Georgia McGorgeous' heart.") + (actions/in-love entities)) (do (actions/walk-to entities :ego [148 76] :face :right) (actions/do-dialogue entities :fairy-godfather "What are you doing?" :ego "Erm... Nothing."))))