diff --git a/desktop/resources/space/bloodclot-explode.png b/desktop/resources/space/bloodclot-explode.png new file mode 100644 index 00000000..1140c092 Binary files /dev/null and b/desktop/resources/space/bloodclot-explode.png differ diff --git a/desktop/resources/space/bloodclot-stand.pxa/0.pxi b/desktop/resources/space/bloodclot-stand.pxa/0.pxi index 8ec67ce3..76c84de5 100644 Binary files a/desktop/resources/space/bloodclot-stand.pxa/0.pxi and b/desktop/resources/space/bloodclot-stand.pxa/0.pxi differ diff --git a/desktop/resources/space/explode.pxa/0.pxi b/desktop/resources/space/explode.pxa/0.pxi new file mode 100644 index 00000000..ff067460 Binary files /dev/null and b/desktop/resources/space/explode.pxa/0.pxi differ diff --git a/desktop/resources/space/explode.pxa/1.pxi b/desktop/resources/space/explode.pxa/1.pxi new file mode 100644 index 00000000..c326db33 Binary files /dev/null and b/desktop/resources/space/explode.pxa/1.pxi differ diff --git a/desktop/resources/space/explode.pxa/10.pxi b/desktop/resources/space/explode.pxa/10.pxi new file mode 100644 index 00000000..4a0f2fda Binary files /dev/null and b/desktop/resources/space/explode.pxa/10.pxi differ diff --git a/desktop/resources/space/explode.pxa/11.pxi b/desktop/resources/space/explode.pxa/11.pxi new file mode 100644 index 00000000..ae494730 Binary files /dev/null and b/desktop/resources/space/explode.pxa/11.pxi differ diff --git a/desktop/resources/space/explode.pxa/12.pxi b/desktop/resources/space/explode.pxa/12.pxi new file mode 100644 index 00000000..8a38f4a8 Binary files /dev/null and b/desktop/resources/space/explode.pxa/12.pxi differ diff --git a/desktop/resources/space/explode.pxa/13.pxi b/desktop/resources/space/explode.pxa/13.pxi new file mode 100644 index 00000000..cc199ae5 Binary files /dev/null and b/desktop/resources/space/explode.pxa/13.pxi differ diff --git a/desktop/resources/space/explode.pxa/14.pxi b/desktop/resources/space/explode.pxa/14.pxi new file mode 100644 index 00000000..cd8aaa44 Binary files /dev/null and b/desktop/resources/space/explode.pxa/14.pxi differ diff --git a/desktop/resources/space/explode.pxa/15.pxi b/desktop/resources/space/explode.pxa/15.pxi new file mode 100644 index 00000000..83aedfb7 Binary files /dev/null and b/desktop/resources/space/explode.pxa/15.pxi differ diff --git a/desktop/resources/space/explode.pxa/16.pxi b/desktop/resources/space/explode.pxa/16.pxi new file mode 100644 index 00000000..b1b20ff1 Binary files /dev/null and b/desktop/resources/space/explode.pxa/16.pxi differ diff --git a/desktop/resources/space/explode.pxa/17.pxi b/desktop/resources/space/explode.pxa/17.pxi new file mode 100644 index 00000000..76f3dd01 Binary files /dev/null and b/desktop/resources/space/explode.pxa/17.pxi differ diff --git a/desktop/resources/space/explode.pxa/18.pxi b/desktop/resources/space/explode.pxa/18.pxi new file mode 100644 index 00000000..47d9ce11 Binary files /dev/null and b/desktop/resources/space/explode.pxa/18.pxi differ diff --git a/desktop/resources/space/explode.pxa/19.pxi b/desktop/resources/space/explode.pxa/19.pxi new file mode 100644 index 00000000..c43858ed Binary files /dev/null and b/desktop/resources/space/explode.pxa/19.pxi differ diff --git a/desktop/resources/space/explode.pxa/2.pxi b/desktop/resources/space/explode.pxa/2.pxi new file mode 100644 index 00000000..f418e8d1 Binary files /dev/null and b/desktop/resources/space/explode.pxa/2.pxi differ diff --git a/desktop/resources/space/explode.pxa/3.pxi b/desktop/resources/space/explode.pxa/3.pxi new file mode 100644 index 00000000..c547ff15 Binary files /dev/null and b/desktop/resources/space/explode.pxa/3.pxi differ diff --git a/desktop/resources/space/explode.pxa/4.pxi b/desktop/resources/space/explode.pxa/4.pxi new file mode 100644 index 00000000..07cace4f Binary files /dev/null and b/desktop/resources/space/explode.pxa/4.pxi differ diff --git a/desktop/resources/space/explode.pxa/5.pxi b/desktop/resources/space/explode.pxa/5.pxi new file mode 100644 index 00000000..2c5a77ed Binary files /dev/null and b/desktop/resources/space/explode.pxa/5.pxi differ diff --git a/desktop/resources/space/explode.pxa/6.pxi b/desktop/resources/space/explode.pxa/6.pxi new file mode 100644 index 00000000..3fbc19fd Binary files /dev/null and b/desktop/resources/space/explode.pxa/6.pxi differ diff --git a/desktop/resources/space/explode.pxa/7.pxi b/desktop/resources/space/explode.pxa/7.pxi new file mode 100644 index 00000000..344137e2 Binary files /dev/null and b/desktop/resources/space/explode.pxa/7.pxi differ diff --git a/desktop/resources/space/explode.pxa/8.pxi b/desktop/resources/space/explode.pxa/8.pxi new file mode 100644 index 00000000..055217b7 Binary files /dev/null and b/desktop/resources/space/explode.pxa/8.pxi differ diff --git a/desktop/resources/space/explode.pxa/9.pxi b/desktop/resources/space/explode.pxa/9.pxi new file mode 100644 index 00000000..2473c376 Binary files /dev/null and b/desktop/resources/space/explode.pxa/9.pxi differ diff --git a/desktop/resources/space/explode.pxa/CelData.plist b/desktop/resources/space/explode.pxa/CelData.plist new file mode 100644 index 00000000..a0ce1822 --- /dev/null +++ b/desktop/resources/space/explode.pxa/CelData.plist @@ -0,0 +1,86 @@ + + + + + + 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/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index cca0f864..ae5358b0 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -9,6 +9,7 @@ [play-clj.core :refer :all] [play-clj.ui :refer :all] [play-clj.utils :refer :all] + [play-clj.math :refer :all] [play-clj.g2d :refer :all])) (defn go-to-jail [entities] @@ -107,4 +108,8 @@ :bloodclot-head "Yes!" :bloodclot-head "Ultimate power is mine!" :bloodclot-head "If I drink this entire bottle, I'll be as powerful as a god!") - (Thread/sleep 5000))) + (actions/remove-entity entities :bloodclot-head) + + #_(particle-effect! (get-in @entities [:room :entities :blowup] ) :start) + (actions/play-animation entities :bloodclot :explode) + (Thread/sleep 15000))) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index b92ad67c..558f0c26 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -179,7 +179,7 @@ bloodclot-head-shoot-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11]) bloodclot-head-keep-shoot-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [12 13]) blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.75 [0 1]) - 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]) + bloodclot-explode (utils/make-anim "space/bloodclot-explode.png" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 4 5 5 5 5 5 4 4 4 4 5 5 4 4 4 4 5 5 5 4 5 5 5 5 5 5 5 5 6 5 5 5 5 6 6 5 5 5 5 5 5 5 6 6 6 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 7 5 6 6 6 6 6 7 7 7 7 6 6 6 6 6 6 6 6 6 6 7 7 7 7 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 10 11 12 13 14 15 16 17 18 19]) bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) effect (particle-effect "space/appear") blowup-effect (particle-effect "space/blowup")] @@ -211,6 +211,7 @@ :opacity 0.0 :anim blergh-stand-anim :anim-start 0 + :explode bloodclot-explode :script (actions/get-script entities