fixed background up.

desktop/build-osx.json

@@ -1,6 +1,6 @@
 {
     "platform": "mac",
-    "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_91.jre/Contents/Home/Archive.zip",
+    "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_112.jre/Contents/jre.zip",
     "executable": "Tick's Tales", 
     "vmargs": [],
     "appjar": "target/advent-standalone.jar",

desktop/build-windows.json

@@ -1,6 +1,6 @@
 {
     "platform": "windows",
-    "jdk": "/Users/brycecovert/dev/jvms/openjdk-1.7.0-u80-unofficial-windows-i586-image.zip",
+    "jdk": "/Users/brycecovert/dev/jvms/java-1.8.0-openjdk-1.8.0.111-3.b15.ojdkbuild.windows.x86_64.zip",
     "executable": "TicksTales",
     "appjar": "target/advent-standalone.jar",
     "mainclass": "advent/core/desktop_launcher",

desktop/build-zip.sh

@@ -6,11 +6,15 @@ cd target
 # cp -r "/Users/brycecovert/Music/Tick's Tales OST" osx/OST
 # cp -r "/Users/brycecovert/Music/Tick's Tales OST" windows/OST
 mv osx "Tick's Tales - OS X"
+mv osx-mobilesim "Tick's Tales - OS X - Mobile Sim"
 mv linux "Tick's Tales - Linux"
 mv windows "Tick's Tales - Windows"
+mv windows-mobilesim "Tick's Tales - Windows - Mobile Sim"
 zip -r linux-1.2.`cat ../last-release`.zip  "Tick's Tales - Linux"
 zip -r osx-1.2.`cat ../last-release`.zip "Tick's Tales - OS X"
+zip -r osx-mobilesim-1.2.`cat ../last-release`.zip "Tick's Tales - OS X - Mobile Sim"
 zip -r windows-1.2.`cat ../last-release`.zip  "Tick's Tales - Windows"
+zip -r windows-mobilesim-1.2.`cat ../last-release`.zip  "Tick's Tales - Windows - Mobile Sim"
 popd
 rm ~/Dropbox/TicksTalesBuilds/*.zip
 cp target/*.zip ~/Dropbox/TicksTalesBuilds/

desktop/project.clj

@@ -33,6 +33,16 @@
                                   [slamhound "1.5.5"]
                                   [org.clojure/data.csv "0.1.3"]]
                    
+                   #_#_:warn-on-reflection true}
+             :mobile-dev {
+                   :source-paths ["src" "src-common" "src-dev"]
+                   :jvm-opts ["-Duse-repl=true" "-Dno-steam=true" "-Dui_scale=1.5" #_"-Dclojure.compiler.direct-linking=true"]
+                   :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"]
+                                  [org.clojure/tools.nrepl "0.2.12"]
+                                  [play-clj-nrepl "0.1.0" :exclusions [play-clj]]
+                                  [slamhound "1.5.5"]
+                                  [org.clojure/data.csv "0.1.3"]]
+                   
                    #_#_:warn-on-reflection true}
              :app-store {
                    :source-paths ["src" "src-common" "src-dev"]

desktop/release-non-steam.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
-#lein do clean, compile, uberjar
+lein do clean, compile, uberjar
-# java -jar packr.jar build-windows.json
+java -jar packr.jar build-windows.json
+java -jar packr.jar build-windows-mobilesim.json
 java -jar packr.jar build-osx.json
+java -jar packr.jar build-osx-mobilesim.json
 # java -jar packr.jar build-linux-32.json
 # java -jar packr.jar build-linux-64.json
 cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/

desktop/src-common/advent/screens/rooms/dream.clj

@@ -403,8 +403,8 @@
                                                                                                :ego "It seems like misery!"
                                                                                                :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?"))}}}
                 :timers {:return [1.0 1.0 return-from-island]}
-                :layers [(assoc (utils/get-texture "dream/sky.png") :x 0 :y 0 :baseline -3 :parallax 0.01)
+                :layers [(assoc (utils/get-texture "dream/sky.png") :x 0 :y 0 :baseline -3 :parallax 0.5)
-                         (assoc (utils/get-texture "dream/far.png") :x -10 :y 0 :baseline -2 :parallax 0.01)
+                         (assoc (utils/get-texture "dream/far.png") :x -10 :y 0 :baseline -2 :origin-x 160 :parallax 0.5)
                          (assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1)
                          (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1)
                          (assoc (utils/get-texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) 
@@ -412,11 +412,11 @@
                          (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 )
                          (assoc (utils/get-texture "dream/corner-r.png") :x  (- 320 80) :y -20 :baseline 240 :parallax 3.2)
                          (assoc (utils/get-texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)]
-                :current-layers [(assoc (utils/get-texture "dream/sky.png") :x 0 :y 0 :baseline -3 :parallax 0.01)
+                :current-layers [(assoc (utils/get-texture "dream/sky.png") :x 160 :y 120 :origin-y 120 :baseline -3 :origin-x 160 :parallax 0.01)
-                         (assoc (utils/get-texture "dream/far.png") :x -10 :y 0 :baseline -2 :parallax 0.01)
+                         (assoc (utils/get-texture "dream/far.png") :x 160 :y 120 :baseline -2 :origin-y 120 :origin-x 160 :parallax 0.01)
-                         (assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1)
+                         (assoc (utils/get-texture "dream/clouds1.png") :x 150 :y 120 :baseline -1 :origin-x 160 :origin-y 120 :parallax 0.1 :scale-x 1.1 :scale-y 1.1)
-                         (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1)
+                         (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :origin-x 15 :origin-y 10 :baseline 0 :parallax 0.2 :scale-x 1.1 :scale-y 1.1)
-                         (assoc (utils/get-texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) 
+                         (assoc (utils/get-texture "dream/cliff.png") :x 160 :y 120 :origin-x 160 :origin-y 120 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) 
                          (assoc (utils/get-texture "dream/background.png") :x 0 :y 0 :baseline 2)
                          (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 )
                          (assoc (utils/get-texture "dream/corner-r.png") :x  (- 320 80) :y -20 :baseline 240 :parallax 3.2)

desktop/src-common/advent/screens/scene.clj

@@ -1317,7 +1317,13 @@ void main ()
            (= (key-code :m) (:key options)))
       (-> entities
           (remove-cam-tweens)
-          (assoc-in [:cam :zoom] utils/max-zoom #_(max utils/max-zoom (min utils/min-zoom (* (or start-zoom zoom) (/ initial-distance distance))))))
+          (assoc-in [:tweens :cam-zoom]
+                    (tween/tween :cam-zoom screen
+                                 [:cam :zoom]
+                                 (get-in entities [:cam :zoom] 1.0)
+                                 utils/max-zoom  
+                                 1.5 
+                                 :ease tween/ease-linear)))
 
       :else
       nil))

desktop/src-common/advent/utils.clj

@@ -30,7 +30,7 @@
   entity)
 
 
-(def ui-scale (Double/parseDouble (str (or (System/getenv "UI_SCALE") 1.0))))
+(def ui-scale (Double/parseDouble (str (or (System/getProperty "ui_scale") 1.0))))
 (def mobile? (= 1.5 ui-scale))
 (def max-zoom (if mobile? 0.5 0.75))
 (def min-zoom 0.95)