diff --git a/desktop/resources/inside-house/background.png b/desktop/resources/inside-house/background.png index b92cc869..6478a80c 100644 Binary files a/desktop/resources/inside-house/background.png and b/desktop/resources/inside-house/background.png differ diff --git a/desktop/resources/inside-house/background.psd b/desktop/resources/inside-house/background.psd index 742f2fdf..7dccc54d 100644 Binary files a/desktop/resources/inside-house/background.psd and b/desktop/resources/inside-house/background.psd differ diff --git a/desktop/resources/inside-house/candle b/desktop/resources/inside-house/candle index c353d53d..a634825c 100644 --- a/desktop/resources/inside-house/candle +++ b/desktop/resources/inside-house/candle @@ -2,26 +2,38 @@ Untitled - Delay - active: false - Duration - -lowMin: 3000.0 -lowMax: 3000.0 +lowMin: 10000.0 +lowMax: 10000.0 - Count - min: 0 -max: 500 +max: 1000 - Emission - lowMin: 0.0 lowMax: 0.0 -highMin: 14.0 -highMax: 14.0 +highMin: 3.0 +highMax: 3.0 relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 +scalingCount: 7 +scaling0: 0.97959185 +scaling1: 0.0 +scaling2: 0.97959185 +scaling3: 0.0 +scaling4: 1.0 +scaling5: 0.0 +scaling6: 0.0 +timelineCount: 7 timeline0: 0.0 +timeline1: 0.13013698 +timeline2: 0.32876712 +timeline3: 0.45890412 +timeline4: 0.63013697 +timeline5: 0.74657536 +timeline6: 0.93835616 - Life - lowMin: 0.0 lowMax: 0.0 -highMin: 30000.0 -highMax: 30000.0 +highMin: 20000.0 +highMax: 20000.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -83,8 +95,8 @@ scaling0: 1.0 timelineCount: 1 timeline0: 0.0 - Scale - -lowMin: 2.0 -lowMax: 2.0 +lowMin: 1.0 +lowMax: 1.0 highMin: 3.0 highMax: 8.0 relative: false @@ -186,20 +198,20 @@ highMin: 1.0 highMax: 1.0 relative: false scalingCount: 4 -scaling0: 0.0 -scaling1: 0.12280702 -scaling2: 0.05263158 +scaling0: 0.0877193 +scaling1: 0.2631579 +scaling2: 0.10526316 scaling3: 0.0 timelineCount: 4 timeline0: 0.0 -timeline1: 0.28082192 -timeline2: 0.42465752 +timeline1: 0.25342464 +timeline2: 0.65753424 timeline3: 1.0 - Options - attached: false continuous: true aligned: false -additive: false +additive: true behind: false premultipliedAlpha: false - Image Path - diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 1f9ff53e..461b55a9 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -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))