Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

2015-04-21 23:05:31 -07:00
parent 39302eaeca 1b71d12d0a
commit ba9459da7b
23 changed files with 18 additions and 6 deletions
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -746,3 +746,9 @@
                                 entities)
                      (can-skip? [this screen entities]
                                 false)))
+
+
+(defn in-love [entities]
+  (transition-music entities :love :duration 1.0)
+  (play-animation entities :ego :love)
+  (transition-music entities nil :duration 1.0))