diff --git a/desktop/resources/ego/thorw.png b/desktop/resources/ego/thorw.png new file mode 100644 index 00000000..f6b4ede8 Binary files /dev/null and b/desktop/resources/ego/thorw.png differ diff --git a/desktop/resources/ego/throw.png b/desktop/resources/ego/throw.png new file mode 100644 index 00000000..fecb340b Binary files /dev/null and b/desktop/resources/ego/throw.png differ diff --git a/desktop/resources/ego/throw.pxa/0.pxi b/desktop/resources/ego/throw.pxa/0.pxi new file mode 100644 index 00000000..0422adf5 Binary files /dev/null and b/desktop/resources/ego/throw.pxa/0.pxi differ diff --git a/desktop/resources/ego/throw.pxa/1.pxi b/desktop/resources/ego/throw.pxa/1.pxi new file mode 100644 index 00000000..fc3deeaf Binary files /dev/null and b/desktop/resources/ego/throw.pxa/1.pxi differ diff --git a/desktop/resources/ego/throw.pxa/2.pxi b/desktop/resources/ego/throw.pxa/2.pxi new file mode 100644 index 00000000..5262a683 Binary files /dev/null and b/desktop/resources/ego/throw.pxa/2.pxi differ diff --git a/desktop/resources/ego/throw.pxa/3.pxi b/desktop/resources/ego/throw.pxa/3.pxi new file mode 100644 index 00000000..2857c195 Binary files /dev/null and b/desktop/resources/ego/throw.pxa/3.pxi differ diff --git a/desktop/resources/ego/throw.pxa/4.pxi b/desktop/resources/ego/throw.pxa/4.pxi new file mode 100644 index 00000000..3b90423b Binary files /dev/null and b/desktop/resources/ego/throw.pxa/4.pxi differ diff --git a/desktop/resources/ego/throw.pxa/5.pxi b/desktop/resources/ego/throw.pxa/5.pxi new file mode 100644 index 00000000..1d4b930b Binary files /dev/null and b/desktop/resources/ego/throw.pxa/5.pxi differ diff --git a/desktop/resources/ego/throw.pxa/6.pxi b/desktop/resources/ego/throw.pxa/6.pxi new file mode 100644 index 00000000..3f2c6de8 Binary files /dev/null and b/desktop/resources/ego/throw.pxa/6.pxi differ diff --git a/desktop/resources/ego/throw.pxa/CelData.plist b/desktop/resources/ego/throw.pxa/CelData.plist new file mode 100644 index 00000000..8f638e26 --- /dev/null +++ b/desktop/resources/ego/throw.pxa/CelData.plist @@ -0,0 +1,34 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/settings.edn b/desktop/settings.edn index 767db683..00f1cecb 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 56.0, :music-volume 56.0} \ No newline at end of file +{:sound-volume 56.0, :music-volume 0.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 1e3a9c14..4cd25569 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -351,6 +351,7 @@ (leave-sheep entities)) (do (actions/talk entities :ego "Come here mama sheep!") + (actions/play-animation entities :ego :throw) (actions/play-animation entities :ego :sigh) (actions/talk entities :ego "She's too far away for me to pet her."))))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index dcfd14ba..5288d8b7 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -199,6 +199,7 @@ sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ]) glad (utils/make-anim "ego/glad.png" [20 46] 0.04 (flatten [0 1 2 3 4 (repeat 8 [5 5 5]) (repeat 20 0)])) 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)])) ego {:right {:walk walk-right :stand stand-anim @@ -235,7 +236,8 @@ :scared-walk scared-walk :sigh sigh :glad glad - :milk milk} + :milk milk + :throw throw} :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) :talk (utils/flip talk-anim) @@ -262,7 +264,8 @@ :pant (utils/flip pant) :sigh (utils/flip sigh) :glad (utils/flip glad) - :milk (utils/flip milk)} + :milk (utils/flip milk) + :throw (utils/flip throw)} :baseline (- 240 (last start-pos)) :facing :right :origin-x 9