diff --git a/desktop/resources/space/bloodclot-head-talk.png b/desktop/resources/space/bloodclot-head-talk.png
new file mode 100644
index 00000000..794210a2
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.png differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/0.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/0.pxi
new file mode 100644
index 00000000..b7c973e2
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/0.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/1.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/1.pxi
new file mode 100644
index 00000000..9d197123
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/1.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/10.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/10.pxi
new file mode 100644
index 00000000..872d6c79
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/10.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/11.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/11.pxi
new file mode 100644
index 00000000..b0791249
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/11.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/12.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/12.pxi
new file mode 100644
index 00000000..b1d252dc
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/12.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/13.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/13.pxi
new file mode 100644
index 00000000..95bfb17d
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/13.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/2.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/2.pxi
new file mode 100644
index 00000000..a980ad08
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/2.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/3.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/3.pxi
new file mode 100644
index 00000000..c3f67584
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/3.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/4.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/4.pxi
new file mode 100644
index 00000000..bf614777
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/4.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/5.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/5.pxi
new file mode 100644
index 00000000..a182d372
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/5.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/6.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/6.pxi
new file mode 100644
index 00000000..bcedf499
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/6.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/7.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/7.pxi
new file mode 100644
index 00000000..9e60e491
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/7.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/8.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/8.pxi
new file mode 100644
index 00000000..b0edf50a
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/8.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/9.pxi b/desktop/resources/space/bloodclot-head-talk.pxa/9.pxi
new file mode 100644
index 00000000..c9601b6d
Binary files /dev/null and b/desktop/resources/space/bloodclot-head-talk.pxa/9.pxi differ
diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/CelData.plist b/desktop/resources/space/bloodclot-head-talk.pxa/CelData.plist
new file mode 100644
index 00000000..3a1d385f
--- /dev/null
+++ b/desktop/resources/space/bloodclot-head-talk.pxa/CelData.plist
@@ -0,0 +1,62 @@
+
+
+
+
+
+ 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/resources/space/bloodclot-stand.png b/desktop/resources/space/bloodclot-stand.png
new file mode 100644
index 00000000..9f0f1258
Binary files /dev/null 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
new file mode 100644
index 00000000..85282fe4
Binary files /dev/null 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
new file mode 100644
index 00000000..0e12daec
--- /dev/null
+++ b/desktop/resources/space/bloodclot-stand.pxa/CelData.plist
@@ -0,0 +1,10 @@
+
+
+
+
+
+ duration
+ 1
+
+
+
diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj
index d3a033e7..f144be91 100644
--- a/desktop/src-common/advent/screens/rooms/space.clj
+++ b/desktop/src-common/advent/screens/rooms/space.clj
@@ -17,7 +17,7 @@
(when (and (not (get-in entities [:actions :script-running?]))
(get-in entities [:state :active?])
(not (get-in entities [:state :blergh-dead?])))
- ((actions/get-script entities (actions/do-dialogue entities :blergh (rand-nth ["Come on, little man! Try and hit me!"
+ ((actions/get-script entities (actions/do-dialogue entities :bloodclot-head (rand-nth ["Come on, little man! Try and hit me!"
"What's the matter? Cold feet?"
"Come here and fight me like man!"
"Your precious Georgia McGorgeous would be laughing if she saw you now."
@@ -132,10 +132,13 @@
(defn make [screen]
- (let [blergh-stand (texture "space/blergh-stand.png")
+ (let [
blergh-flex (texture "space/blergh-flex.png")
- 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])
+ 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-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])
@@ -145,21 +148,34 @@
{}
:layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)]
:timers {:taunt [10.0 8.0 taunt]}
- :blergh (rooms/make-entity :blergh (assoc (animation->texture screen blergh-appear)
+ :bloodclot-head (rooms/make-entity :bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim)
+ :x 195 :y 138 :baseline 195
+ :anim bloodclot-head-stand-anim
+ :talk bloodclot-head-talk-anim
+ :keep-shoot bloodclot-head-keep-shoot-anim
+ :shoot bloodclot-head-shoot-anim
+ :anim-start 0
+ :stand bloodclot-head-stand-anim
+ :talk-color (color 0.95 0.4 0.2 1.0)))
+
+ :blergh (rooms/make-entity :blergh (assoc (animation->texture screen blergh-stand-anim)
:x 180 :y 50 :baseline 190
- :stand blergh-stand-anim :talk blergh-talk-anim
- :swing blergh-swing
+ :stand blergh-stand-anim
+
:appear blergh-appear
:grow blergh-grow
- :talk-color (color 0.95 0.4 0.2 1.0)
- :script (actions/get-script entities (actions/do-dialogue entities :blergh "Come on! Try and hit me!"))
+
+ :script (actions/get-script entities (actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!"))
:scripts {:sword (actions/get-script entities
#_(actions/walk-straight-to entities :ego [205 45] :anim :jump :stop? false :speed 3.0)
(swing-at-blergh entities)
- #_(actions/play-animation entities :ego :swing)
- (actions/do-dialogue entities :blergh "Ha ha ha! Is that the best you can do?"
- :blergh "Take this!")
+
+ (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"
+ :bloodclot-head "Take this!")
+ (actions/play-animation entities :bloodclot-head :shoot :stop? false)
+ (actions/begin-animation entities :bloodclot-head :keep-shoot)
(actions/play-animation entities :ego :shock :stop? false)
+ (actions/begin-animation entities :bloodclot-head :stand)
(actions/play-animation entities :ego :burnt :stop? false)
(actions/play-animation entities :ego :passed-out :continue? true)
@@ -194,5 +210,6 @@
(if (get-in e [:state :broke-jewel?])
(assoc-in e [:room :entities :broken-jewel] (get-in e [:room :entities :broken-jewel]))
e)
- (assoc-in e [:room :entities :blergh] (get-in e [:room :blergh])))
+ (assoc-in e [:room :entities :blergh] (get-in e [:room :blergh]))
+ (assoc-in e [:room :entities :bloodclot-head] (get-in e [:room :bloodclot-head])))
))))