shopkeep sigh

2015-11-11 21:19:18 -08:00
parent 5a52d5376a
commit 81c5f3e094
14 changed files with 3 additions and 1 deletions
--- a/desktop/asset-work/cat-tree/owl-puke.ogg
+++ b/desktop/asset-work/cat-tree/owl-puke.ogg
--- a/desktop/asset-work/cat-tree/owl-puke.wav
+++ b/desktop/asset-work/cat-tree/owl-puke.wav
--- a/desktop/asset-work/ego/scared-step.wav
+++ b/desktop/asset-work/ego/scared-step.wav
--- a/desktop/asset-work/inside-antique/shopkeep-sigh.ogg
+++ b/desktop/asset-work/inside-antique/shopkeep-sigh.ogg
--- a/desktop/asset-work/inside-antique/shopkeep-sigh.wav
+++ b/desktop/asset-work/inside-antique/shopkeep-sigh.wav
--- a/desktop/asset-work/space/bloodclot-exhale.ogg
+++ b/desktop/asset-work/space/bloodclot-exhale.ogg
--- a/desktop/asset-work/space/bloodclot-exhale.wav
+++ b/desktop/asset-work/space/bloodclot-exhale.wav
--- a/desktop/asset-work/space/bloodclot-inhale.ogg
+++ b/desktop/asset-work/space/bloodclot-inhale.ogg
--- a/desktop/asset-work/space/bloodclot-inhale.wav
+++ b/desktop/asset-work/space/bloodclot-inhale.wav
--- a/desktop/resources/cat-tree/owl-puke.ogg
+++ b/desktop/resources/cat-tree/owl-puke.ogg
--- a/desktop/resources/inside-antique/shopkeep-sigh.ogg
+++ b/desktop/resources/inside-antique/shopkeep-sigh.ogg
--- a/desktop/resources/space/bloodclot-exhale.ogg
+++ b/desktop/resources/space/bloodclot-exhale.ogg
--- a/desktop/resources/space/bloodclot-inhale.ogg
+++ b/desktop/resources/space/bloodclot-inhale.ogg
--- a/desktop/src-common/advent/screens/rooms/inside_antique.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj
@@ -289,12 +289,14 @@
                                                                            :talk-color (color 0.2 1.0 0.2 1.0) 
                                                                            :talk shopkeep-talk
                                                                            :sigh shopkeep-sigh
+                                                                            :sigh-sound (utils/load-sound "inside-antique/shopkeep-sigh.ogg")
                                                                            :anim-merges {shopkeep-sigh {:origin-x 9}
                                                                                          :default {:origin-x 9}}
                                                                            :anim-sound-frames {shopkeep-stand {31 [:blink 0.5 1.5]
                                                                                                                81 [:blink 0.5 1.5]
                                                                                                                83 [:blink 0.5 1.5]}
-                                                                                                shopkeep-talk {6 [:blink 0.5 1.5]}}
+                                                                                                shopkeep-talk {6 [:blink 0.5 1.5]}
+                                                                                                shopkeep-sigh {1 [:sigh-sound 1.0]}}
                                                                            :script (actions/get-script entities  (do-antique-dialogue entities))
                                                                            :scripts #(condp = %
                                                                                        :teddy (actions/get-script entities