diff --git a/desktop/resources/ego/hold-up-to-window.png b/desktop/resources/ego/hold-up-to-window.png new file mode 100644 index 00000000..fe43c1b2 Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.png differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/0.pxi b/desktop/resources/ego/hold-up-to-window.pxa/0.pxi new file mode 100644 index 00000000..0422adf5 Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.pxa/0.pxi differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/1.pxi b/desktop/resources/ego/hold-up-to-window.pxa/1.pxi new file mode 100644 index 00000000..b59db78e Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.pxa/1.pxi differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/2.pxi b/desktop/resources/ego/hold-up-to-window.pxa/2.pxi new file mode 100644 index 00000000..a8bf8ee9 Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.pxa/2.pxi differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/3.pxi b/desktop/resources/ego/hold-up-to-window.pxa/3.pxi new file mode 100644 index 00000000..23ae185f Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.pxa/3.pxi differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/4.pxi b/desktop/resources/ego/hold-up-to-window.pxa/4.pxi new file mode 100644 index 00000000..7fa0d0b1 Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.pxa/4.pxi differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/5.pxi b/desktop/resources/ego/hold-up-to-window.pxa/5.pxi new file mode 100644 index 00000000..b408ffe9 Binary files /dev/null and b/desktop/resources/ego/hold-up-to-window.pxa/5.pxi differ diff --git a/desktop/resources/ego/hold-up-to-window.pxa/CelData.plist b/desktop/resources/ego/hold-up-to-window.pxa/CelData.plist new file mode 100644 index 00000000..245204bc --- /dev/null +++ b/desktop/resources/ego/hold-up-to-window.pxa/CelData.plist @@ -0,0 +1,30 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 14058032..8a8de72b 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -141,7 +141,7 @@ (actions/talk entities :ego "It's a nice, big window.")) :scripts {:portrait (actions/get-script entities (actions/walk-to entities :ego [151 60] :face :right) - (actions/play-animation entities :ego :reach) + (actions/play-animation entities :ego :hold-up-to-window) (actions/talk entities :ego "The portrait says 'Herb' on the back.") (actions/update-state entities (fn [state] (update-in state [:clues] #(conj % :name)) )))}}} :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)] diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 75b6a96b..bac805ff 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -115,7 +115,8 @@ fire-3-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 8 9 10 11 2 2 2 2 2 2 2 2 0]] (texture (aget fire-sheet 0 i)))) grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]] - (texture (aget grow-sheet 0 i)))) + (texture (aget grow-sheet 0 i)))) + hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 4 4 4 4 3 3 4 4 3 3 4 4 5 4 5 5 5 5 5 5 5 5 5 5 4 4 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0]) ego {:right {:walk walk-right :stand stand-anim :talk talk-anim @@ -125,6 +126,7 @@ :reach reach-anim :cat-toy cat-toy-anim :grow grow + :hold-up-to-window hold-up-to-window [:fire 1] fire-1-anim [:fire 2] fire-2-anim [:fire 3] fire-3-anim} @@ -137,6 +139,7 @@ :reach (utils/flip reach-anim) :cat-toy (utils/flip cat-toy-anim) :grow (utils/flip grow) + :hold-up-to-window (utils/flip hold-up-to-window) [:fire 1] (utils/flip fire-1-anim) [:fire 2] (utils/flip fire-2-anim) [:fire 3] (utils/flip fire-3-anim)}