diff --git a/desktop/resources/inside-house/candle b/desktop/resources/inside-house/candle new file mode 100644 index 00000000..c353d53d --- /dev/null +++ b/desktop/resources/inside-house/candle @@ -0,0 +1,206 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 14.0 +highMax: 14.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 30000.0 +highMax: 30000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +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 +- 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: 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 +- 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: 2.0 +lowMax: 2.0 +highMin: 3.0 +highMax: 8.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: true +lowMin: 7.0 +lowMax: 7.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Angle - +active: true +lowMin: 180.0 +lowMax: 170.0 +highMin: -180.0 +highMax: -170.0 +relative: true +scalingCount: 10 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 0.08163265 +scaling4: 0.8979592 +scaling5: 0.1632653 +scaling6: 0.75510204 +scaling7: 0.24489796 +scaling8: 0.6938776 +scaling9: 0.4489796 +timelineCount: 10 +timeline0: 0.0 +timeline1: 0.001 +timeline2: 0.14383562 +timeline3: 0.30136988 +timeline4: 0.42465752 +timeline5: 0.55479455 +timeline6: 0.65068495 +timeline7: 0.7328767 +timeline8: 0.84931505 +timeline9: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 180.0 +highMax: -180.0 +relative: false +scalingCount: 2 +scaling0: 0.06122449 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 7.0 +highMax: 2.0 +relative: false +scalingCount: 6 +scaling0: 0.0 +scaling1: 0.5510204 +scaling2: 0.2244898 +scaling3: 0.14285715 +scaling4: 0.46938777 +scaling5: 0.2857143 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.14383562 +timeline2: 0.34246576 +timeline3: 0.45890412 +timeline4: 0.70547944 +timeline5: 0.9589041 +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.8156863 +colors1: 0.8117647 +colors2: 0.7372549 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.12280702 +scaling2: 0.05263158 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.28082192 +timeline2: 0.42465752 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/ego/dot.png diff --git a/desktop/resources/inside-house/dot.png b/desktop/resources/inside-house/dot.png new file mode 100644 index 00000000..8802f8e0 Binary files /dev/null and b/desktop/resources/inside-house/dot.png differ diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 2476bfe5..524de336 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -56,7 +56,7 @@ tr (bitmap-font! font :get-region) scale (or (min (max scale 0.75) 1) 1) tx (.getTexture tr) - _ (texture! tx :set-filter Texture$TextureFilter/Nearest Texture$TextureFilter/Nearest) + _ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) style (style :label font color) #__ #_(set! (.background style) bg) [source-x source-y] [x y] diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 6af2e49a..1f9ff53e 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -171,6 +171,10 @@ :anim candle :anim-start 0 :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)) :flask (assoc (texture "inside-house/flask.png") :x 265 :y 80 :baseline 240 :script (actions/get-script entities