cleaned up clock and forced right direction.

2016-02-15 07:17:25 -08:00
parent 48d4038055
commit b03dd672d2
17 changed files with 1006 additions and 1006 deletions
--- a/desktop/asset-work/inside-antique/beard.png
+++ b/desktop/asset-work/inside-antique/beard.png
--- a/desktop/asset-work/inside-antique/clock.pxa/0.pxi
+++ b/desktop/asset-work/inside-antique/clock.pxa/0.pxi
--- a/desktop/asset-work/inside-antique/clock.pxa/1.pxi
+++ b/desktop/asset-work/inside-antique/clock.pxa/1.pxi
--- a/desktop/asset-work/inside-antique/clock.pxa/2.pxi
+++ b/desktop/asset-work/inside-antique/clock.pxa/2.pxi
--- a/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.c2149b7f86a23c1d9e8741339aa9fc9db3defab6_10043102
+++ b/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.c2149b7f86a23c1d9e8741339aa9fc9db3defab6_10043102
--- a/desktop/content-builder/builder_osx/package/steamcmd_breakpad_osx.zip.vz.2958df1d77a0eb5391f3b48b6f2cbc9617d0898d_295817
+++ b/desktop/content-builder/builder_osx/package/steamcmd_breakpad_osx.zip.vz.2958df1d77a0eb5391f3b48b6f2cbc9617d0898d_295817
--- a/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.4b757b0693fb3bf2e3e27ac2ec37b4e2e9523da6_1156582
+++ b/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.4b757b0693fb3bf2e3e27ac2ec37b4e2e9523da6_1156582
--- a/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.cc35b4ce0695e92f6f2595a74f2db18c5a7bd179
+++ b/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.cc35b4ce0695e92f6f2595a74f2db18c5a7bd179
--- a/desktop/resources/packed/pack.atlas
+++ b/desktop/resources/packed/pack.atlas
--- a/desktop/resources/packed/pack3.png
+++ b/desktop/resources/packed/pack3.png
--- a/desktop/resources/packed/pack4.png
+++ b/desktop/resources/packed/pack4.png
--- a/desktop/resources/packed/pack5.png
+++ b/desktop/resources/packed/pack5.png
--- a/desktop/resources/packed/pack6.png
+++ b/desktop/resources/packed/pack6.png
--- a/desktop/resources/packed/pack7.png
+++ b/desktop/resources/packed/pack7.png
--- a/desktop/resources/packed/pack8.png
+++ b/desktop/resources/packed/pack8.png
--- a/desktop/resources/packed/pack9.png
+++ b/desktop/resources/packed/pack9.png
--- a/desktop/src-common/advent/screens/rooms/inside_antique.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj
@@ -191,7 +191,7 @@
                                        (aget shopkeep-sheet 0 i)))
        shopkeep-sigh (utils/make-anim "inside-antique/antique-sigh.png" [22 21] 0.12 (flatten [ (range 9) 0 0 ]))
        
-        beard (utils/make-anim "inside-antique/beard.png" [26 52] 0.5 [0 1 0 2])
+        beard (utils/make-anim "inside-antique/beard.png" [28 54] 0.5 [0 1 0 2])
        teddy (assoc (utils/get-texture "inside-antique/teddy.png")
                                    :x 255
                                    :y 95 
@@ -246,7 +246,7 @@
                 :window {:box [195 121 256 190]
                          :script (actions/get-script entities
                                                      
-                                                      (actions/walk-to entities :ego [207 68])
+                                                      (actions/walk-to entities :ego [207 68] :face :right)
                                                      (actions/play-animation entities :ego :reach)
                                                      (actions/update-state entities (fn [s] (assoc s :opened-blinds? (not (:opened-blinds? s)))))
                                                      (actions/update-entities entities (fn [screen e]
@@ -338,7 +338,7 @@
                           :beard (assoc (animation->texture screen beard)
                                    :anim beard
                                    :anim-start 0
-                                    :x 70 
+                                    :x 69 
                                    :y 86
                                    :baseline 120)
                           :smoke-particle (doto (assoc (particle-effect "particles/smoke-particle") :x 162 :y 108