better potion.

desktop/asset-work/ending-castle/frankie-fall.pxa/CelData.plist

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.20000000298023224</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>0.10000000149011612</real>
+	</dict>
+</array>
+</plist>

desktop/asset-work/space/explode.pxa/CelData.plist

@@ -82,5 +82,17 @@
 		<key>duration</key>
 		<real>1</real>
 	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
 </array>
 </plist>

desktop/resources/packed/pack.atlas

@@ -123,21 +123,14 @@ cat-tree/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-inside-house/dot
+ego/dot
   rotate: false
   xy: 846, 784
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
-title/dot
+outsidehouse/dot
-  rotate: false
-  xy: 846, 784
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-inside-jail/dot
   rotate: false
   xy: 846, 784
   size: 1, 1
@@ -151,13 +144,6 @@ dream/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-ego/dot
-  rotate: false
-  xy: 846, 784
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
 inside-antique/dot
   rotate: false
   xy: 846, 784
@@ -165,7 +151,21 @@ inside-antique/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-outsidehouse/dot
+title/dot
+  rotate: false
+  xy: 846, 784
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+inside-house/dot
+  rotate: false
+  xy: 846, 784
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+inside-jail/dot
   rotate: false
   xy: 846, 784
   size: 1, 1
@@ -354,14 +354,14 @@ held/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-space/dot
+outside-jail/dot
   rotate: false
   xy: 849, 784
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
-outside-jail/dot
+space/dot
   rotate: false
   xy: 849, 784
   size: 1, 1
@@ -2778,280 +2778,280 @@ filter: Nearest,Nearest
 repeat: none
 cat-tree/grandma-cry-10
   rotate: false
-  xy: 662, 896
+  xy: 894, 835
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-11
   rotate: false
-  xy: 722, 896
+  xy: 954, 835
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-12
   rotate: false
-  xy: 782, 896
+  xy: 683, 774
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-13
   rotate: false
-  xy: 842, 896
+  xy: 518, 693
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-14
   rotate: false
-  xy: 902, 896
+  xy: 518, 651
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-15
   rotate: false
-  xy: 962, 896
+  xy: 518, 609
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-16
   rotate: false
-  xy: 194, 171
+  xy: 434, 553
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-17
   rotate: false
-  xy: 194, 129
+  xy: 410, 511
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-18
   rotate: false
-  xy: 194, 87
+  xy: 410, 469
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-19
   rotate: false
-  xy: 254, 171
+  xy: 410, 427
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-20
   rotate: false
-  xy: 254, 129
+  xy: 518, 567
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-7
   rotate: false
-  xy: 330, 300
+  xy: 540, 735
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-8
   rotate: false
-  xy: 542, 896
+  xy: 774, 835
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-9
   rotate: false
-  xy: 602, 896
+  xy: 834, 835
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 dream/corner-l
   rotate: false
-  xy: 218, 351
+  xy: 774, 877
   size: 112, 59
   orig: 112, 59
   offset: 0, 0
   index: -1
 dream/corner-r
   rotate: false
-  xy: 216, 290
+  xy: 888, 877
   size: 112, 59
   orig: 112, 59
   offset: 0, 0
   index: -1
 ego/scared
   rotate: false
-  xy: 334, 401
+  xy: 683, 816
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-1
   rotate: false
-  xy: 494, 681
+  xy: 344, 347
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-10
   rotate: false
-  xy: 170, 13
+  xy: 170, 55
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-11
   rotate: false
-  xy: 212, 13
+  xy: 386, 389
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-12
   rotate: false
-  xy: 254, 47
+  xy: 386, 352
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-2
   rotate: false
-  xy: 494, 644
+  xy: 344, 310
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-3
   rotate: false
-  xy: 494, 607
+  xy: 344, 273
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-4
   rotate: false
-  xy: 452, 588
+  xy: 302, 241
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-5
   rotate: false
-  xy: 494, 570
+  xy: 344, 236
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-6
   rotate: false
-  xy: 128, 12
+  xy: 600, 740
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-7
   rotate: false
-  xy: 296, 92
+  xy: 470, 516
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-8
   rotate: false
-  xy: 170, 50
+  xy: 470, 479
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-9
   rotate: false
-  xy: 212, 50
+  xy: 470, 442
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 georgia/kick-10
   rotate: false
-  xy: 254, 84
+  xy: 86, 34
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-11
   rotate: false
-  xy: 300, 245
+  xy: 128, 47
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-12
   rotate: false
-  xy: 342, 255
+  xy: 194, 201
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-13
   rotate: false
-  xy: 86, 34
+  xy: 194, 156
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-14
   rotate: false
-  xy: 128, 49
+  xy: 194, 111
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-15
   rotate: false
-  xy: 410, 702
+  xy: 236, 214
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-16
   rotate: false
-  xy: 410, 657
+  xy: 236, 169
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-17
   rotate: false
-  xy: 410, 612
+  xy: 236, 124
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-18
   rotate: false
-  xy: 452, 715
+  xy: 302, 368
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-19
   rotate: false
-  xy: 452, 670
+  xy: 302, 323
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-20
   rotate: false
-  xy: 452, 625
+  xy: 302, 278
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
@@ -3086,56 +3086,56 @@ held/bloodclot-head-7
   index: -1
 held/bloodclot-head-8
   rotate: false
-  xy: 218, 496
+  xy: 542, 854
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-9
   rotate: false
-  xy: 218, 412
+  xy: 658, 854
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-4
   rotate: false
-  xy: 218, 580
+  xy: 2, 79
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-5
   rotate: false
-  xy: 326, 747
+  xy: 110, 246
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-6
   rotate: false
