diff --git a/desktop/resources/space/Blergh.png b/desktop/resources/space/Blergh.png index 4f98badc..770f893b 100644 Binary files a/desktop/resources/space/Blergh.png and b/desktop/resources/space/Blergh.png differ diff --git a/desktop/resources/space/blergh-flex.png b/desktop/resources/space/blergh-flex.png index a9dddbe7..3b5184b1 100644 Binary files a/desktop/resources/space/blergh-flex.png and b/desktop/resources/space/blergh-flex.png differ diff --git a/desktop/resources/space/blergh-stand.png b/desktop/resources/space/blergh-stand.png index a9dddbe7..3b5184b1 100644 Binary files a/desktop/resources/space/blergh-stand.png and b/desktop/resources/space/blergh-stand.png differ diff --git a/desktop/resources/space/blergh-talk.png b/desktop/resources/space/blergh-talk.png index a9dddbe7..4672a45e 100644 Binary files a/desktop/resources/space/blergh-talk.png and b/desktop/resources/space/blergh-talk.png differ diff --git a/desktop/resources/space/bloodclot-talk.png b/desktop/resources/space/bloodclot-talk.png new file mode 100644 index 00000000..24daf998 Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.png differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/0.pxi b/desktop/resources/space/bloodclot-talk.pxa/0.pxi new file mode 100644 index 00000000..06ada2c9 Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/0.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/1.pxi b/desktop/resources/space/bloodclot-talk.pxa/1.pxi new file mode 100644 index 00000000..44bff51a Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/1.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/2.pxi b/desktop/resources/space/bloodclot-talk.pxa/2.pxi new file mode 100644 index 00000000..da8e6e18 Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/2.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/3.pxi b/desktop/resources/space/bloodclot-talk.pxa/3.pxi new file mode 100644 index 00000000..11994fc0 Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/3.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/4.pxi b/desktop/resources/space/bloodclot-talk.pxa/4.pxi new file mode 100644 index 00000000..cbf7f34a Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/4.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/5.pxi b/desktop/resources/space/bloodclot-talk.pxa/5.pxi new file mode 100644 index 00000000..a0dd56cc Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/5.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/6.pxi b/desktop/resources/space/bloodclot-talk.pxa/6.pxi new file mode 100644 index 00000000..9babc0c0 Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/6.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/7.pxi b/desktop/resources/space/bloodclot-talk.pxa/7.pxi new file mode 100644 index 00000000..83d13367 Binary files /dev/null and b/desktop/resources/space/bloodclot-talk.pxa/7.pxi differ diff --git a/desktop/resources/space/bloodclot-talk.pxa/CelData.plist b/desktop/resources/space/bloodclot-talk.pxa/CelData.plist new file mode 100644 index 00000000..3cc9cf5c --- /dev/null +++ b/desktop/resources/space/bloodclot-talk.pxa/CelData.plist @@ -0,0 +1,38 @@ + + + + + + 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/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index d54c7abc..8386147b 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -133,9 +133,8 @@ (defn make [screen] (let [blergh-stand (texture "space/blergh-stand.png") - blergh-talk (texture "space/blergh-talk.png") blergh-flex (texture "space/blergh-flex.png") - blergh-talk-anim (animation 0.3 [blergh-talk blergh-stand]) + blergh-talk-anim (utils/make-anim "space/bloodclot-talk.png" [106 165] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 3 4 4 4 3 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) blergh-stand-anim (animation 0.7 [blergh-flex blergh-stand]) blergh-swing (utils/make-anim "space/blergh-swing.png" [106 165] 0.1 [0 0 1 2 3 4 ]) blergh-appear (utils/make-anim "space/blergh-appear.png" [106 165] 0.05 (flatten [(range 13) 12 12 12 12 12 12 12 12 12 12 12 12 12 ]))