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

more rooms using local textures.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-28 08:28:11 -07:00
parent 135b252062
commit 7d4e93a964
3 changed files with 180 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@
(fn [state] (assoc state :safe-listen-count (inc (:safe-listen-count state 0)))))) (fn [state] (assoc state :safe-listen-count (inc (:safe-listen-count state 0))))))
(defn make [screen] (defn make [screen]
(let [[screet atlas] (utils/acquire-atlas screen "packed/behindhouse.atlas")]
(rooms/make :music {:day :town-2 :night :night} (rooms/make :music {:day :town-2 :night :night}
:name "Behind house" :name "Behind house"
:interactions :interactions
@@ -79,17 +80,17 @@
:ego "I can see Gandarf moving around in the corner of the room." :ego "I can see Gandarf moving around in the corner of the room."
:ego "It's hard to make out from this angle.") :ego "It's hard to make out from this angle.")
(actions/update-state entities #(assoc % :peeked-in-window? true)))))}} (actions/update-state entities #(assoc % :peeked-in-window? true)))))}}
:layers {:day [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) :layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) (assoc (utils/atlas->texture atlas "house") :x 0 :y 0 :baseline 122)
(assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) (assoc (utils/atlas->texture atlas "brush") :x 0 :y 0 :baseline 240)
(assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) (assoc (utils/atlas->texture atlas "fgleft") :x -10 :y 0 :baseline 240 :parallax 1.5)
(assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)] (assoc (utils/atlas->texture atlas "fg2") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]
:night [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) :night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) (assoc (utils/atlas->texture atlas "house") :x 0 :y 0 :baseline 122)
(assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) (assoc (utils/atlas->texture atlas "brush") :x 0 :y 0 :baseline 240)
(assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) (assoc (utils/atlas->texture atlas "fgleft") :x -10 :y 0 :baseline 240 :parallax 1.5)
(assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]} (assoc (utils/atlas->texture atlas "fg2") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]}
:entities {:stick (assoc (utils/get-texture "behindhouse/stick.png") :entities {:stick (assoc (utils/atlas->texture atlas "stick")
:x 26 :y 80 :baseline 160 :x 26 :y 80 :baseline 160
:label "Stick" :label "Stick"
:cursor :hand :cursor :hand
@@ -100,7 +101,7 @@
(actions/give entities :stick) (actions/give entities :stick)
(actions/talk entities :ego "This stick might be useful."))) (actions/talk entities :ego "This stick might be useful.")))
:peeling (assoc (utils/get-texture "behindhouse/house-cover.png") :peeling (assoc (utils/atlas->texture atlas "house-cover")
:x 60 :y 92 :baseline 148 :x 60 :y 92 :baseline 148
:label "Crumbly wall" :label "Crumbly wall"
:cursor :hand :cursor :hand
@@ -172,4 +173,4 @@
(if (= :night (get-in entities [:state :time])) (if (= :night (get-in entities [:state :time]))
(make-night entities) (make-night entities)
entities))) entities)))
:start-pos [172 122])) :start-pos [172 122])))

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

@@ -132,11 +132,12 @@
{:run #(actions/do-dialogue entities :ego %)}]})) {:run #(actions/do-dialogue entities :ego %)}]}))
(defn make [screen] (defn make [screen]
(let [ (let [[screen atlas] (utils/acquire-atlas screen "packed/inside-house.atlas")
safe-lock (utils/make-anim "inside-house/safe-lock.png" [11 8] 0.1 (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])) [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
candle (utils/make-anim "inside-house/candle.png" [34 32] 0.2 [1 0 1 2]) safe-lock (utils/make-anim atlas "safe-lock" [11 8] 0.1 (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ]))
candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1] ) candle (utils/make-anim atlas "candle" [34 32] 0.2 [1 0 1 2])
experiment-left (utils/flip (utils/make-anim-seq "wizard/experiment" [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] candle-aura (utils/make-anim atlas "candle-aura" [27 27] 0.2 [0 1 2 3 2 1] )
experiment-left (utils/flip (utils/make-anim-seq global-atlas "wizard/experiment" [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))]
(rooms/make :music :inside-fangald (rooms/make :music :inside-fangald
:name "Inside house" :name "Inside house"
:interactions {:down-dir {:box [151 0 320 40] :interactions {:down-dir {:box [151 0 320 40]
@@ -175,12 +176,13 @@
:cursor :look :cursor :look
:script (actions/get-script entities :script (actions/get-script entities
(actions/talk entities :ego "It's a really big window!"))}} (actions/talk entities :ego "It's a really big window!"))}}
:layers [(assoc (utils/get-texture "inside-house/background.png") :x 0 :y 0 :baseline 0) :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) (assoc (utils/atlas->texture atlas "desk") :x 0 :y 0 :baseline 200)
(assoc (utils/get-texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) (assoc (utils/atlas->texture atlas "sillhoute") :x 0 :y 0 :baseline 240 :parallax 2.0)
(assoc (utils/get-texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)] (assoc (utils/atlas->texture atlas "glow") :x 0 :y 0 :baseline 199 :additive? true)]
:entities { :entities {
:wizard (common/make-wizard screen {:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0 :wizard (common/make-wizard screen global-atlas
{:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0
:script (actions/get-script entities (do-wizard-dialogue entities)) :script (actions/get-script entities (do-wizard-dialogue entities))
:scripts #(condp = % :scripts #(condp = %
:kiss (actions/get-script entities :kiss (actions/get-script entities
@@ -231,7 +233,7 @@
:magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 230 :y 0 :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 230 :y 0
:baseline 241) :baseline 241)
(particle-effect! :set-position 237 0)) (particle-effect! :set-position 237 0))
:flask (assoc (utils/get-texture "inside-house/flask.png") :flask (assoc (utils/atlas->texture atlas "flask")
:x 265 :y 80 :baseline 240 :x 265 :y 80 :baseline 240
:label "Flask" :label "Flask"
:cursor :hand :cursor :hand
@@ -241,7 +243,7 @@
(when (get-in @entities [:room :entities :wizard]) (when (get-in @entities [:room :entities :wizard])
(actions/do-dialogue entities :ego "Hey, you think I could have this flask?" (actions/do-dialogue entities :ego "Hey, you think I could have this flask?"
:wizard "Sure.")))) :wizard "Sure."))))
:frog-legs (assoc (utils/get-texture "inside-house/frog-legs.png") :frog-legs (assoc (utils/atlas->texture atlas "frog-legs")
:x 180 :y 77 :baseline 240 :x 180 :y 77 :baseline 240
:label "Frog legs" :label "Frog legs"
:cursor :hand :cursor :hand

2
desktop/src-common/advent/utils.clj
View File

@@ -392,7 +392,7 @@
([atlas file [w h] speed frames] ([atlas file [w h] speed frames]
(animation speed (split-texture atlas file [w h] frames)))) (animation speed (split-texture atlas file [w h] frames))))
=
(defn make-bird [screen p] (defn make-bird [screen p]
(let [bird-sheet (texture! (get-texture "outside-castle/bird.png") :split 1 2) (let [bird-sheet (texture! (get-texture "outside-castle/bird.png") :split 1 2)
bird-stand (animation 0.15 (for [i [0 1]] bird-stand (animation 0.15 (for [i [0 1]]