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

added ability to change to a different screen (background)

Browse Source
This commit is contained in:
Remington Covert
2014-09-16 16:46:30 -07:00
parent 1dccf1538e
commit 37af5dc53e
5 changed files with 84 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/behindhouse/background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
desktop/resources/behindhouse/collision.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
desktop/resources/pickup.mp3
View File

Binary file not shown.

29
desktop/src-common/advent/actions.clj
View File

@@ -72,8 +72,12 @@
(let [delta-x (- target-x from-x) (let [delta-x (- target-x from-x)
delta-y (- target-y from-y) delta-y (- target-y from-y)
distance (dist from-x from-y target-x target-y) distance (dist from-x from-y target-x target-y)
moved-x (* 1.5 (/ delta-x distance)) moved-x (if (= 0.0 distance)
moved-y (* 1.5 (/ delta-y distance))] 0
(* 1.5 (/ delta-x distance)))
moved-y (if (= 0.0 distance)
0
(* 1.5 (/ delta-y distance)))]
(if (< distance 1) (if (< distance 1)
(do (swap! targets-left rest) (do (swap! targets-left rest)
entities) entities)
@@ -149,3 +153,24 @@
(put! c entities) (put! c entities)
entities))) entities)))
(reset! entities (<!! c)))) (reset! entities (<!! c))))
(defn transition-background [entities new-background [x y]]
(let [c (chan)]
(put! (get-in @entities [:actions :channel])
(reify
IAction
(begin [this screen entities]
(-> entities
(assoc-in [:background] (get-in entities [:backgrounds new-background]))
(assoc-in [:ego :x] x)
(assoc-in [:ego :y] y)))
(continue [this screen entities] entities)
(done? [this screen entities]
true)
(terminate [this screen entities]
(put! c entities)
entities)))
(reset! entities (<!! c))))

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

@@ -114,6 +114,60 @@
(merge params {:collision (advent.pathfind/map-from-resource collision) (merge params {:collision (advent.pathfind/map-from-resource collision)
:interactions interactions-as-list}))) :interactions interactions-as-list})))
(defn backgrounds []
{:outside-house (make-background :interactions
{:door {:box [258 100 281 160]
:script (actions/get-script
entities
(actions/walk-to entities :ego [262 88])
(actions/talk entities :ego (str "Anyone home?")))}
:sword {:box [274 55 305 88]
:script (actions/get-script
entities
(actions/talk entities :ego (str "It's the coolest sword I've ever seen!"))
(actions/walk-to entities :ego [290 66])
(actions/talk entities :ego "Maybe I can pull it out."))}
:sheep {:box [38 160 71 181]
:script (actions/get-script
entities
(if ((get-in @entities [:ego :inventory]) :wool)
(actions/talk entities :ego "The sheep has given me enough wool.")
(do (actions/give entities :ego :wool)
(actions/talk entities :ego "I guess his wool is shedding."))))}
:right-dir {:box [300 131 320 224]
:script (actions/get-script
entities
(actions/walk-to entities :ego [319 160]))
:cursor :right}
:up-dir {:box [60 180 224 240]
:script (actions/get-script
entities
(actions/walk-to entities :ego [137 204]))
:cursor :up}
:left-dir {:box [0 40 20 140]
:script (actions/get-script
entities
(actions/walk-to entities :ego [0 80])
(actions/transition-background entities :behind-house [310 80]))
:cursor :left}}
:layers [(assoc (texture "bg5.png") :x 0 :y 0 :baseline 0)
(assoc (texture "house.png") :x 0 :y 0 :baseline 122)
(assoc (texture "overdirt.png") :x 0 :y 0 :baseline 240)
(assoc (texture "background-trees.png") :x 0 :y 0 :baseline 44)]
:collision "outsidehouse/collision.png"
:scale-fn (scaler-fn-with-baseline 110 0.10 1.00))
:behind-house (make-background :interactions
{:right-dir {:box [300 40 320 140]
:script (actions/get-script
entities
(actions/walk-to entities :ego [310 80])
(actions/transition-background entities :outside-house [0 80]))
:cursor :right}}
:layers [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0)]
:collision "behindhouse/collision.png"
:scale-fn (scaler-fn-with-baseline 110 0.10 1.00))})
(defscreen scene (defscreen scene
:on-show :on-show
(fn [screen entities] (fn [screen entities]
@@ -122,14 +176,11 @@
sheep-sheet (texture! (texture "outsidehouse/sheep-anim.png") :split 33 21) sheep-sheet (texture! (texture "outsidehouse/sheep-anim.png") :split 33 21)
sheep (animation 0.15 (for [i (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 9 10 (repeat 25 11) (repeat 15 12)])] sheep (animation 0.15 (for [i (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 9 10 (repeat 25 11) (repeat 15 12)])]
(aget sheep-sheet 0 i))) (aget sheep-sheet 0 i)))
background (texture "bg5.png")
background-trees (texture "background-trees.png")
house (texture "house.png")
overdirt (texture "overdirt.png")
music (sound "town-music.mp3") music (sound "town-music.mp3")
;;_ (sound! music :loop) ;;_ (sound! music :loop)
backgrounds (backgrounds)
] ]
{ {:backgrounds backgrounds
:actions {:object nil :actions {:object nil
:channel (chan) :channel (chan)
:current nil :current nil
@@ -140,47 +191,7 @@
:override nil} :override nil}
:sheep (assoc (animation->texture screen sheep) :x 38 :y 160 :baseline 160 :anim sheep) :sheep (assoc (animation->texture screen sheep) :x 38 :y 160 :baseline 160 :anim sheep)
:background (make-background :interactions :background (:outside-house backgrounds)
{:door {:box [258 100 281 160]
:script (actions/get-script
entities
(actions/walk-to entities :ego [262 88])
(actions/talk entities :ego (str "Anyone home?")))}
:sword {:box [274 55 305 88]
:script (actions/get-script
entities
(actions/talk entities :ego (str "It's the coolest sword I've ever seen!"))
(actions/walk-to entities :ego [290 66])
(actions/talk entities :ego "Maybe I can pull it out."))}
:sheep {:box [38 160 71 181]
:script (actions/get-script
entities
(if ((get-in @entities [:ego :inventory]) :wool)
(actions/talk entities :ego "The sheep has given me enough wool.")
(do (actions/give entities :ego :wool)
(actions/talk entities :ego "I guess his wool is shedding."))))}
:right-dir {:box [300 131 320 224]
:script (actions/get-script
entities
(actions/walk-to entities :ego [319 160]))
:cursor :right}
:up-dir {:box [60 180 224 240]
:script (actions/get-script
entities
(actions/walk-to entities :ego [137 204]))
:cursor :up}
:left-dir {:box [0 40 20 140]
:script (actions/get-script
entities
(actions/walk-to entities :ego [0 80]))
:cursor :left}}
:layers [(assoc background :x 0 :y 0 :baseline 0)
(assoc house :x 0 :y 0 :baseline 122)
(assoc overdirt :x 0 :y 0 :baseline 240)
(assoc background-trees :x 0 :y 0 :baseline 44)]
:collision "outsidehouse/collision.png"
:scale-fn (scaler-fn-with-baseline 110 0.10 1.00))
:ego (get-ego screen) :ego (get-ego screen)
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000) :fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)
})) }))