epic cry.

desktop/gametodos.txt

@@ -1,4 +1,3 @@
-+ Grandma cry?
 + More ways to burn paper
 + drool icon
 + loop sounds update every frame instead of each play
@@ -11,4 +10,3 @@
 + secret lever
 + shopkeep sigh
 + proper save/settings file location
-+ grandma visual glitches

desktop/resources/cat-tree/grandma-cry.pxa/CelData.plist

@@ -70,5 +70,17 @@
 		<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>
 </array>
 </plist>

desktop/resources/title/particle-clouds

@@ -218,12 +218,12 @@ lowMin: 3000.0
 lowMax: 3000.0
 - Count - 
 min: 0
-max: 5
+max: 10
 - Emission - 
 lowMin: 0.0
 lowMax: 0.0
-highMin: 1.0
+highMin: 2.0
-highMax: 1.0
+highMax: 2.0
 relative: false
 scalingCount: 1
 scaling0: 1.0
@@ -254,7 +254,7 @@ timelineCount: 1
 timeline0: 0.0
 - Y Offset - 
 active: true
-lowMin: 220.0
+lowMin: 480.0
 lowMax: 70.0
 highMin: 0.0
 highMax: 0.0
@@ -396,12 +396,12 @@ lowMin: 3000.0
 lowMax: 3000.0
 - Count - 
 min: 0
-max: 5
+max: 10
 - Emission - 
 lowMin: 0.0
 lowMax: 0.0
-highMin: 1.0
+highMin: 2.0
-highMax: 1.0
+highMax: 2.0
 relative: false
 scalingCount: 1
 scaling0: 1.0
@@ -432,7 +432,7 @@ timelineCount: 1
 timeline0: 0.0
 - Y Offset - 
 active: true
-lowMin: 220.0
+lowMin: 480.0
 lowMax: 70.0
 highMin: 0.0
 highMax: 0.0

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

@@ -36,6 +36,7 @@
   (actions/do-dialogue entities
                        :grandma "Oh, good, a strapping young lad!"
                        :grandma "Are you here to help this damsel in distress?")
+  (actions/play-animation entities :grandma :cry)
   (actions/present-choices entities {:choices
                                      ["Damsel in distress?"
                                       {:run #(actions/respond entities %
@@ -43,12 +44,14 @@
                                                               :ego "Don't you have to be young to be a damsel?"
                                                               :grandma "I'm 113 years young! I'm practically a baby!")
                                        :choices ["What's your distress?"
-                                                 {:run #(actions/respond entities %
+                                                 {:run #(do (actions/respond entities %
-                                                                         :grandma "It's my Smuffle Wuffles!"
+                                                                              :grandma "It's my Smuffle Wuffles!"
-                                                                         :grandma "We were on a pleasant walk through the woods."
+                                                                              :grandma "We were on a pleasant walk through the woods."
-                                                                         :grandma "Then we got in argument, and so he ran up into that tree!"
+                                                                              :grandma "Then we got in argument, and so he ran up into that tree!")
-                                                                         :ego "An argument? With a cat?"
+                                                            (actions/play-animation entities :grandma :cry)
-                                                                         :grandma "Yes of course! We were arguing about politics!")
+                                                            (actions/do-dialogue entities
+                                                                                 :ego "An argument? With a cat?"
+                                                                             :grandma "Yes of course! We were arguing about politics!"))
                                                   :choices ["So you want me to get your cat down?"
                                                             {:run #(actions/respond entities %
                                                                                     :grandma "Yes! I need a courageous hero to rescue Smuffle Wuffles for me."
@@ -76,10 +79,11 @@
                                                  "Something else."
                                                  {:choices actions/something-else}]}
                                       "What are you doing way out here?"
-                                      {:run #(actions/respond entities %
+                                      {:run #(do (actions/respond entities %
-                                                              :grandma "Me and my cat, Smuffle Wuffles were on a nice, leisurely stroll."
+                                                                  :grandma "Me and my cat, Smuffle Wuffles were on a nice, leisurely stroll."
-                                                              :grandma "Then he ran up that tree!"
+                                                                  :grandma "Then he ran up that tree!"
-                                                              :grandma "So I've been camped out here for the last two days.")
+                                                                  :grandma "So I've been camped out here for the last two days.")
+                                                 (actions/play-animation entities :grandma :cry))
                                        :choices actions/previous-choices}
                                       "Do you know how I can pull the Sword of Blergh, and become a knight?"
                                       {:run #(actions/respond entities %
@@ -89,10 +93,12 @@
                                                               :grandma "How about proving your courage by helping rescue Smuffle Wuffles?")
                                        :choices actions/previous-choices}
                                       "Later."
