diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 894a7934..39ce24f7 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ diff --git a/desktop/resources/cursor_light.png b/desktop/resources/cursor_light.png index 67e336e4..9b627dbd 100644 Binary files a/desktop/resources/cursor_light.png and b/desktop/resources/cursor_light.png differ diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index d3bd0342..dca324e2 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -284,7 +284,7 @@ (done? [this screen entities] (animation! (find-animation (get-in entities [:room :entities target-id ]) anim) :is-animation-finished - (- (:total-time screen) (doto (get-in entities [:room :entities target-id :anim-start]) println)))) + (- (:total-time screen) (get-in entities [:room :entities target-id :anim-start])))) (terminate [this screen entities] (if continue? @@ -1012,7 +1012,7 @@ (add-entity entities :safe-song (rooms/make-entity :safe-song (assoc (utils/get-texture "safe-song/safe-song-1") - :x 130 + :x 110 :y 120 :baseline 241 :night-profile :none diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 2858837c..9d55b869 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -697,9 +697,10 @@ [:stand 1] sheep-1 [:stand 2] sheep-2 [:stand 3] sheep-3 + :origin-y 3 + :origin-x 6 :scale-x (scaler [38 160]) :scale-y (scaler [38 160]) - :box [38 160 71 181] :script (actions/get-script entities