diff --git a/desktop/resources/outside-jail/background.png b/desktop/resources/outside-jail/background.png index cf02b893..6116d2ab 100644 Binary files a/desktop/resources/outside-jail/background.png and b/desktop/resources/outside-jail/background.png differ diff --git a/desktop/resources/outside-jail/dot.png b/desktop/resources/outside-jail/dot.png new file mode 100644 index 00000000..9b630c47 Binary files /dev/null and b/desktop/resources/outside-jail/dot.png differ diff --git a/desktop/resources/outside-jail/fountain b/desktop/resources/outside-jail/fountain new file mode 100644 index 00000000..c97f3d27 --- /dev/null +++ b/desktop/resources/outside-jail/fountain @@ -0,0 +1,309 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 1000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 400.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 750.0 +highMax: 1600.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.3 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -1.0 +lowMax: 0.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: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.5 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 20.0 +lowMax: 20.0 +highMin: 80.0 +highMax: 70.0 +relative: false +scalingCount: 4 +scaling0: 1.0 +scaling1: 0.6122449 +scaling2: 0.53061223 +scaling3: 0.12244898 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.60958904 +timeline2: 0.7808219 +timeline3: 0.9041096 +- Angle - +active: true +lowMin: 88.0 +lowMax: 92.0 +highMin: -50.0 +highMax: 50.0 +relative: true +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5479452 +timeline3: 0.93835616 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -25.0 +highMax: -25.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Tint - +colorsCount: 6 +colors0: 0.9019608 +colors1: 1.0 +colors2: 1.0 +colors3: 0.52156866 +colors4: 0.8509804 +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: 4 +scaling0: 0.0 +scaling1: 0.24561404 +scaling2: 0.15789473 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.20547946 +timeline2: 0.7876712 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 200.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: false +- 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: 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: 70.0 +highMax: 80.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: -50.0 +highMax: -50.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 +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 +timeline0: 0.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/outside-jail/magic.png b/desktop/resources/outside-jail/magic.png new file mode 100644 index 00000000..ab37dd1c Binary files /dev/null and b/desktop/resources/outside-jail/magic.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 191cd611..c415ad74 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -159,10 +159,10 @@ :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 (animation->texture screen fountain) + :entities {:fountain (assoc (texture "outside-jail/dot.png") :x 150 :y 126 :baseline 114 - :anim fountain - :anim-start 0 + #_:anim fountain + #_:anim-start 0 :script (actions/get-script entities (actions/walk-to entities :ego [151 119] :face :right) (actions/play-animation entities :ego :reach) @@ -180,7 +180,13 @@ :y 86 :width 10 :height 10 - :talk-color (color 0.9 0.3 0.9 1.0)}} + :talk-color (color 0.9 0.3 0.9 1.0)} + :fountain-particle (assoc (doto (particle-effect "outside-jail/fountain") + (particle-effect! :reset) + (particle-effect! :start)) + :x 170 + :y 140 + :baseline 320)} :guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand) :x 70 :y 55 :baseline 185 :stand guard-stand