notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

should make rendering work again.

Browse Source
This commit is contained in:
Remington Covert
2015-04-17 08:07:51 -07:00
parent 505655ea01
commit adbdd2ee1d
9 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/project.clj
View File

@@ -14,7 +14,7 @@
:classifier "natives-desktop"] :classifier "natives-desktop"]
[org.clojure/clojure "1.6.0"] [org.clojure/clojure "1.6.0"]
[org.clojure/tools.nrepl "0.2.7"] [org.clojure/tools.nrepl "0.2.7"]
[play-clj "0.4.2-SNAPSHOT"] [play-clj "0.4.5-BRYCE"]
[org.clojure/data.priority-map "0.0.5"] [org.clojure/data.priority-map "0.0.5"]
[org.clojure/core.async "0.1.338.0-5c5012-alpha"]] [org.clojure/core.async "0.1.338.0-5c5012-alpha"]]
:source-paths ["src" "src-common"] :source-paths ["src" "src-common"]

4
desktop/src-common/advent/screens/inventory.clj
View File

@@ -32,7 +32,9 @@
:fade (assoc (texture "black.png") :fade (assoc (texture "black.png")
:scale-x 80 :scale-x 80
:scale-y 80 :scale-y 80
:opacity 0.7) :opacity 0.7
:origin-x 0
:origin-y 0)
:all-items (texture! (texture (pixmap "cursor.png")) :split 16 16) :all-items (texture! (texture (pixmap "cursor.png")) :split 16 16)
:items [] :items []
:shown? false :shown? false

3
desktop/src-common/advent/screens/rooms.clj
View File

