From 8476dff35b6f72432b66ad2150e986683b38bc9a Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 3 Mar 2015 23:26:27 -0800 Subject: [PATCH] fountain effect --- desktop/resources/outside-jail/fountain | 401 ++++++++++++++++-- .../advent/screens/rooms/outside_jail.clj | 6 +- desktop/src-common/advent/utils.clj | 2 +- 3 files changed, 359 insertions(+), 50 deletions(-) diff --git a/desktop/resources/outside-jail/fountain b/desktop/resources/outside-jail/fountain index c97f3d27..de7c246b 100644 --- a/desktop/resources/outside-jail/fountain +++ b/desktop/resources/outside-jail/fountain @@ -1,3 +1,162 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 70.0 +highMax: 70.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1000.0 +highMax: 1000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -2.0 +lowMax: 2.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: false +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 3.0 +lowMax: 3.0 +highMin: 3.0 +highMax: 5.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 40.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.7123288 +timeline2: 1.0 +- Angle - +active: true +lowMin: 80.0 +lowMax: 100.0 +highMin: -30.0 +highMax: 30.0 +relative: true +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 0.8979592 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.30821916 +timeline2: 0.4520548 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +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 +- Tint - +colorsCount: 6 +colors0: 0.0 +colors1: 0.50980395 +colors2: 0.6313726 +colors3: 0.6392157 +colors4: 0.8627451 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 0.8947368 +scaling1: 0.877193 +scaling2: 0.2631579 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.79452056 +timeline2: 0.96575344 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dither.png + + Untitled - Delay - active: false @@ -80,9 +239,9 @@ timelineCount: 1 timeline0: 0.0 - Velocity - active: true -lowMin: 20.0 -lowMax: 20.0 -highMin: 80.0 +lowMin: 5.0 +lowMax: 5.0 +highMin: 90.0 highMax: 70.0 relative: false scalingCount: 4 @@ -146,13 +305,13 @@ highMax: 1.0 relative: false scalingCount: 4 scaling0: 0.0 -scaling1: 0.24561404 -scaling2: 0.15789473 +scaling1: 0.71929824 +scaling2: 0.57894737 scaling3: 0.0 timelineCount: 4 timeline0: 0.0 -timeline1: 0.20547946 -timeline2: 0.7876712 +timeline1: 0.21917808 +timeline2: 0.79452056 timeline3: 1.0 - Options - attached: false @@ -162,7 +321,7 @@ additive: true behind: false premultipliedAlpha: false - Image Path - -dot.png +magic.png Untitled @@ -173,12 +332,12 @@ lowMin: 1000.0 lowMax: 1000.0 - Count - min: 0 -max: 500 +max: 40 - Emission - lowMin: 0.0 lowMax: 0.0 -highMin: 200.0 -highMax: 200.0 +highMin: 8.0 +highMax: 8.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -197,6 +356,151 @@ timeline0: 0.0 - Life Offset - active: false - X Offset - +active: true +lowMin: -3.0 +lowMax: 3.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -1.0 +lowMax: 1.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -7.0 +highMax: 7.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.2 +colors1: 0.7176471 +colors2: 0.94509804 +colors3: 0.88235295 +colors4: 0.9254902 +colors5: 0.94509804 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 2000.0 +lowMax: 2000.0 +- Count - +min: 0 +max: 29 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 50.0 +highMax: 50.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 500.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - active: false - Y Offset - active: false @@ -226,7 +530,7 @@ timeline0: 0.0 lowMin: 0.0 lowMax: 0.0 highMin: 1.0 -highMax: 1.0 +highMax: 2.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -236,74 +540,79 @@ timeline0: 0.0 active: true lowMin: 0.0 lowMax: 0.0 -highMin: 70.0 -highMax: 80.0 +highMin: 30.0 +highMax: 30.0 relative: false scalingCount: 3 scaling0: 1.0 -scaling1: 1.0 +scaling1: 0.877551 scaling2: 0.0 timelineCount: 3 timeline0: 0.0 -timeline1: 0.7123288 -timeline2: 1.0 +timeline1: 0.58219177 +timeline2: 0.74657536 - Angle - active: true -lowMin: 80.0 -lowMax: 100.0 -highMin: -30.0 -highMax: 30.0 -relative: true -scalingCount: 3 -scaling0: 0.0 -scaling1: 0.0 -scaling2: 0.8979592 -timelineCount: 3 +lowMin: 0.0 +lowMax: 0.0 +highMin: 135.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 timeline0: 0.0 -timeline1: 0.30821916 -timeline2: 0.4520548 - Rotation - active: false - Wind - -active: false +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 - Gravity - active: true lowMin: 0.0 lowMax: 0.0 -highMin: -50.0 -highMax: -50.0 +highMin: -10.0 +highMax: -10.0 relative: false scalingCount: 1 scaling0: 1.0 timelineCount: 1 timeline0: 0.0 - Tint - -colorsCount: 6 -colors0: 0.039215688 -colors1: 0.4627451 -colors2: 0.84705883 -colors3: 0.039215688 -colors4: 0.23137255 -colors5: 0.84705883 -timelineCount: 2 +colorsCount: 3 +colors0: 0.87058824 +colors1: 0.9254902 +colors2: 1.0 +timelineCount: 1 timeline0: 0.0 -timeline1: 1.0 - Transparency - lowMin: 0.0 lowMax: 0.0 highMin: 1.0 highMax: 1.0 relative: false -scalingCount: 1 -scaling0: 0.7894737 -timelineCount: 1 +scalingCount: 3 +scaling0: 0.49122807 +scaling1: 0.12280702 +scaling2: 0.2982456 +timelineCount: 3 timeline0: 0.0 +timeline1: 0.369863 +timeline2: 0.89041096 - Options - attached: false continuous: true aligned: false -additive: false +additive: true behind: false premultipliedAlpha: false - Image Path - -dot.png +magic.png diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index c415ad74..00513ac2 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -159,7 +159,7 @@ :script (actions/get-script entities (try-to-go-in-stash entities))}} :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)] :night [(assoc (texture "outside-jail/background-dark.png") :x 0 :y 0 :baseline 0)]} - :entities {:fountain (assoc (texture "outside-jail/dot.png") + :entities {:fountain (assoc (texture "outside-jail/dot.png") #_(animation->texture screen fountain) :x 150 :y 126 :baseline 114 #_:anim fountain #_:anim-start 0 @@ -184,9 +184,9 @@ :fountain-particle (assoc (doto (particle-effect "outside-jail/fountain") (particle-effect! :reset) (particle-effect! :start)) - :x 170 + :x 172 :y 140 - :baseline 320)} + :baseline 114)} :guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand) :x 70 :y 55 :baseline 185 :stand guard-stand diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index ffea40ba..70d976cc 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -25,7 +25,7 @@ target-height (* 16 scale) resized (Pixmap. target-width target-height (.getFormat base-cursor)) index (.indexOf +all-cursors+ which)] - (Pixmap/setFilter Pixmap$Filter/NearestNeighbour) + #_(Pixmap/setFilter Pixmap$Filter/NearestNeighbour) (pixmap! resized :draw-pixmap base-cursor (* index 16) 0 16 16 0 0 target-width target-height) resized ))