diff --git a/desktop/resources/behindhouse/Untitled-1.psd b/desktop/resources/behindhouse/Untitled-1.psd new file mode 100644 index 00000000..13ade9ec Binary files /dev/null and b/desktop/resources/behindhouse/Untitled-1.psd differ diff --git a/desktop/resources/behindhouse/backgroudn.psd b/desktop/resources/behindhouse/backgroudn.psd index ec082fe3..175f8bdb 100644 Binary files a/desktop/resources/behindhouse/backgroudn.psd and b/desktop/resources/behindhouse/backgroudn.psd differ diff --git a/desktop/resources/dream/background.png b/desktop/resources/dream/background.png index 06fa5f59..73ee941c 100644 Binary files a/desktop/resources/dream/background.png and b/desktop/resources/dream/background.png differ diff --git a/desktop/resources/dream/background.psd b/desktop/resources/dream/background.psd new file mode 100644 index 00000000..ff86e6b3 Binary files /dev/null and b/desktop/resources/dream/background.psd differ diff --git a/desktop/resources/dream/cloudy b/desktop/resources/dream/cloudy new file mode 100644 index 00000000..17951ff1 --- /dev/null +++ b/desktop/resources/dream/cloudy @@ -0,0 +1,170 @@ +Untitled +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 2000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 100.0 +highMax: 100.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 4000.0 +highMax: 5000.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: 5.0 +lowMax: -5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 5.0 +lowMax: -5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: ellipse +edges: true +side: both +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 360.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 300.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 40.0 +lowMax: 40.0 +highMin: 90.0 +highMax: 110.0 +relative: false +scalingCount: 3 +scaling0: 0.7346939 +scaling1: 0.8367347 +scaling2: 0.71428573 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 0.9520548 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: -10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.37671232 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: -50.0 +highMax: 50.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.65882355 +colors1: 0.7647059 +colors2: 0.8235294 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.14035088 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.49315068 +timeline2: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +cloudy.png diff --git a/desktop/resources/dream/cloudy.png b/desktop/resources/dream/cloudy.png new file mode 100644 index 00000000..c0d2478d Binary files /dev/null and b/desktop/resources/dream/cloudy.png differ diff --git a/desktop/resources/dream/cloudy2 b/desktop/resources/dream/cloudy2 new file mode 100644 index 00000000..7be214a4 --- /dev/null +++ b/desktop/resources/dream/cloudy2 @@ -0,0 +1,170 @@ +Untitled +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 2000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 100.0 +highMax: 100.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 4000.0 +highMax: 5000.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: 5.0 +lowMax: -5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 5.0 +lowMax: -5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: ellipse +edges: true +side: both +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 360.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 300.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 40.0 +lowMax: 40.0 +highMin: 90.0 +highMax: 110.0 +relative: false +scalingCount: 3 +scaling0: 0.7346939 +scaling1: 0.8367347 +scaling2: 0.71428573 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 0.9520548 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: -10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.37671232 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: -50.0 +highMax: 50.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.5764706 +colors1: 0.7372549 +colors2: 0.8235294 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.07017544 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.51369864 +timeline2: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloudy.png diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/resources/inside-cafeteria/background.psd index 510ac507..70975d8a 100644 Binary files a/desktop/resources/inside-cafeteria/background.psd and b/desktop/resources/inside-cafeteria/background.psd differ diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 5ed4e48f..73691ecc 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -28,10 +28,9 @@ (defn make [screen] (rooms/make :music :town-1 - :interactions {:floor {:box [0 0 320 170] - :script (actions/get-script entities (a/>! [100 100]))}} + :interactions {} :layers [(assoc (texture "dream/background.png") :x 0 :y 0 :baseline 0)] - :entities {} + :entities {:clouds (assoc (particle-effect "dream/cloudy2") :x 160 :y 120 :baseline 240)} :collision "dream/collision.png" :scale-fn (constantly 1.5) :start-pos [140 55]))