diff --git a/desktop/resources/space/bloodclot-stand.png b/desktop/resources/space/bloodclot-stand.png index 9f0f1258..948b831b 100644 Binary files a/desktop/resources/space/bloodclot-stand.png and b/desktop/resources/space/bloodclot-stand.png differ diff --git a/desktop/resources/space/bloodclot-stand.pxa/0.pxi b/desktop/resources/space/bloodclot-stand.pxa/0.pxi index 85282fe4..8ec67ce3 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/bloodclot-stand.pxa/CelData.plist b/desktop/resources/space/bloodclot-stand.pxa/CelData.plist index 0e12daec..29c78f8b 100644 --- a/desktop/resources/space/bloodclot-stand.pxa/CelData.plist +++ b/desktop/resources/space/bloodclot-stand.pxa/CelData.plist @@ -6,5 +6,9 @@ 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 db5929fe..d5249712 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -159,15 +159,11 @@ (defn make [screen] - (let [ - blergh-flex (texture "space/blergh-flex.png") - bloodclot-head-talk-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) + (let [bloodclot-head-talk-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) bloodclot-head-stand-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3]) 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.05 [0 0 0]) - 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 ])) + 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]) 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")] @@ -193,9 +189,9 @@ :x 180 :y 50 :baseline 190 :stand blergh-stand-anim :opacity 0.0 + :anim blergh-stand-anim + :anim-start 0 - :appear blergh-appear - :grow blergh-grow :script (actions/get-script entities (actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!"))