improvements.

This commit is contained in:
2015-03-17 11:33:07 -07:00
parent 60f96d9d28
commit 2bade1604a
4 changed files with 40 additions and 21 deletions

View File

@@ -130,7 +130,7 @@
(actions/talk entities :ego "It's a really big window!"))}}
:layers [(assoc (texture "inside-house/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200)
(assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240)]
(assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0)]
:entities {:wizard (common/make-wizard screen {:x 228 :y 80 :baseline 160 :scale-x 1.75 :scale-y 1.75
:script (actions/get-script entities (do-wizard-dialogue entities))
:scripts #(condp = %
@@ -173,8 +173,8 @@
:script (actions/get-script entities (actions/do-dialogue entities :ego "It's just a candle.")))
:candle-smoke (doto (assoc (particle-effect "inside-house/candle") :x 172 :y 112
:baseline 200)
(particle-effect! :reset)
(particle-effect! :start))
#_(particle-effect! :reset)
#_(particle-effect! :start))
:flask (assoc (texture "inside-house/flask.png")
:x 265 :y 80 :baseline 240
:script (actions/get-script entities
@@ -194,6 +194,13 @@
:collision "inside-house/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75)
:apply-state (fn [entities]
(particle-effect! (get-in entities [:room :entities :candle-smoke] ) :reset)
(particle-effect! (get-in entities [:room :entities :candle-smoke] ) :start)
(particle-effect! (get-in entities [:room :entities :candle-smoke] ) :update 10.0)
(dotimes [_ 160]
(particle-effect! (get-in entities [:room :entities :candle-smoke] ) :update 0.2))
(as-> entities entities
(if (actions/has-obtained? entities :flask-1)
(update-in entities [:room :entities] #(dissoc % :flask))