diff --git a/desktop/resources/dream/Untitled-4.psd b/desktop/resources/dream/Untitled-4.psd new file mode 100644 index 00000000..4f04ee97 Binary files /dev/null and b/desktop/resources/dream/Untitled-4.psd differ diff --git a/desktop/resources/ego/love.png b/desktop/resources/ego/love.png index 0a814b4d..4e37653a 100644 Binary files a/desktop/resources/ego/love.png and b/desktop/resources/ego/love.png differ diff --git a/desktop/resources/ego/love.pxa/10.pxi b/desktop/resources/ego/love.pxa/10.pxi index cfd25461..8508fb2f 100644 Binary files a/desktop/resources/ego/love.pxa/10.pxi and b/desktop/resources/ego/love.pxa/10.pxi differ diff --git a/desktop/resources/ego/love.pxa/11.pxi b/desktop/resources/ego/love.pxa/11.pxi index 8508fb2f..5c546591 100644 Binary files a/desktop/resources/ego/love.pxa/11.pxi and b/desktop/resources/ego/love.pxa/11.pxi differ diff --git a/desktop/resources/ego/love.pxa/12.pxi b/desktop/resources/ego/love.pxa/12.pxi index 5c546591..38f53c84 100644 Binary files a/desktop/resources/ego/love.pxa/12.pxi and b/desktop/resources/ego/love.pxa/12.pxi differ diff --git a/desktop/resources/ego/love.pxa/13.pxi b/desktop/resources/ego/love.pxa/13.pxi index 38f53c84..c0eef494 100644 Binary files a/desktop/resources/ego/love.pxa/13.pxi and b/desktop/resources/ego/love.pxa/13.pxi differ diff --git a/desktop/resources/ego/love.pxa/14.pxi b/desktop/resources/ego/love.pxa/14.pxi index c0eef494..a2304ddb 100644 Binary files a/desktop/resources/ego/love.pxa/14.pxi and b/desktop/resources/ego/love.pxa/14.pxi differ diff --git a/desktop/resources/ego/love.pxa/15.pxi b/desktop/resources/ego/love.pxa/15.pxi index a2304ddb..62aff40f 100644 Binary files a/desktop/resources/ego/love.pxa/15.pxi and b/desktop/resources/ego/love.pxa/15.pxi differ diff --git a/desktop/resources/ego/love.pxa/16.pxi b/desktop/resources/ego/love.pxa/16.pxi index 62aff40f..c489ea94 100644 Binary files a/desktop/resources/ego/love.pxa/16.pxi and b/desktop/resources/ego/love.pxa/16.pxi differ diff --git a/desktop/resources/ego/love.pxa/17.pxi b/desktop/resources/ego/love.pxa/17.pxi index c489ea94..d9516591 100644 Binary files a/desktop/resources/ego/love.pxa/17.pxi and b/desktop/resources/ego/love.pxa/17.pxi differ diff --git a/desktop/resources/ego/love.pxa/18.pxi b/desktop/resources/ego/love.pxa/18.pxi index d9516591..6ae85f88 100644 Binary files a/desktop/resources/ego/love.pxa/18.pxi and b/desktop/resources/ego/love.pxa/18.pxi differ diff --git a/desktop/resources/ego/love.pxa/19.pxi b/desktop/resources/ego/love.pxa/19.pxi index 6ae85f88..9f8d4bf1 100644 Binary files a/desktop/resources/ego/love.pxa/19.pxi and b/desktop/resources/ego/love.pxa/19.pxi differ diff --git a/desktop/resources/ego/love.pxa/20.pxi b/desktop/resources/ego/love.pxa/20.pxi index 9f8d4bf1..09e5bf65 100644 Binary files a/desktop/resources/ego/love.pxa/20.pxi and b/desktop/resources/ego/love.pxa/20.pxi differ diff --git a/desktop/resources/ego/love.pxa/21.pxi b/desktop/resources/ego/love.pxa/21.pxi index 09e5bf65..7a239974 100644 Binary files a/desktop/resources/ego/love.pxa/21.pxi and b/desktop/resources/ego/love.pxa/21.pxi differ diff --git a/desktop/resources/ego/love.pxa/22.pxi b/desktop/resources/ego/love.pxa/22.pxi index 7a239974..570171c8 100644 Binary files a/desktop/resources/ego/love.pxa/22.pxi and b/desktop/resources/ego/love.pxa/22.pxi differ diff --git a/desktop/resources/ego/love.pxa/23.pxi b/desktop/resources/ego/love.pxa/23.pxi index 570171c8..05e7cf2c 100644 Binary files a/desktop/resources/ego/love.pxa/23.pxi and b/desktop/resources/ego/love.pxa/23.pxi differ diff --git a/desktop/resources/ego/love.pxa/24.pxi b/desktop/resources/ego/love.pxa/24.pxi new file mode 100644 index 00000000..7f9ea3cd Binary files /dev/null and b/desktop/resources/ego/love.pxa/24.pxi differ diff --git a/desktop/resources/ego/love.pxa/25.pxi b/desktop/resources/ego/love.pxa/25.pxi new file mode 100644 index 00000000..191d4f5a Binary files /dev/null and b/desktop/resources/ego/love.pxa/25.pxi differ diff --git a/desktop/resources/ego/love.pxa/9.pxi b/desktop/resources/ego/love.pxa/9.pxi index 25bba8cd..cfd25461 100644 Binary files a/desktop/resources/ego/love.pxa/9.pxi and b/desktop/resources/ego/love.pxa/9.pxi differ diff --git a/desktop/resources/ego/love.pxa/CelData.plist b/desktop/resources/ego/love.pxa/CelData.plist index ebc864ae..0bd9980f 100644 --- a/desktop/resources/ego/love.pxa/CelData.plist +++ b/desktop/resources/ego/love.pxa/CelData.plist @@ -98,5 +98,13 @@ duration 1 + + duration + 1 + + + duration + 1 + diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index db778ad1..9dc8286e 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -746,3 +746,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 dc072306..64cb8769 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.")))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 3cc9d997..3f97d88b 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -206,7 +206,7 @@ idea (utils/make-anim "ego/idea.png" [18 70] 0.3 [2 0 0 0 0 0 0 2]) throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 15 6)])) swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9)) - love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 30 7) (repeat 3 8) (repeat 10 7) (repeat 3 8) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) + love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) ego {:right {:walk walk-right :stand stand-anim