diff --git a/desktop/resources/Bluezone-Abyss-sound-017.wav b/desktop/asset-work/Bluezone-Abyss-sound-017.wav similarity index 100% rename from desktop/resources/Bluezone-Abyss-sound-017.wav rename to desktop/asset-work/Bluezone-Abyss-sound-017.wav diff --git a/desktop/resources/aoeu.psd b/desktop/asset-work/aoeu.psd similarity index 100% rename from desktop/resources/aoeu.psd rename to desktop/asset-work/aoeu.psd diff --git a/desktop/resources/behindhouse/Untitled-1.psd b/desktop/asset-work/behindhouse/Untitled-1.psd similarity index 100% rename from desktop/resources/behindhouse/Untitled-1.psd rename to desktop/asset-work/behindhouse/Untitled-1.psd diff --git a/desktop/resources/behindhouse/backgroudn.psd b/desktop/asset-work/behindhouse/backgroudn.psd similarity index 100% rename from desktop/resources/behindhouse/backgroudn.psd rename to desktop/asset-work/behindhouse/backgroudn.psd diff --git a/desktop/resources/behindhouse/background.psd b/desktop/asset-work/behindhouse/background.psd similarity index 100% rename from desktop/resources/behindhouse/background.psd rename to desktop/asset-work/behindhouse/background.psd diff --git a/desktop/resources/blink-other.wav b/desktop/asset-work/blink-other.wav similarity index 100% rename from desktop/resources/blink-other.wav rename to desktop/asset-work/blink-other.wav diff --git a/desktop/resources/blink.wav b/desktop/asset-work/blink.wav similarity index 100% rename from desktop/resources/blink.wav rename to desktop/asset-work/blink.wav diff --git a/desktop/resources/castle-gate/castle-door.psd b/desktop/asset-work/castle-gate/castle-door.psd similarity index 100% rename from desktop/resources/castle-gate/castle-door.psd rename to desktop/asset-work/castle-gate/castle-door.psd diff --git a/desktop/resources/castle-gate/frankie.psd b/desktop/asset-work/castle-gate/frankie.psd similarity index 100% rename from desktop/resources/castle-gate/frankie.psd rename to desktop/asset-work/castle-gate/frankie.psd diff --git a/desktop/resources/cat-tree/background.psd b/desktop/asset-work/cat-tree/background.psd similarity index 100% rename from desktop/resources/cat-tree/background.psd rename to desktop/asset-work/cat-tree/background.psd diff --git a/desktop/resources/cat-tree/cat.wav b/desktop/asset-work/cat-tree/cat.wav similarity index 100% rename from desktop/resources/cat-tree/cat.wav rename to desktop/asset-work/cat-tree/cat.wav diff --git a/desktop/resources/cat-tree/kiss.wav b/desktop/asset-work/cat-tree/kiss.wav similarity index 100% rename from desktop/resources/cat-tree/kiss.wav rename to desktop/asset-work/cat-tree/kiss.wav diff --git a/desktop/resources/door-old1.wav b/desktop/asset-work/door-old1.wav similarity index 100% rename from desktop/resources/door-old1.wav rename to desktop/asset-work/door-old1.wav diff --git a/desktop/resources/door.wav b/desktop/asset-work/door.wav similarity index 100% rename from desktop/resources/door.wav rename to desktop/asset-work/door.wav diff --git a/desktop/resources/dream/Untitled-4.psd b/desktop/asset-work/dream/Untitled-4.psd similarity index 100% rename from desktop/resources/dream/Untitled-4.psd rename to desktop/asset-work/dream/Untitled-4.psd diff --git a/desktop/resources/dream/appear.wav b/desktop/asset-work/dream/appear.wav similarity index 100% rename from desktop/resources/dream/appear.wav rename to desktop/asset-work/dream/appear.wav diff --git a/desktop/resources/dream/background.psd b/desktop/asset-work/dream/background.psd similarity index 100% rename from desktop/resources/dream/background.psd rename to desktop/asset-work/dream/background.psd diff --git a/desktop/resources/dream/music.wav b/desktop/asset-work/dream/music.wav similarity index 100% rename from desktop/resources/dream/music.wav rename to desktop/asset-work/dream/music.wav diff --git a/desktop/resources/ego/blink2.wav b/desktop/asset-work/ego/blink2.wav similarity index 100% rename from desktop/resources/ego/blink2.wav rename to desktop/asset-work/ego/blink2.wav diff --git a/desktop/resources/ego/breakglass.wav b/desktop/asset-work/ego/breakglass.wav similarity index 100% rename from desktop/resources/ego/breakglass.wav rename to desktop/asset-work/ego/breakglass.wav diff --git a/desktop/resources/ego/idea.wav b/desktop/asset-work/ego/idea.wav similarity index 100% rename from desktop/resources/ego/idea.wav rename to desktop/asset-work/ego/idea.wav diff --git a/desktop/resources/ego/potion.wav b/desktop/asset-work/ego/potion.wav similarity index 100% rename from desktop/resources/ego/potion.wav rename to desktop/asset-work/ego/potion.wav diff --git a/desktop/resources/ego/pull-sword.psd b/desktop/asset-work/ego/pull-sword.psd similarity index 100% rename from desktop/resources/ego/pull-sword.psd rename to desktop/asset-work/ego/pull-sword.psd diff --git a/desktop/resources/ego/sigh.wav b/desktop/asset-work/ego/sigh.wav similarity index 100% rename from desktop/resources/ego/sigh.wav rename to desktop/asset-work/ego/sigh.wav diff --git a/desktop/resources/ego/step-1.wav b/desktop/asset-work/ego/step-1.wav similarity index 100% rename from desktop/resources/ego/step-1.wav rename to desktop/asset-work/ego/step-1.wav diff --git a/desktop/resources/ego/step-1_1.wav b/desktop/asset-work/ego/step-1_1.wav similarity index 100% rename from desktop/resources/ego/step-1_1.wav rename to desktop/asset-work/ego/step-1_1.wav diff --git a/desktop/resources/ego/step-2.wav b/desktop/asset-work/ego/step-2.wav similarity index 100% rename from desktop/resources/ego/step-2.wav rename to desktop/asset-work/ego/step-2.wav diff --git a/desktop/resources/ego/step.wav b/desktop/asset-work/ego/step.wav similarity index 100% rename from desktop/resources/ego/step.wav rename to desktop/asset-work/ego/step.wav diff --git a/desktop/resources/ego/test.psd b/desktop/asset-work/ego/test.psd similarity index 100% rename from desktop/resources/ego/test.psd rename to desktop/asset-work/ego/test.psd diff --git a/desktop/resources/ending-castle/ending-castle2.psd b/desktop/asset-work/ending-castle/ending-castle2.psd similarity index 100% rename from desktop/resources/ending-castle/ending-castle2.psd rename to desktop/asset-work/ending-castle/ending-castle2.psd diff --git a/desktop/resources/held/background.psd b/desktop/asset-work/held/background.psd similarity index 100% rename from desktop/resources/held/background.psd rename to desktop/asset-work/held/background.psd diff --git a/desktop/resources/inside-antique/background.psd b/desktop/asset-work/inside-antique/background.psd similarity index 100% rename from desktop/resources/inside-antique/background.psd rename to desktop/asset-work/inside-antique/background.psd diff --git a/desktop/resources/inside-antique/fire-1.wav b/desktop/asset-work/inside-antique/fire-1.wav similarity index 100% rename from desktop/resources/inside-antique/fire-1.wav rename to desktop/asset-work/inside-antique/fire-1.wav diff --git a/desktop/resources/inside-antique/fire-2.wav b/desktop/asset-work/inside-antique/fire-2.wav similarity index 100% rename from desktop/resources/inside-antique/fire-2.wav rename to desktop/asset-work/inside-antique/fire-2.wav diff --git a/desktop/resources/inside-antique/fire-3.wav b/desktop/asset-work/inside-antique/fire-3.wav similarity index 100% rename from desktop/resources/inside-antique/fire-3.wav rename to desktop/asset-work/inside-antique/fire-3.wav diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/asset-work/inside-cafeteria/background.psd similarity index 100% rename from desktop/resources/inside-cafeteria/background.psd rename to desktop/asset-work/inside-cafeteria/background.psd diff --git a/desktop/resources/inside-castle/chorus.wav b/desktop/asset-work/inside-castle/chorus.wav similarity index 100% rename from desktop/resources/inside-castle/chorus.wav rename to desktop/asset-work/inside-castle/chorus.wav diff --git a/desktop/resources/inside-castle/flex.wav b/desktop/asset-work/inside-castle/flex.wav similarity index 100% rename from desktop/resources/inside-castle/flex.wav rename to desktop/asset-work/inside-castle/flex.wav diff --git a/desktop/resources/inside-house/background.psd b/desktop/asset-work/inside-house/background.psd similarity index 100% rename from desktop/resources/inside-house/background.psd rename to desktop/asset-work/inside-house/background.psd diff --git a/desktop/resources/inside-house/close-safe.16.wav b/desktop/asset-work/inside-house/close-safe.16.wav similarity index 100% rename from desktop/resources/inside-house/close-safe.16.wav rename to desktop/asset-work/inside-house/close-safe.16.wav diff --git a/desktop/resources/inside-house/close-safe.wav b/desktop/asset-work/inside-house/close-safe.wav similarity index 100% rename from desktop/resources/inside-house/close-safe.wav rename to desktop/asset-work/inside-house/close-safe.wav diff --git a/desktop/resources/inside-house/disappear.wav b/desktop/asset-work/inside-house/disappear.wav similarity index 100% rename from desktop/resources/inside-house/disappear.wav rename to desktop/asset-work/inside-house/disappear.wav diff --git a/desktop/resources/inside-house/open-safe.16.wav b/desktop/asset-work/inside-house/open-safe.16.wav similarity index 100% rename from desktop/resources/inside-house/open-safe.16.wav rename to desktop/asset-work/inside-house/open-safe.16.wav diff --git a/desktop/resources/inside-house/open-safe.wav b/desktop/asset-work/inside-house/open-safe.wav similarity index 100% rename from desktop/resources/inside-house/open-safe.wav rename to desktop/asset-work/inside-house/open-safe.wav diff --git a/desktop/resources/inside-jail/exhale.wav b/desktop/asset-work/inside-jail/exhale.wav similarity index 100% rename from desktop/resources/inside-jail/exhale.wav rename to desktop/asset-work/inside-jail/exhale.wav diff --git a/desktop/resources/inside-jail/inhale.wav b/desktop/asset-work/inside-jail/inhale.wav similarity index 100% rename from desktop/resources/inside-jail/inhale.wav rename to desktop/asset-work/inside-jail/inhale.wav diff --git a/desktop/resources/inside-stash/background.psd b/desktop/asset-work/inside-stash/background.psd similarity index 100% rename from desktop/resources/inside-stash/background.psd rename to desktop/asset-work/inside-stash/background.psd diff --git a/desktop/resources/intro.wav b/desktop/asset-work/intro.wav similarity index 100% rename from desktop/resources/intro.wav rename to desktop/asset-work/intro.wav diff --git a/desktop/resources/inventory-overlay.psd b/desktop/asset-work/inventory-overlay.psd similarity index 100% rename from desktop/resources/inventory-overlay.psd rename to desktop/asset-work/inventory-overlay.psd diff --git a/desktop/resources/inventory.psd b/desktop/asset-work/inventory.psd similarity index 100% rename from desktop/resources/inventory.psd rename to desktop/asset-work/inventory.psd diff --git a/desktop/resources/love.wav b/desktop/asset-work/love.wav similarity index 100% rename from desktop/resources/love.wav rename to desktop/asset-work/love.wav diff --git a/desktop/resources/night.wav b/desktop/asset-work/night.wav similarity index 100% rename from desktop/resources/night.wav rename to desktop/asset-work/night.wav diff --git a/desktop/resources/outside-castle/background.psd b/desktop/asset-work/outside-castle/background.psd similarity index 100% rename from desktop/resources/outside-castle/background.psd rename to desktop/asset-work/outside-castle/background.psd diff --git a/desktop/resources/outside-castle/flies.wav b/desktop/asset-work/outside-castle/flies.wav similarity index 100% rename from desktop/resources/outside-castle/flies.wav rename to desktop/asset-work/outside-castle/flies.wav diff --git a/desktop/resources/outside-castle/flies2.wav b/desktop/asset-work/outside-castle/flies2.wav similarity index 100% rename from desktop/resources/outside-castle/flies2.wav rename to desktop/asset-work/outside-castle/flies2.wav diff --git a/desktop/resources/outside-castle/scratch.wav b/desktop/asset-work/outside-castle/scratch.wav similarity index 100% rename from desktop/resources/outside-castle/scratch.wav rename to desktop/asset-work/outside-castle/scratch.wav diff --git a/desktop/resources/outside-castle/scratch_1.wav b/desktop/asset-work/outside-castle/scratch_1.wav similarity index 100% rename from desktop/resources/outside-castle/scratch_1.wav rename to desktop/asset-work/outside-castle/scratch_1.wav diff --git a/desktop/resources/outside-jail/fountain-2.wav b/desktop/asset-work/outside-jail/fountain-2.wav similarity index 100% rename from desktop/resources/outside-jail/fountain-2.wav rename to desktop/asset-work/outside-jail/fountain-2.wav diff --git a/desktop/resources/outsidehouse/background.psd b/desktop/asset-work/outsidehouse/background.psd similarity index 100% rename from desktop/resources/outsidehouse/background.psd rename to desktop/asset-work/outsidehouse/background.psd diff --git a/desktop/resources/outsidehouse/background2.psd b/desktop/asset-work/outsidehouse/background2.psd similarity index 100% rename from desktop/resources/outsidehouse/background2.psd rename to desktop/asset-work/outsidehouse/background2.psd diff --git a/desktop/resources/outsidehouse/milk.24.wav b/desktop/asset-work/outsidehouse/milk.24.wav similarity index 100% rename from desktop/resources/outsidehouse/milk.24.wav rename to desktop/asset-work/outsidehouse/milk.24.wav diff --git a/desktop/resources/outsidehouse/milk.wav b/desktop/asset-work/outsidehouse/milk.wav similarity index 100% rename from desktop/resources/outsidehouse/milk.wav rename to desktop/asset-work/outsidehouse/milk.wav diff --git a/desktop/resources/pull-sword.wav b/desktop/asset-work/pull-sword.wav similarity index 100% rename from desktop/resources/pull-sword.wav rename to desktop/asset-work/pull-sword.wav diff --git a/desktop/resources/scratch.wav b/desktop/asset-work/scratch.wav similarity index 100% rename from desktop/resources/scratch.wav rename to desktop/asset-work/scratch.wav diff --git a/desktop/resources/secret-hideout.wav b/desktop/asset-work/secret-hideout.wav similarity index 100% rename from desktop/resources/secret-hideout.wav rename to desktop/asset-work/secret-hideout.wav diff --git a/desktop/resources/space/jump.wav b/desktop/asset-work/space/jump.wav similarity index 100% rename from desktop/resources/space/jump.wav rename to desktop/asset-work/space/jump.wav diff --git a/desktop/resources/space/shock.wav b/desktop/asset-work/space/shock.wav similarity index 100% rename from desktop/resources/space/shock.wav rename to desktop/asset-work/space/shock.wav diff --git a/desktop/resources/space/swingsword.wav b/desktop/asset-work/space/swingsword.wav similarity index 100% rename from desktop/resources/space/swingsword.wav rename to desktop/asset-work/space/swingsword.wav diff --git a/desktop/resources/space/swingsword_1.wav b/desktop/asset-work/space/swingsword_1.wav similarity index 100% rename from desktop/resources/space/swingsword_1.wav rename to desktop/asset-work/space/swingsword_1.wav diff --git a/desktop/resources/title.psd b/desktop/asset-work/title.psd similarity index 100% rename from desktop/resources/title.psd rename to desktop/asset-work/title.psd diff --git a/desktop/resources/wizard.psd b/desktop/asset-work/wizard.psd similarity index 100% rename from desktop/resources/wizard.psd rename to desktop/asset-work/wizard.psd diff --git a/desktop/resources/particles/magic-sword b/desktop/resources/particles/magic-sword new file mode 100644 index 00000000..9dbe05bd --- /dev/null +++ b/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 diff --git a/desktop/settings.edn b/desktop/settings.edn index e6723941..ce85fd0d 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 67.0, :music-volume 86.0} \ No newline at end of file +{:sound-volume 94.0, :music-volume 37.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 72c369ae..410a7f68 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/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