From e830e624214232b299a6aeb33c13d2cc735a41dc Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sat, 10 Oct 2015 12:04:56 -0700 Subject: [PATCH] better love. --- desktop/src-common/advent/actions.clj | 3 +++ desktop/src-common/advent/screens/rooms/inside_castle.clj | 4 ++-- desktop/src-common/advent/screens/scene.clj | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index d9cd2084..62a0d086 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -836,8 +836,11 @@ :none))) (defn georgia-say [entities msg] + (transition-music entities :love :duration 0.5) + (Thread/sleep 1000) (fade-in-georgia entities) (actions/talk entities :georgia-face msg) + (Thread/sleep 1000) (fade-out-georgia entities) (transition-music entities nil :duration 1.0)) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 1cbc875d..e395307b 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -427,8 +427,8 @@ (actions/do-dialogue entities :ego "That's Georgia McGorgeous' house." :ego "One day, when I'm a knight, she'll say...") - #_(actions/georgia-say entities "Kiss me, brave Sir Tick!") - (actions/in-love entities))}} + (actions/georgia-say entities "Kiss me, brave Sir Tick!") + #_(actions/in-love entities))}} :layers {:day [(assoc (utils/get-texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) (assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) (assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index f67b6468..7d8fb777 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -927,7 +927,7 @@ void main() (utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]))) (defn add-georgia-to-all-rooms [screen rooms] - (let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.2 [0 1 0 1 0 0 1 0 1 2]) + (let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.15 [0 1 0 1 0 0 1 0 1 2]) georgia-stand (utils/make-anim "ego/georgia.png" [30 30] 0.3 [0 0 0 0 0 0 0 2 0 0 0 0 2]) georgia-love (utils/make-anim "ego/in-love.png" [30 30] 0.1 [0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 4 5 6 7 8 9 10 11 12 13 14 14 14 15 15 15 14 14 14 14 14 14 14 14 15 15 15 15 15 14 14 14 14 15 15 15 15 15 15 14 14 14 14 14])