more changes for the good of texture packing.

desktop/resources/particles/magic-sword

@@ -0,0 +1,153 @@
+Untitled
+- Delay -
+active: false
+- Duration - 
+lowMin: 3000.0
+lowMax: 3000.0
+- Count - 
+min: 0
+max: 200
+- Emission - 
+lowMin: 40.0
+lowMax: 40.0
+highMin: 80.0
+highMax: 80.0
+relative: false
+scalingCount: 2
+scaling0: 0.42857143
+scaling1: 1.0
+timelineCount: 2
+timeline0: 0.0
+timeline1: 1.0
+- Life - 
+lowMin: 0.0
+lowMax: 0.0
+highMin: 1000.0
+highMax: 3000.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: false
+- Y Offset - 
+active: false
+- Spawn Shape - 
+shape: ellipse
+edges: true
+side: both
+- Spawn Width - 
+lowMin: 0.0
+lowMax: 0.0
+highMin: 35.0
+highMax: 35.0
+relative: false
+scalingCount: 1
+scaling0: 1.0
+timelineCount: 1
+timeline0: 0.0
+- Spawn Height - 
+lowMin: 0.0
+lowMax: 0.0
+highMin: 45.0
+highMax: 45.0
+relative: false
+scalingCount: 1
+scaling0: 1.0
+timelineCount: 1
+timeline0: 0.0
+- Scale - 
+lowMin: 3.0
+lowMax: 3.0
+highMin: 11.0
+highMax: 20.0
+relative: false
+scalingCount: 4
+scaling0: 0.0
+scaling1: 1.0
+scaling2: 0.6938776
+scaling3: 0.0
+timelineCount: 4
+timeline0: 0.0
+timeline1: 0.23972602
+timeline2: 0.63013697
+timeline3: 1.0
+- Velocity - 
+active: true
+lowMin: 3.0
+lowMax: 3.0
+highMin: 10.0
+highMax: 20.0
+relative: false
+scalingCount: 3
+scaling0: 1.0
+scaling1: 0.85714287
+scaling2: 0.0
+timelineCount: 3
+timeline0: 0.0
+timeline1: 0.6712329
+timeline2: 0.96575344
+- Angle - 
+active: true
+lowMin: 90.0
+lowMax: 90.0
+highMin: 90.0
+highMax: 90.0
+relative: false
+scalingCount: 3
+scaling0: 1.0
+scaling1: 1.0
+scaling2: 0.0
+timelineCount: 3
+timeline0: 0.0
+timeline1: 0.48630136
+timeline2: 0.9931507
+- Rotation - 
+active: false
+- Wind - 
+active: false
+- Gravity - 
+active: false
+- Tint - 
+colorsCount: 6
+colors0: 0.24705882
+colors1: 0.31764707
+colors2: 0.8156863
+colors3: 0.5529412
+colors4: 0.34901962
+colors5: 0.7019608
+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: 1.0
+scaling2: 0.49122807
+scaling3: 0.0
+timelineCount: 4
+timeline0: 0.0
+timeline1: 0.1849315
+timeline2: 0.84931505
+timeline3: 1.0
+- Options - 
+attached: false
+continuous: true
+aligned: true
+additive: true
+behind: false
+premultipliedAlpha: false
+- Image Path -
+magic.png

desktop/settings.edn

@@ -1 +1 @@
-{:sound-volume 67.0, :music-volume 86.0}
+{:sound-volume 94.0, :music-volume 37.0}

desktop/src-common/advent/screens/rooms/inside_castle.clj

@@ -456,7 +456,7 @@
                                           entities
                                           (nil? magic)
                                           (do 
-                                            (assoc-in entities [:room :entities :magic] (assoc (doto (particle-effect "particles/magic")
+                                            (assoc-in entities [:room :entities :magic] (assoc (doto (particle-effect "particles/magic-sword")
                                                                                                  (particle-effect! :reset))
                                                                                                :x 25
                                                                                                :y 108