@@ -17,8 +17,9 @@
(or scale-x 1))) (or scale-x 1)))
entity-y (- entity-y (* (or origin-y 0) entity-y (- entity-y (* (or origin-y 0)
(or scale-y 1)))] (or scale-y 1)))]
((zone/box entity-x entity-y ((zone/box entity-x entity-y
(+ entity-x (* width (or 1 scale-x))) (+ entity-x (* width (or scale-x 1)))
(+ entity-y (* height (or scale-y 1)))) x y)))} (+ entity-y (* height (or scale-y 1)))) x y)))}
(when (or (:scripts entity) (:script entity)) (when (or (:scripts entity) (:script entity))
{:get-script (fn [cursor [x y]] {:get-script (fn [cursor [x y]]

3
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -251,7 +251,7 @@
(actions/play-animation entities :ego :sigh) (actions/play-animation entities :ego :sigh)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/talk entities :ego "Wait a second! If I become a janitor, I'll never win Georgia McGorgeous' heart!"))}}} (actions/talk entities :ego "Wait a second! If I become a janitor, I'll never win Georgia McGorgeous' heart!"))}}}
:timers {:return [1.0 10.0 return-from-island]} :timers {:return [30.0 30.0 return-from-island]}
:layers [(assoc (texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) :layers [(assoc (texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1)
(assoc (texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) (assoc (texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1)
(assoc (texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) (assoc (texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2)
@@ -319,6 +319,7 @@
:baseline 240 :baseline 240
:origin-x 31 :origin-x 31
:origin-y 0 :origin-y 0
:test true
:anim fairy-godfather-anim :anim-start 0 :anim fairy-godfather-anim :anim-start 0
:path (catmull-rom-spline (map #(apply vector-2* %) [[200 130] [200 134]]) true) :path (catmull-rom-spline (map #(apply vector-2* %) [[200 130] [200 134]]) true)
:scaled true :scaled true

2
desktop/src-common/advent/screens/rooms/outside_castle.clj
View File

@@ -226,7 +226,7 @@
(if (should-block? entities) (if (should-block? entities)
(block-entrance entities) (block-entrance entities)
(do (do
(actions/transition-background entities :inside-castle [280 145]) (actions/transition-background entities :inside-castle [295 145])
(actions/walk-to entities :ego [245 90])))) (actions/walk-to entities :ego [245 90]))))

8
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -25,10 +25,12 @@
[:dawn :opacity] [:dawn :opacity]
1.0))) 1.0)))
(defn walk-to-castle [entities] (defn walk-to-castle [entities dawn?]
(actions/walk-to entities :ego [0 80]) (actions/walk-to entities :ego [0 80])
(actions/walk-straight-to entities :ego [-20 80]) (actions/walk-straight-to entities :ego [-20 80])
(if dawn?
(actions/transition-background entities :outside-castle [330 80] :between dawn-fade) (actions/transition-background entities :outside-castle [330 80] :between dawn-fade)
(actions/transition-background entities :outside-castle [330 80]))
(actions/walk-straight-to entities :ego [310 80])) (actions/walk-straight-to entities :ego [310 80]))
(def ego-sheep-loc (def ego-sheep-loc
@@ -94,7 +96,7 @@
:ego "I now have The Slinger's Shot." :ego "I now have The Slinger's Shot."
:ego "And just in time, too. It's getting light.") :ego "And just in time, too. It's getting light.")
(actions/update-state entities #(assoc % :next-time :sunrise)) (actions/update-state entities #(assoc % :next-time :sunrise))
(walk-to-castle entities) (walk-to-castle entities true)
(outside-castle/go-through-gate entities) (outside-castle/go-through-gate entities)
(actions/update-state entities #(assoc % :next-time :day)) (actions/update-state entities #(assoc % :next-time :day))
(inside-castle/walk-to-blergh entities) (inside-castle/walk-to-blergh entities)
@@ -348,7 +350,7 @@
:left-dir {:box [0 40 20 140] :left-dir {:box [0 40 20 140]
:script (actions/get-script :script (actions/get-script
entities entities
(walk-to-castle entities)) (walk-to-castle entities false))
:cursor :left}} :cursor :left}}
:layers {:day [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) :layers {:day [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) (assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122)

4
desktop/src-common/advent/screens/safe.clj
View File

@@ -46,7 +46,9 @@
{:fade (assoc (texture "black.png") {:fade (assoc (texture "black.png")
:scale-x 80 :scale-x 80
:scale-y 80 :scale-y 80
:opacity 0.7) :opacity 0.7
:origin-x 0
:origin-y 0)
:safe (assoc (texture "inside-house/safe-screen.png") :x start-x :y start-y) :safe (assoc (texture "inside-house/safe-screen.png") :x start-x :y start-y)
:entered-keys (doall (for [i (range 5)] :entered-keys (doall (for [i (range 5)]
(assoc inputed-key (assoc inputed-key

8
desktop/src-common/advent/screens/scene.clj
View File

@@ -577,12 +577,16 @@
:scale-x 20 :scale-x 20
:scale-y 20 :scale-y 20
:baseline 9500 :baseline 9500
:opacity 0.0) :opacity 0.0
:origin-x 0
:origin-y 0)
:white-fade (assoc (texture "white.png") :white-fade (assoc (texture "white.png")
:scale-x 20 :scale-x 20
:scale-y 20 :scale-y 20
:baseline 9500 :baseline 9500
:opacity 0.0) :opacity 0.0
:origin-x 0
:origin-y 0)
:dawn (assoc (texture "dawn.png") :dawn (assoc (texture "dawn.png")
:x 0 :y 0 :baseline 240 :x 0 :y 0 :baseline 240
:colorize? true :colorize? true

4
desktop/src-common/advent/screens/title.clj
View File

@@ -50,7 +50,9 @@
:fade (assoc (texture "black.png") :fade (assoc (texture "black.png")
:scale-x 80 :scale-x 80
:scale-y 80 :scale-y 80
:opacity 1.0) :opacity 1.0
:origin-x 0
:origin-y 0)
:music-volume-slider (assoc (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings)) :music-volume-slider (assoc (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings))
:x ( - (/ (game :width) 2) :x ( - (/ (game :width) 2)
150) 150)