diff --git a/desktop/resources/space/Blergh.png b/desktop/resources/space/Blergh.png index 9ec7f7d4..4f98badc 100644 Binary files a/desktop/resources/space/Blergh.png and b/desktop/resources/space/Blergh.png differ diff --git a/desktop/resources/space/blegh-flex.png b/desktop/resources/space/blegh-flex.png index 417bc5a3..76f18644 100644 Binary files a/desktop/resources/space/blegh-flex.png and b/desktop/resources/space/blegh-flex.png differ diff --git a/desktop/resources/space/blegh-talk.png b/desktop/resources/space/blegh-talk.png index cf990093..aaa90e5e 100644 Binary files a/desktop/resources/space/blegh-talk.png and b/desktop/resources/space/blegh-talk.png differ diff --git a/desktop/resources/space/blergh-appear.png b/desktop/resources/space/blergh-appear.png index 09f9694b..cfea7d3d 100644 Binary files a/desktop/resources/space/blergh-appear.png and b/desktop/resources/space/blergh-appear.png differ diff --git a/desktop/resources/space/blergh-appear.pxa/0.pxi b/desktop/resources/space/blergh-appear.pxa/0.pxi index fc15f813..ead82935 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/0.pxi and b/desktop/resources/space/blergh-appear.pxa/0.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/1.pxi b/desktop/resources/space/blergh-appear.pxa/1.pxi index 2c2af843..9deed33f 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/1.pxi and b/desktop/resources/space/blergh-appear.pxa/1.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/2.pxi b/desktop/resources/space/blergh-appear.pxa/2.pxi index bcb073ee..d8d91d97 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/2.pxi and b/desktop/resources/space/blergh-appear.pxa/2.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/3.pxi b/desktop/resources/space/blergh-appear.pxa/3.pxi index bee56c84..42a9664f 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/3.pxi and b/desktop/resources/space/blergh-appear.pxa/3.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/4.pxi b/desktop/resources/space/blergh-appear.pxa/4.pxi index 43b9fd98..424db81e 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/4.pxi and b/desktop/resources/space/blergh-appear.pxa/4.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/5.pxi b/desktop/resources/space/blergh-appear.pxa/5.pxi index e652fcc8..e050f393 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/5.pxi and b/desktop/resources/space/blergh-appear.pxa/5.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/6.pxi b/desktop/resources/space/blergh-appear.pxa/6.pxi index e45f698d..97b503bb 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/6.pxi and b/desktop/resources/space/blergh-appear.pxa/6.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/7.pxi b/desktop/resources/space/blergh-appear.pxa/7.pxi index cdb00286..54afa892 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/7.pxi and b/desktop/resources/space/blergh-appear.pxa/7.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/8.pxi b/desktop/resources/space/blergh-appear.pxa/8.pxi index 999c9404..6daa5504 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/8.pxi and b/desktop/resources/space/blergh-appear.pxa/8.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/9.pxi b/desktop/resources/space/blergh-appear.pxa/9.pxi index a26685da..a55d9f41 100644 Binary files a/desktop/resources/space/blergh-appear.pxa/9.pxi and b/desktop/resources/space/blergh-appear.pxa/9.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/CelData.plist b/desktop/resources/space/blergh-appear.pxa/CelData.plist index 222d28b8..0aa530db 100644 --- a/desktop/resources/space/blergh-appear.pxa/CelData.plist +++ b/desktop/resources/space/blergh-appear.pxa/CelData.plist @@ -42,5 +42,17 @@ duration 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/resources/space/blergh-flex.png b/desktop/resources/space/blergh-flex.png index 4532970c..76f18644 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 93f05e0c..42ee2ea1 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 b9b83403..aaa90e5e 100644 Binary files a/desktop/resources/space/blergh-talk.png and b/desktop/resources/space/blergh-talk.png differ diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 4231e2f1..d3fa98db 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -29,7 +29,7 @@ blergh-talk-anim (animation 0.3 [blergh-talk blergh-stand]) 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 10) 9 9 9 9 9 9 9 9 9 ])) + 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 ])) blergh-grow (utils/make-anim "space/blergh-grow.png" [106 165] 0.10 [0 1 0 1 0 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11]) ] (rooms/make :music :town-1 :interactions