-  xy: 434, 914
+  xy: 218, 413
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-7
   rotate: false
-  xy: 2, 79
+  xy: 326, 580
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-castle/hands-1
   rotate: false
-  xy: 110, 248
+  xy: 434, 749
   size: 104, 104
   orig: 104, 104
   offset: 0, 0
   index: -1
 inside-castle/roof
   rotate: false
-  xy: 332, 342
+  xy: 624, 795
   size: 57, 57
   orig: 57, 57
   offset: 0, 0
@@ -3217,6 +3217,27 @@ space/bloodclot-explode-20
   orig: 106, 165
   offset: 0, 0
   index: -1
+space/bloodclot-explode-21
+  rotate: false
+  xy: 218, 521
+  size: 106, 165
+  orig: 106, 165
+  offset: 0, 0
+  index: -1
+space/bloodclot-explode-22
+  rotate: false
+  xy: 326, 688
+  size: 106, 165
+  orig: 106, 165
+  offset: 0, 0
+  index: -1
+space/bloodclot-explode-23
+  rotate: false
+  xy: 434, 855
+  size: 106, 165
+  orig: 106, 165
+  offset: 0, 0
+  index: -1
 space/bloodclot-explode-9
   rotate: false
   xy: 2, 855
@@ -3226,77 +3247,77 @@ space/bloodclot-explode-9
   index: -1
 space/bloodclot-head-talk-10
   rotate: false
-  xy: 110, 94
+  xy: 110, 92
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-11
   rotate: false
-  xy: 326, 593
+  xy: 218, 259
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-12
   rotate: false
-  xy: 334, 516
+  xy: 326, 426
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-13
   rotate: false
-  xy: 334, 439
+  xy: 434, 595
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-14
   rotate: false
-  xy: 216, 213
+  xy: 540, 777
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-5
   rotate: false
-  xy: 434, 837
+  xy: 2, 2
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-6
   rotate: false
-  xy: 2, 2
+  xy: 110, 169
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-7
   rotate: false
-  xy: 110, 171
+  xy: 218, 336
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-8
   rotate: false
-  xy: 326, 670
+  xy: 326, 503
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-9
   rotate: false
-  xy: 434, 760
+  xy: 434, 672
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 talk-bg
   rotate: false
-  xy: 494, 718
+  xy: 344, 384
   size: 40, 40
   orig: 40, 40
   offset: 0, 0

desktop/src-common/advent/screens/rooms/common.clj

@@ -334,7 +334,7 @@
                                  (update-in [:room :entities :ego] #(actions/start-animation screen % :crawl))))
 
                       (continue [this screen entities]
-                                (if (= 170 (get-in entities [:room :entities :bloodclot :current-frame-index]))
+                                (if (= 185 (get-in entities [:room :entities :bloodclot :current-frame-index]))
                                   (particle-effect! (get-in entities [:room :entities :grow-explode]) :start))
                                 
                                 (let [move-speed (* 0.17
@@ -347,7 +347,7 @@
                                     entities )))
 
                       (done? [this screen entities]
-                             (= (get-in entities [:room :entities :bloodclot :current-frame-index]) 176))
+                             (= (get-in entities [:room :entities :bloodclot :current-frame-index]) 191))
 
                       (terminate [this screen entities]
                                  (-> entities
@@ -547,7 +547,7 @@
                        :frankie "No sense in thanking Dipstick.")
   (actions/play-animation entities :frankie :laugh)
   (actions/play-animation entities :georgia :kick)
-  (actions/walk-straight-to entities :georgia [141 35] :anim :stand :speed 1.0)
+  (actions/walk-straight-to entities :georgia [131 40] :anim :stand :speed 1.0)
   (actions/play-animation entities :frankie :fall :stop? false)
   (actions/do-dialogue entities :georgia "Let's go, Sir Hunk.")
   (fade-out entities)

desktop/src-common/advent/screens/rooms/space.clj

@@ -188,7 +188,7 @@
         bloodclot-head-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [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-seq "space/bloodclot-head-talk" [82 75] 0.05 [12 13])
         blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.9 [0 1])
-        bloodclot-explode (utils/make-anim-seq "space/bloodclot-explode" [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])
+        bloodclot-explode (utils/make-anim-seq "space/bloodclot-explode" [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 4 4 4 5 5 5 5 5 5 5 5 5 6 6 6 6 7 7 7 7 7 7 7 7 7 7 7 8 8 8 7 7 7 7 8 8 8 8 8 7 7 7 7 8 8 7 7 7 7 8 8 8 7 8 8 8 8 8 8 8 8 9 8 8 8 8 9 9 8 8 8 8 8 8 8 9 9 9 8 8 8 8 8 9 9 9 9 9 9 9 9 9 9 9 9 9 10 9 10 10 8 9 9 9 9 9 10 10 10 10 9 9 9 9 9 9 9 9 9 9 10 10 10 10 9 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 13 14 15 16 17 18 19 20 21 22])
         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 "particles/appear")
         blowup-effect (particle-effect "particles/blowup")
@@ -239,8 +239,8 @@
                                              :explode-sound (utils/load-sound "space/bloodclot-explode.ogg")
                                              :anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol]
                                                                                     1 [:exhale-sound grunt-vol]}
-                                                                 bloodclot-explode {19 [:grow-sound (constantly 0.5)]
+                                                                 bloodclot-explode {35 [:grow-sound (constantly 0.5)]
-                                                                                    166 [:explode-sound (constantly 0.5)]}}
+                                                                                    181 [:explode-sound (constantly 0.5)]}}
                                              :opacity 0.0
                                              :anim blergh-stand-anim
                                              :anim-start 0