diff --git a/desktop/resources/ego/base.png b/desktop/resources/ego/base.png index c84ed251..ee0cd586 100644 Binary files a/desktop/resources/ego/base.png and b/desktop/resources/ego/base.png differ diff --git a/desktop/resources/ego/love.png b/desktop/resources/ego/love.png new file mode 100644 index 00000000..0a814b4d Binary files /dev/null and b/desktop/resources/ego/love.png differ diff --git a/desktop/resources/ego/love.pxa/0.pxi b/desktop/resources/ego/love.pxa/0.pxi new file mode 100644 index 00000000..a8489915 Binary files /dev/null and b/desktop/resources/ego/love.pxa/0.pxi differ diff --git a/desktop/resources/ego/love.pxa/1.pxi b/desktop/resources/ego/love.pxa/1.pxi new file mode 100644 index 00000000..2886bf9c Binary files /dev/null and b/desktop/resources/ego/love.pxa/1.pxi differ diff --git a/desktop/resources/ego/love.pxa/10.pxi b/desktop/resources/ego/love.pxa/10.pxi new file mode 100644 index 00000000..8508fb2f Binary files /dev/null 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 new file mode 100644 index 00000000..5c546591 Binary files /dev/null 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 new file mode 100644 index 00000000..38f53c84 Binary files /dev/null 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 new file mode 100644 index 00000000..c0eef494 Binary files /dev/null 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 new file mode 100644 index 00000000..a2304ddb Binary files /dev/null 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 new file mode 100644 index 00000000..62aff40f Binary files /dev/null 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 new file mode 100644 index 00000000..c489ea94 Binary files /dev/null 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 new file mode 100644 index 00000000..d9516591 Binary files /dev/null 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 new file mode 100644 index 00000000..6ae85f88 Binary files /dev/null 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 new file mode 100644 index 00000000..9f8d4bf1 Binary files /dev/null and b/desktop/resources/ego/love.pxa/19.pxi differ diff --git a/desktop/resources/ego/love.pxa/2.pxi b/desktop/resources/ego/love.pxa/2.pxi new file mode 100644 index 00000000..a93fa8ec Binary files /dev/null and b/desktop/resources/ego/love.pxa/2.pxi differ diff --git a/desktop/resources/ego/love.pxa/20.pxi b/desktop/resources/ego/love.pxa/20.pxi new file mode 100644 index 00000000..09e5bf65 Binary files /dev/null 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 new file mode 100644 index 00000000..7a239974 Binary files /dev/null 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 new file mode 100644 index 00000000..570171c8 Binary files /dev/null and b/desktop/resources/ego/love.pxa/22.pxi differ diff --git a/desktop/resources/ego/love.pxa/3.pxi b/desktop/resources/ego/love.pxa/3.pxi new file mode 100644 index 00000000..500b144a Binary files /dev/null and b/desktop/resources/ego/love.pxa/3.pxi differ diff --git a/desktop/resources/ego/love.pxa/4.pxi b/desktop/resources/ego/love.pxa/4.pxi new file mode 100644 index 00000000..5b8110f8 Binary files /dev/null and b/desktop/resources/ego/love.pxa/4.pxi differ diff --git a/desktop/resources/ego/love.pxa/5.pxi b/desktop/resources/ego/love.pxa/5.pxi new file mode 100644 index 00000000..8b1bd0ae Binary files /dev/null and b/desktop/resources/ego/love.pxa/5.pxi differ diff --git a/desktop/resources/ego/love.pxa/6.pxi b/desktop/resources/ego/love.pxa/6.pxi new file mode 100644 index 00000000..b6859e78 Binary files /dev/null and b/desktop/resources/ego/love.pxa/6.pxi differ diff --git a/desktop/resources/ego/love.pxa/7.pxi b/desktop/resources/ego/love.pxa/7.pxi new file mode 100644 index 00000000..73e29cb1 Binary files /dev/null and b/desktop/resources/ego/love.pxa/7.pxi differ diff --git a/desktop/resources/ego/love.pxa/8.pxi b/desktop/resources/ego/love.pxa/8.pxi new file mode 100644 index 00000000..24c9e973 Binary files /dev/null and b/desktop/resources/ego/love.pxa/8.pxi differ diff --git a/desktop/resources/ego/love.pxa/9.pxi b/desktop/resources/ego/love.pxa/9.pxi new file mode 100644 index 00000000..cfd25461 Binary files /dev/null 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 new file mode 100644 index 00000000..3bdc27a9 --- /dev/null +++ b/desktop/resources/ego/love.pxa/CelData.plist @@ -0,0 +1,98 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 1912a58c..99e93cf9 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -276,6 +276,10 @@ :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]) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index b386d92c..fcba4806 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -201,6 +201,7 @@ milk (utils/make-anim "ego/squat.png" [18 36] 0.05 [0 1 2 2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0]) 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])) ego {:right {:walk walk-right :stand stand-anim @@ -240,6 +241,7 @@ :milk milk :throw throw :swing-shovel swing-shovel + :love love } :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) @@ -269,7 +271,8 @@ :glad (utils/flip glad) :milk (utils/flip milk) :throw (utils/flip throw) - :swing-shovel (utils/flip swing-shovel)} + :swing-shovel (utils/flip swing-shovel) + :love (utils/flip love)} :baseline (- 240 (last start-pos)) :facing :right :origin-x 9