-                                      {:run #(actions/respond entities %
+                                      {:run #(do (actions/respond entities %
-                                                              :grandma "Please come back soon and help me rescue Smuffle Wuffles!")}]}))
+                                                                  :grandma "Please come back soon and help me rescue Smuffle Wuffles!")
+                                                 (actions/play-animation entities :grandma :cry))}]}))
 
 (defn do-grandma-dialogue [entities]
+  
   (if (actions/has-obtained? entities :kiss)
     (do-saved-grandma-dialogue entities)
     (do-grandma-dialogue-with-cat entities)))
@@ -194,6 +200,7 @@
         grandma-squat-2 (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [5 5 4 3])
         grandma-talk (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 2 0 2 0 2 0 2 0 2 0 1 0 2 0 0])
         grandma-kiss (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 8 9 10 9 10 9 10 9 8 0])
+        grandma-cry (utils/make-anim "cat-tree/grandma-cry.png" [58 40] 0.15 (flatten [(range 20) 0 0 0 0 0 0 0 0 0]))
         owl-stand (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [0 0 0 0 0 0 0 2]) 
         owl-talk (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [1 0 1 0 1 0 0 0 2 0])
         owl-puke (utils/make-anim "cat-tree/owl.png" [19 28] 0.10 [0 0  2 2 3 2 2 3 3 2 3 3 3 4 5 6 7 4 4 3 3 2 2 2 2 2])
@@ -308,21 +315,24 @@
                                                                                                                               :ego "Sounds like the game designer was running out of good ideas."))
                                                                                                      (actions/talk entities :ego "I guess I'm too far away.")))})
                                                           cat-stand)
-                           :grandma (assoc (animation->texture screen grandma-stand)
+                           :grandma (let [gma (assoc (animation->texture screen grandma-stand)
-                                      :x 130 :y 37 :baseline 200
+                                                :x 130 :y 37 :baseline 200
-                                      :anim grandma-stand
+                                                :anim grandma-stand
-                                      :anim-start 0
+                                                :anim-start 0
-                                      :talk grandma-talk
+                                                :talk grandma-talk
-                                      :kiss grandma-kiss
+                                                :kiss grandma-kiss
-                                      :stand grandma-stand
+                                                :cry grandma-cry
-                                      :squat-1 grandma-squat-1
+                                                :stand grandma-stand
-                                      :squat-2 grandma-squat-2
+                                                :squat-1 grandma-squat-1
+                                                :squat-2 grandma-squat-2
 
-                                      :talk-color (color 1.0 0.4 0.9 1.0) 
+                                                :talk-color (color 1.0 0.4 0.9 1.0) 
-                                      :origin-x 12
+                                                :origin-x 13
-                                      :origin-y 0
+                                                :origin-y 0
-                                      :scale-x 1.45
+                                                :scale-x 1.45
-                                      :scale-y 1.45)
+                                                :scale-y 1.45)]
+                                      (assoc gma :anim-merges {(:cry gma) {:origin-x 35 :origin-y 4}
+                                                               :default {:origin-x 13 :origin-y 0}}))
                            :puke (assoc puke
                                    :x 194 :y 188 :baseline 241)}
                 :owl (rooms/make-entity :owl (assoc (animation->texture screen owl-stand)