From 51998792a8355a79953ee02955a1dae337a17855 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Fri, 6 Nov 2015 07:37:39 -0800
Subject: [PATCH] cat toy can be off.

---
 desktop/last-release                          |  2 +-
 .../advent/screens/rooms/cat_tree.clj         | 12 ++++++----
 desktop/src-common/advent/screens/scene.clj   |  1 +
 desktop/src/advent/core/desktop_launcher.clj  | 23 +++++++++----------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/desktop/last-release b/desktop/last-release
index 00750edc..b8626c4c 100644
--- a/desktop/last-release
+++ b/desktop/last-release
@@ -1 +1 @@
-3
+4
diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj
index 15fe36ca..0c3c44c3 100644
--- a/desktop/src-common/advent/screens/rooms/cat_tree.clj
+++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj
@@ -398,11 +398,13 @@
                                        (update-in entities [:room :entities] #(dissoc % :cat))
                                        entities)
                                      (if (is-standing-on-ladder entities)
-                                       (-> entities
-                                           (update-in [:room :entities]
-                                                      assoc :blank (get-in entities [:room :blank])
-                                                      :ladder (get-in entities [:room :ladder]))
-                                           (update-in [:room :entities :ego ]  assoc :x 140 :y 85))
+                                       (do
+                                         
+                                         (-> entities
+                                             (update-in [:room :entities]
+                                                        assoc :blank (get-in entities [:room :blank])
+                                                        :ladder (get-in entities [:room :ladder]))
+                                             (update-in [:room :entities :ego ]  assoc :x 140 :y 85 :facing :right :baseline (- 240 25))))
                                        entities)
                                      (if (= :night (get-in entities [:state :time]))
                                        (make-night entities)
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 447d1e92..85222f8d 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -720,6 +720,7 @@ void main ()
                                  (get-in ego [:left :jump-straight]) {:origin-x 9}
                                  (get-in ego [:right :jump-straight]) {:origin-x 9}
                                  (get-in ego [:left :jumping-straight]) {:origin-x 9}
+                                 (get-in ego [:left :cat-toy]) {:origin-x 32}
                                  (get-in ego [:right :jumping-straight]) {:origin-x 9}
                                  (get-in ego [:left :swing-shovel]) {:origin-x 26}
                                  (get-in ego [:right :swing-shovel]) {:origin-x 26}
diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj
index 24bb03c6..6b68c1e8 100644
--- a/desktop/src/advent/core/desktop_launcher.clj
+++ b/desktop/src/advent/core/desktop_launcher.clj
@@ -1,28 +1,27 @@
 (ns advent.core.desktop-launcher
   (:require [advent.core :refer :all]
             [advent.utils :as utils]
-            #_[clojure.tools.nrepl.server])
+            [clojure.tools.nrepl.server])
   (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration]
            [org.lwjgl.input Keyboard]
            [com.badlogic.gdx Gdx])
   (:gen-class))
 
-#_(defmacro start-nrepl-expr [port]
-  `(let [{port# :port} (clojure.tools.nrepl.server/start-server :port ~port)]
-     (doseq [port-file# ["target/repl-port" ".nrepl-port"]]
-       (-> port-file#
-           java.io.File.
-           (doto .deleteOnExit)
-           (spit port#)))
-     (println "Started nREPL server on port" port#)))
-
 
 
 (defn -main
   [& [port]]
-  #_(try
-    (when port (start-nrepl-expr (Integer/parseInt port)))
+  (try
+    #_(require 'clojure.tools.nrepl.server)
+    (when port (let [{port :port} (clojure.tools.nrepl.server/start-server :port (Integer/parseInt port))]
+     (doseq [port-file ["target/repl-port" ".nrepl-port"]]
+       (-> port-file
+           java.io.File.
+           (doto .deleteOnExit)
+           (spit port)))
+     (println "Started nREPL server on port" port)))
     (catch Exception e))
+
   (let [cfg (LwjglApplicationConfiguration.)]
     (if false
       (do