diff --git a/desktop/project.clj b/desktop/project.clj index 13da26f0..8056b8ae 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -12,7 +12,7 @@ [com.badlogicgames.gdx/gdx-platform "1.3.0" :classifier "natives-desktop"] [org.clojure/clojure "1.6.0"] - [play-clj "0.3.9"] + #_[play-clj "0.3.9"] [org.clojure/data.priority-map "0.0.5"]] :source-paths ["src" "src-common"] diff --git a/desktop/resources/bg5.png b/desktop/resources/bg5.png index fdcab050..3d3d380b 100644 Binary files a/desktop/resources/bg5.png and b/desktop/resources/bg5.png differ diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index fa375132..ac31fe72 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ diff --git a/desktop/resources/pathfind-test-big.png b/desktop/resources/pathfind-test-big.png index d6ae88dc..c2c63c56 100644 Binary files a/desktop/resources/pathfind-test-big.png and b/desktop/resources/pathfind-test-big.png differ diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj index 20450cd5..4b6c972f 100644 --- a/desktop/src-common/advent/core.clj +++ b/desktop/src-common/advent/core.clj @@ -48,8 +48,8 @@ :anim (animation 0.075 (for [i (range 8)] (texture (aget player-sheet 0 i)))) :baseline 95 - :origin-x 0 - :origin-y 0 + :origin-x 9 + :origin-y 0 :x 150 :y 95 :x-velocity 1 :id "ego"}] (merge (animation->texture screen (:anim ego)) ego))) @@ -81,7 +81,7 @@ (animation->texture screen (:anim ego)))))) - (merge (dissoc ego :target-path) (texture (animation! (:anim ego) :get-key-frame 0.6)))))) + (merge (dissoc ego :target-path) (texture (animation! (:anim ego) :get-key-frame 0.25)))))) (defn scaler-fn-with-baseline [baseline minimum-size & [maximum-size]] (let [maximum-size (or maximum-size 1.0)] @@ -104,6 +104,7 @@ (let [ _ (input! :set-cursor-image (cursor "cursor.png" 0) 0 0) background (texture "bg5.png") + background-trees (texture "background-trees.png") house (texture "house.png") overdirt (texture "overdirt.png") music (sound "outside-house.mp3") @@ -128,8 +129,12 @@ :overdirt (assoc overdirt :x 0 :y 0 :baseline 240) + :background-trees (assoc background-trees + :x 0 :y 0 + :baseline 44) :ego (get-ego screen) - :fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)})) + :fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000) + })) :on-render (fn [screen [entities]]