diff --git a/desktop/resources/inside-house/candle-aura.png b/desktop/resources/inside-house/candle-aura.png new file mode 100644 index 00000000..af806269 Binary files /dev/null and b/desktop/resources/inside-house/candle-aura.png differ diff --git a/desktop/resources/inside-house/candle-aura.pxa/0.pxi b/desktop/resources/inside-house/candle-aura.pxa/0.pxi new file mode 100644 index 00000000..c50cf4c3 Binary files /dev/null and b/desktop/resources/inside-house/candle-aura.pxa/0.pxi differ diff --git a/desktop/resources/inside-house/candle-aura.pxa/1.pxi b/desktop/resources/inside-house/candle-aura.pxa/1.pxi new file mode 100644 index 00000000..b66b280c Binary files /dev/null and b/desktop/resources/inside-house/candle-aura.pxa/1.pxi differ diff --git a/desktop/resources/inside-house/candle-aura.pxa/2.pxi b/desktop/resources/inside-house/candle-aura.pxa/2.pxi new file mode 100644 index 00000000..417c3292 Binary files /dev/null and b/desktop/resources/inside-house/candle-aura.pxa/2.pxi differ diff --git a/desktop/resources/inside-house/candle-aura.pxa/3.pxi b/desktop/resources/inside-house/candle-aura.pxa/3.pxi new file mode 100644 index 00000000..146361da Binary files /dev/null and b/desktop/resources/inside-house/candle-aura.pxa/3.pxi differ diff --git a/desktop/resources/inside-house/candle-aura.pxa/CelData.plist b/desktop/resources/inside-house/candle-aura.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/resources/inside-house/candle-aura.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/inside-house/candle.png b/desktop/resources/inside-house/candle.png index b968b350..267a67c7 100644 Binary files a/desktop/resources/inside-house/candle.png and b/desktop/resources/inside-house/candle.png differ diff --git a/desktop/resources/inside-house/glow.png b/desktop/resources/inside-house/glow.png new file mode 100644 index 00000000..65cb99ab Binary files /dev/null and b/desktop/resources/inside-house/glow.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 461b55a9..fd9b1491 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -105,7 +105,8 @@ (let [safelock-sheet (texture! (texture "inside-house/safe-lock.png") :split 9 2) safe-lock (animation 0.1 (for [i (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 ])] (aget safelock-sheet 0 i))) - candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2])] + candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2]) + candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] )] (rooms/make :music :inside-fangald :interactions {:down-dir {:box [151 0 320 20] :script (actions/get-script entities @@ -130,7 +131,8 @@ (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 :parallax 2.0)] + (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) + (assoc (texture "inside-house/glow.png") :x 0 :y 0 :baseline 240 :additive? true)] :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 = % @@ -171,10 +173,10 @@ :anim candle :anim-start 0 :script (actions/get-script entities (actions/do-dialogue entities :ego "It's just a candle."))) + :candle-aura (assoc (animation->texture screen candle-aura) :x 172 :y 97 :baseline 239 :additive? true :origin-x 13 :anim candle-aura :anim-start 0) :candle-smoke (doto (assoc (particle-effect "inside-house/candle") :x 172 :y 112 :baseline 200) - #_(particle-effect! :reset) - #_(particle-effect! :start)) + (particle-effect! :set-position 172 112)) :flask (assoc (texture "inside-house/flask.png") :x 265 :y 80 :baseline 240 :script (actions/get-script entities