diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..33cfd6c4 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,4 @@ +target +\#*# +checkouts +.nrepl-port diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.template.xml similarity index 53% rename from android/AndroidManifest.xml rename to android/AndroidManifest.template.xml index 8cac0f4b..36f876fc 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.template.xml @@ -1,14 +1,16 @@ + android:versionCode="{{version-code}}" + android:versionName="{{version-name}}" > - + + android:label="TicksTales"> @@ -16,7 +18,7 @@ - + @@ -24,4 +26,10 @@ + {{#debug-build}} + + + + + {{/debug-build}} diff --git a/android/libs/armeabi-v7a/libgdx-box2d.so b/android/libs/armeabi-v7a/libgdx-box2d.so index 47532cac..923eff02 100644 Binary files a/android/libs/armeabi-v7a/libgdx-box2d.so and b/android/libs/armeabi-v7a/libgdx-box2d.so differ diff --git a/android/libs/armeabi-v7a/libgdx.so b/android/libs/armeabi-v7a/libgdx.so index 6bb99802..b224b0c9 100644 Binary files a/android/libs/armeabi-v7a/libgdx.so and b/android/libs/armeabi-v7a/libgdx.so differ diff --git a/android/libs/armeabi/libgdx-box2d.so b/android/libs/armeabi/libgdx-box2d.so index 10eefd03..521ac2d7 100644 Binary files a/android/libs/armeabi/libgdx-box2d.so and b/android/libs/armeabi/libgdx-box2d.so differ diff --git a/android/libs/armeabi/libgdx.so b/android/libs/armeabi/libgdx.so index 9e4119b1..c6cdb9ac 100644 Binary files a/android/libs/armeabi/libgdx.so and b/android/libs/armeabi/libgdx.so differ diff --git a/android/libs/x86/libgdx-box2d.so b/android/libs/x86/libgdx-box2d.so index 63538985..03d19131 100644 Binary files a/android/libs/x86/libgdx-box2d.so and b/android/libs/x86/libgdx-box2d.so differ diff --git a/android/libs/x86/libgdx-bullet.so b/android/libs/x86/libgdx-bullet.so index 3037aa66..b567acb3 100644 Binary files a/android/libs/x86/libgdx-bullet.so and b/android/libs/x86/libgdx-bullet.so differ diff --git a/android/libs/x86/libgdx.so b/android/libs/x86/libgdx.so index 6afee9cc..de5b8006 100644 Binary files a/android/libs/x86/libgdx.so and b/android/libs/x86/libgdx.so differ diff --git a/android/project.clj b/android/project.clj index f2eb7962..ce6b9f3b 100644 --- a/android/project.clj +++ b/android/project.clj @@ -1,36 +1,59 @@ (defproject advent "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.3.0" :use-resources true] - [com.badlogicgames.gdx/gdx-backend-android "1.3.0"] - [com.badlogicgames.gdx/gdx-box2d "1.3.0"] - [com.badlogicgames.gdx/gdx-bullet "1.3.0"] - [neko/neko "3.0.2"] - [org.clojure-android/clojure "1.6.0-RC1" :use-resources true] - [play-clj "0.3.9"]] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.3" :use-resources true] + [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.3"] + [com.badlogicgames.gdx/gdx-box2d "1.5.3"] + [com.badlogicgames.gdx/gdx-tools "1.5.3"] + + [com.badlogicgames.gdx/gdx-bullet "1.5.3"] + + [com.badlogicgames.gdx/gdx-backend-android "1.5.3"] + [neko/neko "4.0.0-alpha5"] + [org.clojure-android/clojure "1.7.0-r2" :use-resources true] + + [org.clojure/tools.nrepl "0.2.7"] + [play-clj "0.4.5-BRYCE"] + [org.clojure/data.priority-map "0.0.5"] + + [org.clojure/core.async "0.1.346.0-17112a-alpha"]] + :plugins [[lein-droid "0.4.4-SNAPSHOT"]] + + :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"] [compliment "0.1.3"]] - :android {:aot :all-with-unused}} + :android {:aot :all-with-unused + + :rename-manifest-package "advent.core.debug" + :manifest-options {:app-name "ticks tales (debug)"} + :aot-exclude-ns [cljs.core.async.impl.ioc-macros]}} :release {:android {;; Specify the path to your private ;; keystore and the the alias of the ;; key you want to sign APKs with. ;; :keystore-path "/home/user/.android/private.keystore" ;; :key-alias "mykeyalias" - :aot :all}}} + :aot :all + :aot-exclude-ns [cljs.core.async.macros cljs.core.impl-ioc-macros cljs.core.impl.ioc_macros]}}} :android {;; Specify the path to the Android SDK directory either ;; here or in your ~/.lein/profiles.clj file. - ;; :sdk-path "/home/user/path/to/android-sdk/" + :sdk-path "/usr/local/Cellar/android-sdk/24.3.4/" ;; Uncomment this if dexer fails with OutOfMemoryException - ;; :force-dex-optimize true + #_#_:force-dex-optimize true - :assets-path "../desktop/resources" + :assets-paths ["/Users/brycecovert/dev/advent/desktop/resources"] :native-libraries-paths ["libs"] - :target-version "15" - :aot-exclude-ns ["clojure.parallel" "clojure.core.reducers"] - :dex-opts ["-JXmx2048M"]} + :target-version "15" ; 18+ + :aot-exclude-ns ["clojure.parallel" "clojure.core.reducers" + "cider.nrepl" "cider-nrepl.plugin" + "cider.nrepl.middleware.util.java.parser" + #"cljs-tooling\..+" "cljs.core.async.macros" + "cljs.core.async.impl.ioc-macros" + "cljs.core.impl.ioc_macros" + #"com.badlogic.gdx.physics\..+"] + :dex-opts ["-JXmx8192M" "--multi-dex" "--no-locals"]} :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java" "gen"] diff --git a/android/resources b/android/resources new file mode 120000 index 00000000..311cd019 --- /dev/null +++ b/android/resources @@ -0,0 +1 @@ +../desktop/resources \ No newline at end of file diff --git a/android/src/java/advent/core/AndroidLauncher.java b/android/src/java/advent/core/MainActivity.java similarity index 89% rename from android/src/java/advent/core/AndroidLauncher.java rename to android/src/java/advent/core/MainActivity.java index f5ef5562..3e5159b0 100644 --- a/android/src/java/advent/core/AndroidLauncher.java +++ b/android/src/java/advent/core/MainActivity.java @@ -6,7 +6,7 @@ import clojure.lang.Symbol; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.Game; -public class AndroidLauncher extends AndroidApplication { +public class MainActivity extends AndroidApplication { public void onCreate (android.os.Bundle savedInstanceState) { super.onCreate(savedInstanceState); RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core")); diff --git a/android/src/java/advent/core/SplashActivity.java b/android/src/java/advent/core/SplashActivity.java index f1186880..5a870d6c 100644 --- a/android/src/java/advent/core/SplashActivity.java +++ b/android/src/java/advent/core/SplashActivity.java @@ -2,24 +2,18 @@ package advent.core; import android.app.Activity; import android.content.Intent; -import android.content.pm.PackageManager; import android.os.Bundle; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.TextView; -import android.util.Log; - -import clojure.lang.Symbol; -import clojure.lang.Var; -import clojure.lang.RT; +import neko.App; import advent.core.R; public class SplashActivity extends Activity { private static boolean firstLaunch = true; - private static String TAG = "Splash"; @Override public void onCreate(Bundle bundle) { @@ -28,7 +22,12 @@ public class SplashActivity extends Activity { if (firstLaunch) { firstLaunch = false; setupSplash(); - loadClojure(); + App.loadAsynchronously("advent.core.MainActivity", + new Runnable() { + @Override + public void run() { + proceed(); + }}); } else { proceed(); } @@ -50,25 +49,4 @@ public class SplashActivity extends Activity { finish(); } - public void loadClojure() { - new Thread(new Runnable(){ - @Override - public void run() { - Symbol CLOJURE_MAIN = Symbol.intern("neko.init"); - Var REQUIRE = RT.var("clojure.core", "require"); - REQUIRE.invoke(CLOJURE_MAIN); - - Var INIT = RT.var("neko.init", "init"); - INIT.invoke(SplashActivity.this.getApplication()); - - try { - Class.forName("advent.core.AndroidLauncher"); - } catch (ClassNotFoundException e) { - Log.e(TAG, "Failed loading AndroidLauncher", e); - } - - proceed(); - } - }).start(); - } } 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/abc.png b/desktop/asset-work/behindhouse/abc.png similarity index 100% rename from desktop/resources/behindhouse/abc.png rename to desktop/asset-work/behindhouse/abc.png 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.png b/desktop/asset-work/behindhouse/background.png similarity index 100% rename from desktop/resources/behindhouse/background.png rename to desktop/asset-work/behindhouse/background.png 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/behindhouse/brush.png b/desktop/asset-work/behindhouse/brush.png similarity index 100% rename from desktop/resources/behindhouse/brush.png rename to desktop/asset-work/behindhouse/brush.png diff --git a/desktop/resources/behindhouse/fg.png b/desktop/asset-work/behindhouse/fg.png similarity index 100% rename from desktop/resources/behindhouse/fg.png rename to desktop/asset-work/behindhouse/fg.png diff --git a/desktop/resources/behindhouse/fg2.png b/desktop/asset-work/behindhouse/fg2.png similarity index 100% rename from desktop/resources/behindhouse/fg2.png rename to desktop/asset-work/behindhouse/fg2.png diff --git a/desktop/resources/behindhouse/fgleft.png b/desktop/asset-work/behindhouse/fgleft.png similarity index 100% rename from desktop/resources/behindhouse/fgleft.png rename to desktop/asset-work/behindhouse/fgleft.png diff --git a/desktop/resources/behindhouse/house-cover.png b/desktop/asset-work/behindhouse/house-cover.png similarity index 100% rename from desktop/resources/behindhouse/house-cover.png rename to desktop/asset-work/behindhouse/house-cover.png diff --git a/desktop/resources/behindhouse/house.png b/desktop/asset-work/behindhouse/house.png similarity index 100% rename from desktop/resources/behindhouse/house.png rename to desktop/asset-work/behindhouse/house.png diff --git a/desktop/resources/behindhouse/stick.png b/desktop/asset-work/behindhouse/stick.png similarity index 100% rename from desktop/resources/behindhouse/stick.png rename to desktop/asset-work/behindhouse/stick.png diff --git a/desktop/resources/bg.png b/desktop/asset-work/bg.png similarity index 100% rename from desktop/resources/bg.png rename to desktop/asset-work/bg.png diff --git a/desktop/resources/bg2.png b/desktop/asset-work/bg2.png similarity index 100% rename from desktop/resources/bg2.png rename to desktop/asset-work/bg2.png diff --git a/desktop/resources/bg2.pxi b/desktop/asset-work/bg2.pxi similarity index 100% rename from desktop/resources/bg2.pxi rename to desktop/asset-work/bg2.pxi diff --git a/desktop/resources/bg3.png b/desktop/asset-work/bg3.png similarity index 100% rename from desktop/resources/bg3.png rename to desktop/asset-work/bg3.png diff --git a/desktop/resources/bg3.pxi b/desktop/asset-work/bg3.pxi similarity index 100% rename from desktop/resources/bg3.pxi rename to desktop/asset-work/bg3.pxi diff --git a/desktop/resources/bg4.png b/desktop/asset-work/bg4.png similarity index 100% rename from desktop/resources/bg4.png rename to desktop/asset-work/bg4.png diff --git a/desktop/resources/bg4.png.pxi b/desktop/asset-work/bg4.png.pxi similarity index 100% rename from desktop/resources/bg4.png.pxi rename to desktop/asset-work/bg4.png.pxi diff --git a/desktop/resources/bg4.pxi b/desktop/asset-work/bg4.pxi similarity index 100% rename from desktop/resources/bg4.pxi rename to desktop/asset-work/bg4.pxi diff --git a/desktop/resources/bg5.png b/desktop/asset-work/bg5.png similarity index 100% rename from desktop/resources/bg5.png rename to desktop/asset-work/bg5.png diff --git a/desktop/resources/black.png b/desktop/asset-work/black.png similarity index 100% rename from desktop/resources/black.png rename to desktop/asset-work/black.png 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/butterfly.png b/desktop/asset-work/butterfly.png similarity index 100% rename from desktop/resources/butterfly.png rename to desktop/asset-work/butterfly.png diff --git a/desktop/resources/castle-gate/Untitled.png b/desktop/asset-work/castle-gate/Untitled.png similarity index 100% rename from desktop/resources/castle-gate/Untitled.png rename to desktop/asset-work/castle-gate/Untitled.png diff --git a/desktop/resources/castle-gate/background.png b/desktop/asset-work/castle-gate/background.png similarity index 100% rename from desktop/resources/castle-gate/background.png rename to desktop/asset-work/castle-gate/background.png 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/coinflip.png b/desktop/asset-work/castle-gate/coinflip.png similarity index 100% rename from desktop/resources/castle-gate/coinflip.png rename to desktop/asset-work/castle-gate/coinflip.png diff --git a/desktop/resources/castle-gate/coinflip.pxa/0.pxi b/desktop/asset-work/castle-gate/coinflip.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/coinflip.pxa/0.pxi rename to desktop/asset-work/castle-gate/coinflip.pxa/0.pxi diff --git a/desktop/resources/castle-gate/coinflip.pxa/1.pxi b/desktop/asset-work/castle-gate/coinflip.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/coinflip.pxa/1.pxi rename to desktop/asset-work/castle-gate/coinflip.pxa/1.pxi diff --git a/desktop/resources/castle-gate/coinflip.pxa/2.pxi b/desktop/asset-work/castle-gate/coinflip.pxa/2.pxi similarity index 100% rename from desktop/resources/castle-gate/coinflip.pxa/2.pxi rename to desktop/asset-work/castle-gate/coinflip.pxa/2.pxi diff --git a/desktop/resources/castle-gate/coinflip.pxa/3.pxi b/desktop/asset-work/castle-gate/coinflip.pxa/3.pxi similarity index 100% rename from desktop/resources/castle-gate/coinflip.pxa/3.pxi rename to desktop/asset-work/castle-gate/coinflip.pxa/3.pxi diff --git a/desktop/resources/castle-gate/coinflip.pxa/4.pxi b/desktop/asset-work/castle-gate/coinflip.pxa/4.pxi similarity index 100% rename from desktop/resources/castle-gate/coinflip.pxa/4.pxi rename to desktop/asset-work/castle-gate/coinflip.pxa/4.pxi diff --git a/desktop/resources/castle-gate/coinflip.pxa/CelData.plist b/desktop/asset-work/castle-gate/coinflip.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/coinflip.pxa/CelData.plist rename to desktop/asset-work/castle-gate/coinflip.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/frankie.png b/desktop/asset-work/castle-gate/frankie.png similarity index 100% rename from desktop/resources/castle-gate/frankie.png rename to desktop/asset-work/castle-gate/frankie.png 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/castle-gate/frankie.pxa/0.pxi b/desktop/asset-work/castle-gate/frankie.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/0.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/0.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/1.pxi b/desktop/asset-work/castle-gate/frankie.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/1.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/1.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/10.pxi b/desktop/asset-work/castle-gate/frankie.pxa/10.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/10.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/10.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/11.pxi b/desktop/asset-work/castle-gate/frankie.pxa/11.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/11.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/11.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/12.pxi b/desktop/asset-work/castle-gate/frankie.pxa/12.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/12.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/12.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/2.pxi b/desktop/asset-work/castle-gate/frankie.pxa/2.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/2.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/2.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/3.pxi b/desktop/asset-work/castle-gate/frankie.pxa/3.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/3.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/3.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/4.pxi b/desktop/asset-work/castle-gate/frankie.pxa/4.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/4.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/4.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/5.pxi b/desktop/asset-work/castle-gate/frankie.pxa/5.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/5.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/5.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/6.pxi b/desktop/asset-work/castle-gate/frankie.pxa/6.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/6.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/6.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/7.pxi b/desktop/asset-work/castle-gate/frankie.pxa/7.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/7.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/7.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/8.pxi b/desktop/asset-work/castle-gate/frankie.pxa/8.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/8.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/8.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/9.pxi b/desktop/asset-work/castle-gate/frankie.pxa/9.pxi similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/9.pxi rename to desktop/asset-work/castle-gate/frankie.pxa/9.pxi diff --git a/desktop/resources/castle-gate/frankie.pxa/CelData.plist b/desktop/asset-work/castle-gate/frankie.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/frankie.pxa/CelData.plist rename to desktop/asset-work/castle-gate/frankie.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/goon-1.png b/desktop/asset-work/castle-gate/goon-1.png similarity index 100% rename from desktop/resources/castle-gate/goon-1.png rename to desktop/asset-work/castle-gate/goon-1.png diff --git a/desktop/resources/castle-gate/goon-1.pxa/0.pxi b/desktop/asset-work/castle-gate/goon-1.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-1.pxa/0.pxi rename to desktop/asset-work/castle-gate/goon-1.pxa/0.pxi diff --git a/desktop/resources/castle-gate/goon-1.pxa/1.pxi b/desktop/asset-work/castle-gate/goon-1.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-1.pxa/1.pxi rename to desktop/asset-work/castle-gate/goon-1.pxa/1.pxi diff --git a/desktop/resources/castle-gate/goon-1.pxa/CelData.plist b/desktop/asset-work/castle-gate/goon-1.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/goon-1.pxa/CelData.plist rename to desktop/asset-work/castle-gate/goon-1.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/goon-2-flip.png b/desktop/asset-work/castle-gate/goon-2-flip.png similarity index 100% rename from desktop/resources/castle-gate/goon-2-flip.png rename to desktop/asset-work/castle-gate/goon-2-flip.png diff --git a/desktop/resources/castle-gate/goon-2-flip.pxa/0.pxi b/desktop/asset-work/castle-gate/goon-2-flip.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-flip.pxa/0.pxi rename to desktop/asset-work/castle-gate/goon-2-flip.pxa/0.pxi diff --git a/desktop/resources/castle-gate/goon-2-flip.pxa/1.pxi b/desktop/asset-work/castle-gate/goon-2-flip.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-flip.pxa/1.pxi rename to desktop/asset-work/castle-gate/goon-2-flip.pxa/1.pxi diff --git a/desktop/resources/castle-gate/goon-2-flip.pxa/2.pxi b/desktop/asset-work/castle-gate/goon-2-flip.pxa/2.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-flip.pxa/2.pxi rename to desktop/asset-work/castle-gate/goon-2-flip.pxa/2.pxi diff --git a/desktop/resources/castle-gate/goon-2-flip.pxa/3.pxi b/desktop/asset-work/castle-gate/goon-2-flip.pxa/3.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-flip.pxa/3.pxi rename to desktop/asset-work/castle-gate/goon-2-flip.pxa/3.pxi diff --git a/desktop/resources/castle-gate/goon-2-flip.pxa/CelData.plist b/desktop/asset-work/castle-gate/goon-2-flip.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/goon-2-flip.pxa/CelData.plist rename to desktop/asset-work/castle-gate/goon-2-flip.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/goon-2-search.png b/desktop/asset-work/castle-gate/goon-2-search.png similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.png rename to desktop/asset-work/castle-gate/goon-2-search.png diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/0.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/0.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/0.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/1.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/1.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/1.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/2.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/2.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/2.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/2.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/3.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/3.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/3.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/3.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/4.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/4.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/4.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/4.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/5.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/5.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/5.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/5.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/6.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/6.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/6.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/6.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/7.pxi b/desktop/asset-work/castle-gate/goon-2-search.pxa/7.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/7.pxi rename to desktop/asset-work/castle-gate/goon-2-search.pxa/7.pxi diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/CelData.plist b/desktop/asset-work/castle-gate/goon-2-search.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/goon-2-search.pxa/CelData.plist rename to desktop/asset-work/castle-gate/goon-2-search.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/goon-2-talk.png b/desktop/asset-work/castle-gate/goon-2-talk.png similarity index 100% rename from desktop/resources/castle-gate/goon-2-talk.png rename to desktop/asset-work/castle-gate/goon-2-talk.png diff --git a/desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi b/desktop/asset-work/castle-gate/goon-2-talk.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi rename to desktop/asset-work/castle-gate/goon-2-talk.pxa/0.pxi diff --git a/desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi b/desktop/asset-work/castle-gate/goon-2-talk.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi rename to desktop/asset-work/castle-gate/goon-2-talk.pxa/1.pxi diff --git a/desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist b/desktop/asset-work/castle-gate/goon-2-talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist rename to desktop/asset-work/castle-gate/goon-2-talk.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/goon-2-walk.png b/desktop/asset-work/castle-gate/goon-2-walk.png similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.png rename to desktop/asset-work/castle-gate/goon-2-walk.png diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/0.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/0.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/0.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/1.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/1.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/1.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/2.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/2.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/2.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/2.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/3.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/3.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/3.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/3.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/4.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/4.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/4.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/4.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/5.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/5.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/5.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/5.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/6.pxi b/desktop/asset-work/castle-gate/goon-2-walk.pxa/6.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/6.pxi rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/6.pxi diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist b/desktop/asset-work/castle-gate/goon-2-walk.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist rename to desktop/asset-work/castle-gate/goon-2-walk.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/goon-2.png b/desktop/asset-work/castle-gate/goon-2.png similarity index 100% rename from desktop/resources/castle-gate/goon-2.png rename to desktop/asset-work/castle-gate/goon-2.png diff --git a/desktop/resources/castle-gate/goon-2.pxa/0.pxi b/desktop/asset-work/castle-gate/goon-2.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2.pxa/0.pxi rename to desktop/asset-work/castle-gate/goon-2.pxa/0.pxi diff --git a/desktop/resources/castle-gate/goon-2.pxa/1.pxi b/desktop/asset-work/castle-gate/goon-2.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/goon-2.pxa/1.pxi rename to desktop/asset-work/castle-gate/goon-2.pxa/1.pxi diff --git a/desktop/resources/castle-gate/goon-2.pxa/CelData.plist b/desktop/asset-work/castle-gate/goon-2.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/goon-2.pxa/CelData.plist rename to desktop/asset-work/castle-gate/goon-2.pxa/CelData.plist diff --git a/desktop/resources/castle-gate/overlay.png b/desktop/asset-work/castle-gate/overlay.png similarity index 100% rename from desktop/resources/castle-gate/overlay.png rename to desktop/asset-work/castle-gate/overlay.png diff --git a/desktop/resources/castle-gate/stash-closed.png b/desktop/asset-work/castle-gate/stash-closed.png similarity index 100% rename from desktop/resources/castle-gate/stash-closed.png rename to desktop/asset-work/castle-gate/stash-closed.png diff --git a/desktop/asset-work/castle-gate/throw-walkie-1.png b/desktop/asset-work/castle-gate/throw-walkie-1.png new file mode 100644 index 00000000..cb3c3371 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-1.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-2.png b/desktop/asset-work/castle-gate/throw-walkie-2.png new file mode 100644 index 00000000..6cd688bf Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-2.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-3.png b/desktop/asset-work/castle-gate/throw-walkie-3.png new file mode 100644 index 00000000..ce72c2a4 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-3.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-4.png b/desktop/asset-work/castle-gate/throw-walkie-4.png new file mode 100644 index 00000000..d45e5663 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-4.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-5.png b/desktop/asset-work/castle-gate/throw-walkie-5.png new file mode 100644 index 00000000..8aea5a68 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-5.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-6.png b/desktop/asset-work/castle-gate/throw-walkie-6.png new file mode 100644 index 00000000..dff7f655 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-6.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-7.png b/desktop/asset-work/castle-gate/throw-walkie-7.png new file mode 100644 index 00000000..70f95c44 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-7.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-8.png b/desktop/asset-work/castle-gate/throw-walkie-8.png new file mode 100644 index 00000000..60592b8c Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-8.png differ diff --git a/desktop/asset-work/castle-gate/throw-walkie-9.png b/desktop/asset-work/castle-gate/throw-walkie-9.png new file mode 100644 index 00000000..ef18fcc6 Binary files /dev/null and b/desktop/asset-work/castle-gate/throw-walkie-9.png differ diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/0.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/0.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/0.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/0.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/1.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/1.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/1.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/1.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/2.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/2.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/2.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/2.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/3.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/3.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/3.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/3.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/4.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/4.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/4.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/4.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/5.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/5.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/5.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/5.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/6.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/6.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/6.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/6.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/7.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/7.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/7.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/7.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/8.pxi b/desktop/asset-work/castle-gate/throw-walkie.pxa/8.pxi similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/8.pxi rename to desktop/asset-work/castle-gate/throw-walkie.pxa/8.pxi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/CelData.plist b/desktop/asset-work/castle-gate/throw-walkie.pxa/CelData.plist similarity index 100% rename from desktop/resources/castle-gate/throw-walkie.pxa/CelData.plist rename to desktop/asset-work/castle-gate/throw-walkie.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/Untitled.png b/desktop/asset-work/cat-tree/Untitled.png similarity index 100% rename from desktop/resources/cat-tree/Untitled.png rename to desktop/asset-work/cat-tree/Untitled.png diff --git a/desktop/resources/cat-tree/background.png b/desktop/asset-work/cat-tree/background.png similarity index 100% rename from desktop/resources/cat-tree/background.png rename to desktop/asset-work/cat-tree/background.png 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/brush-l.png b/desktop/asset-work/cat-tree/brush-l.png similarity index 100% rename from desktop/resources/cat-tree/brush-l.png rename to desktop/asset-work/cat-tree/brush-l.png diff --git a/desktop/resources/cat-tree/cat-stand.png b/desktop/asset-work/cat-tree/cat-stand.png similarity index 100% rename from desktop/resources/cat-tree/cat-stand.png rename to desktop/asset-work/cat-tree/cat-stand.png diff --git a/desktop/resources/cat-tree/cat.png b/desktop/asset-work/cat-tree/cat.png similarity index 100% rename from desktop/resources/cat-tree/cat.png rename to desktop/asset-work/cat-tree/cat.png diff --git a/desktop/resources/cat-tree/cat.pxa/0.pxi b/desktop/asset-work/cat-tree/cat.pxa/0.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/0.pxi rename to desktop/asset-work/cat-tree/cat.pxa/0.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/1.pxi b/desktop/asset-work/cat-tree/cat.pxa/1.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/1.pxi rename to desktop/asset-work/cat-tree/cat.pxa/1.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/2.pxi b/desktop/asset-work/cat-tree/cat.pxa/2.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/2.pxi rename to desktop/asset-work/cat-tree/cat.pxa/2.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/3.pxi b/desktop/asset-work/cat-tree/cat.pxa/3.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/3.pxi rename to desktop/asset-work/cat-tree/cat.pxa/3.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/4.pxi b/desktop/asset-work/cat-tree/cat.pxa/4.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/4.pxi rename to desktop/asset-work/cat-tree/cat.pxa/4.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/5.pxi b/desktop/asset-work/cat-tree/cat.pxa/5.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/5.pxi rename to desktop/asset-work/cat-tree/cat.pxa/5.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/6.pxi b/desktop/asset-work/cat-tree/cat.pxa/6.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/6.pxi rename to desktop/asset-work/cat-tree/cat.pxa/6.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/7.pxi b/desktop/asset-work/cat-tree/cat.pxa/7.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/7.pxi rename to desktop/asset-work/cat-tree/cat.pxa/7.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/8.pxi b/desktop/asset-work/cat-tree/cat.pxa/8.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/8.pxi rename to desktop/asset-work/cat-tree/cat.pxa/8.pxi diff --git a/desktop/resources/cat-tree/cat.pxa/CelData.plist b/desktop/asset-work/cat-tree/cat.pxa/CelData.plist similarity index 100% rename from desktop/resources/cat-tree/cat.pxa/CelData.plist rename to desktop/asset-work/cat-tree/cat.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/cat.pxi b/desktop/asset-work/cat-tree/cat.pxi similarity index 100% rename from desktop/resources/cat-tree/cat.pxi rename to desktop/asset-work/cat-tree/cat.pxi 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/destroy-ladder.png b/desktop/asset-work/cat-tree/destroy-ladder.png similarity index 100% rename from desktop/resources/cat-tree/destroy-ladder.png rename to desktop/asset-work/cat-tree/destroy-ladder.png diff --git a/desktop/resources/cat-tree/dot.png b/desktop/asset-work/cat-tree/dot.png similarity index 100% rename from desktop/resources/cat-tree/dot.png rename to desktop/asset-work/cat-tree/dot.png diff --git a/desktop/asset-work/cat-tree/grandma-cry-1.png b/desktop/asset-work/cat-tree/grandma-cry-1.png new file mode 100644 index 00000000..9620b204 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-1.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-10.png b/desktop/asset-work/cat-tree/grandma-cry-10.png new file mode 100644 index 00000000..65c40a91 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-10.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-11.png b/desktop/asset-work/cat-tree/grandma-cry-11.png new file mode 100644 index 00000000..c499b24d Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-11.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-12.png b/desktop/asset-work/cat-tree/grandma-cry-12.png new file mode 100644 index 00000000..f084826f Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-12.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-13.png b/desktop/asset-work/cat-tree/grandma-cry-13.png new file mode 100644 index 00000000..b0588c47 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-13.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-14.png b/desktop/asset-work/cat-tree/grandma-cry-14.png new file mode 100644 index 00000000..b244de08 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-14.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-15.png b/desktop/asset-work/cat-tree/grandma-cry-15.png new file mode 100644 index 00000000..41bb56a9 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-15.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-16.png b/desktop/asset-work/cat-tree/grandma-cry-16.png new file mode 100644 index 00000000..d3accfb4 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-16.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-17.png b/desktop/asset-work/cat-tree/grandma-cry-17.png new file mode 100644 index 00000000..353dea6c Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-17.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-18.png b/desktop/asset-work/cat-tree/grandma-cry-18.png new file mode 100644 index 00000000..a62e95e6 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-18.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-19.png b/desktop/asset-work/cat-tree/grandma-cry-19.png new file mode 100644 index 00000000..01eec00a Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-19.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-2.png b/desktop/asset-work/cat-tree/grandma-cry-2.png new file mode 100644 index 00000000..8d2e7738 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-2.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-20.png b/desktop/asset-work/cat-tree/grandma-cry-20.png new file mode 100644 index 00000000..beb810aa Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-20.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-3.png b/desktop/asset-work/cat-tree/grandma-cry-3.png new file mode 100644 index 00000000..c77aa922 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-3.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-4.png b/desktop/asset-work/cat-tree/grandma-cry-4.png new file mode 100644 index 00000000..18745cb3 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-4.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-5.png b/desktop/asset-work/cat-tree/grandma-cry-5.png new file mode 100644 index 00000000..dd8fc6ff Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-5.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-6.png b/desktop/asset-work/cat-tree/grandma-cry-6.png new file mode 100644 index 00000000..a0ee8e8a Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-6.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-7.png b/desktop/asset-work/cat-tree/grandma-cry-7.png new file mode 100644 index 00000000..cd651ae9 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-7.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-8.png b/desktop/asset-work/cat-tree/grandma-cry-8.png new file mode 100644 index 00000000..f1f68a2f Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-8.png differ diff --git a/desktop/asset-work/cat-tree/grandma-cry-9.png b/desktop/asset-work/cat-tree/grandma-cry-9.png new file mode 100644 index 00000000..59f6dbd4 Binary files /dev/null and b/desktop/asset-work/cat-tree/grandma-cry-9.png differ diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/0.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/0.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/0.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/0.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/1.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/1.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/1.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/1.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/10.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/10.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/10.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/10.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/11.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/11.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/11.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/11.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/12.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/12.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/12.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/12.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/13.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/13.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/13.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/13.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/14.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/14.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/14.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/14.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/15.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/15.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/15.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/15.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/16.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/16.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/16.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/16.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/17.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/17.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/17.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/17.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/18.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/18.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/18.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/18.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/19.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/19.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/19.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/19.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/2.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/2.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/2.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/2.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/3.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/3.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/3.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/3.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/4.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/4.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/4.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/4.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/5.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/5.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/5.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/5.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/6.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/6.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/6.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/6.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/7.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/7.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/7.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/7.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/8.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/8.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/8.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/8.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/9.pxi b/desktop/asset-work/cat-tree/grandma-cry.pxa/9.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/9.pxi rename to desktop/asset-work/cat-tree/grandma-cry.pxa/9.pxi diff --git a/desktop/resources/cat-tree/grandma-cry.pxa/CelData.plist b/desktop/asset-work/cat-tree/grandma-cry.pxa/CelData.plist similarity index 100% rename from desktop/resources/cat-tree/grandma-cry.pxa/CelData.plist rename to desktop/asset-work/cat-tree/grandma-cry.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/grandma.png b/desktop/asset-work/cat-tree/grandma.png similarity index 100% rename from desktop/resources/cat-tree/grandma.png rename to desktop/asset-work/cat-tree/grandma.png diff --git a/desktop/resources/cat-tree/grandma.pxa/0.pxi b/desktop/asset-work/cat-tree/grandma.pxa/0.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/0.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/0.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/1.pxi b/desktop/asset-work/cat-tree/grandma.pxa/1.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/1.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/1.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/10.pxi b/desktop/asset-work/cat-tree/grandma.pxa/10.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/10.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/10.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/2.pxi b/desktop/asset-work/cat-tree/grandma.pxa/2.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/2.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/2.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/3.pxi b/desktop/asset-work/cat-tree/grandma.pxa/3.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/3.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/3.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/4.pxi b/desktop/asset-work/cat-tree/grandma.pxa/4.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/4.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/4.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/5.pxi b/desktop/asset-work/cat-tree/grandma.pxa/5.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/5.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/5.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/6.pxi b/desktop/asset-work/cat-tree/grandma.pxa/6.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/6.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/6.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/7.pxi b/desktop/asset-work/cat-tree/grandma.pxa/7.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/7.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/7.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/8.pxi b/desktop/asset-work/cat-tree/grandma.pxa/8.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/8.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/8.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/9.pxi b/desktop/asset-work/cat-tree/grandma.pxa/9.pxi similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/9.pxi rename to desktop/asset-work/cat-tree/grandma.pxa/9.pxi diff --git a/desktop/resources/cat-tree/grandma.pxa/CelData.plist b/desktop/asset-work/cat-tree/grandma.pxa/CelData.plist similarity index 100% rename from desktop/resources/cat-tree/grandma.pxa/CelData.plist rename to desktop/asset-work/cat-tree/grandma.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/inventory.png b/desktop/asset-work/cat-tree/inventory.png similarity index 100% rename from desktop/resources/cat-tree/inventory.png rename to desktop/asset-work/cat-tree/inventory.png 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/cat-tree/ladderbreak.pxa/0.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/0.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/0.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/0.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/1.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/1.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/1.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/1.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/10.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/10.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/10.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/10.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/11.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/11.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/11.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/11.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/12.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/12.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/12.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/12.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/13.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/13.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/13.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/13.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/14.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/14.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/14.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/14.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/15.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/15.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/15.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/15.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/16.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/16.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/16.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/16.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/17.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/17.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/17.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/17.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/2.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/2.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/2.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/2.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/3.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/3.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/3.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/3.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/4.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/4.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/4.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/4.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/5.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/5.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/5.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/5.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/6.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/6.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/6.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/6.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/7.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/7.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/7.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/7.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/8.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/8.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/8.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/8.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/9.pxi b/desktop/asset-work/cat-tree/ladderbreak.pxa/9.pxi similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/9.pxi rename to desktop/asset-work/cat-tree/ladderbreak.pxa/9.pxi diff --git a/desktop/resources/cat-tree/ladderbreak.pxa/CelData.plist b/desktop/asset-work/cat-tree/ladderbreak.pxa/CelData.plist similarity index 100% rename from desktop/resources/cat-tree/ladderbreak.pxa/CelData.plist rename to desktop/asset-work/cat-tree/ladderbreak.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/monocle.png b/desktop/asset-work/cat-tree/monocle.png similarity index 100% rename from desktop/resources/cat-tree/monocle.png rename to desktop/asset-work/cat-tree/monocle.png diff --git a/desktop/resources/cat-tree/monocle.pxa/0.pxi b/desktop/asset-work/cat-tree/monocle.pxa/0.pxi similarity index 100% rename from desktop/resources/cat-tree/monocle.pxa/0.pxi rename to desktop/asset-work/cat-tree/monocle.pxa/0.pxi diff --git a/desktop/resources/cat-tree/monocle.pxa/1.pxi b/desktop/asset-work/cat-tree/monocle.pxa/1.pxi similarity index 100% rename from desktop/resources/cat-tree/monocle.pxa/1.pxi rename to desktop/asset-work/cat-tree/monocle.pxa/1.pxi diff --git a/desktop/resources/cat-tree/monocle.pxa/2.pxi b/desktop/asset-work/cat-tree/monocle.pxa/2.pxi similarity index 100% rename from desktop/resources/cat-tree/monocle.pxa/2.pxi rename to desktop/asset-work/cat-tree/monocle.pxa/2.pxi diff --git a/desktop/resources/cat-tree/monocle.pxa/3.pxi b/desktop/asset-work/cat-tree/monocle.pxa/3.pxi similarity index 100% rename from desktop/resources/cat-tree/monocle.pxa/3.pxi rename to desktop/asset-work/cat-tree/monocle.pxa/3.pxi diff --git a/desktop/resources/cat-tree/monocle.pxa/CelData.plist b/desktop/asset-work/cat-tree/monocle.pxa/CelData.plist similarity index 100% rename from desktop/resources/cat-tree/monocle.pxa/CelData.plist rename to desktop/asset-work/cat-tree/monocle.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/owl.png b/desktop/asset-work/cat-tree/owl.png similarity index 100% rename from desktop/resources/cat-tree/owl.png rename to desktop/asset-work/cat-tree/owl.png diff --git a/desktop/resources/cat-tree/owl.pxa/0.pxi b/desktop/asset-work/cat-tree/owl.pxa/0.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/0.pxi rename to desktop/asset-work/cat-tree/owl.pxa/0.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/1.pxi b/desktop/asset-work/cat-tree/owl.pxa/1.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/1.pxi rename to desktop/asset-work/cat-tree/owl.pxa/1.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/2.pxi b/desktop/asset-work/cat-tree/owl.pxa/2.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/2.pxi rename to desktop/asset-work/cat-tree/owl.pxa/2.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/3.pxi b/desktop/asset-work/cat-tree/owl.pxa/3.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/3.pxi rename to desktop/asset-work/cat-tree/owl.pxa/3.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/4.pxi b/desktop/asset-work/cat-tree/owl.pxa/4.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/4.pxi rename to desktop/asset-work/cat-tree/owl.pxa/4.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/5.pxi b/desktop/asset-work/cat-tree/owl.pxa/5.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/5.pxi rename to desktop/asset-work/cat-tree/owl.pxa/5.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/6.pxi b/desktop/asset-work/cat-tree/owl.pxa/6.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/6.pxi rename to desktop/asset-work/cat-tree/owl.pxa/6.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/7.pxi b/desktop/asset-work/cat-tree/owl.pxa/7.pxi similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/7.pxi rename to desktop/asset-work/cat-tree/owl.pxa/7.pxi diff --git a/desktop/resources/cat-tree/owl.pxa/CelData.plist b/desktop/asset-work/cat-tree/owl.pxa/CelData.plist similarity index 100% rename from desktop/resources/cat-tree/owl.pxa/CelData.plist rename to desktop/asset-work/cat-tree/owl.pxa/CelData.plist diff --git a/desktop/resources/cat-tree/pounce.png b/desktop/asset-work/cat-tree/pounce.png similarity index 100% rename from desktop/resources/cat-tree/pounce.png rename to desktop/asset-work/cat-tree/pounce.png diff --git a/desktop/resources/cat-tree/puke b/desktop/asset-work/cat-tree/puke similarity index 100% rename from desktop/resources/cat-tree/puke rename to desktop/asset-work/cat-tree/puke diff --git a/desktop/resources/cat-tree/sillhoute.png b/desktop/asset-work/cat-tree/sillhoute.png similarity index 100% rename from desktop/resources/cat-tree/sillhoute.png rename to desktop/asset-work/cat-tree/sillhoute.png diff --git a/desktop/resources/cat-tree/tree-and-rock.png b/desktop/asset-work/cat-tree/tree-and-rock.png similarity index 100% rename from desktop/resources/cat-tree/tree-and-rock.png rename to desktop/asset-work/cat-tree/tree-and-rock.png diff --git a/desktop/resources/cat-tree/tree-r.png b/desktop/asset-work/cat-tree/tree-r.png similarity index 100% rename from desktop/resources/cat-tree/tree-r.png rename to desktop/asset-work/cat-tree/tree-r.png diff --git a/desktop/resources/close.png b/desktop/asset-work/close.png similarity index 100% rename from desktop/resources/close.png rename to desktop/asset-work/close.png diff --git a/desktop/resources/cloud.png b/desktop/asset-work/cloud.png similarity index 100% rename from desktop/resources/cloud.png rename to desktop/asset-work/cloud.png diff --git a/desktop/resources/cloud1.pxi b/desktop/asset-work/cloud1.pxi similarity index 100% rename from desktop/resources/cloud1.pxi rename to desktop/asset-work/cloud1.pxi diff --git a/desktop/resources/cloudy.png b/desktop/asset-work/cloudy.png similarity index 100% rename from desktop/resources/cloudy.png rename to desktop/asset-work/cloudy.png diff --git a/desktop/resources/cursorr.png b/desktop/asset-work/cursorr.png similarity index 100% rename from desktop/resources/cursorr.png rename to desktop/asset-work/cursorr.png diff --git a/desktop/resources/dawn.png b/desktop/asset-work/dawn.png similarity index 100% rename from desktop/resources/dawn.png rename to desktop/asset-work/dawn.png 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/asset-work/door.ogg b/desktop/asset-work/door.ogg new file mode 100644 index 00000000..3f870398 Binary files /dev/null and b/desktop/asset-work/door.ogg differ diff --git a/desktop/asset-work/door.wav b/desktop/asset-work/door.wav new file mode 100644 index 00000000..bddd2c66 Binary files /dev/null and b/desktop/asset-work/door.wav differ 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.png b/desktop/asset-work/dream/background.png similarity index 100% rename from desktop/resources/dream/background.png rename to desktop/asset-work/dream/background.png 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/broom.png b/desktop/asset-work/dream/broom.png similarity index 100% rename from desktop/resources/dream/broom.png rename to desktop/asset-work/dream/broom.png diff --git a/desktop/resources/dream/case.png b/desktop/asset-work/dream/case.png similarity index 100% rename from desktop/resources/dream/case.png rename to desktop/asset-work/dream/case.png diff --git a/desktop/resources/dream/cliff.png b/desktop/asset-work/dream/cliff.png similarity index 100% rename from desktop/resources/dream/cliff.png rename to desktop/asset-work/dream/cliff.png diff --git a/desktop/resources/dream/clouds1.png b/desktop/asset-work/dream/clouds1.png similarity index 100% rename from desktop/resources/dream/clouds1.png rename to desktop/asset-work/dream/clouds1.png diff --git a/desktop/resources/dream/clouds2.png b/desktop/asset-work/dream/clouds2.png similarity index 100% rename from desktop/resources/dream/clouds2.png rename to desktop/asset-work/dream/clouds2.png diff --git a/desktop/resources/dream/cloudy2 b/desktop/asset-work/dream/cloudy2 similarity index 100% rename from desktop/resources/dream/cloudy2 rename to desktop/asset-work/dream/cloudy2 diff --git a/desktop/resources/dream/corner-l.png b/desktop/asset-work/dream/corner-l.png similarity index 100% rename from desktop/resources/dream/corner-l.png rename to desktop/asset-work/dream/corner-l.png diff --git a/desktop/resources/dream/corner-r.png b/desktop/asset-work/dream/corner-r.png similarity index 100% rename from desktop/resources/dream/corner-r.png rename to desktop/asset-work/dream/corner-r.png diff --git a/desktop/resources/dot.png b/desktop/asset-work/dream/dot.png similarity index 100% rename from desktop/resources/dot.png rename to desktop/asset-work/dream/dot.png diff --git a/desktop/resources/dream/explode b/desktop/asset-work/dream/explode similarity index 100% rename from desktop/resources/dream/explode rename to desktop/asset-work/dream/explode diff --git a/desktop/asset-work/dream/fairy-godfather-magic.png b/desktop/asset-work/dream/fairy-godfather-magic.png new file mode 100644 index 00000000..f72f23c2 Binary files /dev/null and b/desktop/asset-work/dream/fairy-godfather-magic.png differ diff --git a/desktop/asset-work/dream/fairy-godfather-magic.pxa/0.pxi b/desktop/asset-work/dream/fairy-godfather-magic.pxa/0.pxi new file mode 100644 index 00000000..bcc3f4cd Binary files /dev/null and b/desktop/asset-work/dream/fairy-godfather-magic.pxa/0.pxi differ diff --git a/desktop/asset-work/dream/fairy-godfather-magic.pxa/1.pxi b/desktop/asset-work/dream/fairy-godfather-magic.pxa/1.pxi new file mode 100644 index 00000000..aecd8695 Binary files /dev/null and b/desktop/asset-work/dream/fairy-godfather-magic.pxa/1.pxi differ diff --git a/desktop/asset-work/dream/fairy-godfather-magic.pxa/2.pxi b/desktop/asset-work/dream/fairy-godfather-magic.pxa/2.pxi new file mode 100644 index 00000000..00099131 Binary files /dev/null and b/desktop/asset-work/dream/fairy-godfather-magic.pxa/2.pxi differ diff --git a/desktop/asset-work/dream/fairy-godfather-magic.pxa/3.pxi b/desktop/asset-work/dream/fairy-godfather-magic.pxa/3.pxi new file mode 100644 index 00000000..b76e68f1 Binary files /dev/null and b/desktop/asset-work/dream/fairy-godfather-magic.pxa/3.pxi differ diff --git a/desktop/asset-work/dream/fairy-godfather-magic.pxa/4.pxi b/desktop/asset-work/dream/fairy-godfather-magic.pxa/4.pxi new file mode 100644 index 00000000..1930ae38 Binary files /dev/null and b/desktop/asset-work/dream/fairy-godfather-magic.pxa/4.pxi differ diff --git a/desktop/resources/ego/cat-toy.pxa/CelData.plist b/desktop/asset-work/dream/fairy-godfather-magic.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/cat-toy.pxa/CelData.plist rename to desktop/asset-work/dream/fairy-godfather-magic.pxa/CelData.plist diff --git a/desktop/resources/dream/fairy-godfather.png b/desktop/asset-work/dream/fairy-godfather.png similarity index 100% rename from desktop/resources/dream/fairy-godfather.png rename to desktop/asset-work/dream/fairy-godfather.png diff --git a/desktop/resources/dream/fairy-godfather.pxa/0.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/0.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/0.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/0.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/1.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/1.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/1.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/1.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/2.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/2.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/2.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/2.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/3.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/3.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/3.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/3.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/4.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/4.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/4.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/4.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/5.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/5.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/5.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/5.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/6.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/6.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/6.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/6.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/7.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/7.pxi similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/7.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/7.pxi diff --git a/desktop/resources/dream/fairy-godfather.pxa/8.pxi b/desktop/asset-work/dream/fairy-godfather.pxa/8.pxi similarity index 99% rename from desktop/resources/dream/fairy-godfather.pxa/8.pxi rename to desktop/asset-work/dream/fairy-godfather.pxa/8.pxi index 5e06e105..1f79eedf 100644 Binary files a/desktop/resources/dream/fairy-godfather.pxa/8.pxi and b/desktop/asset-work/dream/fairy-godfather.pxa/8.pxi differ diff --git a/desktop/resources/dream/fairy-godfather.pxa/CelData.plist b/desktop/asset-work/dream/fairy-godfather.pxa/CelData.plist similarity index 100% rename from desktop/resources/dream/fairy-godfather.pxa/CelData.plist rename to desktop/asset-work/dream/fairy-godfather.pxa/CelData.plist diff --git a/desktop/resources/dream/fountain.png b/desktop/asset-work/dream/fountain.png similarity index 100% rename from desktop/resources/dream/fountain.png rename to desktop/asset-work/dream/fountain.png diff --git a/desktop/resources/dream/island.png b/desktop/asset-work/dream/island.png similarity index 100% rename from desktop/resources/dream/island.png rename to desktop/asset-work/dream/island.png diff --git a/desktop/resources/dream/magic b/desktop/asset-work/dream/magic similarity index 100% rename from desktop/resources/dream/magic rename to desktop/asset-work/dream/magic 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/dream/pedestals.png b/desktop/asset-work/dream/pedestals.png similarity index 100% rename from desktop/resources/dream/pedestals.png rename to desktop/asset-work/dream/pedestals.png diff --git a/desktop/resources/dream/plaque1.png b/desktop/asset-work/dream/plaque1.png similarity index 100% rename from desktop/resources/dream/plaque1.png rename to desktop/asset-work/dream/plaque1.png diff --git a/desktop/resources/dream/plaque2.png b/desktop/asset-work/dream/plaque2.png similarity index 100% rename from desktop/resources/dream/plaque2.png rename to desktop/asset-work/dream/plaque2.png diff --git a/desktop/resources/dream/plaque3.png b/desktop/asset-work/dream/plaque3.png similarity index 100% rename from desktop/resources/dream/plaque3.png rename to desktop/asset-work/dream/plaque3.png diff --git a/desktop/resources/dream/shovel.png b/desktop/asset-work/dream/shovel.png similarity index 100% rename from desktop/resources/dream/shovel.png rename to desktop/asset-work/dream/shovel.png diff --git a/desktop/resources/dream/sign.png b/desktop/asset-work/dream/sign.png similarity index 100% rename from desktop/resources/dream/sign.png rename to desktop/asset-work/dream/sign.png diff --git a/desktop/resources/dream/sword.png b/desktop/asset-work/dream/sword.png similarity index 100% rename from desktop/resources/dream/sword.png rename to desktop/asset-work/dream/sword.png diff --git a/desktop/resources/ego/Untitled.png b/desktop/asset-work/ego/Untitled.png similarity index 100% rename from desktop/resources/ego/Untitled.png rename to desktop/asset-work/ego/Untitled.png diff --git a/desktop/resources/ego/axe-wood.png b/desktop/asset-work/ego/axe-wood.png similarity index 100% rename from desktop/resources/ego/axe-wood.png rename to desktop/asset-work/ego/axe-wood.png diff --git a/desktop/resources/ego/axe.png b/desktop/asset-work/ego/axe.png similarity index 100% rename from desktop/resources/ego/axe.png rename to desktop/asset-work/ego/axe.png diff --git a/desktop/resources/ego/axe.pxa/0.pxi b/desktop/asset-work/ego/axe.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/0.pxi rename to desktop/asset-work/ego/axe.pxa/0.pxi diff --git a/desktop/resources/ego/axe.pxa/1.pxi b/desktop/asset-work/ego/axe.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/1.pxi rename to desktop/asset-work/ego/axe.pxa/1.pxi diff --git a/desktop/resources/ego/axe.pxa/2.pxi b/desktop/asset-work/ego/axe.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/2.pxi rename to desktop/asset-work/ego/axe.pxa/2.pxi diff --git a/desktop/resources/ego/axe.pxa/3.pxi b/desktop/asset-work/ego/axe.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/3.pxi rename to desktop/asset-work/ego/axe.pxa/3.pxi diff --git a/desktop/resources/ego/axe.pxa/4.pxi b/desktop/asset-work/ego/axe.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/4.pxi rename to desktop/asset-work/ego/axe.pxa/4.pxi diff --git a/desktop/resources/ego/axe.pxa/5.pxi b/desktop/asset-work/ego/axe.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/5.pxi rename to desktop/asset-work/ego/axe.pxa/5.pxi diff --git a/desktop/resources/ego/axe.pxa/6.pxi b/desktop/asset-work/ego/axe.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/axe.pxa/6.pxi rename to desktop/asset-work/ego/axe.pxa/6.pxi diff --git a/desktop/resources/ego/axe.pxa/CelData.plist b/desktop/asset-work/ego/axe.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/axe.pxa/CelData.plist rename to desktop/asset-work/ego/axe.pxa/CelData.plist diff --git a/desktop/resources/ego/base.png b/desktop/asset-work/ego/base.png similarity index 100% rename from desktop/resources/ego/base.png rename to desktop/asset-work/ego/base.png 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/burnt.png b/desktop/asset-work/ego/burnt.png similarity index 100% rename from desktop/resources/ego/burnt.png rename to desktop/asset-work/ego/burnt.png diff --git a/desktop/resources/ego/burnt.pxa/0.pxi b/desktop/asset-work/ego/burnt.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/0.pxi rename to desktop/asset-work/ego/burnt.pxa/0.pxi diff --git a/desktop/resources/ego/burnt.pxa/1.pxi b/desktop/asset-work/ego/burnt.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/1.pxi rename to desktop/asset-work/ego/burnt.pxa/1.pxi diff --git a/desktop/resources/ego/burnt.pxa/10.pxi b/desktop/asset-work/ego/burnt.pxa/10.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/10.pxi rename to desktop/asset-work/ego/burnt.pxa/10.pxi diff --git a/desktop/resources/ego/burnt.pxa/11.pxi b/desktop/asset-work/ego/burnt.pxa/11.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/11.pxi rename to desktop/asset-work/ego/burnt.pxa/11.pxi diff --git a/desktop/resources/ego/burnt.pxa/2.pxi b/desktop/asset-work/ego/burnt.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/2.pxi rename to desktop/asset-work/ego/burnt.pxa/2.pxi diff --git a/desktop/resources/ego/burnt.pxa/3.pxi b/desktop/asset-work/ego/burnt.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/3.pxi rename to desktop/asset-work/ego/burnt.pxa/3.pxi diff --git a/desktop/resources/ego/burnt.pxa/4.pxi b/desktop/asset-work/ego/burnt.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/4.pxi rename to desktop/asset-work/ego/burnt.pxa/4.pxi diff --git a/desktop/resources/ego/burnt.pxa/5.pxi b/desktop/asset-work/ego/burnt.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/5.pxi rename to desktop/asset-work/ego/burnt.pxa/5.pxi diff --git a/desktop/resources/ego/burnt.pxa/6.pxi b/desktop/asset-work/ego/burnt.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/6.pxi rename to desktop/asset-work/ego/burnt.pxa/6.pxi diff --git a/desktop/resources/ego/burnt.pxa/7.pxi b/desktop/asset-work/ego/burnt.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/7.pxi rename to desktop/asset-work/ego/burnt.pxa/7.pxi diff --git a/desktop/resources/ego/burnt.pxa/8.pxi b/desktop/asset-work/ego/burnt.pxa/8.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/8.pxi rename to desktop/asset-work/ego/burnt.pxa/8.pxi diff --git a/desktop/resources/ego/burnt.pxa/9.pxi b/desktop/asset-work/ego/burnt.pxa/9.pxi similarity index 100% rename from desktop/resources/ego/burnt.pxa/9.pxi rename to desktop/asset-work/ego/burnt.pxa/9.pxi diff --git a/desktop/resources/ego/burnt.pxa/CelData.plist b/desktop/asset-work/ego/burnt.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/burnt.pxa/CelData.plist rename to desktop/asset-work/ego/burnt.pxa/CelData.plist diff --git a/desktop/resources/ego/cat-toy.png b/desktop/asset-work/ego/cat-toy.png similarity index 100% rename from desktop/resources/ego/cat-toy.png rename to desktop/asset-work/ego/cat-toy.png diff --git a/desktop/resources/ego/cat-toy.pxa/0.pxi b/desktop/asset-work/ego/cat-toy.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/cat-toy.pxa/0.pxi rename to desktop/asset-work/ego/cat-toy.pxa/0.pxi diff --git a/desktop/resources/ego/cat-toy.pxa/1.pxi b/desktop/asset-work/ego/cat-toy.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/cat-toy.pxa/1.pxi rename to desktop/asset-work/ego/cat-toy.pxa/1.pxi diff --git a/desktop/resources/ego/cat-toy.pxa/2.pxi b/desktop/asset-work/ego/cat-toy.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/cat-toy.pxa/2.pxi rename to desktop/asset-work/ego/cat-toy.pxa/2.pxi diff --git a/desktop/resources/ego/cat-toy.pxa/3.pxi b/desktop/asset-work/ego/cat-toy.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/cat-toy.pxa/3.pxi rename to desktop/asset-work/ego/cat-toy.pxa/3.pxi diff --git a/desktop/resources/ego/cat-toy.pxa/4.pxi b/desktop/asset-work/ego/cat-toy.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/cat-toy.pxa/4.pxi rename to desktop/asset-work/ego/cat-toy.pxa/4.pxi diff --git a/desktop/resources/ego/grow.pxa/CelData.plist b/desktop/asset-work/ego/cat-toy.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/grow.pxa/CelData.plist rename to desktop/asset-work/ego/cat-toy.pxa/CelData.plist diff --git a/desktop/resources/ego/crawl.png b/desktop/asset-work/ego/crawl.png similarity index 100% rename from desktop/resources/ego/crawl.png rename to desktop/asset-work/ego/crawl.png diff --git a/desktop/resources/ego/crawl.pxa/0.pxi b/desktop/asset-work/ego/crawl.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/0.pxi rename to desktop/asset-work/ego/crawl.pxa/0.pxi diff --git a/desktop/resources/ego/crawl.pxa/1.pxi b/desktop/asset-work/ego/crawl.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/1.pxi rename to desktop/asset-work/ego/crawl.pxa/1.pxi diff --git a/desktop/resources/ego/crawl.pxa/2.pxi b/desktop/asset-work/ego/crawl.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/2.pxi rename to desktop/asset-work/ego/crawl.pxa/2.pxi diff --git a/desktop/resources/ego/crawl.pxa/3.pxi b/desktop/asset-work/ego/crawl.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/3.pxi rename to desktop/asset-work/ego/crawl.pxa/3.pxi diff --git a/desktop/resources/ego/crawl.pxa/4.pxi b/desktop/asset-work/ego/crawl.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/4.pxi rename to desktop/asset-work/ego/crawl.pxa/4.pxi diff --git a/desktop/resources/ego/crawl.pxa/5.pxi b/desktop/asset-work/ego/crawl.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/5.pxi rename to desktop/asset-work/ego/crawl.pxa/5.pxi diff --git a/desktop/resources/ego/crawl.pxa/6.pxi b/desktop/asset-work/ego/crawl.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/crawl.pxa/6.pxi rename to desktop/asset-work/ego/crawl.pxa/6.pxi diff --git a/desktop/resources/ego/crawl.pxa/CelData.plist b/desktop/asset-work/ego/crawl.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/crawl.pxa/CelData.plist rename to desktop/asset-work/ego/crawl.pxa/CelData.plist diff --git a/desktop/resources/ego/crowbar.png b/desktop/asset-work/ego/crowbar.png similarity index 100% rename from desktop/resources/ego/crowbar.png rename to desktop/asset-work/ego/crowbar.png diff --git a/desktop/resources/ego/crowbar.pxa/0.pxi b/desktop/asset-work/ego/crowbar.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/crowbar.pxa/0.pxi rename to desktop/asset-work/ego/crowbar.pxa/0.pxi diff --git a/desktop/resources/ego/crowbar.pxa/1.pxi b/desktop/asset-work/ego/crowbar.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/crowbar.pxa/1.pxi rename to desktop/asset-work/ego/crowbar.pxa/1.pxi diff --git a/desktop/resources/ego/crowbar.pxa/2.pxi b/desktop/asset-work/ego/crowbar.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/crowbar.pxa/2.pxi rename to desktop/asset-work/ego/crowbar.pxa/2.pxi diff --git a/desktop/resources/ego/crowbar.pxa/3.pxi b/desktop/asset-work/ego/crowbar.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/crowbar.pxa/3.pxi rename to desktop/asset-work/ego/crowbar.pxa/3.pxi diff --git a/desktop/resources/ego/crowbar.pxa/CelData.plist b/desktop/asset-work/ego/crowbar.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/crowbar.pxa/CelData.plist rename to desktop/asset-work/ego/crowbar.pxa/CelData.plist diff --git a/desktop/resources/dream/dot.png b/desktop/asset-work/ego/dot.png similarity index 100% rename from desktop/resources/dream/dot.png rename to desktop/asset-work/ego/dot.png diff --git a/desktop/resources/ego/fire.png b/desktop/asset-work/ego/fire.png similarity index 100% rename from desktop/resources/ego/fire.png rename to desktop/asset-work/ego/fire.png diff --git a/desktop/resources/ego/fire.pxa/0.pxi b/desktop/asset-work/ego/fire.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/0.pxi rename to desktop/asset-work/ego/fire.pxa/0.pxi diff --git a/desktop/resources/ego/fire.pxa/1.pxi b/desktop/asset-work/ego/fire.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/1.pxi rename to desktop/asset-work/ego/fire.pxa/1.pxi diff --git a/desktop/resources/ego/fire.pxa/10.pxi b/desktop/asset-work/ego/fire.pxa/10.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/10.pxi rename to desktop/asset-work/ego/fire.pxa/10.pxi diff --git a/desktop/resources/ego/fire.pxa/11.pxi b/desktop/asset-work/ego/fire.pxa/11.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/11.pxi rename to desktop/asset-work/ego/fire.pxa/11.pxi diff --git a/desktop/resources/ego/fire.pxa/2.pxi b/desktop/asset-work/ego/fire.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/2.pxi rename to desktop/asset-work/ego/fire.pxa/2.pxi diff --git a/desktop/resources/ego/fire.pxa/3.pxi b/desktop/asset-work/ego/fire.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/3.pxi rename to desktop/asset-work/ego/fire.pxa/3.pxi diff --git a/desktop/resources/ego/fire.pxa/4.pxi b/desktop/asset-work/ego/fire.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/4.pxi rename to desktop/asset-work/ego/fire.pxa/4.pxi diff --git a/desktop/resources/ego/fire.pxa/5.pxi b/desktop/asset-work/ego/fire.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/5.pxi rename to desktop/asset-work/ego/fire.pxa/5.pxi diff --git a/desktop/resources/ego/fire.pxa/6.pxi b/desktop/asset-work/ego/fire.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/6.pxi rename to desktop/asset-work/ego/fire.pxa/6.pxi diff --git a/desktop/resources/ego/fire.pxa/7.pxi b/desktop/asset-work/ego/fire.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/7.pxi rename to desktop/asset-work/ego/fire.pxa/7.pxi diff --git a/desktop/resources/ego/fire.pxa/8.pxi b/desktop/asset-work/ego/fire.pxa/8.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/8.pxi rename to desktop/asset-work/ego/fire.pxa/8.pxi diff --git a/desktop/resources/ego/fire.pxa/9.pxi b/desktop/asset-work/ego/fire.pxa/9.pxi similarity index 100% rename from desktop/resources/ego/fire.pxa/9.pxi rename to desktop/asset-work/ego/fire.pxa/9.pxi diff --git a/desktop/resources/ego/fire.pxa/CelData.plist b/desktop/asset-work/ego/fire.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/fire.pxa/CelData.plist rename to desktop/asset-work/ego/fire.pxa/CelData.plist diff --git a/desktop/resources/ego/flying.png b/desktop/asset-work/ego/flying.png similarity index 100% rename from desktop/resources/ego/flying.png rename to desktop/asset-work/ego/flying.png diff --git a/desktop/resources/ego/frog.png b/desktop/asset-work/ego/frog.png similarity index 100% rename from desktop/resources/ego/frog.png rename to desktop/asset-work/ego/frog.png diff --git a/desktop/resources/ego/frog.pxa/0.pxi b/desktop/asset-work/ego/frog.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/frog.pxa/0.pxi rename to desktop/asset-work/ego/frog.pxa/0.pxi diff --git a/desktop/resources/ego/frog.pxa/1.pxi b/desktop/asset-work/ego/frog.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/frog.pxa/1.pxi rename to desktop/asset-work/ego/frog.pxa/1.pxi diff --git a/desktop/resources/ego/frog.pxa/CelData.plist b/desktop/asset-work/ego/frog.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/frog.pxa/CelData.plist rename to desktop/asset-work/ego/frog.pxa/CelData.plist diff --git a/desktop/resources/ego/frustrated-talk.png b/desktop/asset-work/ego/frustrated-talk.png similarity index 100% rename from desktop/resources/ego/frustrated-talk.png rename to desktop/asset-work/ego/frustrated-talk.png diff --git a/desktop/resources/ego/frustratedtalk.pxa/0.pxi b/desktop/asset-work/ego/frustratedtalk.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/0.pxi rename to desktop/asset-work/ego/frustratedtalk.pxa/0.pxi diff --git a/desktop/resources/ego/frustratedtalk.pxa/1.pxi b/desktop/asset-work/ego/frustratedtalk.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/1.pxi rename to desktop/asset-work/ego/frustratedtalk.pxa/1.pxi diff --git a/desktop/resources/ego/frustratedtalk.pxa/2.pxi b/desktop/asset-work/ego/frustratedtalk.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/2.pxi rename to desktop/asset-work/ego/frustratedtalk.pxa/2.pxi diff --git a/desktop/resources/ego/frustratedtalk.pxa/3.pxi b/desktop/asset-work/ego/frustratedtalk.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/3.pxi rename to desktop/asset-work/ego/frustratedtalk.pxa/3.pxi diff --git a/desktop/resources/ego/frustratedtalk.pxa/4.pxi b/desktop/asset-work/ego/frustratedtalk.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/4.pxi rename to desktop/asset-work/ego/frustratedtalk.pxa/4.pxi diff --git a/desktop/resources/ego/frustratedtalk.pxa/5.pxi b/desktop/asset-work/ego/frustratedtalk.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/5.pxi rename to desktop/asset-work/ego/frustratedtalk.pxa/5.pxi diff --git a/desktop/resources/ego/frustratedtalk.pxa/CelData.plist b/desktop/asset-work/ego/frustratedtalk.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/frustratedtalk.pxa/CelData.plist rename to desktop/asset-work/ego/frustratedtalk.pxa/CelData.plist diff --git a/desktop/asset-work/ego/georgia.png b/desktop/asset-work/ego/georgia.png new file mode 100644 index 00000000..582d7eff Binary files /dev/null and b/desktop/asset-work/ego/georgia.png differ diff --git a/desktop/asset-work/ego/georgia.pxa/0.pxi b/desktop/asset-work/ego/georgia.pxa/0.pxi new file mode 100644 index 00000000..6301ad4f Binary files /dev/null and b/desktop/asset-work/ego/georgia.pxa/0.pxi differ diff --git a/desktop/asset-work/ego/georgia.pxa/1.pxi b/desktop/asset-work/ego/georgia.pxa/1.pxi new file mode 100644 index 00000000..67e47402 Binary files /dev/null and b/desktop/asset-work/ego/georgia.pxa/1.pxi differ diff --git a/desktop/asset-work/ego/georgia.pxa/2.pxi b/desktop/asset-work/ego/georgia.pxa/2.pxi new file mode 100644 index 00000000..ea29616f Binary files /dev/null and b/desktop/asset-work/ego/georgia.pxa/2.pxi differ diff --git a/desktop/resources/ego/idea.pxa/CelData.plist b/desktop/asset-work/ego/georgia.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/idea.pxa/CelData.plist rename to desktop/asset-work/ego/georgia.pxa/CelData.plist diff --git a/desktop/resources/ego/get-sick.png b/desktop/asset-work/ego/get-sick.png similarity index 100% rename from desktop/resources/ego/get-sick.png rename to desktop/asset-work/ego/get-sick.png diff --git a/desktop/resources/ego/get-sick.pxa/0.pxi b/desktop/asset-work/ego/get-sick.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/get-sick.pxa/0.pxi rename to desktop/asset-work/ego/get-sick.pxa/0.pxi diff --git a/desktop/resources/ego/get-sick.pxa/1.pxi b/desktop/asset-work/ego/get-sick.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/get-sick.pxa/1.pxi rename to desktop/asset-work/ego/get-sick.pxa/1.pxi diff --git a/desktop/resources/ego/get-sick.pxa/2.pxi b/desktop/asset-work/ego/get-sick.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/get-sick.pxa/2.pxi rename to desktop/asset-work/ego/get-sick.pxa/2.pxi diff --git a/desktop/resources/ego/get-sick.pxa/3.pxi b/desktop/asset-work/ego/get-sick.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/get-sick.pxa/3.pxi rename to desktop/asset-work/ego/get-sick.pxa/3.pxi diff --git a/desktop/resources/ego/get-sick.pxa/4.pxi b/desktop/asset-work/ego/get-sick.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/get-sick.pxa/4.pxi rename to desktop/asset-work/ego/get-sick.pxa/4.pxi diff --git a/desktop/resources/ego/get-sick.pxa/5.pxi b/desktop/asset-work/ego/get-sick.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/get-sick.pxa/5.pxi rename to desktop/asset-work/ego/get-sick.pxa/5.pxi diff --git a/desktop/resources/ego/get-sick.pxa/CelData.plist b/desktop/asset-work/ego/get-sick.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/get-sick.pxa/CelData.plist rename to desktop/asset-work/ego/get-sick.pxa/CelData.plist diff --git a/desktop/resources/ego/glad-jump b/desktop/asset-work/ego/glad-jump similarity index 100% rename from desktop/resources/ego/glad-jump rename to desktop/asset-work/ego/glad-jump diff --git a/desktop/resources/ego/glad.png b/desktop/asset-work/ego/glad.png similarity index 100% rename from desktop/resources/ego/glad.png rename to desktop/asset-work/ego/glad.png diff --git a/desktop/resources/ego/glad.pxa/0.pxi b/desktop/asset-work/ego/glad.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/0.pxi rename to desktop/asset-work/ego/glad.pxa/0.pxi diff --git a/desktop/resources/ego/glad.pxa/1.pxi b/desktop/asset-work/ego/glad.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/1.pxi rename to desktop/asset-work/ego/glad.pxa/1.pxi diff --git a/desktop/resources/ego/glad.pxa/2.pxi b/desktop/asset-work/ego/glad.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/2.pxi rename to desktop/asset-work/ego/glad.pxa/2.pxi diff --git a/desktop/resources/ego/glad.pxa/3.pxi b/desktop/asset-work/ego/glad.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/3.pxi rename to desktop/asset-work/ego/glad.pxa/3.pxi diff --git a/desktop/resources/ego/glad.pxa/4.pxi b/desktop/asset-work/ego/glad.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/4.pxi rename to desktop/asset-work/ego/glad.pxa/4.pxi diff --git a/desktop/resources/ego/glad.pxa/5.pxi b/desktop/asset-work/ego/glad.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/5.pxi rename to desktop/asset-work/ego/glad.pxa/5.pxi diff --git a/desktop/resources/ego/glad.pxa/6.pxi b/desktop/asset-work/ego/glad.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/glad.pxa/6.pxi rename to desktop/asset-work/ego/glad.pxa/6.pxi diff --git a/desktop/resources/ego/glad.pxa/CelData.plist b/desktop/asset-work/ego/glad.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/glad.pxa/CelData.plist rename to desktop/asset-work/ego/glad.pxa/CelData.plist diff --git a/desktop/resources/ego/grow-talk.png b/desktop/asset-work/ego/grow-talk.png similarity index 100% rename from desktop/resources/ego/grow-talk.png rename to desktop/asset-work/ego/grow-talk.png diff --git a/desktop/resources/ego/grow-talk.pxa/0.pxi b/desktop/asset-work/ego/grow-talk.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/grow-talk.pxa/0.pxi rename to desktop/asset-work/ego/grow-talk.pxa/0.pxi diff --git a/desktop/resources/ego/grow-talk.pxa/1.pxi b/desktop/asset-work/ego/grow-talk.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/grow-talk.pxa/1.pxi rename to desktop/asset-work/ego/grow-talk.pxa/1.pxi diff --git a/desktop/resources/ego/grow-talk.pxa/CelData.plist b/desktop/asset-work/ego/grow-talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/grow-talk.pxa/CelData.plist rename to desktop/asset-work/ego/grow-talk.pxa/CelData.plist diff --git a/desktop/resources/ego/grow.png b/desktop/asset-work/ego/grow.png similarity index 100% rename from desktop/resources/ego/grow.png rename to desktop/asset-work/ego/grow.png diff --git a/desktop/resources/ego/grow.pxa/0.pxi b/desktop/asset-work/ego/grow.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/grow.pxa/0.pxi rename to desktop/asset-work/ego/grow.pxa/0.pxi diff --git a/desktop/resources/ego/grow.pxa/1.pxi b/desktop/asset-work/ego/grow.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/grow.pxa/1.pxi rename to desktop/asset-work/ego/grow.pxa/1.pxi diff --git a/desktop/resources/ego/grow.pxa/2.pxi b/desktop/asset-work/ego/grow.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/grow.pxa/2.pxi rename to desktop/asset-work/ego/grow.pxa/2.pxi diff --git a/desktop/resources/ego/grow.pxa/3.pxi b/desktop/asset-work/ego/grow.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/grow.pxa/3.pxi rename to desktop/asset-work/ego/grow.pxa/3.pxi diff --git a/desktop/resources/ego/grow.pxa/4.pxi b/desktop/asset-work/ego/grow.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/grow.pxa/4.pxi rename to desktop/asset-work/ego/grow.pxa/4.pxi diff --git "a/desktop/resources/ego/spear\\.pxa/CelData.plist" b/desktop/asset-work/ego/grow.pxa/CelData.plist similarity index 100% rename from "desktop/resources/ego/spear\\.pxa/CelData.plist" rename to desktop/asset-work/ego/grow.pxa/CelData.plist diff --git a/desktop/resources/ego/hold-up-to-window.png b/desktop/asset-work/ego/hold-up-to-window.png similarity index 100% rename from desktop/resources/ego/hold-up-to-window.png rename to desktop/asset-work/ego/hold-up-to-window.png diff --git a/desktop/resources/ego/hold-up-to-window.pxa/0.pxi b/desktop/asset-work/ego/hold-up-to-window.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/0.pxi rename to desktop/asset-work/ego/hold-up-to-window.pxa/0.pxi diff --git a/desktop/resources/ego/hold-up-to-window.pxa/1.pxi b/desktop/asset-work/ego/hold-up-to-window.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/1.pxi rename to desktop/asset-work/ego/hold-up-to-window.pxa/1.pxi diff --git a/desktop/resources/ego/hold-up-to-window.pxa/2.pxi b/desktop/asset-work/ego/hold-up-to-window.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/2.pxi rename to desktop/asset-work/ego/hold-up-to-window.pxa/2.pxi diff --git a/desktop/resources/ego/hold-up-to-window.pxa/3.pxi b/desktop/asset-work/ego/hold-up-to-window.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/3.pxi rename to desktop/asset-work/ego/hold-up-to-window.pxa/3.pxi diff --git a/desktop/resources/ego/hold-up-to-window.pxa/4.pxi b/desktop/asset-work/ego/hold-up-to-window.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/4.pxi rename to desktop/asset-work/ego/hold-up-to-window.pxa/4.pxi diff --git a/desktop/resources/ego/hold-up-to-window.pxa/5.pxi b/desktop/asset-work/ego/hold-up-to-window.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/5.pxi rename to desktop/asset-work/ego/hold-up-to-window.pxa/5.pxi diff --git a/desktop/resources/ego/hold-up-to-window.pxa/CelData.plist b/desktop/asset-work/ego/hold-up-to-window.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/hold-up-to-window.pxa/CelData.plist rename to desktop/asset-work/ego/hold-up-to-window.pxa/CelData.plist diff --git a/desktop/resources/ego/ida.png b/desktop/asset-work/ego/ida.png similarity index 100% rename from desktop/resources/ego/ida.png rename to desktop/asset-work/ego/ida.png diff --git a/desktop/resources/ego/idea.png b/desktop/asset-work/ego/idea.png similarity index 100% rename from desktop/resources/ego/idea.png rename to desktop/asset-work/ego/idea.png diff --git a/desktop/resources/ego/idea.pxa/0.pxi b/desktop/asset-work/ego/idea.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/idea.pxa/0.pxi rename to desktop/asset-work/ego/idea.pxa/0.pxi diff --git a/desktop/resources/ego/idea.pxa/1.pxi b/desktop/asset-work/ego/idea.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/idea.pxa/1.pxi rename to desktop/asset-work/ego/idea.pxa/1.pxi diff --git a/desktop/resources/ego/idea.pxa/2.pxi b/desktop/asset-work/ego/idea.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/idea.pxa/2.pxi rename to desktop/asset-work/ego/idea.pxa/2.pxi diff --git a/desktop/resources/inside-antique/clock.pxa/CelData.plist b/desktop/asset-work/ego/idea.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-antique/clock.pxa/CelData.plist rename to desktop/asset-work/ego/idea.pxa/CelData.plist 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/asset-work/ego/in-love.png b/desktop/asset-work/ego/in-love.png new file mode 100644 index 00000000..01f2f4a9 Binary files /dev/null and b/desktop/asset-work/ego/in-love.png differ diff --git a/desktop/asset-work/ego/in-love2.pxa/0.pxi b/desktop/asset-work/ego/in-love2.pxa/0.pxi new file mode 100644 index 00000000..a688f17e Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/0.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/1.pxi b/desktop/asset-work/ego/in-love2.pxa/1.pxi new file mode 100644 index 00000000..9c4b93bf Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/1.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/10.pxi b/desktop/asset-work/ego/in-love2.pxa/10.pxi new file mode 100644 index 00000000..c579a49f Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/10.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/11.pxi b/desktop/asset-work/ego/in-love2.pxa/11.pxi new file mode 100644 index 00000000..010531bd Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/11.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/12.pxi b/desktop/asset-work/ego/in-love2.pxa/12.pxi new file mode 100644 index 00000000..df40a160 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/12.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/13.pxi b/desktop/asset-work/ego/in-love2.pxa/13.pxi new file mode 100644 index 00000000..5dd7e83f Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/13.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/14.pxi b/desktop/asset-work/ego/in-love2.pxa/14.pxi new file mode 100644 index 00000000..b7904c9d Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/14.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/15.pxi b/desktop/asset-work/ego/in-love2.pxa/15.pxi new file mode 100644 index 00000000..481a48bc Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/15.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/16.pxi b/desktop/asset-work/ego/in-love2.pxa/16.pxi new file mode 100644 index 00000000..2176da54 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/16.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/17.pxi b/desktop/asset-work/ego/in-love2.pxa/17.pxi new file mode 100644 index 00000000..f9794bb2 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/17.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/18.pxi b/desktop/asset-work/ego/in-love2.pxa/18.pxi new file mode 100644 index 00000000..0a0f9fac Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/18.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/2.pxi b/desktop/asset-work/ego/in-love2.pxa/2.pxi new file mode 100644 index 00000000..b7904c9d Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/2.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/3.pxi b/desktop/asset-work/ego/in-love2.pxa/3.pxi new file mode 100644 index 00000000..63fbce16 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/3.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/4.pxi b/desktop/asset-work/ego/in-love2.pxa/4.pxi new file mode 100644 index 00000000..22983a6b Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/4.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/5.pxi b/desktop/asset-work/ego/in-love2.pxa/5.pxi new file mode 100644 index 00000000..cf0df98a Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/5.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/6.pxi b/desktop/asset-work/ego/in-love2.pxa/6.pxi new file mode 100644 index 00000000..62f3ed90 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/6.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/7.pxi b/desktop/asset-work/ego/in-love2.pxa/7.pxi new file mode 100644 index 00000000..9e9158ba Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/7.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/8.pxi b/desktop/asset-work/ego/in-love2.pxa/8.pxi new file mode 100644 index 00000000..a64101b4 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/8.pxi differ diff --git a/desktop/asset-work/ego/in-love2.pxa/9.pxi b/desktop/asset-work/ego/in-love2.pxa/9.pxi new file mode 100644 index 00000000..1654ed08 Binary files /dev/null and b/desktop/asset-work/ego/in-love2.pxa/9.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/CelData.plist b/desktop/asset-work/ego/in-love2.pxa/CelData.plist similarity index 100% rename from desktop/resources/wizard/disappear.pxa/CelData.plist rename to desktop/asset-work/ego/in-love2.pxa/CelData.plist diff --git a/desktop/asset-work/ego/inside-step-1.wav b/desktop/asset-work/ego/inside-step-1.wav new file mode 100644 index 00000000..5b343c4c Binary files /dev/null and b/desktop/asset-work/ego/inside-step-1.wav differ diff --git a/desktop/asset-work/ego/inside-step-2.wav b/desktop/asset-work/ego/inside-step-2.wav new file mode 100644 index 00000000..76842bce Binary files /dev/null and b/desktop/asset-work/ego/inside-step-2.wav differ diff --git a/desktop/asset-work/ego/inside-step-3.wav b/desktop/asset-work/ego/inside-step-3.wav new file mode 100644 index 00000000..89bd275b Binary files /dev/null and b/desktop/asset-work/ego/inside-step-3.wav differ diff --git a/desktop/asset-work/ego/inside-step-4.wav b/desktop/asset-work/ego/inside-step-4.wav new file mode 100644 index 00000000..035f2ef7 Binary files /dev/null and b/desktop/asset-work/ego/inside-step-4.wav differ diff --git a/desktop/resources/ego/jet b/desktop/asset-work/ego/jet similarity index 100% rename from desktop/resources/ego/jet rename to desktop/asset-work/ego/jet diff --git a/desktop/asset-work/ego/love-1.png b/desktop/asset-work/ego/love-1.png new file mode 100644 index 00000000..dd996d0a Binary files /dev/null and b/desktop/asset-work/ego/love-1.png differ diff --git a/desktop/asset-work/ego/love-10.png b/desktop/asset-work/ego/love-10.png new file mode 100644 index 00000000..67aea5b8 Binary files /dev/null and b/desktop/asset-work/ego/love-10.png differ diff --git a/desktop/asset-work/ego/love-11.png b/desktop/asset-work/ego/love-11.png new file mode 100644 index 00000000..abd81cc8 Binary files /dev/null and b/desktop/asset-work/ego/love-11.png differ diff --git a/desktop/asset-work/ego/love-12.png b/desktop/asset-work/ego/love-12.png new file mode 100644 index 00000000..e78d35e0 Binary files /dev/null and b/desktop/asset-work/ego/love-12.png differ diff --git a/desktop/asset-work/ego/love-13.png b/desktop/asset-work/ego/love-13.png new file mode 100644 index 00000000..2d1da708 Binary files /dev/null and b/desktop/asset-work/ego/love-13.png differ diff --git a/desktop/asset-work/ego/love-14.png b/desktop/asset-work/ego/love-14.png new file mode 100644 index 00000000..64ce0a3f Binary files /dev/null and b/desktop/asset-work/ego/love-14.png differ diff --git a/desktop/asset-work/ego/love-15.png b/desktop/asset-work/ego/love-15.png new file mode 100644 index 00000000..39e75a4d Binary files /dev/null and b/desktop/asset-work/ego/love-15.png differ diff --git a/desktop/asset-work/ego/love-16.png b/desktop/asset-work/ego/love-16.png new file mode 100644 index 00000000..fe3101bf Binary files /dev/null and b/desktop/asset-work/ego/love-16.png differ diff --git a/desktop/asset-work/ego/love-17.png b/desktop/asset-work/ego/love-17.png new file mode 100644 index 00000000..2c35a2b9 Binary files /dev/null and b/desktop/asset-work/ego/love-17.png differ diff --git a/desktop/asset-work/ego/love-18.png b/desktop/asset-work/ego/love-18.png new file mode 100644 index 00000000..8ba4a200 Binary files /dev/null and b/desktop/asset-work/ego/love-18.png differ diff --git a/desktop/asset-work/ego/love-19.png b/desktop/asset-work/ego/love-19.png new file mode 100644 index 00000000..026a83d9 Binary files /dev/null and b/desktop/asset-work/ego/love-19.png differ diff --git a/desktop/asset-work/ego/love-2.png b/desktop/asset-work/ego/love-2.png new file mode 100644 index 00000000..8242a446 Binary files /dev/null and b/desktop/asset-work/ego/love-2.png differ diff --git a/desktop/asset-work/ego/love-20.png b/desktop/asset-work/ego/love-20.png new file mode 100644 index 00000000..07c79988 Binary files /dev/null and b/desktop/asset-work/ego/love-20.png differ diff --git a/desktop/asset-work/ego/love-21.png b/desktop/asset-work/ego/love-21.png new file mode 100644 index 00000000..b9d4ada5 Binary files /dev/null and b/desktop/asset-work/ego/love-21.png differ diff --git a/desktop/asset-work/ego/love-22.png b/desktop/asset-work/ego/love-22.png new file mode 100644 index 00000000..e6b9f148 Binary files /dev/null and b/desktop/asset-work/ego/love-22.png differ diff --git a/desktop/asset-work/ego/love-23.png b/desktop/asset-work/ego/love-23.png new file mode 100644 index 00000000..88dbcf3a Binary files /dev/null and b/desktop/asset-work/ego/love-23.png differ diff --git a/desktop/asset-work/ego/love-24.png b/desktop/asset-work/ego/love-24.png new file mode 100644 index 00000000..09b0a446 Binary files /dev/null and b/desktop/asset-work/ego/love-24.png differ diff --git a/desktop/asset-work/ego/love-25.png b/desktop/asset-work/ego/love-25.png new file mode 100644 index 00000000..130b3fe1 Binary files /dev/null and b/desktop/asset-work/ego/love-25.png differ diff --git a/desktop/asset-work/ego/love-26.png b/desktop/asset-work/ego/love-26.png new file mode 100644 index 00000000..41d564ae Binary files /dev/null and b/desktop/asset-work/ego/love-26.png differ diff --git a/desktop/asset-work/ego/love-3.png b/desktop/asset-work/ego/love-3.png new file mode 100644 index 00000000..6fe79039 Binary files /dev/null and b/desktop/asset-work/ego/love-3.png differ diff --git a/desktop/asset-work/ego/love-4.png b/desktop/asset-work/ego/love-4.png new file mode 100644 index 00000000..dc674ce4 Binary files /dev/null and b/desktop/asset-work/ego/love-4.png differ diff --git a/desktop/asset-work/ego/love-5.png b/desktop/asset-work/ego/love-5.png new file mode 100644 index 00000000..6b45448f Binary files /dev/null and b/desktop/asset-work/ego/love-5.png differ diff --git a/desktop/asset-work/ego/love-6.png b/desktop/asset-work/ego/love-6.png new file mode 100644 index 00000000..cd6475f7 Binary files /dev/null and b/desktop/asset-work/ego/love-6.png differ diff --git a/desktop/asset-work/ego/love-7.png b/desktop/asset-work/ego/love-7.png new file mode 100644 index 00000000..0d25120f Binary files /dev/null and b/desktop/asset-work/ego/love-7.png differ diff --git a/desktop/asset-work/ego/love-8.png b/desktop/asset-work/ego/love-8.png new file mode 100644 index 00000000..cb282d1e Binary files /dev/null and b/desktop/asset-work/ego/love-8.png differ diff --git a/desktop/asset-work/ego/love-9.png b/desktop/asset-work/ego/love-9.png new file mode 100644 index 00000000..84aa32c5 Binary files /dev/null and b/desktop/asset-work/ego/love-9.png differ diff --git a/desktop/resources/ego/love.pxa/0.pxi b/desktop/asset-work/ego/love.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/0.pxi rename to desktop/asset-work/ego/love.pxa/0.pxi diff --git a/desktop/resources/ego/love.pxa/1.pxi b/desktop/asset-work/ego/love.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/1.pxi rename to desktop/asset-work/ego/love.pxa/1.pxi diff --git a/desktop/resources/ego/love.pxa/10.pxi b/desktop/asset-work/ego/love.pxa/10.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/10.pxi rename to desktop/asset-work/ego/love.pxa/10.pxi diff --git a/desktop/resources/ego/love.pxa/11.pxi b/desktop/asset-work/ego/love.pxa/11.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/11.pxi rename to desktop/asset-work/ego/love.pxa/11.pxi diff --git a/desktop/resources/ego/love.pxa/12.pxi b/desktop/asset-work/ego/love.pxa/12.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/12.pxi rename to desktop/asset-work/ego/love.pxa/12.pxi diff --git a/desktop/resources/ego/love.pxa/13.pxi b/desktop/asset-work/ego/love.pxa/13.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/13.pxi rename to desktop/asset-work/ego/love.pxa/13.pxi diff --git a/desktop/resources/ego/love.pxa/14.pxi b/desktop/asset-work/ego/love.pxa/14.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/14.pxi rename to desktop/asset-work/ego/love.pxa/14.pxi diff --git a/desktop/resources/ego/love.pxa/15.pxi b/desktop/asset-work/ego/love.pxa/15.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/15.pxi rename to desktop/asset-work/ego/love.pxa/15.pxi diff --git a/desktop/resources/ego/love.pxa/16.pxi b/desktop/asset-work/ego/love.pxa/16.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/16.pxi rename to desktop/asset-work/ego/love.pxa/16.pxi diff --git a/desktop/resources/ego/love.pxa/17.pxi b/desktop/asset-work/ego/love.pxa/17.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/17.pxi rename to desktop/asset-work/ego/love.pxa/17.pxi diff --git a/desktop/resources/ego/love.pxa/18.pxi b/desktop/asset-work/ego/love.pxa/18.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/18.pxi rename to desktop/asset-work/ego/love.pxa/18.pxi diff --git a/desktop/resources/ego/love.pxa/19.pxi b/desktop/asset-work/ego/love.pxa/19.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/19.pxi rename to desktop/asset-work/ego/love.pxa/19.pxi diff --git a/desktop/resources/ego/love.pxa/2.pxi b/desktop/asset-work/ego/love.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/2.pxi rename to desktop/asset-work/ego/love.pxa/2.pxi diff --git a/desktop/resources/ego/love.pxa/20.pxi b/desktop/asset-work/ego/love.pxa/20.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/20.pxi rename to desktop/asset-work/ego/love.pxa/20.pxi diff --git a/desktop/resources/ego/love.pxa/21.pxi b/desktop/asset-work/ego/love.pxa/21.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/21.pxi rename to desktop/asset-work/ego/love.pxa/21.pxi diff --git a/desktop/resources/ego/love.pxa/22.pxi b/desktop/asset-work/ego/love.pxa/22.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/22.pxi rename to desktop/asset-work/ego/love.pxa/22.pxi diff --git a/desktop/resources/ego/love.pxa/23.pxi b/desktop/asset-work/ego/love.pxa/23.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/23.pxi rename to desktop/asset-work/ego/love.pxa/23.pxi diff --git a/desktop/resources/ego/love.pxa/24.pxi b/desktop/asset-work/ego/love.pxa/24.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/24.pxi rename to desktop/asset-work/ego/love.pxa/24.pxi diff --git a/desktop/resources/ego/love.pxa/25.pxi b/desktop/asset-work/ego/love.pxa/25.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/25.pxi rename to desktop/asset-work/ego/love.pxa/25.pxi diff --git a/desktop/resources/ego/love.pxa/3.pxi b/desktop/asset-work/ego/love.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/3.pxi rename to desktop/asset-work/ego/love.pxa/3.pxi diff --git a/desktop/resources/ego/love.pxa/4.pxi b/desktop/asset-work/ego/love.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/4.pxi rename to desktop/asset-work/ego/love.pxa/4.pxi diff --git a/desktop/resources/ego/love.pxa/5.pxi b/desktop/asset-work/ego/love.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/5.pxi rename to desktop/asset-work/ego/love.pxa/5.pxi diff --git a/desktop/resources/ego/love.pxa/6.pxi b/desktop/asset-work/ego/love.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/6.pxi rename to desktop/asset-work/ego/love.pxa/6.pxi diff --git a/desktop/resources/ego/love.pxa/7.pxi b/desktop/asset-work/ego/love.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/7.pxi rename to desktop/asset-work/ego/love.pxa/7.pxi diff --git a/desktop/resources/ego/love.pxa/8.pxi b/desktop/asset-work/ego/love.pxa/8.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/8.pxi rename to desktop/asset-work/ego/love.pxa/8.pxi diff --git a/desktop/resources/ego/love.pxa/9.pxi b/desktop/asset-work/ego/love.pxa/9.pxi similarity index 100% rename from desktop/resources/ego/love.pxa/9.pxi rename to desktop/asset-work/ego/love.pxa/9.pxi diff --git a/desktop/resources/ego/love.pxa/CelData.plist b/desktop/asset-work/ego/love.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/love.pxa/CelData.plist rename to desktop/asset-work/ego/love.pxa/CelData.plist diff --git a/desktop/resources/ego/pant.png b/desktop/asset-work/ego/pant.png similarity index 100% rename from desktop/resources/ego/pant.png rename to desktop/asset-work/ego/pant.png diff --git a/desktop/resources/ego/pant.pxa/0.pxi b/desktop/asset-work/ego/pant.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/pant.pxa/0.pxi rename to desktop/asset-work/ego/pant.pxa/0.pxi diff --git a/desktop/resources/ego/pant.pxa/1.pxi b/desktop/asset-work/ego/pant.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/pant.pxa/1.pxi rename to desktop/asset-work/ego/pant.pxa/1.pxi diff --git a/desktop/resources/ego/pant.pxa/CelData.plist b/desktop/asset-work/ego/pant.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/pant.pxa/CelData.plist rename to desktop/asset-work/ego/pant.pxa/CelData.plist 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/reach.png b/desktop/asset-work/ego/reach.png similarity index 100% rename from desktop/resources/ego/reach.png rename to desktop/asset-work/ego/reach.png diff --git a/desktop/resources/ego/reach.pxa/0.pxi b/desktop/asset-work/ego/reach.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/reach.pxa/0.pxi rename to desktop/asset-work/ego/reach.pxa/0.pxi diff --git a/desktop/resources/ego/reach.pxa/1.pxi b/desktop/asset-work/ego/reach.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/reach.pxa/1.pxi rename to desktop/asset-work/ego/reach.pxa/1.pxi diff --git a/desktop/resources/ego/reach.pxa/2.pxi b/desktop/asset-work/ego/reach.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/reach.pxa/2.pxi rename to desktop/asset-work/ego/reach.pxa/2.pxi diff --git a/desktop/resources/ego/reach.pxa/3.pxi b/desktop/asset-work/ego/reach.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/reach.pxa/3.pxi rename to desktop/asset-work/ego/reach.pxa/3.pxi diff --git a/desktop/resources/ego/reach.pxa/CelData.plist b/desktop/asset-work/ego/reach.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/reach.pxa/CelData.plist rename to desktop/asset-work/ego/reach.pxa/CelData.plist diff --git a/desktop/resources/ego/scared-walk.png b/desktop/asset-work/ego/scared-walk.png similarity index 100% rename from desktop/resources/ego/scared-walk.png rename to desktop/asset-work/ego/scared-walk.png diff --git a/desktop/resources/ego/scared-walk.pxa/0.pxi b/desktop/asset-work/ego/scared-walk.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/0.pxi rename to desktop/asset-work/ego/scared-walk.pxa/0.pxi diff --git a/desktop/resources/ego/scared-walk.pxa/1.pxi b/desktop/asset-work/ego/scared-walk.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/1.pxi rename to desktop/asset-work/ego/scared-walk.pxa/1.pxi diff --git a/desktop/resources/ego/scared-walk.pxa/2.pxi b/desktop/asset-work/ego/scared-walk.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/2.pxi rename to desktop/asset-work/ego/scared-walk.pxa/2.pxi diff --git a/desktop/resources/ego/scared-walk.pxa/3.pxi b/desktop/asset-work/ego/scared-walk.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/3.pxi rename to desktop/asset-work/ego/scared-walk.pxa/3.pxi diff --git a/desktop/resources/ego/scared-walk.pxa/4.pxi b/desktop/asset-work/ego/scared-walk.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/4.pxi rename to desktop/asset-work/ego/scared-walk.pxa/4.pxi diff --git a/desktop/resources/ego/scared-walk.pxa/5.pxi b/desktop/asset-work/ego/scared-walk.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/5.pxi rename to desktop/asset-work/ego/scared-walk.pxa/5.pxi diff --git a/desktop/resources/ego/scared-walk.pxa/CelData.plist b/desktop/asset-work/ego/scared-walk.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/scared-walk.pxa/CelData.plist rename to desktop/asset-work/ego/scared-walk.pxa/CelData.plist diff --git a/desktop/resources/ego/scared.png b/desktop/asset-work/ego/scared.png similarity index 100% rename from desktop/resources/ego/scared.png rename to desktop/asset-work/ego/scared.png diff --git a/desktop/resources/ego/scared.pxa/0.pxi b/desktop/asset-work/ego/scared.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/scared.pxa/0.pxi rename to desktop/asset-work/ego/scared.pxa/0.pxi diff --git a/desktop/resources/ego/scared.pxa/1.pxi b/desktop/asset-work/ego/scared.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/scared.pxa/1.pxi rename to desktop/asset-work/ego/scared.pxa/1.pxi diff --git a/desktop/resources/ego/scared.pxa/2.pxi b/desktop/asset-work/ego/scared.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/scared.pxa/2.pxi rename to desktop/asset-work/ego/scared.pxa/2.pxi diff --git a/desktop/resources/ego/scared.pxa/3.pxi b/desktop/asset-work/ego/scared.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/scared.pxa/3.pxi rename to desktop/asset-work/ego/scared.pxa/3.pxi diff --git a/desktop/resources/ego/scared.pxa/CelData.plist b/desktop/asset-work/ego/scared.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/scared.pxa/CelData.plist rename to desktop/asset-work/ego/scared.pxa/CelData.plist diff --git a/desktop/resources/ego/scoot.png b/desktop/asset-work/ego/scoot.png similarity index 100% rename from desktop/resources/ego/scoot.png rename to desktop/asset-work/ego/scoot.png diff --git a/desktop/resources/ego/shock.png b/desktop/asset-work/ego/shock.png similarity index 100% rename from desktop/resources/ego/shock.png rename to desktop/asset-work/ego/shock.png diff --git a/desktop/resources/ego/shock.pxa/0.pxi b/desktop/asset-work/ego/shock.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/0.pxi rename to desktop/asset-work/ego/shock.pxa/0.pxi diff --git a/desktop/resources/ego/shock.pxa/1.pxi b/desktop/asset-work/ego/shock.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/1.pxi rename to desktop/asset-work/ego/shock.pxa/1.pxi diff --git a/desktop/resources/ego/shock.pxa/2.pxi b/desktop/asset-work/ego/shock.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/2.pxi rename to desktop/asset-work/ego/shock.pxa/2.pxi diff --git a/desktop/resources/ego/shock.pxa/3.pxi b/desktop/asset-work/ego/shock.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/3.pxi rename to desktop/asset-work/ego/shock.pxa/3.pxi diff --git a/desktop/resources/ego/shock.pxa/4.pxi b/desktop/asset-work/ego/shock.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/4.pxi rename to desktop/asset-work/ego/shock.pxa/4.pxi diff --git a/desktop/resources/ego/shock.pxa/5.pxi b/desktop/asset-work/ego/shock.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/5.pxi rename to desktop/asset-work/ego/shock.pxa/5.pxi diff --git a/desktop/resources/ego/shock.pxa/6.pxi b/desktop/asset-work/ego/shock.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/6.pxi rename to desktop/asset-work/ego/shock.pxa/6.pxi diff --git a/desktop/resources/ego/shock.pxa/7.pxi b/desktop/asset-work/ego/shock.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/7.pxi rename to desktop/asset-work/ego/shock.pxa/7.pxi diff --git a/desktop/resources/ego/shock.pxa/8.pxi b/desktop/asset-work/ego/shock.pxa/8.pxi similarity index 100% rename from desktop/resources/ego/shock.pxa/8.pxi rename to desktop/asset-work/ego/shock.pxa/8.pxi diff --git a/desktop/resources/ego/shock.pxa/CelData.plist b/desktop/asset-work/ego/shock.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/shock.pxa/CelData.plist rename to desktop/asset-work/ego/shock.pxa/CelData.plist diff --git a/desktop/resources/ego/shoot.png b/desktop/asset-work/ego/shoot.png similarity index 100% rename from desktop/resources/ego/shoot.png rename to desktop/asset-work/ego/shoot.png diff --git a/desktop/resources/ego/shoot.pxa/0.pxi b/desktop/asset-work/ego/shoot.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/shoot.pxa/0.pxi rename to desktop/asset-work/ego/shoot.pxa/0.pxi diff --git a/desktop/resources/ego/shoot.pxa/1.pxi b/desktop/asset-work/ego/shoot.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/shoot.pxa/1.pxi rename to desktop/asset-work/ego/shoot.pxa/1.pxi diff --git a/desktop/resources/ego/shoot.pxa/2.pxi b/desktop/asset-work/ego/shoot.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/shoot.pxa/2.pxi rename to desktop/asset-work/ego/shoot.pxa/2.pxi diff --git a/desktop/resources/ego/shoot.pxa/3.pxi b/desktop/asset-work/ego/shoot.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/shoot.pxa/3.pxi rename to desktop/asset-work/ego/shoot.pxa/3.pxi diff --git a/desktop/resources/ego/shoot.pxa/4.pxi b/desktop/asset-work/ego/shoot.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/shoot.pxa/4.pxi rename to desktop/asset-work/ego/shoot.pxa/4.pxi diff --git a/desktop/resources/ego/shoot.pxa/5.pxi b/desktop/asset-work/ego/shoot.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/shoot.pxa/5.pxi rename to desktop/asset-work/ego/shoot.pxa/5.pxi diff --git a/desktop/resources/ego/shoot.pxa/CelData.plist b/desktop/asset-work/ego/shoot.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/shoot.pxa/CelData.plist rename to desktop/asset-work/ego/shoot.pxa/CelData.plist diff --git a/desktop/resources/ego/sigh.png b/desktop/asset-work/ego/sigh.png similarity index 100% rename from desktop/resources/ego/sigh.png rename to desktop/asset-work/ego/sigh.png diff --git a/desktop/resources/ego/sigh.pxa/0.pxi b/desktop/asset-work/ego/sigh.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/0.pxi rename to desktop/asset-work/ego/sigh.pxa/0.pxi diff --git a/desktop/resources/ego/sigh.pxa/1.pxi b/desktop/asset-work/ego/sigh.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/1.pxi rename to desktop/asset-work/ego/sigh.pxa/1.pxi diff --git a/desktop/resources/ego/sigh.pxa/2.pxi b/desktop/asset-work/ego/sigh.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/2.pxi rename to desktop/asset-work/ego/sigh.pxa/2.pxi diff --git a/desktop/resources/ego/sigh.pxa/3.pxi b/desktop/asset-work/ego/sigh.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/3.pxi rename to desktop/asset-work/ego/sigh.pxa/3.pxi diff --git a/desktop/resources/ego/sigh.pxa/4.pxi b/desktop/asset-work/ego/sigh.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/4.pxi rename to desktop/asset-work/ego/sigh.pxa/4.pxi diff --git a/desktop/resources/ego/sigh.pxa/5.pxi b/desktop/asset-work/ego/sigh.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/5.pxi rename to desktop/asset-work/ego/sigh.pxa/5.pxi diff --git a/desktop/resources/ego/sigh.pxa/6.pxi b/desktop/asset-work/ego/sigh.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/6.pxi rename to desktop/asset-work/ego/sigh.pxa/6.pxi diff --git a/desktop/resources/ego/sigh.pxa/7.pxi b/desktop/asset-work/ego/sigh.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/7.pxi rename to desktop/asset-work/ego/sigh.pxa/7.pxi diff --git a/desktop/resources/ego/sigh.pxa/8.pxi b/desktop/asset-work/ego/sigh.pxa/8.pxi similarity index 100% rename from desktop/resources/ego/sigh.pxa/8.pxi rename to desktop/asset-work/ego/sigh.pxa/8.pxi diff --git a/desktop/resources/ego/sigh.pxa/CelData.plist b/desktop/asset-work/ego/sigh.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/sigh.pxa/CelData.plist rename to desktop/asset-work/ego/sigh.pxa/CelData.plist 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/spear.png b/desktop/asset-work/ego/spear.png similarity index 100% rename from desktop/resources/ego/spear.png rename to desktop/asset-work/ego/spear.png diff --git "a/desktop/resources/ego/spear\\.pxa/0.pxi" b/desktop/asset-work/ego/spear.pxa/0.pxi similarity index 100% rename from "desktop/resources/ego/spear\\.pxa/0.pxi" rename to desktop/asset-work/ego/spear.pxa/0.pxi diff --git "a/desktop/resources/ego/spear\\.pxa/1.pxi" b/desktop/asset-work/ego/spear.pxa/1.pxi similarity index 100% rename from "desktop/resources/ego/spear\\.pxa/1.pxi" rename to desktop/asset-work/ego/spear.pxa/1.pxi diff --git "a/desktop/resources/ego/spear\\.pxa/2.pxi" b/desktop/asset-work/ego/spear.pxa/2.pxi similarity index 100% rename from "desktop/resources/ego/spear\\.pxa/2.pxi" rename to desktop/asset-work/ego/spear.pxa/2.pxi diff --git "a/desktop/resources/ego/spear\\.pxa/3.pxi" b/desktop/asset-work/ego/spear.pxa/3.pxi similarity index 100% rename from "desktop/resources/ego/spear\\.pxa/3.pxi" rename to desktop/asset-work/ego/spear.pxa/3.pxi diff --git "a/desktop/resources/ego/spear\\.pxa/4.pxi" b/desktop/asset-work/ego/spear.pxa/4.pxi similarity index 100% rename from "desktop/resources/ego/spear\\.pxa/4.pxi" rename to desktop/asset-work/ego/spear.pxa/4.pxi diff --git a/desktop/resources/ego/standup.pxa/CelData.plist b/desktop/asset-work/ego/spear.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/standup.pxa/CelData.plist rename to desktop/asset-work/ego/spear.pxa/CelData.plist diff --git a/desktop/resources/ego/squat.png b/desktop/asset-work/ego/squat.png similarity index 100% rename from desktop/resources/ego/squat.png rename to desktop/asset-work/ego/squat.png diff --git a/desktop/resources/ego/squat.pxa/0.pxi b/desktop/asset-work/ego/squat.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/0.pxi rename to desktop/asset-work/ego/squat.pxa/0.pxi diff --git a/desktop/resources/ego/squat.pxa/1.pxi b/desktop/asset-work/ego/squat.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/1.pxi rename to desktop/asset-work/ego/squat.pxa/1.pxi diff --git a/desktop/resources/ego/squat.pxa/2.pxi b/desktop/asset-work/ego/squat.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/2.pxi rename to desktop/asset-work/ego/squat.pxa/2.pxi diff --git a/desktop/resources/ego/squat.pxa/3.pxi b/desktop/asset-work/ego/squat.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/3.pxi rename to desktop/asset-work/ego/squat.pxa/3.pxi diff --git a/desktop/resources/ego/squat.pxa/4.pxi b/desktop/asset-work/ego/squat.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/4.pxi rename to desktop/asset-work/ego/squat.pxa/4.pxi diff --git a/desktop/resources/ego/squat.pxa/5.pxi b/desktop/asset-work/ego/squat.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/5.pxi rename to desktop/asset-work/ego/squat.pxa/5.pxi diff --git a/desktop/resources/ego/squat.pxa/6.pxi b/desktop/asset-work/ego/squat.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/squat.pxa/6.pxi rename to desktop/asset-work/ego/squat.pxa/6.pxi diff --git a/desktop/resources/ego/squat.pxa/CelData.plist b/desktop/asset-work/ego/squat.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/squat.pxa/CelData.plist rename to desktop/asset-work/ego/squat.pxa/CelData.plist diff --git a/desktop/resources/ego/stand.png b/desktop/asset-work/ego/stand.png similarity index 100% rename from desktop/resources/ego/stand.png rename to desktop/asset-work/ego/stand.png diff --git a/desktop/resources/ego/stand.pxa/0.pxi b/desktop/asset-work/ego/stand.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/0.pxi rename to desktop/asset-work/ego/stand.pxa/0.pxi diff --git a/desktop/resources/ego/stand.pxa/1.pxi b/desktop/asset-work/ego/stand.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/1.pxi rename to desktop/asset-work/ego/stand.pxa/1.pxi diff --git a/desktop/resources/ego/stand.pxa/2.pxi b/desktop/asset-work/ego/stand.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/2.pxi rename to desktop/asset-work/ego/stand.pxa/2.pxi diff --git a/desktop/resources/ego/stand.pxa/3.pxi b/desktop/asset-work/ego/stand.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/3.pxi rename to desktop/asset-work/ego/stand.pxa/3.pxi diff --git a/desktop/resources/ego/stand.pxa/4.pxi b/desktop/asset-work/ego/stand.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/4.pxi rename to desktop/asset-work/ego/stand.pxa/4.pxi diff --git a/desktop/resources/ego/stand.pxa/5.pxi b/desktop/asset-work/ego/stand.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/5.pxi rename to desktop/asset-work/ego/stand.pxa/5.pxi diff --git a/desktop/resources/ego/stand.pxa/6.pxi b/desktop/asset-work/ego/stand.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/stand.pxa/6.pxi rename to desktop/asset-work/ego/stand.pxa/6.pxi diff --git a/desktop/resources/ego/stand.pxa/CelData.plist b/desktop/asset-work/ego/stand.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/stand.pxa/CelData.plist rename to desktop/asset-work/ego/stand.pxa/CelData.plist diff --git a/desktop/resources/ego/standup.png b/desktop/asset-work/ego/standup.png similarity index 100% rename from desktop/resources/ego/standup.png rename to desktop/asset-work/ego/standup.png diff --git a/desktop/resources/ego/standup.pxa/0.pxi b/desktop/asset-work/ego/standup.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/standup.pxa/0.pxi rename to desktop/asset-work/ego/standup.pxa/0.pxi diff --git a/desktop/resources/ego/standup.pxa/1.pxi b/desktop/asset-work/ego/standup.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/standup.pxa/1.pxi rename to desktop/asset-work/ego/standup.pxa/1.pxi diff --git a/desktop/resources/ego/standup.pxa/2.pxi b/desktop/asset-work/ego/standup.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/standup.pxa/2.pxi rename to desktop/asset-work/ego/standup.pxa/2.pxi diff --git a/desktop/resources/ego/standup.pxa/3.pxi b/desktop/asset-work/ego/standup.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/standup.pxa/3.pxi rename to desktop/asset-work/ego/standup.pxa/3.pxi diff --git a/desktop/resources/ego/standup.pxa/4.pxi b/desktop/asset-work/ego/standup.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/standup.pxa/4.pxi rename to desktop/asset-work/ego/standup.pxa/4.pxi diff --git a/desktop/resources/outside-jail/axe.pxa/CelData.plist b/desktop/asset-work/ego/standup.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/axe.pxa/CelData.plist rename to desktop/asset-work/ego/standup.pxa/CelData.plist diff --git a/desktop/resources/ego/step b/desktop/asset-work/ego/step similarity index 100% rename from desktop/resources/ego/step rename to desktop/asset-work/ego/step diff --git a/desktop/asset-work/ego/step-1.wav b/desktop/asset-work/ego/step-1.wav new file mode 100644 index 00000000..36d1a00a Binary files /dev/null and b/desktop/asset-work/ego/step-1.wav differ 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/asset-work/ego/step-2.wav b/desktop/asset-work/ego/step-2.wav new file mode 100644 index 00000000..c5206685 Binary files /dev/null and b/desktop/asset-work/ego/step-2.wav differ diff --git a/desktop/asset-work/ego/step-3.wav b/desktop/asset-work/ego/step-3.wav new file mode 100644 index 00000000..9a1c235d Binary files /dev/null and b/desktop/asset-work/ego/step-3.wav differ diff --git a/desktop/asset-work/ego/step-4.wav b/desktop/asset-work/ego/step-4.wav new file mode 100644 index 00000000..42bb6c8b Binary files /dev/null and b/desktop/asset-work/ego/step-4.wav differ 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/suspended.png b/desktop/asset-work/ego/suspended.png similarity index 100% rename from desktop/resources/ego/suspended.png rename to desktop/asset-work/ego/suspended.png diff --git a/desktop/resources/ego/suspended.pxa/0.pxi b/desktop/asset-work/ego/suspended.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/0.pxi rename to desktop/asset-work/ego/suspended.pxa/0.pxi diff --git a/desktop/resources/ego/suspended.pxa/1.pxi b/desktop/asset-work/ego/suspended.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/1.pxi rename to desktop/asset-work/ego/suspended.pxa/1.pxi diff --git a/desktop/resources/ego/suspended.pxa/2.pxi b/desktop/asset-work/ego/suspended.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/2.pxi rename to desktop/asset-work/ego/suspended.pxa/2.pxi diff --git a/desktop/resources/ego/suspended.pxa/3.pxi b/desktop/asset-work/ego/suspended.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/3.pxi rename to desktop/asset-work/ego/suspended.pxa/3.pxi diff --git a/desktop/resources/ego/suspended.pxa/4.pxi b/desktop/asset-work/ego/suspended.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/4.pxi rename to desktop/asset-work/ego/suspended.pxa/4.pxi diff --git a/desktop/resources/ego/suspended.pxa/5.pxi b/desktop/asset-work/ego/suspended.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/5.pxi rename to desktop/asset-work/ego/suspended.pxa/5.pxi diff --git a/desktop/resources/ego/suspended.pxa/6.pxi b/desktop/asset-work/ego/suspended.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/suspended.pxa/6.pxi rename to desktop/asset-work/ego/suspended.pxa/6.pxi diff --git a/desktop/resources/ego/suspended.pxa/CelData.plist b/desktop/asset-work/ego/suspended.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/suspended.pxa/CelData.plist rename to desktop/asset-work/ego/suspended.pxa/CelData.plist diff --git a/desktop/resources/ego/swing-shovel.png b/desktop/asset-work/ego/swing-shovel.png similarity index 100% rename from desktop/resources/ego/swing-shovel.png rename to desktop/asset-work/ego/swing-shovel.png diff --git a/desktop/resources/ego/swing.png b/desktop/asset-work/ego/swing.png similarity index 100% rename from desktop/resources/ego/swing.png rename to desktop/asset-work/ego/swing.png diff --git a/desktop/resources/ego/swing.pxa/0.pxi b/desktop/asset-work/ego/swing.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/0.pxi rename to desktop/asset-work/ego/swing.pxa/0.pxi diff --git a/desktop/resources/ego/swing.pxa/1.pxi b/desktop/asset-work/ego/swing.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/1.pxi rename to desktop/asset-work/ego/swing.pxa/1.pxi diff --git a/desktop/resources/ego/swing.pxa/2.pxi b/desktop/asset-work/ego/swing.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/2.pxi rename to desktop/asset-work/ego/swing.pxa/2.pxi diff --git a/desktop/resources/ego/swing.pxa/3.pxi b/desktop/asset-work/ego/swing.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/3.pxi rename to desktop/asset-work/ego/swing.pxa/3.pxi diff --git a/desktop/resources/ego/swing.pxa/4.pxi b/desktop/asset-work/ego/swing.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/4.pxi rename to desktop/asset-work/ego/swing.pxa/4.pxi diff --git a/desktop/resources/ego/swing.pxa/5.pxi b/desktop/asset-work/ego/swing.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/5.pxi rename to desktop/asset-work/ego/swing.pxa/5.pxi diff --git a/desktop/resources/ego/swing.pxa/6.pxi b/desktop/asset-work/ego/swing.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/6.pxi rename to desktop/asset-work/ego/swing.pxa/6.pxi diff --git a/desktop/resources/ego/swing.pxa/7.pxi b/desktop/asset-work/ego/swing.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/swing.pxa/7.pxi rename to desktop/asset-work/ego/swing.pxa/7.pxi diff --git a/desktop/resources/ego/swing.pxa/CelData.plist b/desktop/asset-work/ego/swing.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/swing.pxa/CelData.plist rename to desktop/asset-work/ego/swing.pxa/CelData.plist diff --git a/desktop/resources/ego/swingshovel.pxa/0.pxi b/desktop/asset-work/ego/swingshovel.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/0.pxi rename to desktop/asset-work/ego/swingshovel.pxa/0.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/1.pxi b/desktop/asset-work/ego/swingshovel.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/1.pxi rename to desktop/asset-work/ego/swingshovel.pxa/1.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/2.pxi b/desktop/asset-work/ego/swingshovel.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/2.pxi rename to desktop/asset-work/ego/swingshovel.pxa/2.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/3.pxi b/desktop/asset-work/ego/swingshovel.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/3.pxi rename to desktop/asset-work/ego/swingshovel.pxa/3.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/4.pxi b/desktop/asset-work/ego/swingshovel.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/4.pxi rename to desktop/asset-work/ego/swingshovel.pxa/4.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/5.pxi b/desktop/asset-work/ego/swingshovel.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/5.pxi rename to desktop/asset-work/ego/swingshovel.pxa/5.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/6.pxi b/desktop/asset-work/ego/swingshovel.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/6.pxi rename to desktop/asset-work/ego/swingshovel.pxa/6.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/7.pxi b/desktop/asset-work/ego/swingshovel.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/7.pxi rename to desktop/asset-work/ego/swingshovel.pxa/7.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/8.pxi b/desktop/asset-work/ego/swingshovel.pxa/8.pxi similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/8.pxi rename to desktop/asset-work/ego/swingshovel.pxa/8.pxi diff --git a/desktop/resources/ego/swingshovel.pxa/CelData.plist b/desktop/asset-work/ego/swingshovel.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/swingshovel.pxa/CelData.plist rename to desktop/asset-work/ego/swingshovel.pxa/CelData.plist diff --git a/desktop/resources/ego/talk.png b/desktop/asset-work/ego/talk.png similarity index 100% rename from desktop/resources/ego/talk.png rename to desktop/asset-work/ego/talk.png diff --git a/desktop/resources/ego/talk.pxa/0.pxi b/desktop/asset-work/ego/talk.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/0.pxi rename to desktop/asset-work/ego/talk.pxa/0.pxi diff --git a/desktop/resources/ego/talk.pxa/1.pxi b/desktop/asset-work/ego/talk.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/1.pxi rename to desktop/asset-work/ego/talk.pxa/1.pxi diff --git a/desktop/resources/ego/talk.pxa/2.pxi b/desktop/asset-work/ego/talk.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/2.pxi rename to desktop/asset-work/ego/talk.pxa/2.pxi diff --git a/desktop/resources/ego/talk.pxa/3.pxi b/desktop/asset-work/ego/talk.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/3.pxi rename to desktop/asset-work/ego/talk.pxa/3.pxi diff --git a/desktop/resources/ego/talk.pxa/4.pxi b/desktop/asset-work/ego/talk.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/4.pxi rename to desktop/asset-work/ego/talk.pxa/4.pxi diff --git a/desktop/resources/ego/talk.pxa/5.pxi b/desktop/asset-work/ego/talk.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/5.pxi rename to desktop/asset-work/ego/talk.pxa/5.pxi diff --git a/desktop/resources/ego/talk.pxa/6.pxi b/desktop/asset-work/ego/talk.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/6.pxi rename to desktop/asset-work/ego/talk.pxa/6.pxi diff --git a/desktop/resources/ego/talk.pxa/7.pxi b/desktop/asset-work/ego/talk.pxa/7.pxi similarity index 100% rename from desktop/resources/ego/talk.pxa/7.pxi rename to desktop/asset-work/ego/talk.pxa/7.pxi diff --git a/desktop/resources/ego/talk.pxa/CelData.plist b/desktop/asset-work/ego/talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/talk.pxa/CelData.plist rename to desktop/asset-work/ego/talk.pxa/CelData.plist 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/ego/thorw.png b/desktop/asset-work/ego/thorw.png similarity index 100% rename from desktop/resources/ego/thorw.png rename to desktop/asset-work/ego/thorw.png diff --git a/desktop/resources/ego/throw.png b/desktop/asset-work/ego/throw.png similarity index 100% rename from desktop/resources/ego/throw.png rename to desktop/asset-work/ego/throw.png diff --git a/desktop/resources/ego/throw.pxa/0.pxi b/desktop/asset-work/ego/throw.pxa/0.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/0.pxi rename to desktop/asset-work/ego/throw.pxa/0.pxi diff --git a/desktop/resources/ego/throw.pxa/1.pxi b/desktop/asset-work/ego/throw.pxa/1.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/1.pxi rename to desktop/asset-work/ego/throw.pxa/1.pxi diff --git a/desktop/resources/ego/throw.pxa/2.pxi b/desktop/asset-work/ego/throw.pxa/2.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/2.pxi rename to desktop/asset-work/ego/throw.pxa/2.pxi diff --git a/desktop/resources/ego/throw.pxa/3.pxi b/desktop/asset-work/ego/throw.pxa/3.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/3.pxi rename to desktop/asset-work/ego/throw.pxa/3.pxi diff --git a/desktop/resources/ego/throw.pxa/4.pxi b/desktop/asset-work/ego/throw.pxa/4.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/4.pxi rename to desktop/asset-work/ego/throw.pxa/4.pxi diff --git a/desktop/resources/ego/throw.pxa/5.pxi b/desktop/asset-work/ego/throw.pxa/5.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/5.pxi rename to desktop/asset-work/ego/throw.pxa/5.pxi diff --git a/desktop/resources/ego/throw.pxa/6.pxi b/desktop/asset-work/ego/throw.pxa/6.pxi similarity index 100% rename from desktop/resources/ego/throw.pxa/6.pxi rename to desktop/asset-work/ego/throw.pxa/6.pxi diff --git a/desktop/resources/ego/throw.pxa/CelData.plist b/desktop/asset-work/ego/throw.pxa/CelData.plist similarity index 100% rename from desktop/resources/ego/throw.pxa/CelData.plist rename to desktop/asset-work/ego/throw.pxa/CelData.plist diff --git a/desktop/resources/ego/warden.png b/desktop/asset-work/ego/warden.png similarity index 100% rename from desktop/resources/ego/warden.png rename to desktop/asset-work/ego/warden.png diff --git a/desktop/resources/ending-castle/Untitled.png b/desktop/asset-work/ending-castle/Untitled.png similarity index 100% rename from desktop/resources/ending-castle/Untitled.png rename to desktop/asset-work/ending-castle/Untitled.png diff --git a/desktop/resources/ending-castle/duke.png b/desktop/asset-work/ending-castle/duke.png similarity index 100% rename from desktop/resources/ending-castle/duke.png rename to desktop/asset-work/ending-castle/duke.png diff --git a/desktop/resources/ending-castle/duke.pxa/0.pxi b/desktop/asset-work/ending-castle/duke.pxa/0.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/0.pxi rename to desktop/asset-work/ending-castle/duke.pxa/0.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/1.pxi b/desktop/asset-work/ending-castle/duke.pxa/1.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/1.pxi rename to desktop/asset-work/ending-castle/duke.pxa/1.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/10.pxi b/desktop/asset-work/ending-castle/duke.pxa/10.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/10.pxi rename to desktop/asset-work/ending-castle/duke.pxa/10.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/2.pxi b/desktop/asset-work/ending-castle/duke.pxa/2.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/2.pxi rename to desktop/asset-work/ending-castle/duke.pxa/2.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/3.pxi b/desktop/asset-work/ending-castle/duke.pxa/3.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/3.pxi rename to desktop/asset-work/ending-castle/duke.pxa/3.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/4.pxi b/desktop/asset-work/ending-castle/duke.pxa/4.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/4.pxi rename to desktop/asset-work/ending-castle/duke.pxa/4.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/5.pxi b/desktop/asset-work/ending-castle/duke.pxa/5.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/5.pxi rename to desktop/asset-work/ending-castle/duke.pxa/5.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/6.pxi b/desktop/asset-work/ending-castle/duke.pxa/6.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/6.pxi rename to desktop/asset-work/ending-castle/duke.pxa/6.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/7.pxi b/desktop/asset-work/ending-castle/duke.pxa/7.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/7.pxi rename to desktop/asset-work/ending-castle/duke.pxa/7.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/8.pxi b/desktop/asset-work/ending-castle/duke.pxa/8.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/8.pxi rename to desktop/asset-work/ending-castle/duke.pxa/8.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/9.pxi b/desktop/asset-work/ending-castle/duke.pxa/9.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/9.pxi rename to desktop/asset-work/ending-castle/duke.pxa/9.pxi diff --git a/desktop/resources/ending-castle/duke.pxa/CelData.plist b/desktop/asset-work/ending-castle/duke.pxa/CelData.plist similarity index 100% rename from desktop/resources/ending-castle/duke.pxa/CelData.plist rename to desktop/asset-work/ending-castle/duke.pxa/CelData.plist diff --git a/desktop/resources/ending-castle/duke.pxi b/desktop/asset-work/ending-castle/duke.pxi similarity index 100% rename from desktop/resources/ending-castle/duke.pxi rename to desktop/asset-work/ending-castle/duke.pxi diff --git a/desktop/resources/ending-castle/ending-castle2-assets/background.png b/desktop/asset-work/ending-castle/ending-castle2-assets/background.png similarity index 100% rename from desktop/resources/ending-castle/ending-castle2-assets/background.png rename to desktop/asset-work/ending-castle/ending-castle2-assets/background.png diff --git a/desktop/asset-work/ending-castle/ending-castle2-assets/collision.png b/desktop/asset-work/ending-castle/ending-castle2-assets/collision.png new file mode 100644 index 00000000..04b85262 Binary files /dev/null and b/desktop/asset-work/ending-castle/ending-castle2-assets/collision.png differ diff --git a/desktop/resources/ending-castle/ending-castle2-assets/foreground.png b/desktop/asset-work/ending-castle/ending-castle2-assets/foreground.png similarity index 100% rename from desktop/resources/ending-castle/ending-castle2-assets/foreground.png rename to desktop/asset-work/ending-castle/ending-castle2-assets/foreground.png 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/ending-castle/game-player.png b/desktop/asset-work/ending-castle/game-player.png similarity index 100% rename from desktop/resources/ending-castle/game-player.png rename to desktop/asset-work/ending-castle/game-player.png diff --git a/desktop/resources/ending-castle/game-player.pxa/0.pxi b/desktop/asset-work/ending-castle/game-player.pxa/0.pxi similarity index 100% rename from desktop/resources/ending-castle/game-player.pxa/0.pxi rename to desktop/asset-work/ending-castle/game-player.pxa/0.pxi diff --git a/desktop/resources/ending-castle/game-player.pxa/1.pxi b/desktop/asset-work/ending-castle/game-player.pxa/1.pxi similarity index 100% rename from desktop/resources/ending-castle/game-player.pxa/1.pxi rename to desktop/asset-work/ending-castle/game-player.pxa/1.pxi diff --git a/desktop/resources/ending-castle/game-player.pxa/CelData.plist b/desktop/asset-work/ending-castle/game-player.pxa/CelData.plist similarity index 100% rename from desktop/resources/ending-castle/game-player.pxa/CelData.plist rename to desktop/asset-work/ending-castle/game-player.pxa/CelData.plist diff --git a/desktop/resources/ending-castle/warden-2.png b/desktop/asset-work/ending-castle/warden-2.png similarity index 100% rename from desktop/resources/ending-castle/warden-2.png rename to desktop/asset-work/ending-castle/warden-2.png diff --git a/desktop/resources/ending-castle/warden.pxa/0.pxi b/desktop/asset-work/ending-castle/warden.pxa/0.pxi similarity index 100% rename from desktop/resources/ending-castle/warden.pxa/0.pxi rename to desktop/asset-work/ending-castle/warden.pxa/0.pxi diff --git a/desktop/resources/ending-castle/warden.pxa/1.pxi b/desktop/asset-work/ending-castle/warden.pxa/1.pxi similarity index 100% rename from desktop/resources/ending-castle/warden.pxa/1.pxi rename to desktop/asset-work/ending-castle/warden.pxa/1.pxi diff --git a/desktop/resources/ending-castle/warden.pxa/CelData.plist b/desktop/asset-work/ending-castle/warden.pxa/CelData.plist similarity index 100% rename from desktop/resources/ending-castle/warden.pxa/CelData.plist rename to desktop/asset-work/ending-castle/warden.pxa/CelData.plist diff --git a/desktop/resources/ending-castle/warden2.pxa/0.pxi b/desktop/asset-work/ending-castle/warden2.pxa/0.pxi similarity index 100% rename from desktop/resources/ending-castle/warden2.pxa/0.pxi rename to desktop/asset-work/ending-castle/warden2.pxa/0.pxi diff --git a/desktop/resources/ending-castle/warden2.pxa/1.pxi b/desktop/asset-work/ending-castle/warden2.pxa/1.pxi similarity index 100% rename from desktop/resources/ending-castle/warden2.pxa/1.pxi rename to desktop/asset-work/ending-castle/warden2.pxa/1.pxi diff --git a/desktop/resources/ending-castle/warden2.pxa/CelData.plist b/desktop/asset-work/ending-castle/warden2.pxa/CelData.plist similarity index 100% rename from desktop/resources/ending-castle/warden2.pxa/CelData.plist rename to desktop/asset-work/ending-castle/warden2.pxa/CelData.plist diff --git a/desktop/asset-work/forest.ogg b/desktop/asset-work/forest.ogg new file mode 100644 index 00000000..8f221179 Binary files /dev/null and b/desktop/asset-work/forest.ogg differ diff --git a/desktop/asset-work/forest.wav b/desktop/asset-work/forest.wav new file mode 100644 index 00000000..41b39e4e Binary files /dev/null and b/desktop/asset-work/forest.wav differ diff --git a/desktop/resources/goon-2-walk.png b/desktop/asset-work/goon-2-walk.png similarity index 100% rename from desktop/resources/goon-2-walk.png rename to desktop/asset-work/goon-2-walk.png diff --git a/desktop/resources/held/background.png b/desktop/asset-work/held/background.png similarity index 100% rename from desktop/resources/held/background.png rename to desktop/asset-work/held/background.png 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/asset-work/held/bloodclot-head-1.png b/desktop/asset-work/held/bloodclot-head-1.png new file mode 100644 index 00000000..b543058c Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-1.png differ diff --git a/desktop/asset-work/held/bloodclot-head-2.png b/desktop/asset-work/held/bloodclot-head-2.png new file mode 100644 index 00000000..2a4a1798 Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-2.png differ diff --git a/desktop/asset-work/held/bloodclot-head-3.png b/desktop/asset-work/held/bloodclot-head-3.png new file mode 100644 index 00000000..780d158d Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-3.png differ diff --git a/desktop/asset-work/held/bloodclot-head-4.png b/desktop/asset-work/held/bloodclot-head-4.png new file mode 100644 index 00000000..95e426a0 Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-4.png differ diff --git a/desktop/asset-work/held/bloodclot-head-5.png b/desktop/asset-work/held/bloodclot-head-5.png new file mode 100644 index 00000000..9c4ada30 Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-5.png differ diff --git a/desktop/asset-work/held/bloodclot-head-6.png b/desktop/asset-work/held/bloodclot-head-6.png new file mode 100644 index 00000000..2885999d Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-6.png differ diff --git a/desktop/asset-work/held/bloodclot-head-7.png b/desktop/asset-work/held/bloodclot-head-7.png new file mode 100644 index 00000000..05de84de Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-7.png differ diff --git a/desktop/asset-work/held/bloodclot-head-8.png b/desktop/asset-work/held/bloodclot-head-8.png new file mode 100644 index 00000000..25292665 Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-8.png differ diff --git a/desktop/asset-work/held/bloodclot-head-9.png b/desktop/asset-work/held/bloodclot-head-9.png new file mode 100644 index 00000000..f16d22b2 Binary files /dev/null and b/desktop/asset-work/held/bloodclot-head-9.png differ diff --git a/desktop/resources/held/bloodclot-head.pxa/0.pxi b/desktop/asset-work/held/bloodclot-head.pxa/0.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/0.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/0.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/1.pxi b/desktop/asset-work/held/bloodclot-head.pxa/1.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/1.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/1.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/2.pxi b/desktop/asset-work/held/bloodclot-head.pxa/2.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/2.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/2.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/3.pxi b/desktop/asset-work/held/bloodclot-head.pxa/3.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/3.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/3.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/4.pxi b/desktop/asset-work/held/bloodclot-head.pxa/4.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/4.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/4.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/5.pxi b/desktop/asset-work/held/bloodclot-head.pxa/5.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/5.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/5.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/6.pxi b/desktop/asset-work/held/bloodclot-head.pxa/6.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/6.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/6.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/7.pxi b/desktop/asset-work/held/bloodclot-head.pxa/7.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/7.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/7.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/8.pxi b/desktop/asset-work/held/bloodclot-head.pxa/8.pxi similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/8.pxi rename to desktop/asset-work/held/bloodclot-head.pxa/8.pxi diff --git a/desktop/resources/held/bloodclot-head.pxa/CelData.plist b/desktop/asset-work/held/bloodclot-head.pxa/CelData.plist similarity index 100% rename from desktop/resources/held/bloodclot-head.pxa/CelData.plist rename to desktop/asset-work/held/bloodclot-head.pxa/CelData.plist diff --git a/desktop/resources/held/dot.png b/desktop/asset-work/held/dot.png similarity index 100% rename from desktop/resources/held/dot.png rename to desktop/asset-work/held/dot.png diff --git a/desktop/resources/held/flesh.png b/desktop/asset-work/held/flesh.png similarity index 100% rename from desktop/resources/held/flesh.png rename to desktop/asset-work/held/flesh.png diff --git a/desktop/resources/held/hand.png b/desktop/asset-work/held/hand.png similarity index 100% rename from desktop/resources/held/hand.png rename to desktop/asset-work/held/hand.png diff --git a/desktop/resources/held/head.png b/desktop/asset-work/held/head.png similarity index 100% rename from desktop/resources/held/head.png rename to desktop/asset-work/held/head.png diff --git a/desktop/resources/held/title.png b/desktop/asset-work/held/title.png similarity index 100% rename from desktop/resources/held/title.png rename to desktop/asset-work/held/title.png diff --git a/desktop/resources/inside-antique/antique-sigh.png b/desktop/asset-work/inside-antique/antique-sigh.png similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.png rename to desktop/asset-work/inside-antique/antique-sigh.png diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/0.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/0.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/0.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/1.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/1.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/1.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/2.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/2.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/2.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/3.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/3.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/3.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/4.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/4.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/4.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/5.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/5.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/5.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/6.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/6.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/6.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/6.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/7.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/7.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/7.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/7.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/8.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/8.pxi similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/8.pxi rename to desktop/asset-work/inside-antique/antique-sigh.pxa/8.pxi diff --git a/desktop/resources/inside-antique/antique-sigh.pxa/CelData.plist b/desktop/asset-work/inside-antique/antique-sigh.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-antique/antique-sigh.pxa/CelData.plist rename to desktop/asset-work/inside-antique/antique-sigh.pxa/CelData.plist diff --git a/desktop/resources/inside-antique/background.png b/desktop/asset-work/inside-antique/background.png similarity index 100% rename from desktop/resources/inside-antique/background.png rename to desktop/asset-work/inside-antique/background.png 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/beard.png b/desktop/asset-work/inside-antique/beard.png similarity index 100% rename from desktop/resources/inside-antique/beard.png rename to desktop/asset-work/inside-antique/beard.png diff --git a/desktop/resources/inside-antique/bowl.png b/desktop/asset-work/inside-antique/bowl.png similarity index 100% rename from desktop/resources/inside-antique/bowl.png rename to desktop/asset-work/inside-antique/bowl.png diff --git a/desktop/resources/inside-antique/clock.pxa/0.pxi b/desktop/asset-work/inside-antique/clock.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-antique/clock.pxa/0.pxi rename to desktop/asset-work/inside-antique/clock.pxa/0.pxi diff --git a/desktop/resources/inside-antique/clock.pxa/1.pxi b/desktop/asset-work/inside-antique/clock.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-antique/clock.pxa/1.pxi rename to desktop/asset-work/inside-antique/clock.pxa/1.pxi diff --git a/desktop/resources/inside-antique/clock.pxa/2.pxi b/desktop/asset-work/inside-antique/clock.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-antique/clock.pxa/2.pxi rename to desktop/asset-work/inside-antique/clock.pxa/2.pxi diff --git a/desktop/resources/outside-jail/fountain.pxa/CelData.plist b/desktop/asset-work/inside-antique/clock.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/fountain.pxa/CelData.plist rename to desktop/asset-work/inside-antique/clock.pxa/CelData.plist diff --git a/desktop/resources/inside-antique/closed-blinds.png b/desktop/asset-work/inside-antique/closed-blinds.png similarity index 100% rename from desktop/resources/inside-antique/closed-blinds.png rename to desktop/asset-work/inside-antique/closed-blinds.png diff --git a/desktop/resources/inside-antique/darken.png b/desktop/asset-work/inside-antique/darken.png similarity index 100% rename from desktop/resources/inside-antique/darken.png rename to desktop/asset-work/inside-antique/darken.png diff --git a/desktop/resources/inside-antique/desk.png b/desktop/asset-work/inside-antique/desk.png similarity index 100% rename from desktop/resources/inside-antique/desk.png rename to desktop/asset-work/inside-antique/desk.png diff --git a/desktop/resources/ego/dot.png b/desktop/asset-work/inside-antique/dot.png similarity index 100% rename from desktop/resources/ego/dot.png rename to desktop/asset-work/inside-antique/dot.png diff --git a/desktop/resources/inside-antique/fg.png b/desktop/asset-work/inside-antique/fg.png similarity index 100% rename from desktop/resources/inside-antique/fg.png rename to desktop/asset-work/inside-antique/fg.png 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-antique/fire-particle b/desktop/asset-work/inside-antique/fire-particle similarity index 100% rename from desktop/resources/inside-antique/fire-particle rename to desktop/asset-work/inside-antique/fire-particle diff --git a/desktop/resources/inside-antique/glow.png b/desktop/asset-work/inside-antique/glow.png similarity index 100% rename from desktop/resources/inside-antique/glow.png rename to desktop/asset-work/inside-antique/glow.png diff --git a/desktop/resources/inside-antique/open-blinds.png b/desktop/asset-work/inside-antique/open-blinds.png similarity index 100% rename from desktop/resources/inside-antique/open-blinds.png rename to desktop/asset-work/inside-antique/open-blinds.png diff --git a/desktop/resources/inside-antique/portrait.png b/desktop/asset-work/inside-antique/portrait.png similarity index 100% rename from desktop/resources/inside-antique/portrait.png rename to desktop/asset-work/inside-antique/portrait.png diff --git a/desktop/resources/inside-antique/shopkeep-talk.png b/desktop/asset-work/inside-antique/shopkeep-talk.png similarity index 100% rename from desktop/resources/inside-antique/shopkeep-talk.png rename to desktop/asset-work/inside-antique/shopkeep-talk.png diff --git a/desktop/resources/inside-antique/shopkeep.png b/desktop/asset-work/inside-antique/shopkeep.png similarity index 100% rename from desktop/resources/inside-antique/shopkeep.png rename to desktop/asset-work/inside-antique/shopkeep.png diff --git a/desktop/resources/inside-antique/smoke-particle b/desktop/asset-work/inside-antique/smoke-particle similarity index 100% rename from desktop/resources/inside-antique/smoke-particle rename to desktop/asset-work/inside-antique/smoke-particle diff --git a/desktop/resources/inside-antique/sword.png b/desktop/asset-work/inside-antique/sword.png similarity index 100% rename from desktop/resources/inside-antique/sword.png rename to desktop/asset-work/inside-antique/sword.png diff --git a/desktop/resources/inside-antique/teddy.png b/desktop/asset-work/inside-antique/teddy.png similarity index 100% rename from desktop/resources/inside-antique/teddy.png rename to desktop/asset-work/inside-antique/teddy.png diff --git a/desktop/resources/inside-cafeteria/background.png b/desktop/asset-work/inside-cafeteria/background.png similarity index 100% rename from desktop/resources/inside-cafeteria/background.png rename to desktop/asset-work/inside-cafeteria/background.png 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-cafeteria/doorway.png b/desktop/asset-work/inside-cafeteria/doorway.png similarity index 100% rename from desktop/resources/inside-cafeteria/doorway.png rename to desktop/asset-work/inside-cafeteria/doorway.png diff --git a/desktop/resources/inside-cafeteria/fg.png b/desktop/asset-work/inside-cafeteria/fg.png similarity index 100% rename from desktop/resources/inside-cafeteria/fg.png rename to desktop/asset-work/inside-cafeteria/fg.png diff --git a/desktop/resources/inside-cafeteria/fight.png b/desktop/asset-work/inside-cafeteria/fight.png similarity index 100% rename from desktop/resources/inside-cafeteria/fight.png rename to desktop/asset-work/inside-cafeteria/fight.png diff --git a/desktop/resources/inside-cafeteria/glow.png b/desktop/asset-work/inside-cafeteria/glow.png similarity index 100% rename from desktop/resources/inside-cafeteria/glow.png rename to desktop/asset-work/inside-cafeteria/glow.png diff --git a/desktop/resources/inside-cafeteria/hands-fight.png b/desktop/asset-work/inside-cafeteria/hands-fight.png similarity index 100% rename from desktop/resources/inside-cafeteria/hands-fight.png rename to desktop/asset-work/inside-cafeteria/hands-fight.png diff --git a/desktop/resources/inside-cafeteria/knight-a.png b/desktop/asset-work/inside-cafeteria/knight-a.png similarity index 100% rename from desktop/resources/inside-cafeteria/knight-a.png rename to desktop/asset-work/inside-cafeteria/knight-a.png diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/0.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/0.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/0.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/1.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/1.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/1.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/2.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/2.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/2.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/3.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/3.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/3.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/4.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/4.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/4.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/5.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/5.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/5.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/6.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/6.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/6.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/6.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/7.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/7.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/7.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/7.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/8.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/8.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/8.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/8.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/9.pxi b/desktop/asset-work/inside-cafeteria/knighta.pxa/9.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/9.pxi rename to desktop/asset-work/inside-cafeteria/knighta.pxa/9.pxi diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/CelData.plist b/desktop/asset-work/inside-cafeteria/knighta.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-cafeteria/knighta.pxa/CelData.plist rename to desktop/asset-work/inside-cafeteria/knighta.pxa/CelData.plist diff --git a/desktop/resources/inside-cafeteria/knights-stand.png b/desktop/asset-work/inside-cafeteria/knights-stand.png similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.png rename to desktop/asset-work/inside-cafeteria/knights-stand.png diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/0.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/0.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/0.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/1.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/1.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/1.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/2.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/2.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/2.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/3.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/3.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/3.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/4.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/4.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/4.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/5.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/5.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/5.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/6.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/6.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/6.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/6.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/7.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/7.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/7.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/7.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/8.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/8.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/8.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/8.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/9.pxi b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/9.pxi similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/9.pxi rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/9.pxi diff --git a/desktop/resources/inside-cafeteria/knights-stand.pxa/CelData.plist b/desktop/asset-work/inside-cafeteria/knights-stand.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-cafeteria/knights-stand.pxa/CelData.plist rename to desktop/asset-work/inside-cafeteria/knights-stand.pxa/CelData.plist diff --git a/desktop/resources/inside-cafeteria/knights.png b/desktop/asset-work/inside-cafeteria/knights.png similarity index 100% rename from desktop/resources/inside-cafeteria/knights.png rename to desktop/asset-work/inside-cafeteria/knights.png diff --git a/desktop/resources/inside-cafeteria/ladder-guard-2.png b/desktop/asset-work/inside-cafeteria/ladder-guard-2.png similarity index 100% rename from desktop/resources/inside-cafeteria/ladder-guard-2.png rename to desktop/asset-work/inside-cafeteria/ladder-guard-2.png diff --git a/desktop/resources/inside-cafeteria/ladder-guard.png b/desktop/asset-work/inside-cafeteria/ladder-guard.png similarity index 100% rename from desktop/resources/inside-cafeteria/ladder-guard.png rename to desktop/asset-work/inside-cafeteria/ladder-guard.png diff --git a/desktop/resources/inside-cafeteria/ladder.png b/desktop/asset-work/inside-cafeteria/ladder.png similarity index 100% rename from desktop/resources/inside-cafeteria/ladder.png rename to desktop/asset-work/inside-cafeteria/ladder.png diff --git a/desktop/resources/inside-cafeteria/warriors-stand.png b/desktop/asset-work/inside-cafeteria/warriors-stand.png similarity index 100% rename from desktop/resources/inside-cafeteria/warriors-stand.png rename to desktop/asset-work/inside-cafeteria/warriors-stand.png diff --git a/desktop/resources/inside-cafeteria/warriors.png b/desktop/asset-work/inside-cafeteria/warriors.png similarity index 100% rename from desktop/resources/inside-cafeteria/warriors.png rename to desktop/asset-work/inside-cafeteria/warriors.png diff --git a/desktop/resources/inside-castle/Untitled.png b/desktop/asset-work/inside-castle/Untitled.png similarity index 100% rename from desktop/resources/inside-castle/Untitled.png rename to desktop/asset-work/inside-castle/Untitled.png diff --git a/desktop/resources/inside-castle/background-sunrise.png b/desktop/asset-work/inside-castle/background-sunrise.png similarity index 100% rename from desktop/resources/inside-castle/background-sunrise.png rename to desktop/asset-work/inside-castle/background-sunrise.png diff --git a/desktop/resources/inside-castle/background.png b/desktop/asset-work/inside-castle/background.png similarity index 100% rename from desktop/resources/inside-castle/background.png rename to desktop/asset-work/inside-castle/background.png diff --git a/desktop/resources/inside-castle/books.png b/desktop/asset-work/inside-castle/books.png similarity index 100% rename from desktop/resources/inside-castle/books.png rename to desktop/asset-work/inside-castle/books.png diff --git a/desktop/resources/inside-castle/bookstack.png b/desktop/asset-work/inside-castle/bookstack.png similarity index 100% rename from desktop/resources/inside-castle/bookstack.png rename to desktop/asset-work/inside-castle/bookstack.png diff --git a/desktop/resources/inside-castle/brian-working.png b/desktop/asset-work/inside-castle/brian-working.png similarity index 100% rename from desktop/resources/inside-castle/brian-working.png rename to desktop/asset-work/inside-castle/brian-working.png diff --git a/desktop/resources/inside-castle/brian-working.pxa/0.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/0.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/0.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/1.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/1.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/1.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/2.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/2.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/2.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/3.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/3.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/3.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/4.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/4.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/4.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/5.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/5.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/5.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/6.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/6.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/6.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/6.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/7.pxi b/desktop/asset-work/inside-castle/brian-working.pxa/7.pxi similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/7.pxi rename to desktop/asset-work/inside-castle/brian-working.pxa/7.pxi diff --git a/desktop/resources/inside-castle/brian-working.pxa/CelData.plist b/desktop/asset-work/inside-castle/brian-working.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-castle/brian-working.pxa/CelData.plist rename to desktop/asset-work/inside-castle/brian-working.pxa/CelData.plist 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/door.png b/desktop/asset-work/inside-castle/door.png similarity index 100% rename from desktop/resources/inside-castle/door.png rename to desktop/asset-work/inside-castle/door.png diff --git a/desktop/resources/inside-castle/door.pxa/0.pxi b/desktop/asset-work/inside-castle/door.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-castle/door.pxa/0.pxi rename to desktop/asset-work/inside-castle/door.pxa/0.pxi diff --git a/desktop/resources/inside-castle/door.pxa/1.pxi b/desktop/asset-work/inside-castle/door.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-castle/door.pxa/1.pxi rename to desktop/asset-work/inside-castle/door.pxa/1.pxi diff --git a/desktop/resources/inside-castle/door.pxa/2.pxi b/desktop/asset-work/inside-castle/door.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-castle/door.pxa/2.pxi rename to desktop/asset-work/inside-castle/door.pxa/2.pxi diff --git a/desktop/resources/inside-castle/door.pxa/3.pxi b/desktop/asset-work/inside-castle/door.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-castle/door.pxa/3.pxi rename to desktop/asset-work/inside-castle/door.pxa/3.pxi diff --git a/desktop/resources/inside-castle/door.pxa/CelData.plist b/desktop/asset-work/inside-castle/door.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-castle/door.pxa/CelData.plist rename to desktop/asset-work/inside-castle/door.pxa/CelData.plist diff --git a/desktop/resources/inside-castle/fight-1.png b/desktop/asset-work/inside-castle/fight-1.png similarity index 100% rename from desktop/resources/inside-castle/fight-1.png rename to desktop/asset-work/inside-castle/fight-1.png 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-castle/game-player-talk.png b/desktop/asset-work/inside-castle/game-player-talk.png similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.png rename to desktop/asset-work/inside-castle/game-player-talk.png diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/0.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/0.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/1.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/1.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/2.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/2.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/3.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/3.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/4.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/4.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/4.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/5.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/5.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/5.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/6.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/6.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/6.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/6.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/7.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/7.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/7.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/7.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/8.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/8.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/8.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/8.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/9.pxi b/desktop/asset-work/inside-castle/game-player-talk.pxa/9.pxi similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/9.pxi rename to desktop/asset-work/inside-castle/game-player-talk.pxa/9.pxi diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist b/desktop/asset-work/inside-castle/game-player-talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist rename to desktop/asset-work/inside-castle/game-player-talk.pxa/CelData.plist diff --git a/desktop/resources/inside-castle/gameplayer.png b/desktop/asset-work/inside-castle/gameplayer.png similarity index 100% rename from desktop/resources/inside-castle/gameplayer.png rename to desktop/asset-work/inside-castle/gameplayer.png diff --git a/desktop/resources/inside-castle/gameplayer.pxi b/desktop/asset-work/inside-castle/gameplayer.pxi similarity index 100% rename from desktop/resources/inside-castle/gameplayer.pxi rename to desktop/asset-work/inside-castle/gameplayer.pxi diff --git a/desktop/resources/inside-castle/hands-1.png b/desktop/asset-work/inside-castle/hands-1.png similarity index 100% rename from desktop/resources/inside-castle/hands-1.png rename to desktop/asset-work/inside-castle/hands-1.png diff --git a/desktop/resources/inside-castle/hands-fight.png b/desktop/asset-work/inside-castle/hands-fight.png similarity index 100% rename from desktop/resources/inside-castle/hands-fight.png rename to desktop/asset-work/inside-castle/hands-fight.png diff --git a/desktop/resources/inside-castle/hands.pxa/0.pxi b/desktop/asset-work/inside-castle/hands.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/0.pxi rename to desktop/asset-work/inside-castle/hands.pxa/0.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/1.pxi b/desktop/asset-work/inside-castle/hands.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/1.pxi rename to desktop/asset-work/inside-castle/hands.pxa/1.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/2.pxi b/desktop/asset-work/inside-castle/hands.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/2.pxi rename to desktop/asset-work/inside-castle/hands.pxa/2.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/3.pxi b/desktop/asset-work/inside-castle/hands.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/3.pxi rename to desktop/asset-work/inside-castle/hands.pxa/3.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/4.pxi b/desktop/asset-work/inside-castle/hands.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/4.pxi rename to desktop/asset-work/inside-castle/hands.pxa/4.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/5.pxi b/desktop/asset-work/inside-castle/hands.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/5.pxi rename to desktop/asset-work/inside-castle/hands.pxa/5.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/6.pxi b/desktop/asset-work/inside-castle/hands.pxa/6.pxi similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/6.pxi rename to desktop/asset-work/inside-castle/hands.pxa/6.pxi diff --git a/desktop/resources/inside-castle/hands.pxa/CelData.plist b/desktop/asset-work/inside-castle/hands.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-castle/hands.pxa/CelData.plist rename to desktop/asset-work/inside-castle/hands.pxa/CelData.plist diff --git a/desktop/resources/inside-castle/inside-castle-sunrise.png b/desktop/asset-work/inside-castle/inside-castle-sunrise.png similarity index 100% rename from desktop/resources/inside-castle/inside-castle-sunrise.png rename to desktop/asset-work/inside-castle/inside-castle-sunrise.png diff --git a/desktop/resources/inside-castle/magic b/desktop/asset-work/inside-castle/magic similarity index 100% rename from desktop/resources/inside-castle/magic rename to desktop/asset-work/inside-castle/magic diff --git a/desktop/resources/inside-castle/magic.png b/desktop/asset-work/inside-castle/magic.png similarity index 100% rename from desktop/resources/inside-castle/magic.png rename to desktop/asset-work/inside-castle/magic.png diff --git a/desktop/resources/inside-castle/monocle.png b/desktop/asset-work/inside-castle/monocle.png similarity index 100% rename from desktop/resources/inside-castle/monocle.png rename to desktop/asset-work/inside-castle/monocle.png diff --git a/desktop/resources/inside-castle/pedestal-overlay.png b/desktop/asset-work/inside-castle/pedestal-overlay.png similarity index 100% rename from desktop/resources/inside-castle/pedestal-overlay.png rename to desktop/asset-work/inside-castle/pedestal-overlay.png diff --git a/desktop/resources/inside-castle/player.pxi b/desktop/asset-work/inside-castle/player.pxi similarity index 100% rename from desktop/resources/inside-castle/player.pxi rename to desktop/asset-work/inside-castle/player.pxi diff --git a/desktop/resources/inside-castle/pull-sword.png b/desktop/asset-work/inside-castle/pull-sword.png similarity index 100% rename from desktop/resources/inside-castle/pull-sword.png rename to desktop/asset-work/inside-castle/pull-sword.png diff --git a/desktop/resources/inside-castle/roof.png b/desktop/asset-work/inside-castle/roof.png similarity index 100% rename from desktop/resources/inside-castle/roof.png rename to desktop/asset-work/inside-castle/roof.png diff --git a/desktop/resources/inside-castle/sword.png b/desktop/asset-work/inside-castle/sword.png similarity index 100% rename from desktop/resources/inside-castle/sword.png rename to desktop/asset-work/inside-castle/sword.png diff --git a/desktop/resources/inside-castle/trophy.png b/desktop/asset-work/inside-castle/trophy.png similarity index 100% rename from desktop/resources/inside-castle/trophy.png rename to desktop/asset-work/inside-castle/trophy.png diff --git a/desktop/resources/inside-castle/walkie-talkie.png b/desktop/asset-work/inside-castle/walkie-talkie.png similarity index 100% rename from desktop/resources/inside-castle/walkie-talkie.png rename to desktop/asset-work/inside-castle/walkie-talkie.png diff --git a/desktop/resources/inside-castle/watch.png b/desktop/asset-work/inside-castle/watch.png similarity index 100% rename from desktop/resources/inside-castle/watch.png rename to desktop/asset-work/inside-castle/watch.png diff --git a/desktop/resources/inside-castle/way-back-tree.png b/desktop/asset-work/inside-castle/way-back-tree.png similarity index 100% rename from desktop/resources/inside-castle/way-back-tree.png rename to desktop/asset-work/inside-castle/way-back-tree.png diff --git a/desktop/asset-work/inside-castle/writing.ogg b/desktop/asset-work/inside-castle/writing.ogg new file mode 100644 index 00000000..2d66c64f Binary files /dev/null and b/desktop/asset-work/inside-castle/writing.ogg differ diff --git a/desktop/asset-work/inside-castle/writing.wav b/desktop/asset-work/inside-castle/writing.wav new file mode 100644 index 00000000..62e84602 Binary files /dev/null and b/desktop/asset-work/inside-castle/writing.wav differ diff --git a/desktop/resources/inside-house/background.png b/desktop/asset-work/inside-house/background.png similarity index 100% rename from desktop/resources/inside-house/background.png rename to desktop/asset-work/inside-house/background.png 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/candle b/desktop/asset-work/inside-house/candle similarity index 100% rename from desktop/resources/inside-house/candle rename to desktop/asset-work/inside-house/candle diff --git a/desktop/resources/inside-house/candle-aura.png b/desktop/asset-work/inside-house/candle-aura.png similarity index 100% rename from desktop/resources/inside-house/candle-aura.png rename to desktop/asset-work/inside-house/candle-aura.png diff --git a/desktop/resources/inside-house/candle-aura.pxa/0.pxi b/desktop/asset-work/inside-house/candle-aura.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-house/candle-aura.pxa/0.pxi rename to desktop/asset-work/inside-house/candle-aura.pxa/0.pxi diff --git a/desktop/resources/inside-house/candle-aura.pxa/1.pxi b/desktop/asset-work/inside-house/candle-aura.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-house/candle-aura.pxa/1.pxi rename to desktop/asset-work/inside-house/candle-aura.pxa/1.pxi diff --git a/desktop/resources/inside-house/candle-aura.pxa/2.pxi b/desktop/asset-work/inside-house/candle-aura.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-house/candle-aura.pxa/2.pxi rename to desktop/asset-work/inside-house/candle-aura.pxa/2.pxi diff --git a/desktop/resources/inside-house/candle-aura.pxa/3.pxi b/desktop/asset-work/inside-house/candle-aura.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-house/candle-aura.pxa/3.pxi rename to desktop/asset-work/inside-house/candle-aura.pxa/3.pxi diff --git a/desktop/resources/inside-house/candle-aura.pxa/CelData.plist b/desktop/asset-work/inside-house/candle-aura.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-house/candle-aura.pxa/CelData.plist rename to desktop/asset-work/inside-house/candle-aura.pxa/CelData.plist diff --git a/desktop/resources/inside-house/candle.png b/desktop/asset-work/inside-house/candle.png similarity index 100% rename from desktop/resources/inside-house/candle.png rename to desktop/asset-work/inside-house/candle.png 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/desk.png b/desktop/asset-work/inside-house/desk.png similarity index 100% rename from desktop/resources/inside-house/desk.png rename to desktop/asset-work/inside-house/desk.png 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-antique/dot.png b/desktop/asset-work/inside-house/dot.png similarity index 100% rename from desktop/resources/inside-antique/dot.png rename to desktop/asset-work/inside-house/dot.png diff --git a/desktop/resources/inside-house/flask.png b/desktop/asset-work/inside-house/flask.png similarity index 100% rename from desktop/resources/inside-house/flask.png rename to desktop/asset-work/inside-house/flask.png diff --git a/desktop/resources/inside-house/frog-legs.png b/desktop/asset-work/inside-house/frog-legs.png similarity index 100% rename from desktop/resources/inside-house/frog-legs.png rename to desktop/asset-work/inside-house/frog-legs.png diff --git a/desktop/resources/inside-house/glow.png b/desktop/asset-work/inside-house/glow.png similarity index 100% rename from desktop/resources/inside-house/glow.png rename to desktop/asset-work/inside-house/glow.png diff --git a/desktop/resources/inside-house/inputed-key.png b/desktop/asset-work/inside-house/inputed-key.png similarity index 100% rename from desktop/resources/inside-house/inputed-key.png rename to desktop/asset-work/inside-house/inputed-key.png diff --git a/desktop/resources/inside-house/magic-frog b/desktop/asset-work/inside-house/magic-frog similarity index 100% rename from desktop/resources/inside-house/magic-frog rename to desktop/asset-work/inside-house/magic-frog 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-house/safe-lock.png b/desktop/asset-work/inside-house/safe-lock.png similarity index 100% rename from desktop/resources/inside-house/safe-lock.png rename to desktop/asset-work/inside-house/safe-lock.png diff --git a/desktop/resources/inside-house/safe-screen.png b/desktop/asset-work/inside-house/safe-screen.png similarity index 100% rename from desktop/resources/inside-house/safe-screen.png rename to desktop/asset-work/inside-house/safe-screen.png diff --git a/desktop/resources/inside-house/sillhoute.png b/desktop/asset-work/inside-house/sillhoute.png similarity index 100% rename from desktop/resources/inside-house/sillhoute.png rename to desktop/asset-work/inside-house/sillhoute.png diff --git a/desktop/resources/inside-jail/background.png b/desktop/asset-work/inside-jail/background.png similarity index 100% rename from desktop/resources/inside-jail/background.png rename to desktop/asset-work/inside-jail/background.png diff --git a/desktop/resources/inside-jail/ball-n-chain.png b/desktop/asset-work/inside-jail/ball-n-chain.png similarity index 100% rename from desktop/resources/inside-jail/ball-n-chain.png rename to desktop/asset-work/inside-jail/ball-n-chain.png diff --git a/desktop/resources/inside-jail/bars-.png b/desktop/asset-work/inside-jail/bars-.png similarity index 100% rename from desktop/resources/inside-jail/bars-.png rename to desktop/asset-work/inside-jail/bars-.png diff --git a/desktop/resources/inside-jail/bars.png b/desktop/asset-work/inside-jail/bars.png similarity index 100% rename from desktop/resources/inside-jail/bars.png rename to desktop/asset-work/inside-jail/bars.png diff --git a/desktop/resources/inside-jail/candle b/desktop/asset-work/inside-jail/candle similarity index 100% rename from desktop/resources/inside-jail/candle rename to desktop/asset-work/inside-jail/candle diff --git a/desktop/resources/inside-jail/candle.png b/desktop/asset-work/inside-jail/candle.png similarity index 100% rename from desktop/resources/inside-jail/candle.png rename to desktop/asset-work/inside-jail/candle.png diff --git a/desktop/resources/inside-jail/candle.pxa/0.pxi b/desktop/asset-work/inside-jail/candle.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-jail/candle.pxa/0.pxi rename to desktop/asset-work/inside-jail/candle.pxa/0.pxi diff --git a/desktop/resources/inside-jail/candle.pxa/1.pxi b/desktop/asset-work/inside-jail/candle.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-jail/candle.pxa/1.pxi rename to desktop/asset-work/inside-jail/candle.pxa/1.pxi diff --git a/desktop/resources/inside-jail/candle.pxa/2.pxi b/desktop/asset-work/inside-jail/candle.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-jail/candle.pxa/2.pxi rename to desktop/asset-work/inside-jail/candle.pxa/2.pxi diff --git a/desktop/resources/inside-jail/candle.pxa/3.pxi b/desktop/asset-work/inside-jail/candle.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-jail/candle.pxa/3.pxi rename to desktop/asset-work/inside-jail/candle.pxa/3.pxi diff --git a/desktop/resources/inside-jail/candle.pxa/CelData.plist b/desktop/asset-work/inside-jail/candle.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-jail/candle.pxa/CelData.plist rename to desktop/asset-work/inside-jail/candle.pxa/CelData.plist diff --git a/desktop/resources/inside-jail/chest-top-open.png b/desktop/asset-work/inside-jail/chest-top-open.png similarity index 100% rename from desktop/resources/inside-jail/chest-top-open.png rename to desktop/asset-work/inside-jail/chest-top-open.png diff --git a/desktop/resources/inside-jail/chest-top.png b/desktop/asset-work/inside-jail/chest-top.png similarity index 100% rename from desktop/resources/inside-jail/chest-top.png rename to desktop/asset-work/inside-jail/chest-top.png diff --git a/desktop/resources/inside-jail/crowbar.png b/desktop/asset-work/inside-jail/crowbar.png similarity index 100% rename from desktop/resources/inside-jail/crowbar.png rename to desktop/asset-work/inside-jail/crowbar.png diff --git a/desktop/resources/inside-house/dot.png b/desktop/asset-work/inside-jail/dot.png similarity index 100% rename from desktop/resources/inside-house/dot.png rename to desktop/asset-work/inside-jail/dot.png 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/fg.png b/desktop/asset-work/inside-jail/fg.png similarity index 100% rename from desktop/resources/inside-jail/fg.png rename to desktop/asset-work/inside-jail/fg.png diff --git a/desktop/resources/inside-jail/glow.png b/desktop/asset-work/inside-jail/glow.png similarity index 100% rename from desktop/resources/inside-jail/glow.png rename to desktop/asset-work/inside-jail/glow.png 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-jail/moveable-bars.png b/desktop/asset-work/inside-jail/moveable-bars.png similarity index 100% rename from desktop/resources/inside-jail/moveable-bars.png rename to desktop/asset-work/inside-jail/moveable-bars.png diff --git a/desktop/resources/inside-jail/warden.png b/desktop/asset-work/inside-jail/warden.png similarity index 100% rename from desktop/resources/inside-jail/warden.png rename to desktop/asset-work/inside-jail/warden.png diff --git a/desktop/resources/inside-jail/warden.pxa/0.pxi b/desktop/asset-work/inside-jail/warden.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/0.pxi rename to desktop/asset-work/inside-jail/warden.pxa/0.pxi diff --git a/desktop/resources/inside-jail/warden.pxa/1.pxi b/desktop/asset-work/inside-jail/warden.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/1.pxi rename to desktop/asset-work/inside-jail/warden.pxa/1.pxi diff --git a/desktop/resources/inside-jail/warden.pxa/2.pxi b/desktop/asset-work/inside-jail/warden.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/2.pxi rename to desktop/asset-work/inside-jail/warden.pxa/2.pxi diff --git a/desktop/resources/inside-jail/warden.pxa/3.pxi b/desktop/asset-work/inside-jail/warden.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/3.pxi rename to desktop/asset-work/inside-jail/warden.pxa/3.pxi diff --git a/desktop/resources/inside-jail/warden.pxa/4.pxi b/desktop/asset-work/inside-jail/warden.pxa/4.pxi similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/4.pxi rename to desktop/asset-work/inside-jail/warden.pxa/4.pxi diff --git a/desktop/resources/inside-jail/warden.pxa/5.pxi b/desktop/asset-work/inside-jail/warden.pxa/5.pxi similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/5.pxi rename to desktop/asset-work/inside-jail/warden.pxa/5.pxi diff --git a/desktop/resources/inside-jail/warden.pxa/CelData.plist b/desktop/asset-work/inside-jail/warden.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-jail/warden.pxa/CelData.plist rename to desktop/asset-work/inside-jail/warden.pxa/CelData.plist diff --git a/desktop/resources/inside-jail/window-bent.png b/desktop/asset-work/inside-jail/window-bent.png similarity index 100% rename from desktop/resources/inside-jail/window-bent.png rename to desktop/asset-work/inside-jail/window-bent.png diff --git a/desktop/resources/inside-jail/window.png b/desktop/asset-work/inside-jail/window.png similarity index 100% rename from desktop/resources/inside-jail/window.png rename to desktop/asset-work/inside-jail/window.png diff --git a/desktop/resources/inside-stash/background.png b/desktop/asset-work/inside-stash/background.png similarity index 100% rename from desktop/resources/inside-stash/background.png rename to desktop/asset-work/inside-stash/background.png 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/inside-stash/candle.png b/desktop/asset-work/inside-stash/candle.png similarity index 100% rename from desktop/resources/inside-stash/candle.png rename to desktop/asset-work/inside-stash/candle.png diff --git a/desktop/resources/inside-stash/candle.pxa/0.pxi b/desktop/asset-work/inside-stash/candle.pxa/0.pxi similarity index 100% rename from desktop/resources/inside-stash/candle.pxa/0.pxi rename to desktop/asset-work/inside-stash/candle.pxa/0.pxi diff --git a/desktop/resources/inside-stash/candle.pxa/1.pxi b/desktop/asset-work/inside-stash/candle.pxa/1.pxi similarity index 100% rename from desktop/resources/inside-stash/candle.pxa/1.pxi rename to desktop/asset-work/inside-stash/candle.pxa/1.pxi diff --git a/desktop/resources/inside-stash/candle.pxa/2.pxi b/desktop/asset-work/inside-stash/candle.pxa/2.pxi similarity index 100% rename from desktop/resources/inside-stash/candle.pxa/2.pxi rename to desktop/asset-work/inside-stash/candle.pxa/2.pxi diff --git a/desktop/resources/inside-stash/candle.pxa/3.pxi b/desktop/asset-work/inside-stash/candle.pxa/3.pxi similarity index 100% rename from desktop/resources/inside-stash/candle.pxa/3.pxi rename to desktop/asset-work/inside-stash/candle.pxa/3.pxi diff --git a/desktop/resources/inside-stash/candle.pxa/CelData.plist b/desktop/asset-work/inside-stash/candle.pxa/CelData.plist similarity index 100% rename from desktop/resources/inside-stash/candle.pxa/CelData.plist rename to desktop/asset-work/inside-stash/candle.pxa/CelData.plist diff --git a/desktop/resources/inside-stash/lid.png b/desktop/asset-work/inside-stash/lid.png similarity index 100% rename from desktop/resources/inside-stash/lid.png rename to desktop/asset-work/inside-stash/lid.png diff --git a/desktop/asset-work/intro.wav b/desktop/asset-work/intro.wav new file mode 100644 index 00000000..91790100 Binary files /dev/null and b/desktop/asset-work/intro.wav differ diff --git a/desktop/resources/inventory-overlay.png b/desktop/asset-work/inventory-overlay.png similarity index 100% rename from desktop/resources/inventory-overlay.png rename to desktop/asset-work/inventory-overlay.png 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.png b/desktop/asset-work/inventory.png similarity index 100% rename from desktop/resources/inventory.png rename to desktop/asset-work/inventory.png 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/left.pxa/0.pxi b/desktop/asset-work/left.pxa/0.pxi similarity index 100% rename from desktop/resources/left.pxa/0.pxi rename to desktop/asset-work/left.pxa/0.pxi diff --git a/desktop/resources/left.pxa/1.pxi b/desktop/asset-work/left.pxa/1.pxi similarity index 100% rename from desktop/resources/left.pxa/1.pxi rename to desktop/asset-work/left.pxa/1.pxi diff --git a/desktop/resources/left.pxa/2.pxi b/desktop/asset-work/left.pxa/2.pxi similarity index 100% rename from desktop/resources/left.pxa/2.pxi rename to desktop/asset-work/left.pxa/2.pxi diff --git a/desktop/resources/left.pxa/3.pxi b/desktop/asset-work/left.pxa/3.pxi similarity index 100% rename from desktop/resources/left.pxa/3.pxi rename to desktop/asset-work/left.pxa/3.pxi diff --git a/desktop/resources/left.pxa/4.pxi b/desktop/asset-work/left.pxa/4.pxi similarity index 100% rename from desktop/resources/left.pxa/4.pxi rename to desktop/asset-work/left.pxa/4.pxi diff --git a/desktop/resources/left.pxa/5.pxi b/desktop/asset-work/left.pxa/5.pxi similarity index 100% rename from desktop/resources/left.pxa/5.pxi rename to desktop/asset-work/left.pxa/5.pxi diff --git a/desktop/resources/left.pxa/6.pxi b/desktop/asset-work/left.pxa/6.pxi similarity index 100% rename from desktop/resources/left.pxa/6.pxi rename to desktop/asset-work/left.pxa/6.pxi diff --git a/desktop/resources/left.pxa/7.pxi b/desktop/asset-work/left.pxa/7.pxi similarity index 100% rename from desktop/resources/left.pxa/7.pxi rename to desktop/asset-work/left.pxa/7.pxi diff --git a/desktop/resources/left.pxa/CelData.plist b/desktop/asset-work/left.pxa/CelData.plist similarity index 100% rename from desktop/resources/left.pxa/CelData.plist rename to desktop/asset-work/left.pxa/CelData.plist 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/Untitled.png b/desktop/asset-work/outside-castle/Untitled.png similarity index 100% rename from desktop/resources/outside-castle/Untitled.png rename to desktop/asset-work/outside-castle/Untitled.png diff --git a/desktop/resources/outside-castle/background-sunrise.png b/desktop/asset-work/outside-castle/background-sunrise.png similarity index 100% rename from desktop/resources/outside-castle/background-sunrise.png rename to desktop/asset-work/outside-castle/background-sunrise.png diff --git a/desktop/resources/outside-castle/background.png b/desktop/asset-work/outside-castle/background.png similarity index 100% rename from desktop/resources/outside-castle/background.png rename to desktop/asset-work/outside-castle/background.png 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/balloons.png b/desktop/asset-work/outside-castle/balloons.png similarity index 100% rename from desktop/resources/outside-castle/balloons.png rename to desktop/asset-work/outside-castle/balloons.png diff --git a/desktop/resources/outside-castle/bird.png b/desktop/asset-work/outside-castle/bird.png similarity index 100% rename from desktop/resources/outside-castle/bird.png rename to desktop/asset-work/outside-castle/bird.png diff --git a/desktop/resources/outside-castle/blanket.png b/desktop/asset-work/outside-castle/blanket.png similarity index 100% rename from desktop/resources/outside-castle/blanket.png rename to desktop/asset-work/outside-castle/blanket.png diff --git a/desktop/resources/outside-castle/brush.png b/desktop/asset-work/outside-castle/brush.png similarity index 100% rename from desktop/resources/outside-castle/brush.png rename to desktop/asset-work/outside-castle/brush.png diff --git a/desktop/asset-work/outside-castle/door.wav b/desktop/asset-work/outside-castle/door.wav new file mode 100644 index 00000000..2a1b679c Binary files /dev/null and b/desktop/asset-work/outside-castle/door.wav differ diff --git a/desktop/resources/outside-castle/flies.png b/desktop/asset-work/outside-castle/flies.png similarity index 100% rename from desktop/resources/outside-castle/flies.png rename to desktop/asset-work/outside-castle/flies.png 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/asset-work/outside-castle/moo.ogg b/desktop/asset-work/outside-castle/moo.ogg new file mode 100644 index 00000000..ed3db796 Binary files /dev/null and b/desktop/asset-work/outside-castle/moo.ogg differ diff --git a/desktop/asset-work/outside-castle/moo.wav b/desktop/asset-work/outside-castle/moo.wav new file mode 100644 index 00000000..98401915 Binary files /dev/null and b/desktop/asset-work/outside-castle/moo.wav differ diff --git a/desktop/resources/outside-castle/note.png b/desktop/asset-work/outside-castle/note.png similarity index 100% rename from desktop/resources/outside-castle/note.png rename to desktop/asset-work/outside-castle/note.png diff --git a/desktop/resources/outside-castle/peddler-talk.png b/desktop/asset-work/outside-castle/peddler-talk.png similarity index 100% rename from desktop/resources/outside-castle/peddler-talk.png rename to desktop/asset-work/outside-castle/peddler-talk.png diff --git a/desktop/resources/outside-castle/peddler.png b/desktop/asset-work/outside-castle/peddler.png similarity index 100% rename from desktop/resources/outside-castle/peddler.png rename to desktop/asset-work/outside-castle/peddler.png diff --git a/desktop/resources/outside-castle/peddler.pxi b/desktop/asset-work/outside-castle/peddler.pxi similarity index 100% rename from desktop/resources/outside-castle/peddler.pxi rename to desktop/asset-work/outside-castle/peddler.pxi diff --git a/desktop/asset-work/outside-castle/scratch.ogg b/desktop/asset-work/outside-castle/scratch.ogg new file mode 100644 index 00000000..3ffb8974 Binary files /dev/null and b/desktop/asset-work/outside-castle/scratch.ogg differ diff --git a/desktop/asset-work/outside-castle/scratch.wav b/desktop/asset-work/outside-castle/scratch.wav new file mode 100644 index 00000000..9b0c92ed Binary files /dev/null and b/desktop/asset-work/outside-castle/scratch.wav differ 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-castle/steer.png b/desktop/asset-work/outside-castle/steer.png similarity index 100% rename from desktop/resources/outside-castle/steer.png rename to desktop/asset-work/outside-castle/steer.png diff --git a/desktop/resources/outside-castle/steer.pxi b/desktop/asset-work/outside-castle/steer.pxi similarity index 100% rename from desktop/resources/outside-castle/steer.pxi rename to desktop/asset-work/outside-castle/steer.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/0.pxi b/desktop/asset-work/outside-castle/talk.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/0.pxi rename to desktop/asset-work/outside-castle/talk.pxa/0.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/1.pxi b/desktop/asset-work/outside-castle/talk.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/1.pxi rename to desktop/asset-work/outside-castle/talk.pxa/1.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/2.pxi b/desktop/asset-work/outside-castle/talk.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/2.pxi rename to desktop/asset-work/outside-castle/talk.pxa/2.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/3.pxi b/desktop/asset-work/outside-castle/talk.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/3.pxi rename to desktop/asset-work/outside-castle/talk.pxa/3.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/4.pxi b/desktop/asset-work/outside-castle/talk.pxa/4.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/4.pxi rename to desktop/asset-work/outside-castle/talk.pxa/4.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/5.pxi b/desktop/asset-work/outside-castle/talk.pxa/5.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/5.pxi rename to desktop/asset-work/outside-castle/talk.pxa/5.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/6.pxi b/desktop/asset-work/outside-castle/talk.pxa/6.pxi similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/6.pxi rename to desktop/asset-work/outside-castle/talk.pxa/6.pxi diff --git a/desktop/resources/outside-castle/talk.pxa/CelData.plist b/desktop/asset-work/outside-castle/talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-castle/talk.pxa/CelData.plist rename to desktop/asset-work/outside-castle/talk.pxa/CelData.plist diff --git a/desktop/resources/outside-castle/walk-behind.png b/desktop/asset-work/outside-castle/walk-behind.png similarity index 100% rename from desktop/resources/outside-castle/walk-behind.png rename to desktop/asset-work/outside-castle/walk-behind.png diff --git a/desktop/resources/outside-jail/Untitled.png b/desktop/asset-work/outside-jail/Untitled.png similarity index 100% rename from desktop/resources/outside-jail/Untitled.png rename to desktop/asset-work/outside-jail/Untitled.png diff --git a/desktop/resources/outside-jail/alarm-clock.png b/desktop/asset-work/outside-jail/alarm-clock.png similarity index 100% rename from desktop/resources/outside-jail/alarm-clock.png rename to desktop/asset-work/outside-jail/alarm-clock.png diff --git a/desktop/resources/outside-jail/axe-wood.pxa/0.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/0.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/0.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/1.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/1.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/1.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/10.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/10.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/10.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/10.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/2.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/2.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/2.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/3.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/3.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/3.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/4.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/4.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/4.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/4.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/5.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/5.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/5.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/5.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/6.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/6.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/6.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/6.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/7.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/7.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/7.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/7.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/8.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/8.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/8.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/8.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/9.pxi b/desktop/asset-work/outside-jail/axe-wood.pxa/9.pxi similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/9.pxi rename to desktop/asset-work/outside-jail/axe-wood.pxa/9.pxi diff --git a/desktop/resources/outside-jail/axe-wood.pxa/CelData.plist b/desktop/asset-work/outside-jail/axe-wood.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/axe-wood.pxa/CelData.plist rename to desktop/asset-work/outside-jail/axe-wood.pxa/CelData.plist diff --git a/desktop/resources/outside-jail/axe.png b/desktop/asset-work/outside-jail/axe.png similarity index 100% rename from desktop/resources/outside-jail/axe.png rename to desktop/asset-work/outside-jail/axe.png diff --git a/desktop/resources/outside-jail/axe.pxa/0.pxi b/desktop/asset-work/outside-jail/axe.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/axe.pxa/0.pxi rename to desktop/asset-work/outside-jail/axe.pxa/0.pxi diff --git a/desktop/resources/outside-jail/axe.pxa/1.pxi b/desktop/asset-work/outside-jail/axe.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/axe.pxa/1.pxi rename to desktop/asset-work/outside-jail/axe.pxa/1.pxi diff --git a/desktop/resources/outside-jail/axe.pxa/2.pxi b/desktop/asset-work/outside-jail/axe.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/axe.pxa/2.pxi rename to desktop/asset-work/outside-jail/axe.pxa/2.pxi diff --git a/desktop/resources/outside-jail/axe.pxa/3.pxi b/desktop/asset-work/outside-jail/axe.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-jail/axe.pxa/3.pxi rename to desktop/asset-work/outside-jail/axe.pxa/3.pxi diff --git a/desktop/resources/outside-jail/axe.pxa/4.pxi b/desktop/asset-work/outside-jail/axe.pxa/4.pxi similarity index 100% rename from desktop/resources/outside-jail/axe.pxa/4.pxi rename to desktop/asset-work/outside-jail/axe.pxa/4.pxi diff --git a/desktop/resources/outside-jail/open-stash.pxa/CelData.plist b/desktop/asset-work/outside-jail/axe.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/open-stash.pxa/CelData.plist rename to desktop/asset-work/outside-jail/axe.pxa/CelData.plist diff --git a/desktop/resources/outside-jail/axe2.pxi b/desktop/asset-work/outside-jail/axe2.pxi similarity index 100% rename from desktop/resources/outside-jail/axe2.pxi rename to desktop/asset-work/outside-jail/axe2.pxi diff --git a/desktop/resources/outside-jail/background.png b/desktop/asset-work/outside-jail/background.png similarity index 100% rename from desktop/resources/outside-jail/background.png rename to desktop/asset-work/outside-jail/background.png diff --git a/desktop/resources/outside-jail/bent-bar-window.png b/desktop/asset-work/outside-jail/bent-bar-window.png similarity index 100% rename from desktop/resources/outside-jail/bent-bar-window.png rename to desktop/asset-work/outside-jail/bent-bar-window.png diff --git a/desktop/resources/outside-jail/candle-aura.png b/desktop/asset-work/outside-jail/candle-aura.png similarity index 100% rename from desktop/resources/outside-jail/candle-aura.png rename to desktop/asset-work/outside-jail/candle-aura.png diff --git a/desktop/resources/outside-jail/candle-aura.pxa/0.pxi b/desktop/asset-work/outside-jail/candle-aura.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/candle-aura.pxa/0.pxi rename to desktop/asset-work/outside-jail/candle-aura.pxa/0.pxi diff --git a/desktop/resources/outside-jail/candle-aura.pxa/1.pxi b/desktop/asset-work/outside-jail/candle-aura.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/candle-aura.pxa/1.pxi rename to desktop/asset-work/outside-jail/candle-aura.pxa/1.pxi diff --git a/desktop/resources/outside-jail/candle-aura.pxa/2.pxi b/desktop/asset-work/outside-jail/candle-aura.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/candle-aura.pxa/2.pxi rename to desktop/asset-work/outside-jail/candle-aura.pxa/2.pxi diff --git a/desktop/resources/outside-jail/candle-aura.pxa/3.pxi b/desktop/asset-work/outside-jail/candle-aura.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-jail/candle-aura.pxa/3.pxi rename to desktop/asset-work/outside-jail/candle-aura.pxa/3.pxi diff --git a/desktop/resources/outside-jail/candle-aura.pxa/CelData.plist b/desktop/asset-work/outside-jail/candle-aura.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/candle-aura.pxa/CelData.plist rename to desktop/asset-work/outside-jail/candle-aura.pxa/CelData.plist diff --git a/desktop/resources/outside-jail/candle-aura2.png b/desktop/asset-work/outside-jail/candle-aura2.png similarity index 100% rename from desktop/resources/outside-jail/candle-aura2.png rename to desktop/asset-work/outside-jail/candle-aura2.png diff --git a/desktop/resources/outside-jail/candle.png b/desktop/asset-work/outside-jail/candle.png similarity index 100% rename from desktop/resources/outside-jail/candle.png rename to desktop/asset-work/outside-jail/candle.png diff --git a/desktop/resources/outside-jail/candle.pxa/0.pxi b/desktop/asset-work/outside-jail/candle.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/candle.pxa/0.pxi rename to desktop/asset-work/outside-jail/candle.pxa/0.pxi diff --git a/desktop/resources/outside-jail/candle.pxa/1.pxi b/desktop/asset-work/outside-jail/candle.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/candle.pxa/1.pxi rename to desktop/asset-work/outside-jail/candle.pxa/1.pxi diff --git a/desktop/resources/outside-jail/candle.pxa/2.pxi b/desktop/asset-work/outside-jail/candle.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/candle.pxa/2.pxi rename to desktop/asset-work/outside-jail/candle.pxa/2.pxi diff --git a/desktop/resources/outside-jail/candle.pxa/3.pxi b/desktop/asset-work/outside-jail/candle.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-jail/candle.pxa/3.pxi rename to desktop/asset-work/outside-jail/candle.pxa/3.pxi diff --git a/desktop/resources/outside-jail/candle.pxa/CelData.plist b/desktop/asset-work/outside-jail/candle.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/candle.pxa/CelData.plist rename to desktop/asset-work/outside-jail/candle.pxa/CelData.plist diff --git a/desktop/resources/outside-jail/closed-stash.png b/desktop/asset-work/outside-jail/closed-stash.png similarity index 100% rename from desktop/resources/outside-jail/closed-stash.png rename to desktop/asset-work/outside-jail/closed-stash.png diff --git a/desktop/resources/outside-jail/dot.png b/desktop/asset-work/outside-jail/dot.png similarity index 100% rename from desktop/resources/outside-jail/dot.png rename to desktop/asset-work/outside-jail/dot.png diff --git a/desktop/resources/outside-jail/fountain b/desktop/asset-work/outside-jail/fountain similarity index 100% rename from desktop/resources/outside-jail/fountain rename to desktop/asset-work/outside-jail/fountain 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/outside-jail/fountain.png b/desktop/asset-work/outside-jail/fountain.png similarity index 100% rename from desktop/resources/outside-jail/fountain.png rename to desktop/asset-work/outside-jail/fountain.png diff --git a/desktop/resources/outside-jail/fountain.pxa/0.pxi b/desktop/asset-work/outside-jail/fountain.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/fountain.pxa/0.pxi rename to desktop/asset-work/outside-jail/fountain.pxa/0.pxi diff --git a/desktop/resources/outside-jail/fountain.pxa/1.pxi b/desktop/asset-work/outside-jail/fountain.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/fountain.pxa/1.pxi rename to desktop/asset-work/outside-jail/fountain.pxa/1.pxi diff --git a/desktop/resources/outside-jail/fountain.pxa/2.pxi b/desktop/asset-work/outside-jail/fountain.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/fountain.pxa/2.pxi rename to desktop/asset-work/outside-jail/fountain.pxa/2.pxi diff --git a/desktop/asset-work/outside-jail/fountain.pxa/CelData.plist b/desktop/asset-work/outside-jail/fountain.pxa/CelData.plist new file mode 100644 index 00000000..4749afb9 --- /dev/null +++ b/desktop/asset-work/outside-jail/fountain.pxa/CelData.plist @@ -0,0 +1,18 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/outside-jail/guard-sleep.png b/desktop/asset-work/outside-jail/guard-sleep.png similarity index 100% rename from desktop/resources/outside-jail/guard-sleep.png rename to desktop/asset-work/outside-jail/guard-sleep.png diff --git a/desktop/resources/outside-jail/guard-sleep.pxa/0.pxi b/desktop/asset-work/outside-jail/guard-sleep.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/guard-sleep.pxa/0.pxi rename to desktop/asset-work/outside-jail/guard-sleep.pxa/0.pxi diff --git a/desktop/resources/outside-jail/guard-sleep.pxa/1.pxi b/desktop/asset-work/outside-jail/guard-sleep.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/guard-sleep.pxa/1.pxi rename to desktop/asset-work/outside-jail/guard-sleep.pxa/1.pxi diff --git a/desktop/resources/outside-jail/guard-sleep.pxa/2.pxi b/desktop/asset-work/outside-jail/guard-sleep.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/guard-sleep.pxa/2.pxi rename to desktop/asset-work/outside-jail/guard-sleep.pxa/2.pxi diff --git a/desktop/resources/outside-jail/guard-sleep.pxa/3.pxi b/desktop/asset-work/outside-jail/guard-sleep.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-jail/guard-sleep.pxa/3.pxi rename to desktop/asset-work/outside-jail/guard-sleep.pxa/3.pxi diff --git a/desktop/resources/outside-jail/guard-sleep.pxa/CelData.plist b/desktop/asset-work/outside-jail/guard-sleep.pxa/CelData.plist similarity index 100% rename from desktop/resources/outside-jail/guard-sleep.pxa/CelData.plist rename to desktop/asset-work/outside-jail/guard-sleep.pxa/CelData.plist diff --git a/desktop/resources/outside-jail/open-stash.png b/desktop/asset-work/outside-jail/open-stash.png similarity index 100% rename from desktop/resources/outside-jail/open-stash.png rename to desktop/asset-work/outside-jail/open-stash.png diff --git a/desktop/resources/outside-jail/open-stash.pxa/0.pxi b/desktop/asset-work/outside-jail/open-stash.pxa/0.pxi similarity index 100% rename from desktop/resources/outside-jail/open-stash.pxa/0.pxi rename to desktop/asset-work/outside-jail/open-stash.pxa/0.pxi diff --git a/desktop/resources/outside-jail/open-stash.pxa/1.pxi b/desktop/asset-work/outside-jail/open-stash.pxa/1.pxi similarity index 100% rename from desktop/resources/outside-jail/open-stash.pxa/1.pxi rename to desktop/asset-work/outside-jail/open-stash.pxa/1.pxi diff --git a/desktop/resources/outside-jail/open-stash.pxa/2.pxi b/desktop/asset-work/outside-jail/open-stash.pxa/2.pxi similarity index 100% rename from desktop/resources/outside-jail/open-stash.pxa/2.pxi rename to desktop/asset-work/outside-jail/open-stash.pxa/2.pxi diff --git a/desktop/resources/outside-jail/open-stash.pxa/3.pxi b/desktop/asset-work/outside-jail/open-stash.pxa/3.pxi similarity index 100% rename from desktop/resources/outside-jail/open-stash.pxa/3.pxi rename to desktop/asset-work/outside-jail/open-stash.pxa/3.pxi diff --git a/desktop/resources/outside-jail/open-stash.pxa/4.pxi b/desktop/asset-work/outside-jail/open-stash.pxa/4.pxi similarity index 100% rename from desktop/resources/outside-jail/open-stash.pxa/4.pxi rename to desktop/asset-work/outside-jail/open-stash.pxa/4.pxi diff --git a/desktop/asset-work/outside-jail/open-stash.pxa/CelData.plist b/desktop/asset-work/outside-jail/open-stash.pxa/CelData.plist new file mode 100644 index 00000000..1ff35422 --- /dev/null +++ b/desktop/asset-work/outside-jail/open-stash.pxa/CelData.plist @@ -0,0 +1,26 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/outside-jail/rope.png b/desktop/asset-work/outside-jail/rope.png similarity index 100% rename from desktop/resources/outside-jail/rope.png rename to desktop/asset-work/outside-jail/rope.png diff --git a/desktop/resources/outside-jail/spear.png b/desktop/asset-work/outside-jail/spear.png similarity index 100% rename from desktop/resources/outside-jail/spear.png rename to desktop/asset-work/outside-jail/spear.png diff --git a/desktop/resources/outside-particles b/desktop/asset-work/outside-particles similarity index 100% rename from desktop/resources/outside-particles rename to desktop/asset-work/outside-particles diff --git a/desktop/resources/outsidehouse/background-trees.png b/desktop/asset-work/outsidehouse/background-trees.png similarity index 100% rename from desktop/resources/outsidehouse/background-trees.png rename to desktop/asset-work/outsidehouse/background-trees.png diff --git a/desktop/resources/outsidehouse/background.png b/desktop/asset-work/outsidehouse/background.png similarity index 100% rename from desktop/resources/outsidehouse/background.png rename to desktop/asset-work/outsidehouse/background.png 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/cauldron.png b/desktop/asset-work/outsidehouse/cauldron.png similarity index 100% rename from desktop/resources/outsidehouse/cauldron.png rename to desktop/asset-work/outsidehouse/cauldron.png diff --git a/desktop/resources/outsidehouse/cauldron.pxa/0.pxi b/desktop/asset-work/outsidehouse/cauldron.pxa/0.pxi similarity index 100% rename from desktop/resources/outsidehouse/cauldron.pxa/0.pxi rename to desktop/asset-work/outsidehouse/cauldron.pxa/0.pxi diff --git a/desktop/resources/outsidehouse/cauldron.pxa/1.pxi b/desktop/asset-work/outsidehouse/cauldron.pxa/1.pxi similarity index 100% rename from desktop/resources/outsidehouse/cauldron.pxa/1.pxi rename to desktop/asset-work/outsidehouse/cauldron.pxa/1.pxi diff --git a/desktop/resources/outsidehouse/cauldron.pxa/2.pxi b/desktop/asset-work/outsidehouse/cauldron.pxa/2.pxi similarity index 100% rename from desktop/resources/outsidehouse/cauldron.pxa/2.pxi rename to desktop/asset-work/outsidehouse/cauldron.pxa/2.pxi diff --git a/desktop/resources/outsidehouse/cauldron.pxa/3.pxi b/desktop/asset-work/outsidehouse/cauldron.pxa/3.pxi similarity index 100% rename from desktop/resources/outsidehouse/cauldron.pxa/3.pxi rename to desktop/asset-work/outsidehouse/cauldron.pxa/3.pxi diff --git a/desktop/resources/outsidehouse/cauldron.pxa/CelData.plist b/desktop/asset-work/outsidehouse/cauldron.pxa/CelData.plist similarity index 100% rename from desktop/resources/outsidehouse/cauldron.pxa/CelData.plist rename to desktop/asset-work/outsidehouse/cauldron.pxa/CelData.plist diff --git a/desktop/resources/outsidehouse/door.png b/desktop/asset-work/outsidehouse/door.png similarity index 100% rename from desktop/resources/outsidehouse/door.png rename to desktop/asset-work/outsidehouse/door.png diff --git a/desktop/resources/outsidehouse/door.pxa/0.pxi b/desktop/asset-work/outsidehouse/door.pxa/0.pxi similarity index 100% rename from desktop/resources/outsidehouse/door.pxa/0.pxi rename to desktop/asset-work/outsidehouse/door.pxa/0.pxi diff --git a/desktop/resources/outsidehouse/door.pxa/1.pxi b/desktop/asset-work/outsidehouse/door.pxa/1.pxi similarity index 100% rename from desktop/resources/outsidehouse/door.pxa/1.pxi rename to desktop/asset-work/outsidehouse/door.pxa/1.pxi diff --git a/desktop/resources/outsidehouse/door.pxa/2.pxi b/desktop/asset-work/outsidehouse/door.pxa/2.pxi similarity index 100% rename from desktop/resources/outsidehouse/door.pxa/2.pxi rename to desktop/asset-work/outsidehouse/door.pxa/2.pxi diff --git a/desktop/resources/outsidehouse/door.pxa/3.pxi b/desktop/asset-work/outsidehouse/door.pxa/3.pxi similarity index 100% rename from desktop/resources/outsidehouse/door.pxa/3.pxi rename to desktop/asset-work/outsidehouse/door.pxa/3.pxi diff --git a/desktop/resources/outsidehouse/door.pxa/CelData.plist b/desktop/asset-work/outsidehouse/door.pxa/CelData.plist similarity index 100% rename from desktop/resources/outsidehouse/door.pxa/CelData.plist rename to desktop/asset-work/outsidehouse/door.pxa/CelData.plist diff --git a/desktop/resources/inside-jail/dot.png b/desktop/asset-work/outsidehouse/dot.png similarity index 100% rename from desktop/resources/inside-jail/dot.png rename to desktop/asset-work/outsidehouse/dot.png diff --git a/desktop/resources/outsidehouse/fence.png b/desktop/asset-work/outsidehouse/fence.png similarity index 100% rename from desktop/resources/outsidehouse/fence.png rename to desktop/asset-work/outsidehouse/fence.png diff --git a/desktop/resources/outsidehouse/fg.png b/desktop/asset-work/outsidehouse/fg.png similarity index 100% rename from desktop/resources/outsidehouse/fg.png rename to desktop/asset-work/outsidehouse/fg.png diff --git a/desktop/resources/outsidehouse/fg1.png b/desktop/asset-work/outsidehouse/fg1.png similarity index 100% rename from desktop/resources/outsidehouse/fg1.png rename to desktop/asset-work/outsidehouse/fg1.png diff --git a/desktop/resources/outsidehouse/fg2.png b/desktop/asset-work/outsidehouse/fg2.png similarity index 100% rename from desktop/resources/outsidehouse/fg2.png rename to desktop/asset-work/outsidehouse/fg2.png diff --git a/desktop/resources/outsidehouse/fgtest.png b/desktop/asset-work/outsidehouse/fgtest.png similarity index 100% rename from desktop/resources/outsidehouse/fgtest.png rename to desktop/asset-work/outsidehouse/fgtest.png diff --git a/desktop/resources/outsidehouse/foreground.png b/desktop/asset-work/outsidehouse/foreground.png similarity index 100% rename from desktop/resources/outsidehouse/foreground.png rename to desktop/asset-work/outsidehouse/foreground.png diff --git a/desktop/resources/outsidehouse/house.png b/desktop/asset-work/outsidehouse/house.png similarity index 100% rename from desktop/resources/outsidehouse/house.png rename to desktop/asset-work/outsidehouse/house.png diff --git a/desktop/resources/outsidehouse/lamb-walk.png b/desktop/asset-work/outsidehouse/lamb-walk.png similarity index 100% rename from desktop/resources/outsidehouse/lamb-walk.png rename to desktop/asset-work/outsidehouse/lamb-walk.png diff --git a/desktop/resources/outsidehouse/lamb.png b/desktop/asset-work/outsidehouse/lamb.png similarity index 100% rename from desktop/resources/outsidehouse/lamb.png rename to desktop/asset-work/outsidehouse/lamb.png diff --git a/desktop/resources/outsidehouse/lamb.pxa/0.pxi b/desktop/asset-work/outsidehouse/lamb.pxa/0.pxi similarity index 100% rename from desktop/resources/outsidehouse/lamb.pxa/0.pxi rename to desktop/asset-work/outsidehouse/lamb.pxa/0.pxi diff --git a/desktop/resources/outsidehouse/lamb.pxa/1.pxi b/desktop/asset-work/outsidehouse/lamb.pxa/1.pxi similarity index 100% rename from desktop/resources/outsidehouse/lamb.pxa/1.pxi rename to desktop/asset-work/outsidehouse/lamb.pxa/1.pxi diff --git a/desktop/resources/outsidehouse/lamb.pxa/2.pxi b/desktop/asset-work/outsidehouse/lamb.pxa/2.pxi similarity index 100% rename from desktop/resources/outsidehouse/lamb.pxa/2.pxi rename to desktop/asset-work/outsidehouse/lamb.pxa/2.pxi diff --git a/desktop/resources/outsidehouse/lamb.pxa/3.pxi b/desktop/asset-work/outsidehouse/lamb.pxa/3.pxi similarity index 100% rename from desktop/resources/outsidehouse/lamb.pxa/3.pxi rename to desktop/asset-work/outsidehouse/lamb.pxa/3.pxi diff --git a/desktop/resources/outsidehouse/lamb.pxa/CelData.plist b/desktop/asset-work/outsidehouse/lamb.pxa/CelData.plist similarity index 100% rename from desktop/resources/outsidehouse/lamb.pxa/CelData.plist rename to desktop/asset-work/outsidehouse/lamb.pxa/CelData.plist diff --git a/desktop/resources/outsidehouse/magic b/desktop/asset-work/outsidehouse/magic similarity index 100% rename from desktop/resources/outsidehouse/magic rename to desktop/asset-work/outsidehouse/magic 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/outsidehouse/note.png b/desktop/asset-work/outsidehouse/note.png similarity index 100% rename from desktop/resources/outsidehouse/note.png rename to desktop/asset-work/outsidehouse/note.png diff --git a/desktop/resources/outsidehouse/sheep-anim.png b/desktop/asset-work/outsidehouse/sheep-anim.png similarity index 100% rename from desktop/resources/outsidehouse/sheep-anim.png rename to desktop/asset-work/outsidehouse/sheep-anim.png diff --git a/desktop/asset-work/outsidehouse/sheep-bleet.ogg b/desktop/asset-work/outsidehouse/sheep-bleet.ogg new file mode 100644 index 00000000..cc8fc915 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-bleet.ogg differ diff --git a/desktop/asset-work/outsidehouse/sheep-bleet.wav b/desktop/asset-work/outsidehouse/sheep-bleet.wav new file mode 100644 index 00000000..2c016c27 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-bleet.wav differ diff --git a/desktop/asset-work/outsidehouse/sheep-eat.wav b/desktop/asset-work/outsidehouse/sheep-eat.wav new file mode 100644 index 00000000..08e60b57 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-eat.wav differ diff --git a/desktop/resources/outsidehouse/sheep-walk.png b/desktop/asset-work/outsidehouse/sheep-walk.png similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.png rename to desktop/asset-work/outsidehouse/sheep-walk.png diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/0.pxi b/desktop/asset-work/outsidehouse/sheep-walk.pxa/0.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/0.pxi rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/0.pxi diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/1.pxi b/desktop/asset-work/outsidehouse/sheep-walk.pxa/1.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/1.pxi rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/1.pxi diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/2.pxi b/desktop/asset-work/outsidehouse/sheep-walk.pxa/2.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/2.pxi rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/2.pxi diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/3.pxi b/desktop/asset-work/outsidehouse/sheep-walk.pxa/3.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/3.pxi rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/3.pxi diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/4.pxi b/desktop/asset-work/outsidehouse/sheep-walk.pxa/4.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/4.pxi rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/4.pxi diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/5.pxi b/desktop/asset-work/outsidehouse/sheep-walk.pxa/5.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/5.pxi rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/5.pxi diff --git a/desktop/resources/outsidehouse/sheep-walk.pxa/CelData.plist b/desktop/asset-work/outsidehouse/sheep-walk.pxa/CelData.plist similarity index 100% rename from desktop/resources/outsidehouse/sheep-walk.pxa/CelData.plist rename to desktop/asset-work/outsidehouse/sheep-walk.pxa/CelData.plist diff --git a/desktop/resources/outsidehouse/sheep.png b/desktop/asset-work/outsidehouse/sheep.png similarity index 100% rename from desktop/resources/outsidehouse/sheep.png rename to desktop/asset-work/outsidehouse/sheep.png diff --git a/desktop/resources/outsidehouse/sheep.pxa/0.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/0.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/0.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/0.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/1.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/1.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/1.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/1.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/10.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/10.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/10.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/10.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/11.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/11.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/11.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/11.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/12.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/12.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/12.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/12.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/2.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/2.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/2.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/2.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/3.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/3.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/3.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/3.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/4.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/4.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/4.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/4.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/5.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/5.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/5.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/5.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/6.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/6.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/6.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/6.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/7.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/7.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/7.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/7.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/8.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/8.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/8.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/8.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/9.pxi b/desktop/asset-work/outsidehouse/sheep.pxa/9.pxi similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/9.pxi rename to desktop/asset-work/outsidehouse/sheep.pxa/9.pxi diff --git a/desktop/resources/outsidehouse/sheep.pxa/CelData.plist b/desktop/asset-work/outsidehouse/sheep.pxa/CelData.plist similarity index 100% rename from desktop/resources/outsidehouse/sheep.pxa/CelData.plist rename to desktop/asset-work/outsidehouse/sheep.pxa/CelData.plist diff --git a/desktop/asset-work/pack.json b/desktop/asset-work/pack.json new file mode 100644 index 00000000..a2fd2bb5 --- /dev/null +++ b/desktop/asset-work/pack.json @@ -0,0 +1,36 @@ +{ + pot: true, + paddingX: 2, + paddingY: 2, + bleed: true, + edgePadding: true, + duplicatePadding: false, + rotation: false, + minWidth: 16, + minHeight: 16, + maxWidth: 1024, + maxHeight: 1024, + square: false, + stripWhitespaceX: false, + stripWhitespaceY: false, + alphaThreshold: 0, + filterMin: Nearest, + filterMag: Nearest, + wrapX: ClampToEdge, + wrapY: ClampToEdge, + format: RGBA8888, + alias: true, + outputFormat: png, + jpegQuality: 0.9, + ignoreBlankImages: true, + fast: false, + debug: false, + combineSubdirectories: true, + flattenPaths: false, + premultiplyAlpha: false, + useIndexes: true, + limitMemory: true, + grid: false, + scale: [ 1 ], + scaleSuffix: [ "" ] +} diff --git a/desktop/resources/pathfind-test.png b/desktop/asset-work/pathfind-test.png similarity index 100% rename from desktop/resources/pathfind-test.png rename to desktop/asset-work/pathfind-test.png diff --git a/desktop/resources/player.png b/desktop/asset-work/player.png similarity index 100% rename from desktop/resources/player.png rename to desktop/asset-work/player.png 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/right.pxa/0.pxi b/desktop/asset-work/right.pxa/0.pxi similarity index 100% rename from desktop/resources/right.pxa/0.pxi rename to desktop/asset-work/right.pxa/0.pxi diff --git a/desktop/resources/right.pxa/1.pxi b/desktop/asset-work/right.pxa/1.pxi similarity index 100% rename from desktop/resources/right.pxa/1.pxi rename to desktop/asset-work/right.pxa/1.pxi diff --git a/desktop/resources/right.pxa/2.pxi b/desktop/asset-work/right.pxa/2.pxi similarity index 100% rename from desktop/resources/right.pxa/2.pxi rename to desktop/asset-work/right.pxa/2.pxi diff --git a/desktop/resources/right.pxa/3.pxi b/desktop/asset-work/right.pxa/3.pxi similarity index 100% rename from desktop/resources/right.pxa/3.pxi rename to desktop/asset-work/right.pxa/3.pxi diff --git a/desktop/resources/right.pxa/4.pxi b/desktop/asset-work/right.pxa/4.pxi similarity index 100% rename from desktop/resources/right.pxa/4.pxi rename to desktop/asset-work/right.pxa/4.pxi diff --git a/desktop/resources/right.pxa/5.pxi b/desktop/asset-work/right.pxa/5.pxi similarity index 100% rename from desktop/resources/right.pxa/5.pxi rename to desktop/asset-work/right.pxa/5.pxi diff --git a/desktop/resources/right.pxa/6.pxi b/desktop/asset-work/right.pxa/6.pxi similarity index 100% rename from desktop/resources/right.pxa/6.pxi rename to desktop/asset-work/right.pxa/6.pxi diff --git a/desktop/resources/right.pxa/7.pxi b/desktop/asset-work/right.pxa/7.pxi similarity index 100% rename from desktop/resources/right.pxa/7.pxi rename to desktop/asset-work/right.pxa/7.pxi diff --git a/desktop/resources/right.pxa/CelData.plist b/desktop/asset-work/right.pxa/right.pxa/CelData.plist similarity index 100% rename from desktop/resources/right.pxa/CelData.plist rename to desktop/asset-work/right.pxa/right.pxa/CelData.plist 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/Blergh.png b/desktop/asset-work/space/Blergh.png similarity index 100% rename from desktop/resources/space/Blergh.png rename to desktop/asset-work/space/Blergh.png diff --git a/desktop/resources/space/Untitled.png b/desktop/asset-work/space/Untitled.png similarity index 100% rename from desktop/resources/space/Untitled.png rename to desktop/asset-work/space/Untitled.png diff --git a/desktop/resources/space/appear b/desktop/asset-work/space/appear similarity index 100% rename from desktop/resources/space/appear rename to desktop/asset-work/space/appear diff --git a/desktop/resources/space/background.png b/desktop/asset-work/space/background.png similarity index 100% rename from desktop/resources/space/background.png rename to desktop/asset-work/space/background.png diff --git a/desktop/resources/space/blergh-appear.pxa/0.pxi b/desktop/asset-work/space/blergh-appear.pxa/0.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/0.pxi rename to desktop/asset-work/space/blergh-appear.pxa/0.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/1.pxi b/desktop/asset-work/space/blergh-appear.pxa/1.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/1.pxi rename to desktop/asset-work/space/blergh-appear.pxa/1.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/10.pxi b/desktop/asset-work/space/blergh-appear.pxa/10.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/10.pxi rename to desktop/asset-work/space/blergh-appear.pxa/10.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/11.pxi b/desktop/asset-work/space/blergh-appear.pxa/11.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/11.pxi rename to desktop/asset-work/space/blergh-appear.pxa/11.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/12.pxi b/desktop/asset-work/space/blergh-appear.pxa/12.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/12.pxi rename to desktop/asset-work/space/blergh-appear.pxa/12.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/2.pxi b/desktop/asset-work/space/blergh-appear.pxa/2.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/2.pxi rename to desktop/asset-work/space/blergh-appear.pxa/2.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/3.pxi b/desktop/asset-work/space/blergh-appear.pxa/3.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/3.pxi rename to desktop/asset-work/space/blergh-appear.pxa/3.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/4.pxi b/desktop/asset-work/space/blergh-appear.pxa/4.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/4.pxi rename to desktop/asset-work/space/blergh-appear.pxa/4.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/5.pxi b/desktop/asset-work/space/blergh-appear.pxa/5.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/5.pxi rename to desktop/asset-work/space/blergh-appear.pxa/5.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/6.pxi b/desktop/asset-work/space/blergh-appear.pxa/6.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/6.pxi rename to desktop/asset-work/space/blergh-appear.pxa/6.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/7.pxi b/desktop/asset-work/space/blergh-appear.pxa/7.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/7.pxi rename to desktop/asset-work/space/blergh-appear.pxa/7.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/8.pxi b/desktop/asset-work/space/blergh-appear.pxa/8.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/8.pxi rename to desktop/asset-work/space/blergh-appear.pxa/8.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/9.pxi b/desktop/asset-work/space/blergh-appear.pxa/9.pxi similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/9.pxi rename to desktop/asset-work/space/blergh-appear.pxa/9.pxi diff --git a/desktop/resources/space/blergh-appear.pxa/CelData.plist b/desktop/asset-work/space/blergh-appear.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/blergh-appear.pxa/CelData.plist rename to desktop/asset-work/space/blergh-appear.pxa/CelData.plist diff --git a/desktop/resources/space/blergh-flex.png b/desktop/asset-work/space/blergh-flex.png similarity index 100% rename from desktop/resources/space/blergh-flex.png rename to desktop/asset-work/space/blergh-flex.png diff --git a/desktop/resources/space/blergh-stand.png b/desktop/asset-work/space/blergh-stand.png similarity index 100% rename from desktop/resources/space/blergh-stand.png rename to desktop/asset-work/space/blergh-stand.png diff --git a/desktop/resources/space/blergh-talk.png b/desktop/asset-work/space/blergh-talk.png similarity index 100% rename from desktop/resources/space/blergh-talk.png rename to desktop/asset-work/space/blergh-talk.png diff --git a/desktop/asset-work/space/bloodclot-explode-1.png b/desktop/asset-work/space/bloodclot-explode-1.png new file mode 100644 index 00000000..7eaf8dbc Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-1.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-10.png b/desktop/asset-work/space/bloodclot-explode-10.png new file mode 100644 index 00000000..8d6cf0f7 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-10.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-11.png b/desktop/asset-work/space/bloodclot-explode-11.png new file mode 100644 index 00000000..c0c95322 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-11.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-12.png b/desktop/asset-work/space/bloodclot-explode-12.png new file mode 100644 index 00000000..745d7318 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-12.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-13.png b/desktop/asset-work/space/bloodclot-explode-13.png new file mode 100644 index 00000000..53d098ce Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-13.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-14.png b/desktop/asset-work/space/bloodclot-explode-14.png new file mode 100644 index 00000000..90aa5bfc Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-14.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-15.png b/desktop/asset-work/space/bloodclot-explode-15.png new file mode 100644 index 00000000..b1260611 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-15.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-16.png b/desktop/asset-work/space/bloodclot-explode-16.png new file mode 100644 index 00000000..e4c99b6e Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-16.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-17.png b/desktop/asset-work/space/bloodclot-explode-17.png new file mode 100644 index 00000000..ae4bae22 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-17.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-18.png b/desktop/asset-work/space/bloodclot-explode-18.png new file mode 100644 index 00000000..faf4f4bf Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-18.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-19.png b/desktop/asset-work/space/bloodclot-explode-19.png new file mode 100644 index 00000000..f7a7dc35 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-19.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-2.png b/desktop/asset-work/space/bloodclot-explode-2.png new file mode 100644 index 00000000..a6246c6c Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-2.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-20.png b/desktop/asset-work/space/bloodclot-explode-20.png new file mode 100644 index 00000000..c10eec42 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-20.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-3.png b/desktop/asset-work/space/bloodclot-explode-3.png new file mode 100644 index 00000000..03805232 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-3.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-4.png b/desktop/asset-work/space/bloodclot-explode-4.png new file mode 100644 index 00000000..23471c23 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-4.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-5.png b/desktop/asset-work/space/bloodclot-explode-5.png new file mode 100644 index 00000000..93536492 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-5.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-6.png b/desktop/asset-work/space/bloodclot-explode-6.png new file mode 100644 index 00000000..1f663af6 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-6.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-7.png b/desktop/asset-work/space/bloodclot-explode-7.png new file mode 100644 index 00000000..93da22f5 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-7.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-8.png b/desktop/asset-work/space/bloodclot-explode-8.png new file mode 100644 index 00000000..d48ce13b Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-8.png differ diff --git a/desktop/asset-work/space/bloodclot-explode-9.png b/desktop/asset-work/space/bloodclot-explode-9.png new file mode 100644 index 00000000..331899a7 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-explode-9.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-1.png b/desktop/asset-work/space/bloodclot-head-talk-1.png new file mode 100644 index 00000000..3fdd5cce Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-1.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-10.png b/desktop/asset-work/space/bloodclot-head-talk-10.png new file mode 100644 index 00000000..38e9a926 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-10.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-11.png b/desktop/asset-work/space/bloodclot-head-talk-11.png new file mode 100644 index 00000000..00b56335 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-11.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-12.png b/desktop/asset-work/space/bloodclot-head-talk-12.png new file mode 100644 index 00000000..1eaa399e Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-12.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-13.png b/desktop/asset-work/space/bloodclot-head-talk-13.png new file mode 100644 index 00000000..7867a726 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-13.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-14.png b/desktop/asset-work/space/bloodclot-head-talk-14.png new file mode 100644 index 00000000..7bf56376 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-14.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-2.png b/desktop/asset-work/space/bloodclot-head-talk-2.png new file mode 100644 index 00000000..d9675d1f Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-2.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-3.png b/desktop/asset-work/space/bloodclot-head-talk-3.png new file mode 100644 index 00000000..63d68d89 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-3.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-4.png b/desktop/asset-work/space/bloodclot-head-talk-4.png new file mode 100644 index 00000000..6729f553 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-4.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-5.png b/desktop/asset-work/space/bloodclot-head-talk-5.png new file mode 100644 index 00000000..03f63ef2 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-5.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-6.png b/desktop/asset-work/space/bloodclot-head-talk-6.png new file mode 100644 index 00000000..e0fc9df5 Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-6.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-7.png b/desktop/asset-work/space/bloodclot-head-talk-7.png new file mode 100644 index 00000000..f4bcc24b Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-7.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-8.png b/desktop/asset-work/space/bloodclot-head-talk-8.png new file mode 100644 index 00000000..6d5f506d Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-8.png differ diff --git a/desktop/asset-work/space/bloodclot-head-talk-9.png b/desktop/asset-work/space/bloodclot-head-talk-9.png new file mode 100644 index 00000000..c8069b1d Binary files /dev/null and b/desktop/asset-work/space/bloodclot-head-talk-9.png differ diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/0.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/0.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/0.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/0.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/1.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/1.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/1.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/1.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/10.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/10.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/10.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/10.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/11.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/11.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/11.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/11.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/12.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/12.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/12.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/12.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/13.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/13.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/13.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/13.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/2.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/2.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/2.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/2.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/3.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/3.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/3.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/3.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/4.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/4.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/4.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/4.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/5.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/5.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/5.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/5.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/6.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/6.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/6.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/6.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/7.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/7.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/7.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/7.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/8.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/8.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/8.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/8.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/9.pxi b/desktop/asset-work/space/bloodclot-head-talk.pxa/9.pxi similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/9.pxi rename to desktop/asset-work/space/bloodclot-head-talk.pxa/9.pxi diff --git a/desktop/resources/space/bloodclot-head-talk.pxa/CelData.plist b/desktop/asset-work/space/bloodclot-head-talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/bloodclot-head-talk.pxa/CelData.plist rename to desktop/asset-work/space/bloodclot-head-talk.pxa/CelData.plist diff --git a/desktop/resources/space/bloodclot-stand.png b/desktop/asset-work/space/bloodclot-stand.png similarity index 100% rename from desktop/resources/space/bloodclot-stand.png rename to desktop/asset-work/space/bloodclot-stand.png diff --git a/desktop/resources/space/bloodclot-stand.pxa/0.pxi b/desktop/asset-work/space/bloodclot-stand.pxa/0.pxi similarity index 100% rename from desktop/resources/space/bloodclot-stand.pxa/0.pxi rename to desktop/asset-work/space/bloodclot-stand.pxa/0.pxi diff --git a/desktop/resources/space/bloodclot-stand.pxa/1.pxi b/desktop/asset-work/space/bloodclot-stand.pxa/1.pxi similarity index 100% rename from desktop/resources/space/bloodclot-stand.pxa/1.pxi rename to desktop/asset-work/space/bloodclot-stand.pxa/1.pxi diff --git a/desktop/resources/space/bloodclot-stand.pxa/CelData.plist b/desktop/asset-work/space/bloodclot-stand.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/bloodclot-stand.pxa/CelData.plist rename to desktop/asset-work/space/bloodclot-stand.pxa/CelData.plist diff --git a/desktop/resources/space/bloodclot-talk.png b/desktop/asset-work/space/bloodclot-talk.png similarity index 100% rename from desktop/resources/space/bloodclot-talk.png rename to desktop/asset-work/space/bloodclot-talk.png diff --git a/desktop/resources/space/bloodclot-talk.pxa/0.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/0.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/0.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/0.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/1.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/1.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/1.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/1.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/2.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/2.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/2.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/2.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/3.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/3.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/3.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/3.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/4.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/4.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/4.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/4.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/5.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/5.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/5.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/5.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/6.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/6.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/6.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/6.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/7.pxi b/desktop/asset-work/space/bloodclot-talk.pxa/7.pxi similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/7.pxi rename to desktop/asset-work/space/bloodclot-talk.pxa/7.pxi diff --git a/desktop/resources/space/bloodclot-talk.pxa/CelData.plist b/desktop/asset-work/space/bloodclot-talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/bloodclot-talk.pxa/CelData.plist rename to desktop/asset-work/space/bloodclot-talk.pxa/CelData.plist diff --git a/desktop/resources/space/blowup b/desktop/asset-work/space/blowup similarity index 100% rename from desktop/resources/space/blowup rename to desktop/asset-work/space/blowup diff --git a/desktop/resources/space/broken-jewel.png b/desktop/asset-work/space/broken-jewel.png similarity index 100% rename from desktop/resources/space/broken-jewel.png rename to desktop/asset-work/space/broken-jewel.png diff --git a/desktop/resources/space/bullet.png b/desktop/asset-work/space/bullet.png similarity index 100% rename from desktop/resources/space/bullet.png rename to desktop/asset-work/space/bullet.png diff --git a/desktop/resources/space/bullet.pxa/0.pxi b/desktop/asset-work/space/bullet.pxa/0.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/0.pxi rename to desktop/asset-work/space/bullet.pxa/0.pxi diff --git a/desktop/resources/space/bullet.pxa/1.pxi b/desktop/asset-work/space/bullet.pxa/1.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/1.pxi rename to desktop/asset-work/space/bullet.pxa/1.pxi diff --git a/desktop/resources/space/bullet.pxa/2.pxi b/desktop/asset-work/space/bullet.pxa/2.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/2.pxi rename to desktop/asset-work/space/bullet.pxa/2.pxi diff --git a/desktop/resources/space/bullet.pxa/3.pxi b/desktop/asset-work/space/bullet.pxa/3.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/3.pxi rename to desktop/asset-work/space/bullet.pxa/3.pxi diff --git a/desktop/resources/space/bullet.pxa/4.pxi b/desktop/asset-work/space/bullet.pxa/4.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/4.pxi rename to desktop/asset-work/space/bullet.pxa/4.pxi diff --git a/desktop/resources/space/bullet.pxa/5.pxi b/desktop/asset-work/space/bullet.pxa/5.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/5.pxi rename to desktop/asset-work/space/bullet.pxa/5.pxi diff --git a/desktop/resources/space/bullet.pxa/6.pxi b/desktop/asset-work/space/bullet.pxa/6.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/6.pxi rename to desktop/asset-work/space/bullet.pxa/6.pxi diff --git a/desktop/resources/space/bullet.pxa/7.pxi b/desktop/asset-work/space/bullet.pxa/7.pxi similarity index 100% rename from desktop/resources/space/bullet.pxa/7.pxi rename to desktop/asset-work/space/bullet.pxa/7.pxi diff --git a/desktop/resources/space/bullet.pxa/CelData.plist b/desktop/asset-work/space/bullet.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/bullet.pxa/CelData.plist rename to desktop/asset-work/space/bullet.pxa/CelData.plist diff --git a/desktop/resources/space/cloud.png b/desktop/asset-work/space/cloud.png similarity index 100% rename from desktop/resources/space/cloud.png rename to desktop/asset-work/space/cloud.png diff --git a/desktop/resources/space/dot.png b/desktop/asset-work/space/dot.png similarity index 100% rename from desktop/resources/space/dot.png rename to desktop/asset-work/space/dot.png diff --git a/desktop/resources/space/explode.pxa/0.pxi b/desktop/asset-work/space/explode.pxa/0.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/0.pxi rename to desktop/asset-work/space/explode.pxa/0.pxi diff --git a/desktop/resources/space/explode.pxa/1.pxi b/desktop/asset-work/space/explode.pxa/1.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/1.pxi rename to desktop/asset-work/space/explode.pxa/1.pxi diff --git a/desktop/resources/space/explode.pxa/10.pxi b/desktop/asset-work/space/explode.pxa/10.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/10.pxi rename to desktop/asset-work/space/explode.pxa/10.pxi diff --git a/desktop/resources/space/explode.pxa/11.pxi b/desktop/asset-work/space/explode.pxa/11.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/11.pxi rename to desktop/asset-work/space/explode.pxa/11.pxi diff --git a/desktop/resources/space/explode.pxa/12.pxi b/desktop/asset-work/space/explode.pxa/12.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/12.pxi rename to desktop/asset-work/space/explode.pxa/12.pxi diff --git a/desktop/resources/space/explode.pxa/13.pxi b/desktop/asset-work/space/explode.pxa/13.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/13.pxi rename to desktop/asset-work/space/explode.pxa/13.pxi diff --git a/desktop/resources/space/explode.pxa/14.pxi b/desktop/asset-work/space/explode.pxa/14.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/14.pxi rename to desktop/asset-work/space/explode.pxa/14.pxi diff --git a/desktop/resources/space/explode.pxa/15.pxi b/desktop/asset-work/space/explode.pxa/15.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/15.pxi rename to desktop/asset-work/space/explode.pxa/15.pxi diff --git a/desktop/resources/space/explode.pxa/16.pxi b/desktop/asset-work/space/explode.pxa/16.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/16.pxi rename to desktop/asset-work/space/explode.pxa/16.pxi diff --git a/desktop/resources/space/explode.pxa/17.pxi b/desktop/asset-work/space/explode.pxa/17.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/17.pxi rename to desktop/asset-work/space/explode.pxa/17.pxi diff --git a/desktop/resources/space/explode.pxa/18.pxi b/desktop/asset-work/space/explode.pxa/18.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/18.pxi rename to desktop/asset-work/space/explode.pxa/18.pxi diff --git a/desktop/resources/space/explode.pxa/19.pxi b/desktop/asset-work/space/explode.pxa/19.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/19.pxi rename to desktop/asset-work/space/explode.pxa/19.pxi diff --git a/desktop/resources/space/explode.pxa/2.pxi b/desktop/asset-work/space/explode.pxa/2.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/2.pxi rename to desktop/asset-work/space/explode.pxa/2.pxi diff --git a/desktop/resources/space/explode.pxa/3.pxi b/desktop/asset-work/space/explode.pxa/3.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/3.pxi rename to desktop/asset-work/space/explode.pxa/3.pxi diff --git a/desktop/resources/space/explode.pxa/4.pxi b/desktop/asset-work/space/explode.pxa/4.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/4.pxi rename to desktop/asset-work/space/explode.pxa/4.pxi diff --git a/desktop/resources/space/explode.pxa/5.pxi b/desktop/asset-work/space/explode.pxa/5.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/5.pxi rename to desktop/asset-work/space/explode.pxa/5.pxi diff --git a/desktop/resources/space/explode.pxa/6.pxi b/desktop/asset-work/space/explode.pxa/6.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/6.pxi rename to desktop/asset-work/space/explode.pxa/6.pxi diff --git a/desktop/resources/space/explode.pxa/7.pxi b/desktop/asset-work/space/explode.pxa/7.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/7.pxi rename to desktop/asset-work/space/explode.pxa/7.pxi diff --git a/desktop/resources/space/explode.pxa/8.pxi b/desktop/asset-work/space/explode.pxa/8.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/8.pxi rename to desktop/asset-work/space/explode.pxa/8.pxi diff --git a/desktop/resources/space/explode.pxa/9.pxi b/desktop/asset-work/space/explode.pxa/9.pxi similarity index 100% rename from desktop/resources/space/explode.pxa/9.pxi rename to desktop/asset-work/space/explode.pxa/9.pxi diff --git a/desktop/resources/space/explode.pxa/CelData.plist b/desktop/asset-work/space/explode.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/explode.pxa/CelData.plist rename to desktop/asset-work/space/explode.pxa/CelData.plist diff --git a/desktop/resources/space/grow-explode b/desktop/asset-work/space/grow-explode similarity index 100% rename from desktop/resources/space/grow-explode rename to desktop/asset-work/space/grow-explode diff --git a/desktop/resources/space/grow.pxa/0.pxi b/desktop/asset-work/space/grow.pxa/0.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/0.pxi rename to desktop/asset-work/space/grow.pxa/0.pxi diff --git a/desktop/resources/space/grow.pxa/1.pxi b/desktop/asset-work/space/grow.pxa/1.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/1.pxi rename to desktop/asset-work/space/grow.pxa/1.pxi diff --git a/desktop/resources/space/grow.pxa/10.pxi b/desktop/asset-work/space/grow.pxa/10.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/10.pxi rename to desktop/asset-work/space/grow.pxa/10.pxi diff --git a/desktop/resources/space/grow.pxa/11.pxi b/desktop/asset-work/space/grow.pxa/11.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/11.pxi rename to desktop/asset-work/space/grow.pxa/11.pxi diff --git a/desktop/resources/space/grow.pxa/2.pxi b/desktop/asset-work/space/grow.pxa/2.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/2.pxi rename to desktop/asset-work/space/grow.pxa/2.pxi diff --git a/desktop/resources/space/grow.pxa/3.pxi b/desktop/asset-work/space/grow.pxa/3.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/3.pxi rename to desktop/asset-work/space/grow.pxa/3.pxi diff --git a/desktop/resources/space/grow.pxa/4.pxi b/desktop/asset-work/space/grow.pxa/4.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/4.pxi rename to desktop/asset-work/space/grow.pxa/4.pxi diff --git a/desktop/resources/space/grow.pxa/5.pxi b/desktop/asset-work/space/grow.pxa/5.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/5.pxi rename to desktop/asset-work/space/grow.pxa/5.pxi diff --git a/desktop/resources/space/grow.pxa/6.pxi b/desktop/asset-work/space/grow.pxa/6.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/6.pxi rename to desktop/asset-work/space/grow.pxa/6.pxi diff --git a/desktop/resources/space/grow.pxa/7.pxi b/desktop/asset-work/space/grow.pxa/7.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/7.pxi rename to desktop/asset-work/space/grow.pxa/7.pxi diff --git a/desktop/resources/space/grow.pxa/8.pxi b/desktop/asset-work/space/grow.pxa/8.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/8.pxi rename to desktop/asset-work/space/grow.pxa/8.pxi diff --git a/desktop/resources/space/grow.pxa/9.pxi b/desktop/asset-work/space/grow.pxa/9.pxi similarity index 100% rename from desktop/resources/space/grow.pxa/9.pxi rename to desktop/asset-work/space/grow.pxa/9.pxi diff --git a/desktop/resources/space/grow.pxa/CelData.plist b/desktop/asset-work/space/grow.pxa/CelData.plist similarity index 100% rename from desktop/resources/space/grow.pxa/CelData.plist rename to desktop/asset-work/space/grow.pxa/CelData.plist 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/later.png b/desktop/asset-work/space/later.png similarity index 100% rename from desktop/resources/space/later.png rename to desktop/asset-work/space/later.png 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/susp.png b/desktop/asset-work/space/susp.png similarity index 100% rename from desktop/resources/space/susp.png rename to desktop/asset-work/space/susp.png 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/talk-bg-2.png b/desktop/asset-work/talk-bg-2.png similarity index 100% rename from desktop/resources/talk-bg-2.png rename to desktop/asset-work/talk-bg-2.png diff --git a/desktop/resources/talk-bg.png b/desktop/asset-work/talk-bg.png similarity index 100% rename from desktop/resources/talk-bg.png rename to desktop/asset-work/talk-bg.png diff --git a/desktop/resources/testscreen/subject.png b/desktop/asset-work/testscreen/subject.png similarity index 100% rename from desktop/resources/testscreen/subject.png rename to desktop/asset-work/testscreen/subject.png diff --git a/desktop/resources/testscreen/test.png b/desktop/asset-work/testscreen/test.png similarity index 100% rename from desktop/resources/testscreen/test.png rename to desktop/asset-work/testscreen/test.png diff --git a/desktop/resources/the-end.png b/desktop/asset-work/the-end.png similarity index 100% rename from desktop/resources/the-end.png rename to desktop/asset-work/the-end.png diff --git a/desktop/resources/title-overlay.png b/desktop/asset-work/title-overlay.png similarity index 100% rename from desktop/resources/title-overlay.png rename to desktop/asset-work/title-overlay.png diff --git a/desktop/resources/title.png b/desktop/asset-work/title.png similarity index 100% rename from desktop/resources/title.png rename to desktop/asset-work/title.png 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/title/background.png b/desktop/asset-work/title/background.png similarity index 100% rename from desktop/resources/title/background.png rename to desktop/asset-work/title/background.png diff --git a/desktop/asset-work/title/balloon.png b/desktop/asset-work/title/balloon.png new file mode 100644 index 00000000..37777984 Binary files /dev/null and b/desktop/asset-work/title/balloon.png differ diff --git a/desktop/asset-work/title/balloon.pxa/0.pxi b/desktop/asset-work/title/balloon.pxa/0.pxi new file mode 100644 index 00000000..d2546977 Binary files /dev/null and b/desktop/asset-work/title/balloon.pxa/0.pxi differ diff --git a/desktop/asset-work/title/balloon.pxa/1.pxi b/desktop/asset-work/title/balloon.pxa/1.pxi new file mode 100644 index 00000000..025e2f61 Binary files /dev/null and b/desktop/asset-work/title/balloon.pxa/1.pxi differ diff --git a/desktop/asset-work/title/balloon.pxa/2.pxi b/desktop/asset-work/title/balloon.pxa/2.pxi new file mode 100644 index 00000000..ea0d7182 Binary files /dev/null and b/desktop/asset-work/title/balloon.pxa/2.pxi differ diff --git a/desktop/asset-work/title/balloon.pxa/3.pxi b/desktop/asset-work/title/balloon.pxa/3.pxi new file mode 100644 index 00000000..0f1e6196 Binary files /dev/null and b/desktop/asset-work/title/balloon.pxa/3.pxi differ diff --git a/desktop/asset-work/title/balloon.pxa/CelData.plist b/desktop/asset-work/title/balloon.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/asset-work/title/balloon.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/title/clouds.png b/desktop/asset-work/title/clouds.png similarity index 100% rename from desktop/resources/title/clouds.png rename to desktop/asset-work/title/clouds.png diff --git a/desktop/resources/outsidehouse/dot.png b/desktop/asset-work/title/dot.png similarity index 100% rename from desktop/resources/outsidehouse/dot.png rename to desktop/asset-work/title/dot.png diff --git a/desktop/resources/title/logo.png b/desktop/asset-work/title/logo.png similarity index 100% rename from desktop/resources/title/logo.png rename to desktop/asset-work/title/logo.png diff --git a/desktop/resources/title/particle-clouds b/desktop/asset-work/title/particle-clouds similarity index 100% rename from desktop/resources/title/particle-clouds rename to desktop/asset-work/title/particle-clouds diff --git a/desktop/resources/white.png b/desktop/asset-work/white.png similarity index 100% rename from desktop/resources/white.png rename to desktop/asset-work/white.png diff --git a/desktop/resources/wizard.png b/desktop/asset-work/wizard.png similarity index 100% rename from desktop/resources/wizard.png rename to desktop/asset-work/wizard.png 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/wizard/Untitled.png b/desktop/asset-work/wizard/Untitled.png similarity index 100% rename from desktop/resources/wizard/Untitled.png rename to desktop/asset-work/wizard/Untitled.png diff --git a/desktop/resources/wizard/cloud.png b/desktop/asset-work/wizard/cloud.png similarity index 100% rename from desktop/resources/wizard/cloud.png rename to desktop/asset-work/wizard/cloud.png diff --git a/desktop/resources/wizard/cloud.pxi b/desktop/asset-work/wizard/cloud.pxi similarity index 100% rename from desktop/resources/wizard/cloud.pxi rename to desktop/asset-work/wizard/cloud.pxi diff --git a/desktop/resources/wizard/disappear.png b/desktop/asset-work/wizard/disappear.png similarity index 100% rename from desktop/resources/wizard/disappear.png rename to desktop/asset-work/wizard/disappear.png diff --git a/desktop/resources/wizard/disappear.pxa/0.pxi b/desktop/asset-work/wizard/disappear.pxa/0.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/0.pxi rename to desktop/asset-work/wizard/disappear.pxa/0.pxi diff --git a/desktop/resources/wizard/disappear.pxa/1.pxi b/desktop/asset-work/wizard/disappear.pxa/1.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/1.pxi rename to desktop/asset-work/wizard/disappear.pxa/1.pxi diff --git a/desktop/resources/wizard/disappear.pxa/10.pxi b/desktop/asset-work/wizard/disappear.pxa/10.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/10.pxi rename to desktop/asset-work/wizard/disappear.pxa/10.pxi diff --git a/desktop/resources/wizard/disappear.pxa/11.pxi b/desktop/asset-work/wizard/disappear.pxa/11.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/11.pxi rename to desktop/asset-work/wizard/disappear.pxa/11.pxi diff --git a/desktop/resources/wizard/disappear.pxa/12.pxi b/desktop/asset-work/wizard/disappear.pxa/12.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/12.pxi rename to desktop/asset-work/wizard/disappear.pxa/12.pxi diff --git a/desktop/resources/wizard/disappear.pxa/13.pxi b/desktop/asset-work/wizard/disappear.pxa/13.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/13.pxi rename to desktop/asset-work/wizard/disappear.pxa/13.pxi diff --git a/desktop/resources/wizard/disappear.pxa/14.pxi b/desktop/asset-work/wizard/disappear.pxa/14.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/14.pxi rename to desktop/asset-work/wizard/disappear.pxa/14.pxi diff --git a/desktop/resources/wizard/disappear.pxa/15.pxi b/desktop/asset-work/wizard/disappear.pxa/15.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/15.pxi rename to desktop/asset-work/wizard/disappear.pxa/15.pxi diff --git a/desktop/resources/wizard/disappear.pxa/16.pxi b/desktop/asset-work/wizard/disappear.pxa/16.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/16.pxi rename to desktop/asset-work/wizard/disappear.pxa/16.pxi diff --git a/desktop/resources/wizard/disappear.pxa/17.pxi b/desktop/asset-work/wizard/disappear.pxa/17.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/17.pxi rename to desktop/asset-work/wizard/disappear.pxa/17.pxi diff --git a/desktop/resources/wizard/disappear.pxa/18.pxi b/desktop/asset-work/wizard/disappear.pxa/18.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/18.pxi rename to desktop/asset-work/wizard/disappear.pxa/18.pxi diff --git a/desktop/resources/wizard/disappear.pxa/2.pxi b/desktop/asset-work/wizard/disappear.pxa/2.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/2.pxi rename to desktop/asset-work/wizard/disappear.pxa/2.pxi diff --git a/desktop/resources/wizard/disappear.pxa/3.pxi b/desktop/asset-work/wizard/disappear.pxa/3.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/3.pxi rename to desktop/asset-work/wizard/disappear.pxa/3.pxi diff --git a/desktop/resources/wizard/disappear.pxa/4.pxi b/desktop/asset-work/wizard/disappear.pxa/4.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/4.pxi rename to desktop/asset-work/wizard/disappear.pxa/4.pxi diff --git a/desktop/resources/wizard/disappear.pxa/5.pxi b/desktop/asset-work/wizard/disappear.pxa/5.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/5.pxi rename to desktop/asset-work/wizard/disappear.pxa/5.pxi diff --git a/desktop/resources/wizard/disappear.pxa/6.pxi b/desktop/asset-work/wizard/disappear.pxa/6.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/6.pxi rename to desktop/asset-work/wizard/disappear.pxa/6.pxi diff --git a/desktop/resources/wizard/disappear.pxa/7.pxi b/desktop/asset-work/wizard/disappear.pxa/7.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/7.pxi rename to desktop/asset-work/wizard/disappear.pxa/7.pxi diff --git a/desktop/resources/wizard/disappear.pxa/8.pxi b/desktop/asset-work/wizard/disappear.pxa/8.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/8.pxi rename to desktop/asset-work/wizard/disappear.pxa/8.pxi diff --git a/desktop/resources/wizard/disappear.pxa/9.pxi b/desktop/asset-work/wizard/disappear.pxa/9.pxi similarity index 100% rename from desktop/resources/wizard/disappear.pxa/9.pxi rename to desktop/asset-work/wizard/disappear.pxa/9.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/CelData.plist b/desktop/asset-work/wizard/disappear.pxa/CelData.plist new file mode 100644 index 00000000..b0a4961c --- /dev/null +++ b/desktop/asset-work/wizard/disappear.pxa/CelData.plist @@ -0,0 +1,82 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/title/dot.png b/desktop/asset-work/wizard/dot.png similarity index 100% rename from desktop/resources/title/dot.png rename to desktop/asset-work/wizard/dot.png diff --git a/desktop/asset-work/wizard/experiment-1.png b/desktop/asset-work/wizard/experiment-1.png new file mode 100644 index 00000000..bab47830 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-1.png differ diff --git a/desktop/asset-work/wizard/experiment-10.png b/desktop/asset-work/wizard/experiment-10.png new file mode 100644 index 00000000..57519417 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-10.png differ diff --git a/desktop/asset-work/wizard/experiment-11.png b/desktop/asset-work/wizard/experiment-11.png new file mode 100644 index 00000000..474f3197 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-11.png differ diff --git a/desktop/asset-work/wizard/experiment-12.png b/desktop/asset-work/wizard/experiment-12.png new file mode 100644 index 00000000..7550c2db Binary files /dev/null and b/desktop/asset-work/wizard/experiment-12.png differ diff --git a/desktop/asset-work/wizard/experiment-13.png b/desktop/asset-work/wizard/experiment-13.png new file mode 100644 index 00000000..98c2ac8e Binary files /dev/null and b/desktop/asset-work/wizard/experiment-13.png differ diff --git a/desktop/asset-work/wizard/experiment-14.png b/desktop/asset-work/wizard/experiment-14.png new file mode 100644 index 00000000..36325b18 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-14.png differ diff --git a/desktop/asset-work/wizard/experiment-15.png b/desktop/asset-work/wizard/experiment-15.png new file mode 100644 index 00000000..a21c0927 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-15.png differ diff --git a/desktop/asset-work/wizard/experiment-16.png b/desktop/asset-work/wizard/experiment-16.png new file mode 100644 index 00000000..1d94d337 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-16.png differ diff --git a/desktop/asset-work/wizard/experiment-17.png b/desktop/asset-work/wizard/experiment-17.png new file mode 100644 index 00000000..d764f486 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-17.png differ diff --git a/desktop/asset-work/wizard/experiment-18.png b/desktop/asset-work/wizard/experiment-18.png new file mode 100644 index 00000000..81a58675 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-18.png differ diff --git a/desktop/asset-work/wizard/experiment-19.png b/desktop/asset-work/wizard/experiment-19.png new file mode 100644 index 00000000..006f56dc Binary files /dev/null and b/desktop/asset-work/wizard/experiment-19.png differ diff --git a/desktop/asset-work/wizard/experiment-2.png b/desktop/asset-work/wizard/experiment-2.png new file mode 100644 index 00000000..74959eea Binary files /dev/null and b/desktop/asset-work/wizard/experiment-2.png differ diff --git a/desktop/asset-work/wizard/experiment-20.png b/desktop/asset-work/wizard/experiment-20.png new file mode 100644 index 00000000..37f9e647 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-20.png differ diff --git a/desktop/asset-work/wizard/experiment-21.png b/desktop/asset-work/wizard/experiment-21.png new file mode 100644 index 00000000..5091050c Binary files /dev/null and b/desktop/asset-work/wizard/experiment-21.png differ diff --git a/desktop/asset-work/wizard/experiment-22.png b/desktop/asset-work/wizard/experiment-22.png new file mode 100644 index 00000000..0cc62950 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-22.png differ diff --git a/desktop/asset-work/wizard/experiment-23.png b/desktop/asset-work/wizard/experiment-23.png new file mode 100644 index 00000000..7e907eca Binary files /dev/null and b/desktop/asset-work/wizard/experiment-23.png differ diff --git a/desktop/asset-work/wizard/experiment-24.png b/desktop/asset-work/wizard/experiment-24.png new file mode 100644 index 00000000..548ab474 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-24.png differ diff --git a/desktop/asset-work/wizard/experiment-25.png b/desktop/asset-work/wizard/experiment-25.png new file mode 100644 index 00000000..ef2545fe Binary files /dev/null and b/desktop/asset-work/wizard/experiment-25.png differ diff --git a/desktop/asset-work/wizard/experiment-26.png b/desktop/asset-work/wizard/experiment-26.png new file mode 100644 index 00000000..53780839 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-26.png differ diff --git a/desktop/asset-work/wizard/experiment-27.png b/desktop/asset-work/wizard/experiment-27.png new file mode 100644 index 00000000..c3982013 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-27.png differ diff --git a/desktop/asset-work/wizard/experiment-28.png b/desktop/asset-work/wizard/experiment-28.png new file mode 100644 index 00000000..1f2b618d Binary files /dev/null and b/desktop/asset-work/wizard/experiment-28.png differ diff --git a/desktop/asset-work/wizard/experiment-29.png b/desktop/asset-work/wizard/experiment-29.png new file mode 100644 index 00000000..fe8e667a Binary files /dev/null and b/desktop/asset-work/wizard/experiment-29.png differ diff --git a/desktop/asset-work/wizard/experiment-3.png b/desktop/asset-work/wizard/experiment-3.png new file mode 100644 index 00000000..7f061c70 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-3.png differ diff --git a/desktop/asset-work/wizard/experiment-30.png b/desktop/asset-work/wizard/experiment-30.png new file mode 100644 index 00000000..3c468730 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-30.png differ diff --git a/desktop/asset-work/wizard/experiment-31.png b/desktop/asset-work/wizard/experiment-31.png new file mode 100644 index 00000000..7a3bc164 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-31.png differ diff --git a/desktop/asset-work/wizard/experiment-32.png b/desktop/asset-work/wizard/experiment-32.png new file mode 100644 index 00000000..3aa5b8b6 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-32.png differ diff --git a/desktop/asset-work/wizard/experiment-33.png b/desktop/asset-work/wizard/experiment-33.png new file mode 100644 index 00000000..1f3940a5 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-33.png differ diff --git a/desktop/asset-work/wizard/experiment-34.png b/desktop/asset-work/wizard/experiment-34.png new file mode 100644 index 00000000..74a2cda0 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-34.png differ diff --git a/desktop/asset-work/wizard/experiment-35.png b/desktop/asset-work/wizard/experiment-35.png new file mode 100644 index 00000000..c1b95f9a Binary files /dev/null and b/desktop/asset-work/wizard/experiment-35.png differ diff --git a/desktop/asset-work/wizard/experiment-36.png b/desktop/asset-work/wizard/experiment-36.png new file mode 100644 index 00000000..3a533894 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-36.png differ diff --git a/desktop/asset-work/wizard/experiment-37.png b/desktop/asset-work/wizard/experiment-37.png new file mode 100644 index 00000000..3c70d06d Binary files /dev/null and b/desktop/asset-work/wizard/experiment-37.png differ diff --git a/desktop/asset-work/wizard/experiment-38.png b/desktop/asset-work/wizard/experiment-38.png new file mode 100644 index 00000000..1a685bb7 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-38.png differ diff --git a/desktop/asset-work/wizard/experiment-39.png b/desktop/asset-work/wizard/experiment-39.png new file mode 100644 index 00000000..3ab05231 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-39.png differ diff --git a/desktop/asset-work/wizard/experiment-4.png b/desktop/asset-work/wizard/experiment-4.png new file mode 100644 index 00000000..a7a204c4 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-4.png differ diff --git a/desktop/asset-work/wizard/experiment-5.png b/desktop/asset-work/wizard/experiment-5.png new file mode 100644 index 00000000..e9b6984c Binary files /dev/null and b/desktop/asset-work/wizard/experiment-5.png differ diff --git a/desktop/asset-work/wizard/experiment-6.png b/desktop/asset-work/wizard/experiment-6.png new file mode 100644 index 00000000..b4fd556e Binary files /dev/null and b/desktop/asset-work/wizard/experiment-6.png differ diff --git a/desktop/asset-work/wizard/experiment-7.png b/desktop/asset-work/wizard/experiment-7.png new file mode 100644 index 00000000..0225fb48 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-7.png differ diff --git a/desktop/asset-work/wizard/experiment-8.png b/desktop/asset-work/wizard/experiment-8.png new file mode 100644 index 00000000..edcab441 Binary files /dev/null and b/desktop/asset-work/wizard/experiment-8.png differ diff --git a/desktop/asset-work/wizard/experiment-9.png b/desktop/asset-work/wizard/experiment-9.png new file mode 100644 index 00000000..637a27cb Binary files /dev/null and b/desktop/asset-work/wizard/experiment-9.png differ diff --git a/desktop/resources/wizard/experiment.pxa/0.pxi b/desktop/asset-work/wizard/experiment.pxa/0.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/0.pxi rename to desktop/asset-work/wizard/experiment.pxa/0.pxi diff --git a/desktop/resources/wizard/experiment.pxa/1.pxi b/desktop/asset-work/wizard/experiment.pxa/1.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/1.pxi rename to desktop/asset-work/wizard/experiment.pxa/1.pxi diff --git a/desktop/resources/wizard/experiment.pxa/10.pxi b/desktop/asset-work/wizard/experiment.pxa/10.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/10.pxi rename to desktop/asset-work/wizard/experiment.pxa/10.pxi diff --git a/desktop/resources/wizard/experiment.pxa/11.pxi b/desktop/asset-work/wizard/experiment.pxa/11.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/11.pxi rename to desktop/asset-work/wizard/experiment.pxa/11.pxi diff --git a/desktop/resources/wizard/experiment.pxa/12.pxi b/desktop/asset-work/wizard/experiment.pxa/12.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/12.pxi rename to desktop/asset-work/wizard/experiment.pxa/12.pxi diff --git a/desktop/resources/wizard/experiment.pxa/13.pxi b/desktop/asset-work/wizard/experiment.pxa/13.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/13.pxi rename to desktop/asset-work/wizard/experiment.pxa/13.pxi diff --git a/desktop/resources/wizard/experiment.pxa/14.pxi b/desktop/asset-work/wizard/experiment.pxa/14.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/14.pxi rename to desktop/asset-work/wizard/experiment.pxa/14.pxi diff --git a/desktop/resources/wizard/experiment.pxa/15.pxi b/desktop/asset-work/wizard/experiment.pxa/15.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/15.pxi rename to desktop/asset-work/wizard/experiment.pxa/15.pxi diff --git a/desktop/resources/wizard/experiment.pxa/16.pxi b/desktop/asset-work/wizard/experiment.pxa/16.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/16.pxi rename to desktop/asset-work/wizard/experiment.pxa/16.pxi diff --git a/desktop/resources/wizard/experiment.pxa/17.pxi b/desktop/asset-work/wizard/experiment.pxa/17.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/17.pxi rename to desktop/asset-work/wizard/experiment.pxa/17.pxi diff --git a/desktop/resources/wizard/experiment.pxa/18.pxi b/desktop/asset-work/wizard/experiment.pxa/18.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/18.pxi rename to desktop/asset-work/wizard/experiment.pxa/18.pxi diff --git a/desktop/resources/wizard/experiment.pxa/19.pxi b/desktop/asset-work/wizard/experiment.pxa/19.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/19.pxi rename to desktop/asset-work/wizard/experiment.pxa/19.pxi diff --git a/desktop/resources/wizard/experiment.pxa/2.pxi b/desktop/asset-work/wizard/experiment.pxa/2.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/2.pxi rename to desktop/asset-work/wizard/experiment.pxa/2.pxi diff --git a/desktop/resources/wizard/experiment.pxa/20.pxi b/desktop/asset-work/wizard/experiment.pxa/20.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/20.pxi rename to desktop/asset-work/wizard/experiment.pxa/20.pxi diff --git a/desktop/resources/wizard/experiment.pxa/21.pxi b/desktop/asset-work/wizard/experiment.pxa/21.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/21.pxi rename to desktop/asset-work/wizard/experiment.pxa/21.pxi diff --git a/desktop/resources/wizard/experiment.pxa/22.pxi b/desktop/asset-work/wizard/experiment.pxa/22.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/22.pxi rename to desktop/asset-work/wizard/experiment.pxa/22.pxi diff --git a/desktop/resources/wizard/experiment.pxa/23.pxi b/desktop/asset-work/wizard/experiment.pxa/23.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/23.pxi rename to desktop/asset-work/wizard/experiment.pxa/23.pxi diff --git a/desktop/resources/wizard/experiment.pxa/24.pxi b/desktop/asset-work/wizard/experiment.pxa/24.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/24.pxi rename to desktop/asset-work/wizard/experiment.pxa/24.pxi diff --git a/desktop/resources/wizard/experiment.pxa/25.pxi b/desktop/asset-work/wizard/experiment.pxa/25.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/25.pxi rename to desktop/asset-work/wizard/experiment.pxa/25.pxi diff --git a/desktop/resources/wizard/experiment.pxa/26.pxi b/desktop/asset-work/wizard/experiment.pxa/26.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/26.pxi rename to desktop/asset-work/wizard/experiment.pxa/26.pxi diff --git a/desktop/resources/wizard/experiment.pxa/27.pxi b/desktop/asset-work/wizard/experiment.pxa/27.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/27.pxi rename to desktop/asset-work/wizard/experiment.pxa/27.pxi diff --git a/desktop/resources/wizard/experiment.pxa/28.pxi b/desktop/asset-work/wizard/experiment.pxa/28.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/28.pxi rename to desktop/asset-work/wizard/experiment.pxa/28.pxi diff --git a/desktop/resources/wizard/experiment.pxa/29.pxi b/desktop/asset-work/wizard/experiment.pxa/29.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/29.pxi rename to desktop/asset-work/wizard/experiment.pxa/29.pxi diff --git a/desktop/resources/wizard/experiment.pxa/3.pxi b/desktop/asset-work/wizard/experiment.pxa/3.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/3.pxi rename to desktop/asset-work/wizard/experiment.pxa/3.pxi diff --git a/desktop/resources/wizard/experiment.pxa/30.pxi b/desktop/asset-work/wizard/experiment.pxa/30.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/30.pxi rename to desktop/asset-work/wizard/experiment.pxa/30.pxi diff --git a/desktop/resources/wizard/experiment.pxa/31.pxi b/desktop/asset-work/wizard/experiment.pxa/31.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/31.pxi rename to desktop/asset-work/wizard/experiment.pxa/31.pxi diff --git a/desktop/resources/wizard/experiment.pxa/32.pxi b/desktop/asset-work/wizard/experiment.pxa/32.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/32.pxi rename to desktop/asset-work/wizard/experiment.pxa/32.pxi diff --git a/desktop/resources/wizard/experiment.pxa/33.pxi b/desktop/asset-work/wizard/experiment.pxa/33.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/33.pxi rename to desktop/asset-work/wizard/experiment.pxa/33.pxi diff --git a/desktop/resources/wizard/experiment.pxa/34.pxi b/desktop/asset-work/wizard/experiment.pxa/34.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/34.pxi rename to desktop/asset-work/wizard/experiment.pxa/34.pxi diff --git a/desktop/resources/wizard/experiment.pxa/35.pxi b/desktop/asset-work/wizard/experiment.pxa/35.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/35.pxi rename to desktop/asset-work/wizard/experiment.pxa/35.pxi diff --git a/desktop/resources/wizard/experiment.pxa/36.pxi b/desktop/asset-work/wizard/experiment.pxa/36.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/36.pxi rename to desktop/asset-work/wizard/experiment.pxa/36.pxi diff --git a/desktop/resources/wizard/experiment.pxa/37.pxi b/desktop/asset-work/wizard/experiment.pxa/37.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/37.pxi rename to desktop/asset-work/wizard/experiment.pxa/37.pxi diff --git a/desktop/resources/wizard/experiment.pxa/38.pxi b/desktop/asset-work/wizard/experiment.pxa/38.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/38.pxi rename to desktop/asset-work/wizard/experiment.pxa/38.pxi diff --git a/desktop/resources/wizard/experiment.pxa/4.pxi b/desktop/asset-work/wizard/experiment.pxa/4.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/4.pxi rename to desktop/asset-work/wizard/experiment.pxa/4.pxi diff --git a/desktop/resources/wizard/experiment.pxa/5.pxi b/desktop/asset-work/wizard/experiment.pxa/5.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/5.pxi rename to desktop/asset-work/wizard/experiment.pxa/5.pxi diff --git a/desktop/resources/wizard/experiment.pxa/6.pxi b/desktop/asset-work/wizard/experiment.pxa/6.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/6.pxi rename to desktop/asset-work/wizard/experiment.pxa/6.pxi diff --git a/desktop/resources/wizard/experiment.pxa/7.pxi b/desktop/asset-work/wizard/experiment.pxa/7.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/7.pxi rename to desktop/asset-work/wizard/experiment.pxa/7.pxi diff --git a/desktop/resources/wizard/experiment.pxa/8.pxi b/desktop/asset-work/wizard/experiment.pxa/8.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/8.pxi rename to desktop/asset-work/wizard/experiment.pxa/8.pxi diff --git a/desktop/resources/wizard/experiment.pxa/9.pxi b/desktop/asset-work/wizard/experiment.pxa/9.pxi similarity index 100% rename from desktop/resources/wizard/experiment.pxa/9.pxi rename to desktop/asset-work/wizard/experiment.pxa/9.pxi diff --git a/desktop/resources/wizard/experiment.pxa/CelData.plist b/desktop/asset-work/wizard/experiment.pxa/CelData.plist similarity index 100% rename from desktop/resources/wizard/experiment.pxa/CelData.plist rename to desktop/asset-work/wizard/experiment.pxa/CelData.plist diff --git a/desktop/resources/wizard/flame.png b/desktop/asset-work/wizard/flame.png similarity index 100% rename from desktop/resources/wizard/flame.png rename to desktop/asset-work/wizard/flame.png diff --git a/desktop/resources/wizard/gandarf-cloud b/desktop/asset-work/wizard/gandarf-cloud similarity index 100% rename from desktop/resources/wizard/gandarf-cloud rename to desktop/asset-work/wizard/gandarf-cloud diff --git a/desktop/resources/wizard/magic-hands.png b/desktop/asset-work/wizard/magic-hands.png similarity index 100% rename from desktop/resources/wizard/magic-hands.png rename to desktop/asset-work/wizard/magic-hands.png diff --git a/desktop/resources/wizard/magic-hands.pxa/0.pxi b/desktop/asset-work/wizard/magic-hands.pxa/0.pxi similarity index 100% rename from desktop/resources/wizard/magic-hands.pxa/0.pxi rename to desktop/asset-work/wizard/magic-hands.pxa/0.pxi diff --git a/desktop/resources/wizard/magic-hands.pxa/1.pxi b/desktop/asset-work/wizard/magic-hands.pxa/1.pxi similarity index 100% rename from desktop/resources/wizard/magic-hands.pxa/1.pxi rename to desktop/asset-work/wizard/magic-hands.pxa/1.pxi diff --git a/desktop/resources/wizard/magic-hands.pxa/CelData.plist b/desktop/asset-work/wizard/magic-hands.pxa/CelData.plist similarity index 100% rename from desktop/resources/wizard/magic-hands.pxa/CelData.plist rename to desktop/asset-work/wizard/magic-hands.pxa/CelData.plist diff --git a/desktop/resources/wizard/stand.png b/desktop/asset-work/wizard/stand.png similarity index 100% rename from desktop/resources/wizard/stand.png rename to desktop/asset-work/wizard/stand.png diff --git a/desktop/resources/wizard/talk-angry.png b/desktop/asset-work/wizard/talk-angry.png similarity index 100% rename from desktop/resources/wizard/talk-angry.png rename to desktop/asset-work/wizard/talk-angry.png diff --git a/desktop/resources/wizard/talk-angry.pxa/0.pxi b/desktop/asset-work/wizard/talk-angry.pxa/0.pxi similarity index 100% rename from desktop/resources/wizard/talk-angry.pxa/0.pxi rename to desktop/asset-work/wizard/talk-angry.pxa/0.pxi diff --git a/desktop/resources/wizard/talk-angry.pxa/1.pxi b/desktop/asset-work/wizard/talk-angry.pxa/1.pxi similarity index 100% rename from desktop/resources/wizard/talk-angry.pxa/1.pxi rename to desktop/asset-work/wizard/talk-angry.pxa/1.pxi diff --git a/desktop/resources/wizard/talk-angry.pxa/2.pxi b/desktop/asset-work/wizard/talk-angry.pxa/2.pxi similarity index 100% rename from desktop/resources/wizard/talk-angry.pxa/2.pxi rename to desktop/asset-work/wizard/talk-angry.pxa/2.pxi diff --git a/desktop/resources/wizard/talk-angry.pxa/3.pxi b/desktop/asset-work/wizard/talk-angry.pxa/3.pxi similarity index 100% rename from desktop/resources/wizard/talk-angry.pxa/3.pxi rename to desktop/asset-work/wizard/talk-angry.pxa/3.pxi diff --git a/desktop/resources/wizard/talk-angry.pxa/CelData.plist b/desktop/asset-work/wizard/talk-angry.pxa/CelData.plist similarity index 100% rename from desktop/resources/wizard/talk-angry.pxa/CelData.plist rename to desktop/asset-work/wizard/talk-angry.pxa/CelData.plist diff --git a/desktop/resources/wizard/talk.png b/desktop/asset-work/wizard/talk.png similarity index 100% rename from desktop/resources/wizard/talk.png rename to desktop/asset-work/wizard/talk.png diff --git a/desktop/resources/wizard/talk.pxa/0.pxi b/desktop/asset-work/wizard/talk.pxa/0.pxi similarity index 100% rename from desktop/resources/wizard/talk.pxa/0.pxi rename to desktop/asset-work/wizard/talk.pxa/0.pxi diff --git a/desktop/resources/wizard/talk.pxa/1.pxi b/desktop/asset-work/wizard/talk.pxa/1.pxi similarity index 100% rename from desktop/resources/wizard/talk.pxa/1.pxi rename to desktop/asset-work/wizard/talk.pxa/1.pxi diff --git a/desktop/resources/wizard/talk.pxa/2.pxi b/desktop/asset-work/wizard/talk.pxa/2.pxi similarity index 100% rename from desktop/resources/wizard/talk.pxa/2.pxi rename to desktop/asset-work/wizard/talk.pxa/2.pxi diff --git a/desktop/resources/wizard/talk.pxa/3.pxi b/desktop/asset-work/wizard/talk.pxa/3.pxi similarity index 100% rename from desktop/resources/wizard/talk.pxa/3.pxi rename to desktop/asset-work/wizard/talk.pxa/3.pxi diff --git a/desktop/resources/wizard/talk.pxa/CelData.plist b/desktop/asset-work/wizard/talk.pxa/CelData.plist similarity index 100% rename from desktop/resources/wizard/talk.pxa/CelData.plist rename to desktop/asset-work/wizard/talk.pxa/CelData.plist diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 119a8f7e..fb0d257e 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -1,20 +1,21 @@ ART + Update all collisions ++ Have georgia mcgorgeous talk to you PROGRAMMING -+ fight with blergh at end isn't great -+ proper save/settings file location -+ Save slots? + try to have dialogue for every wrong interaction -+ Dialogue frozen -+ ending credits ++ preload all sounds ++ behind house left direction not great + +IOS ++ all mp3s ++ pngcrush breaks colors ++ renable pickup sound once it's been replaced ++ update-override slow on IOS AUDIO - + Walking + blink + scratch - + peddler scratch - + sheep + candles + magic hands + gandarf explosion @@ -30,8 +31,6 @@ AUDIO + ladder break + eavesdrop + milking - + angus - + writing + antique sigh + bloodclot grunt + bloodclot explode diff --git a/desktop/project.clj b/desktop/project.clj index 0fb99ca0..01b899fe 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -3,15 +3,7 @@ :dependencies [[com.badlogicgames.gdx/gdx "1.5.3"] [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.3"] - [com.badlogicgames.gdx/gdx-box2d "1.5.3"] - [com.badlogicgames.gdx/gdx-tools "1.5.3"] - [com.badlogicgames.gdx/gdx-box2d-platform "1.5.3" - :classifier "natives-desktop"] - [com.badlogicgames.gdx/gdx-bullet "1.5.3"] - [com.badlogicgames.gdx/gdx-bullet-platform "1.5.3" - :classifier "natives-desktop"] - [com.badlogicgames.gdx/gdx-platform "1.5.3" - :classifier "natives-desktop"] + [com.badlogicgames.gdx/gdx-platform "1.5.3" :classifier "natives-desktop"] [org.clojure/clojure "1.6.0"] [org.clojure/tools.nrepl "0.2.7"] [play-clj "0.4.5-BRYCE"] @@ -20,6 +12,12 @@ :source-paths ["src" "src-common"] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :omit-source true + :aliases {"pack" ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" "asset-work/" "resources/packed/"]} + :profiles { + :dev { + :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"]] + :warn-on-reflection true} + } :aot [advent.core.desktop-launcher] :main advent.core.desktop-launcher) diff --git a/desktop/resources/blink-other.mp3 b/desktop/resources/blink-other.mp3 new file mode 100644 index 00000000..761eb068 Binary files /dev/null and b/desktop/resources/blink-other.mp3 differ diff --git a/desktop/resources/blink-other.ogg.mp3 b/desktop/resources/blink-other.ogg.mp3 new file mode 100644 index 00000000..761eb068 Binary files /dev/null and b/desktop/resources/blink-other.ogg.mp3 differ diff --git a/desktop/resources/blink.mp3 b/desktop/resources/blink.mp3 new file mode 100644 index 00000000..291751f2 Binary files /dev/null and b/desktop/resources/blink.mp3 differ diff --git a/desktop/resources/blink.ogg.mp3 b/desktop/resources/blink.ogg.mp3 new file mode 100644 index 00000000..291751f2 Binary files /dev/null and b/desktop/resources/blink.ogg.mp3 differ diff --git a/desktop/resources/castle-gate/throw-walkie.png b/desktop/resources/castle-gate/throw-walkie.png deleted file mode 100644 index 563b412e..00000000 Binary files a/desktop/resources/castle-gate/throw-walkie.png and /dev/null differ diff --git a/desktop/resources/cat-tree/cat.ogg.mp3 b/desktop/resources/cat-tree/cat.ogg.mp3 new file mode 100644 index 00000000..9871e687 Binary files /dev/null and b/desktop/resources/cat-tree/cat.ogg.mp3 differ diff --git a/desktop/resources/cat-tree/grandma-cry.png b/desktop/resources/cat-tree/grandma-cry.png deleted file mode 100644 index da2a99ec..00000000 Binary files a/desktop/resources/cat-tree/grandma-cry.png and /dev/null differ diff --git a/desktop/resources/cat-tree/kiss.ogg.mp3 b/desktop/resources/cat-tree/kiss.ogg.mp3 new file mode 100644 index 00000000..49818208 Binary files /dev/null and b/desktop/resources/cat-tree/kiss.ogg.mp3 differ diff --git a/desktop/resources/door.mp3 b/desktop/resources/door.mp3 new file mode 100644 index 00000000..00eb6a02 Binary files /dev/null and b/desktop/resources/door.mp3 differ diff --git a/desktop/resources/door.ogg b/desktop/resources/door.ogg index 846fbcbf..3f870398 100644 Binary files a/desktop/resources/door.ogg and b/desktop/resources/door.ogg differ diff --git a/desktop/resources/door.ogg.mp3 b/desktop/resources/door.ogg.mp3 new file mode 100644 index 00000000..00eb6a02 Binary files /dev/null and b/desktop/resources/door.ogg.mp3 differ diff --git a/desktop/resources/door.wav b/desktop/resources/door.wav deleted file mode 100644 index 7bcecfe0..00000000 Binary files a/desktop/resources/door.wav and /dev/null differ diff --git a/desktop/resources/dream-2.mp3 b/desktop/resources/dream-2.mp3 deleted file mode 100644 index 8bd196d2..00000000 Binary files a/desktop/resources/dream-2.mp3 and /dev/null differ diff --git a/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 b/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 new file mode 100644 index 00000000..779bb851 Binary files /dev/null and b/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 differ diff --git a/desktop/resources/dream/appear.ogg.mp3 b/desktop/resources/dream/appear.ogg.mp3 new file mode 100644 index 00000000..779bb851 Binary files /dev/null and b/desktop/resources/dream/appear.ogg.mp3 differ diff --git a/desktop/resources/dream/music.ogg.mp3 b/desktop/resources/dream/music.ogg.mp3 new file mode 100644 index 00000000..3dbcb128 Binary files /dev/null and b/desktop/resources/dream/music.ogg.mp3 differ diff --git a/desktop/resources/dream/wind.ogg.mp3 b/desktop/resources/dream/wind.ogg.mp3 new file mode 100644 index 00000000..d785c554 Binary files /dev/null and b/desktop/resources/dream/wind.ogg.mp3 differ diff --git a/desktop/resources/ego/blink2.ogg.mp3 b/desktop/resources/ego/blink2.ogg.mp3 new file mode 100644 index 00000000..3887b47e Binary files /dev/null and b/desktop/resources/ego/blink2.ogg.mp3 differ diff --git a/desktop/resources/ego/breakglass.ogg.mp3 b/desktop/resources/ego/breakglass.ogg.mp3 new file mode 100644 index 00000000..20c44303 Binary files /dev/null and b/desktop/resources/ego/breakglass.ogg.mp3 differ diff --git a/desktop/resources/ego/idea.ogg.mp3 b/desktop/resources/ego/idea.ogg.mp3 new file mode 100644 index 00000000..8f64369c Binary files /dev/null and b/desktop/resources/ego/idea.ogg.mp3 differ diff --git a/desktop/resources/ego/inside-step-1.ogg b/desktop/resources/ego/inside-step-1.ogg new file mode 100644 index 00000000..0d8baae0 Binary files /dev/null and b/desktop/resources/ego/inside-step-1.ogg differ diff --git a/desktop/resources/ego/inside-step-2.ogg b/desktop/resources/ego/inside-step-2.ogg new file mode 100644 index 00000000..a181fcd8 Binary files /dev/null and b/desktop/resources/ego/inside-step-2.ogg differ diff --git a/desktop/resources/ego/inside-step-3.ogg b/desktop/resources/ego/inside-step-3.ogg new file mode 100644 index 00000000..e17f734e Binary files /dev/null and b/desktop/resources/ego/inside-step-3.ogg differ diff --git a/desktop/resources/ego/inside-step-4.ogg b/desktop/resources/ego/inside-step-4.ogg new file mode 100644 index 00000000..e259cdaa Binary files /dev/null and b/desktop/resources/ego/inside-step-4.ogg differ diff --git a/desktop/resources/ego/love.png b/desktop/resources/ego/love.png deleted file mode 100644 index 4e37653a..00000000 Binary files a/desktop/resources/ego/love.png and /dev/null differ diff --git a/desktop/resources/ego/potion.ogg.mp3 b/desktop/resources/ego/potion.ogg.mp3 new file mode 100644 index 00000000..350b14bb Binary files /dev/null and b/desktop/resources/ego/potion.ogg.mp3 differ diff --git a/desktop/resources/ego/sigh.ogg.mp3 b/desktop/resources/ego/sigh.ogg.mp3 new file mode 100644 index 00000000..4975cbfc Binary files /dev/null and b/desktop/resources/ego/sigh.ogg.mp3 differ diff --git "a/desktop/resources/ego/spear\\.png" "b/desktop/resources/ego/spear\\.png" deleted file mode 100644 index fd2e23ae..00000000 Binary files "a/desktop/resources/ego/spear\\.png" and /dev/null differ diff --git a/desktop/resources/ego/step-1.aif b/desktop/resources/ego/step-1.aif new file mode 100644 index 00000000..999e3cad Binary files /dev/null and b/desktop/resources/ego/step-1.aif differ diff --git a/desktop/resources/ego/step-1.ogg b/desktop/resources/ego/step-1.ogg index be91eda4..d580aab1 100644 Binary files a/desktop/resources/ego/step-1.ogg and b/desktop/resources/ego/step-1.ogg differ diff --git a/desktop/resources/ego/step-1.ogg.mp3 b/desktop/resources/ego/step-1.ogg.mp3 new file mode 100644 index 00000000..b6eeb94e Binary files /dev/null and b/desktop/resources/ego/step-1.ogg.mp3 differ diff --git a/desktop/resources/ego/step-1.wav b/desktop/resources/ego/step-1.wav deleted file mode 100644 index 2c38aa3a..00000000 Binary files a/desktop/resources/ego/step-1.wav and /dev/null differ diff --git a/desktop/resources/ego/step-2.ogg b/desktop/resources/ego/step-2.ogg index 4a3aa0f3..9c0aeedd 100644 Binary files a/desktop/resources/ego/step-2.ogg and b/desktop/resources/ego/step-2.ogg differ diff --git a/desktop/resources/ego/step-2.ogg.mp3 b/desktop/resources/ego/step-2.ogg.mp3 new file mode 100644 index 00000000..2142924e Binary files /dev/null and b/desktop/resources/ego/step-2.ogg.mp3 differ diff --git a/desktop/resources/ego/step-2.wav b/desktop/resources/ego/step-2.wav deleted file mode 100644 index c24e79fa..00000000 Binary files a/desktop/resources/ego/step-2.wav and /dev/null differ diff --git a/desktop/resources/ego/step-3.ogg b/desktop/resources/ego/step-3.ogg new file mode 100644 index 00000000..8ce5d237 Binary files /dev/null and b/desktop/resources/ego/step-3.ogg differ diff --git a/desktop/resources/ego/step-4.ogg b/desktop/resources/ego/step-4.ogg new file mode 100644 index 00000000..375661c8 Binary files /dev/null and b/desktop/resources/ego/step-4.ogg differ diff --git a/desktop/resources/ego/step.ogg.mp3 b/desktop/resources/ego/step.ogg.mp3 new file mode 100644 index 00000000..94b273c1 Binary files /dev/null and b/desktop/resources/ego/step.ogg.mp3 differ diff --git a/desktop/resources/held/bloodclot-head.png b/desktop/resources/held/bloodclot-head.png deleted file mode 100644 index 1b088c77..00000000 Binary files a/desktop/resources/held/bloodclot-head.png and /dev/null differ diff --git a/desktop/resources/inside-antique/fire-1.ogg.mp3 b/desktop/resources/inside-antique/fire-1.ogg.mp3 new file mode 100644 index 00000000..fa43625a Binary files /dev/null and b/desktop/resources/inside-antique/fire-1.ogg.mp3 differ diff --git a/desktop/resources/inside-antique/fire-2.ogg.mp3 b/desktop/resources/inside-antique/fire-2.ogg.mp3 new file mode 100644 index 00000000..528202b9 Binary files /dev/null and b/desktop/resources/inside-antique/fire-2.ogg.mp3 differ diff --git a/desktop/resources/inside-antique/fire-3.ogg.mp3 b/desktop/resources/inside-antique/fire-3.ogg.mp3 new file mode 100644 index 00000000..cfd168f8 Binary files /dev/null and b/desktop/resources/inside-antique/fire-3.ogg.mp3 differ diff --git a/desktop/resources/inside-castle/chorus.ogg b/desktop/resources/inside-castle/chorus.ogg new file mode 100644 index 00000000..7aaf7852 Binary files /dev/null and b/desktop/resources/inside-castle/chorus.ogg differ diff --git a/desktop/resources/inside-castle/chorus.ogg.mp3 b/desktop/resources/inside-castle/chorus.ogg.mp3 new file mode 100644 index 00000000..49e8211e Binary files /dev/null and b/desktop/resources/inside-castle/chorus.ogg.mp3 differ diff --git a/desktop/resources/inside-castle/collision.png b/desktop/resources/inside-castle/collision.png index 123e69f2..cb37de5b 100644 Binary files a/desktop/resources/inside-castle/collision.png and b/desktop/resources/inside-castle/collision.png differ diff --git a/desktop/resources/inside-castle/flex.ogg.mp3 b/desktop/resources/inside-castle/flex.ogg.mp3 new file mode 100644 index 00000000..d967361b Binary files /dev/null and b/desktop/resources/inside-castle/flex.ogg.mp3 differ diff --git a/desktop/resources/inside-castle/writing.ogg b/desktop/resources/inside-castle/writing.ogg new file mode 100644 index 00000000..2d66c64f Binary files /dev/null and b/desktop/resources/inside-castle/writing.ogg differ diff --git a/desktop/resources/inside-fangald.mp3 b/desktop/resources/inside-fangald.mp3 deleted file mode 100644 index fa868020..00000000 Binary files a/desktop/resources/inside-fangald.mp3 and /dev/null differ diff --git a/desktop/resources/inside-house/close-safe.ogg.mp3 b/desktop/resources/inside-house/close-safe.ogg.mp3 new file mode 100644 index 00000000..fc72fced Binary files /dev/null and b/desktop/resources/inside-house/close-safe.ogg.mp3 differ diff --git a/desktop/resources/inside-house/disappear.ogg.mp3 b/desktop/resources/inside-house/disappear.ogg.mp3 new file mode 100644 index 00000000..3c7fc1eb Binary files /dev/null and b/desktop/resources/inside-house/disappear.ogg.mp3 differ diff --git a/desktop/resources/inside-house/open-safe.ogg.mp3 b/desktop/resources/inside-house/open-safe.ogg.mp3 new file mode 100644 index 00000000..03f84279 Binary files /dev/null and b/desktop/resources/inside-house/open-safe.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-1.ogg.mp3 b/desktop/resources/inside-house/safe-1.ogg.mp3 new file mode 100644 index 00000000..4390dccf Binary files /dev/null and b/desktop/resources/inside-house/safe-1.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-2.ogg.mp3 b/desktop/resources/inside-house/safe-2.ogg.mp3 new file mode 100644 index 00000000..688939dd Binary files /dev/null and b/desktop/resources/inside-house/safe-2.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-3.ogg.mp3 b/desktop/resources/inside-house/safe-3.ogg.mp3 new file mode 100644 index 00000000..4c2751b1 Binary files /dev/null and b/desktop/resources/inside-house/safe-3.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-4.ogg.mp3 b/desktop/resources/inside-house/safe-4.ogg.mp3 new file mode 100644 index 00000000..a916662b Binary files /dev/null and b/desktop/resources/inside-house/safe-4.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-5.ogg.mp3 b/desktop/resources/inside-house/safe-5.ogg.mp3 new file mode 100644 index 00000000..a5475f84 Binary files /dev/null and b/desktop/resources/inside-house/safe-5.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/exhale.ogg.mp3 b/desktop/resources/inside-jail/exhale.ogg.mp3 new file mode 100644 index 00000000..086009a8 Binary files /dev/null and b/desktop/resources/inside-jail/exhale.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/inhale.ogg.mp3 b/desktop/resources/inside-jail/inhale.ogg.mp3 new file mode 100644 index 00000000..f7ab04a9 Binary files /dev/null and b/desktop/resources/inside-jail/inhale.ogg.mp3 differ diff --git a/desktop/resources/make-osx-versions.sh b/desktop/resources/make-osx-versions.sh new file mode 100755 index 00000000..5b6801fb --- /dev/null +++ b/desktop/resources/make-osx-versions.sh @@ -0,0 +1,2 @@ +#/bin/bash +for x in **/*.ogg; do ffmpeg -i "$x" "$x.mp3"; done diff --git a/desktop/resources/music/forest.ogg b/desktop/resources/music/forest.ogg new file mode 100644 index 00000000..8f221179 Binary files /dev/null and b/desktop/resources/music/forest.ogg differ diff --git a/desktop/resources/music/inside-antique.mp3 b/desktop/resources/music/inside-antique.mp3 new file mode 100644 index 00000000..7399d079 Binary files /dev/null and b/desktop/resources/music/inside-antique.mp3 differ diff --git a/desktop/resources/inside-antique.ogg b/desktop/resources/music/inside-antique.ogg similarity index 100% rename from desktop/resources/inside-antique.ogg rename to desktop/resources/music/inside-antique.ogg diff --git a/desktop/resources/music/inside-antique.ogg.mp3 b/desktop/resources/music/inside-antique.ogg.mp3 new file mode 100644 index 00000000..7399d079 Binary files /dev/null and b/desktop/resources/music/inside-antique.ogg.mp3 differ diff --git a/desktop/resources/music/inside-fangald.mp3 b/desktop/resources/music/inside-fangald.mp3 new file mode 100644 index 00000000..99937d85 Binary files /dev/null and b/desktop/resources/music/inside-fangald.mp3 differ diff --git a/desktop/resources/inside-fangald.ogg b/desktop/resources/music/inside-fangald.ogg similarity index 100% rename from desktop/resources/inside-fangald.ogg rename to desktop/resources/music/inside-fangald.ogg diff --git a/desktop/resources/music/inside-fangald.ogg.mp3 b/desktop/resources/music/inside-fangald.ogg.mp3 new file mode 100644 index 00000000..99937d85 Binary files /dev/null and b/desktop/resources/music/inside-fangald.ogg.mp3 differ diff --git a/desktop/resources/music/intro.mp3 b/desktop/resources/music/intro.mp3 new file mode 100644 index 00000000..c9cb4980 Binary files /dev/null and b/desktop/resources/music/intro.mp3 differ diff --git a/desktop/resources/intro.ogg b/desktop/resources/music/intro.ogg similarity index 100% rename from desktop/resources/intro.ogg rename to desktop/resources/music/intro.ogg diff --git a/desktop/resources/music/intro.ogg.mp3 b/desktop/resources/music/intro.ogg.mp3 new file mode 100644 index 00000000..c9cb4980 Binary files /dev/null and b/desktop/resources/music/intro.ogg.mp3 differ diff --git a/desktop/resources/music/love.mp3 b/desktop/resources/music/love.mp3 new file mode 100644 index 00000000..e89545eb Binary files /dev/null and b/desktop/resources/music/love.mp3 differ diff --git a/desktop/resources/love.ogg b/desktop/resources/music/love.ogg similarity index 100% rename from desktop/resources/love.ogg rename to desktop/resources/music/love.ogg diff --git a/desktop/resources/music/love.ogg.mp3 b/desktop/resources/music/love.ogg.mp3 new file mode 100644 index 00000000..e89545eb Binary files /dev/null and b/desktop/resources/music/love.ogg.mp3 differ diff --git a/desktop/resources/megaboss.mp3 b/desktop/resources/music/megaboss.mp3 similarity index 100% rename from desktop/resources/megaboss.mp3 rename to desktop/resources/music/megaboss.mp3 diff --git a/desktop/resources/music/night.mp3 b/desktop/resources/music/night.mp3 new file mode 100644 index 00000000..08196ca3 Binary files /dev/null and b/desktop/resources/music/night.mp3 differ diff --git a/desktop/resources/night.ogg b/desktop/resources/music/night.ogg similarity index 100% rename from desktop/resources/night.ogg rename to desktop/resources/music/night.ogg diff --git a/desktop/resources/music/night.ogg.mp3 b/desktop/resources/music/night.ogg.mp3 new file mode 100644 index 00000000..08196ca3 Binary files /dev/null and b/desktop/resources/music/night.ogg.mp3 differ diff --git a/desktop/resources/music/pull-sword.mp3 b/desktop/resources/music/pull-sword.mp3 new file mode 100644 index 00000000..e5a15214 Binary files /dev/null and b/desktop/resources/music/pull-sword.mp3 differ diff --git a/desktop/resources/pull-sword.ogg b/desktop/resources/music/pull-sword.ogg similarity index 100% rename from desktop/resources/pull-sword.ogg rename to desktop/resources/music/pull-sword.ogg diff --git a/desktop/resources/music/pull-sword.ogg.mp3 b/desktop/resources/music/pull-sword.ogg.mp3 new file mode 100644 index 00000000..e5a15214 Binary files /dev/null and b/desktop/resources/music/pull-sword.ogg.mp3 differ diff --git a/desktop/resources/music/secret-hideout.mp3 b/desktop/resources/music/secret-hideout.mp3 new file mode 100644 index 00000000..9bc3332c Binary files /dev/null and b/desktop/resources/music/secret-hideout.mp3 differ diff --git a/desktop/resources/secret-hideout.ogg b/desktop/resources/music/secret-hideout.ogg similarity index 100% rename from desktop/resources/secret-hideout.ogg rename to desktop/resources/music/secret-hideout.ogg diff --git a/desktop/resources/music/secret-hideout.ogg.mp3 b/desktop/resources/music/secret-hideout.ogg.mp3 new file mode 100644 index 00000000..9bc3332c Binary files /dev/null and b/desktop/resources/music/secret-hideout.ogg.mp3 differ diff --git a/desktop/resources/music/town-music-1.mp3 b/desktop/resources/music/town-music-1.mp3 new file mode 100644 index 00000000..0fee8992 Binary files /dev/null and b/desktop/resources/music/town-music-1.mp3 differ diff --git a/desktop/resources/town-music-1.ogg b/desktop/resources/music/town-music-1.ogg similarity index 100% rename from desktop/resources/town-music-1.ogg rename to desktop/resources/music/town-music-1.ogg diff --git a/desktop/resources/music/town-music-1.ogg.mp3 b/desktop/resources/music/town-music-1.ogg.mp3 new file mode 100644 index 00000000..0fee8992 Binary files /dev/null and b/desktop/resources/music/town-music-1.ogg.mp3 differ diff --git a/desktop/resources/music/town-music-2.mp3 b/desktop/resources/music/town-music-2.mp3 new file mode 100644 index 00000000..266ee236 Binary files /dev/null and b/desktop/resources/music/town-music-2.mp3 differ diff --git a/desktop/resources/town-music-2.ogg b/desktop/resources/music/town-music-2.ogg similarity index 100% rename from desktop/resources/town-music-2.ogg rename to desktop/resources/music/town-music-2.ogg diff --git a/desktop/resources/music/town-music-2.ogg.mp3 b/desktop/resources/music/town-music-2.ogg.mp3 new file mode 100644 index 00000000..266ee236 Binary files /dev/null and b/desktop/resources/music/town-music-2.ogg.mp3 differ diff --git a/desktop/resources/music/town-music.mp3 b/desktop/resources/music/town-music.mp3 new file mode 100644 index 00000000..d38ec333 Binary files /dev/null and b/desktop/resources/music/town-music.mp3 differ diff --git a/desktop/resources/town-music.ogg b/desktop/resources/music/town-music.ogg similarity index 100% rename from desktop/resources/town-music.ogg rename to desktop/resources/music/town-music.ogg diff --git a/desktop/resources/music/town-music.ogg.mp3 b/desktop/resources/music/town-music.ogg.mp3 new file mode 100644 index 00000000..d38ec333 Binary files /dev/null and b/desktop/resources/music/town-music.ogg.mp3 differ diff --git a/desktop/resources/town-music.ovw b/desktop/resources/music/town-music.ovw similarity index 100% rename from desktop/resources/town-music.ovw rename to desktop/resources/music/town-music.ovw diff --git a/desktop/resources/dream/wind.ogg b/desktop/resources/music/wind.ogg similarity index 100% rename from desktop/resources/dream/wind.ogg rename to desktop/resources/music/wind.ogg diff --git a/desktop/resources/outside-castle/flies.ogg.mp3 b/desktop/resources/outside-castle/flies.ogg.mp3 new file mode 100644 index 00000000..c028424d Binary files /dev/null and b/desktop/resources/outside-castle/flies.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/flies2.ogg.mp3 b/desktop/resources/outside-castle/flies2.ogg.mp3 new file mode 100644 index 00000000..192f5df2 Binary files /dev/null and b/desktop/resources/outside-castle/flies2.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/moo.ogg b/desktop/resources/outside-castle/moo.ogg new file mode 100644 index 00000000..ed3db796 Binary files /dev/null and b/desktop/resources/outside-castle/moo.ogg differ diff --git a/desktop/resources/outside-castle/scratch.ogg b/desktop/resources/outside-castle/scratch.ogg index e0d356d1..3ffb8974 100644 Binary files a/desktop/resources/outside-castle/scratch.ogg and b/desktop/resources/outside-castle/scratch.ogg differ diff --git a/desktop/resources/outside-castle/scratch.ogg.mp3 b/desktop/resources/outside-castle/scratch.ogg.mp3 new file mode 100644 index 00000000..bd565ef5 Binary files /dev/null and b/desktop/resources/outside-castle/scratch.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/scratch.wav b/desktop/resources/outside-castle/scratch.wav deleted file mode 100644 index 6ce39095..00000000 Binary files a/desktop/resources/outside-castle/scratch.wav and /dev/null differ diff --git a/desktop/resources/outside-house.mp3 b/desktop/resources/outside-house.mp3 deleted file mode 100644 index 5c04fb6b..00000000 Binary files a/desktop/resources/outside-house.mp3 and /dev/null differ diff --git a/desktop/resources/outside-jail/collision.png b/desktop/resources/outside-jail/collision.png index 056ff066..d1e3be49 100644 Binary files a/desktop/resources/outside-jail/collision.png and b/desktop/resources/outside-jail/collision.png differ diff --git a/desktop/resources/outside-jail/fountain-2.ogg.mp3 b/desktop/resources/outside-jail/fountain-2.ogg.mp3 new file mode 100644 index 00000000..9f045878 Binary files /dev/null and b/desktop/resources/outside-jail/fountain-2.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/milk.ogg.mp3 b/desktop/resources/outsidehouse/milk.ogg.mp3 new file mode 100644 index 00000000..d136c900 Binary files /dev/null and b/desktop/resources/outsidehouse/milk.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/outsidehouse.png b/desktop/resources/outsidehouse/outsidehouse.png deleted file mode 100644 index 2af4bc6b..00000000 Binary files a/desktop/resources/outsidehouse/outsidehouse.png and /dev/null differ diff --git a/desktop/resources/outsidehouse/sheep-bleet.ogg b/desktop/resources/outsidehouse/sheep-bleet.ogg new file mode 100644 index 00000000..cc8fc915 Binary files /dev/null and b/desktop/resources/outsidehouse/sheep-bleet.ogg differ diff --git a/desktop/resources/outsidehouse/sheep-eat.ogg b/desktop/resources/outsidehouse/sheep-eat.ogg new file mode 100644 index 00000000..81ca92af Binary files /dev/null and b/desktop/resources/outsidehouse/sheep-eat.ogg differ diff --git a/desktop/resources/overdirt.png b/desktop/resources/overdirt.png deleted file mode 100644 index abdb8e67..00000000 Binary files a/desktop/resources/overdirt.png and /dev/null differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas new file mode 100644 index 00000000..01a80f50 --- /dev/null +++ b/desktop/resources/packed/pack.atlas @@ -0,0 +1,3064 @@ + +pack.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/background + rotate: false + xy: 484, 316 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +bg + rotate: false + xy: 2, 286 + size: 480, 270 + orig: 480, 270 + offset: 0, 0 + index: -1 +butterfly + rotate: false + xy: 272, 3 + size: 14, 7 + orig: 14, 7 + offset: 0, 0 + index: -1 +castle-gate/background + rotate: false + xy: 544, 74 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +castle-gate/coinflip + rotate: false + xy: 484, 304 + size: 50, 10 + orig: 50, 10 + offset: 0, 0 + index: -1 +castle-gate/goon-1 + rotate: false + xy: 995, 558 + size: 24, 33 + orig: 24, 33 + offset: 0, 0 + index: -1 +castle-gate/goon-2-flip + rotate: false + xy: 974, 169 + size: 48, 32 + orig: 48, 32 + offset: 0, 0 + index: -1 +castle-gate/overlay + rotate: false + xy: 732, 616 + size: 138, 239 + orig: 138, 239 + offset: 0, 0 + index: -1 +cat-tree/Untitled + rotate: false + xy: 974, 149 + size: 28, 18 + orig: 28, 18 + offset: 0, 0 + index: -1 +cat-tree/pounce + rotate: false + xy: 974, 149 + size: 28, 18 + orig: 28, 18 + offset: 0, 0 + index: -1 +cat-tree/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +ego/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +outsidehouse/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +dream/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +title/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-house/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-jail/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot + rotate: false + xy: 729, 621 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +cat-tree/monocle + rotate: false + xy: 202, 3 + size: 28, 7 + orig: 28, 7 + offset: 0, 0 + index: -1 +cat-tree/tree-r + rotate: false + xy: 872, 615 + size: 65, 240 + orig: 65, 240 + offset: 0, 0 + index: -1 +close + rotate: false + xy: 1004, 151 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +dream/broom + rotate: false + xy: 1007, 825 + size: 15, 66 + orig: 15, 66 + offset: 0, 0 + index: -1 +dream/case + rotate: false + xy: 1007, 785 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 +dream/plaque1 + rotate: false + xy: 1012, 99 + size: 8, 11 + orig: 8, 11 + offset: 0, 0 + index: -1 +dream/plaque2 + rotate: false + xy: 1012, 125 + size: 10, 6 + orig: 10, 6 + offset: 0, 0 + index: -1 +dream/plaque3 + rotate: false + xy: 1012, 86 + size: 8, 11 + orig: 8, 11 + offset: 0, 0 + index: -1 +dream/sword + rotate: false + xy: 1007, 745 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 +ego/Untitled + rotate: false + xy: 939, 558 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/axe + rotate: false + xy: 544, 2 + size: 420, 70 + orig: 420, 70 + offset: 0, 0 + index: -1 +ego/fire + rotate: false + xy: 806, 353 + size: 216, 36 + orig: 216, 36 + offset: 0, 0 + index: -1 +ego/frog + rotate: false + xy: 974, 278 + size: 32, 36 + orig: 32, 36 + offset: 0, 0 + index: -1 +ego/ida + rotate: false + xy: 966, 3 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/pant + rotate: false + xy: 960, 893 + size: 62, 36 + orig: 62, 36 + offset: 0, 0 + index: -1 +ego/standup + rotate: false + xy: 704, 558 + size: 225, 55 + orig: 225, 55 + offset: 0, 0 + index: -1 +held/dot + rotate: false + xy: 1021, 590 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +outside-jail/dot + rotate: false + xy: 1021, 590 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +space/dot + rotate: false + xy: 1021, 590 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/bowl + rotate: false + xy: 288, 3 + size: 12, 7 + orig: 12, 7 + offset: 0, 0 + index: -1 +inside-antique/sword + rotate: false + xy: 1012, 133 + size: 8, 16 + orig: 8, 16 + offset: 0, 0 + index: -1 +inside-castle/sword + rotate: false + xy: 1012, 133 + size: 8, 16 + orig: 8, 16 + offset: 0, 0 + index: -1 +inside-cafeteria/doorway + rotate: false + xy: 1008, 238 + size: 14, 113 + orig: 14, 113 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight + rotate: false + xy: 2, 751 + size: 728, 104 + orig: 728, 104 + offset: 0, 0 + index: -1 +inside-cafeteria/knight-a + rotate: false + xy: 2, 558 + size: 700, 85 + orig: 700, 85 + offset: 0, 0 + index: -1 +inside-cafeteria/knights + rotate: false + xy: 939, 630 + size: 74, 97 + orig: 74, 97 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder-guard-2 + rotate: false + xy: 974, 203 + size: 30, 73 + orig: 30, 73 + offset: 0, 0 + index: -1 +inside-cafeteria/warriors + rotate: false + xy: 939, 729 + size: 66, 126 + orig: 66, 126 + offset: 0, 0 + index: -1 +inside-castle/bookstack + rotate: false + xy: 995, 593 + size: 27, 35 + orig: 27, 35 + offset: 0, 0 + index: -1 +inside-castle/hands-fight + rotate: false + xy: 2, 645 + size: 728, 104 + orig: 728, 104 + offset: 0, 0 + index: -1 +inside-castle/monocle + rotate: false + xy: 232, 3 + size: 28, 7 + orig: 28, 7 + offset: 0, 0 + index: -1 +inside-castle/walkie-talkie + rotate: false + xy: 960, 857 + size: 35, 34 + orig: 35, 34 + offset: 0, 0 + index: -1 +inside-castle/watch + rotate: false + xy: 262, 2 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +inside-house/flask + rotate: false + xy: 1006, 215 + size: 16, 21 + orig: 16, 21 + offset: 0, 0 + index: -1 +inside-house/frog-legs + rotate: false + xy: 524, 286 + size: 17, 16 + orig: 17, 16 + offset: 0, 0 + index: -1 +inside-house/inputed-key + rotate: false + xy: 1012, 112 + size: 9, 11 + orig: 9, 11 + offset: 0, 0 + index: -1 +inside-house/safe-lock + rotate: false + xy: 2, 8 + size: 198, 2 + orig: 198, 2 + offset: 0, 0 + index: -1 +inside-jail/ball-n-chain + rotate: false + xy: 484, 286 + size: 38, 16 + orig: 38, 16 + offset: 0, 0 + index: -1 +inside-jail/crowbar + rotate: false + xy: 997, 864 + size: 8, 27 + orig: 8, 27 + offset: 0, 0 + index: -1 +inside-jail/moveable-bars + rotate: false + xy: 960, 931 + size: 53, 91 + orig: 53, 91 + offset: 0, 0 + index: -1 +inside-stash/candle + rotate: false + xy: 2, 2 + size: 16, 4 + orig: 16, 4 + offset: 0, 0 + index: -1 +inside-stash/lid + rotate: false + xy: 704, 615 + size: 23, 7 + orig: 23, 7 + offset: 0, 0 + index: -1 +outside-castle/bird + rotate: false + xy: 1020, 554 + size: 2, 2 + orig: 2, 2 + offset: 0, 0 + index: -1 +outside-castle/steer + rotate: false + xy: 806, 316 + size: 200, 35 + orig: 200, 35 + offset: 0, 0 + index: -1 +outside-jail/candle-aura + rotate: false + xy: 2, 149 + size: 540, 135 + orig: 540, 135 + offset: 0, 0 + index: -1 +outside-jail/candle-aura2 + rotate: false + xy: 2, 12 + size: 540, 135 + orig: 540, 135 + offset: 0, 0 + index: -1 +outsidehouse/lamb + rotate: false + xy: 704, 624 + size: 26, 19 + orig: 26, 19 + offset: 0, 0 + index: -1 +player + rotate: false + xy: 866, 75 + size: 144, 72 + orig: 144, 72 + offset: 0, 0 + index: -1 +space/Blergh + rotate: false + xy: 852, 857 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-flex + rotate: false + xy: 866, 149 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/blergh-stand + rotate: false + xy: 866, 149 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-stand + rotate: false + xy: 806, 391 + size: 212, 165 + orig: 212, 165 + offset: 0, 0 + index: -1 +space/bloodclot-talk + rotate: false + xy: 2, 857 + size: 848, 165 + orig: 848, 165 + offset: 0, 0 + index: -1 +space/broken-jewel + rotate: false + xy: 1007, 729 + size: 10, 14 + orig: 10, 14 + offset: 0, 0 + index: -1 +wizard/flame + rotate: false + xy: 1006, 203 + size: 5, 10 + orig: 5, 10 + offset: 0, 0 + index: -1 + +pack2.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/fg2 + rotate: false + xy: 2, 95 + size: 183, 360 + orig: 183, 360 + offset: 0, 0 + index: -1 +behindhouse/house-cover + rotate: false + xy: 504, 586 + size: 20, 21 + orig: 20, 21 + offset: 0, 0 + index: -1 +behindhouse/stick + rotate: false + xy: 604, 836 + size: 24, 42 + orig: 24, 42 + offset: 0, 0 + index: -1 +bg2 + rotate: false + xy: 187, 99 + size: 360, 202 + orig: 360, 202 + offset: 0, 0 + index: -1 +bg3 + rotate: false + xy: 549, 88 + size: 360, 202 + orig: 360, 202 + offset: 0, 0 + index: -1 +castle-gate/goon-2 + rotate: false + xy: 604, 802 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 +castle-gate/goon-2-talk + rotate: false + xy: 995, 134 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 +cat-tree/brush-l + rotate: false + xy: 187, 385 + size: 152, 70 + orig: 152, 70 + offset: 0, 0 + index: -1 +cat-tree/cat + rotate: false + xy: 995, 86 + size: 22, 11 + orig: 22, 11 + offset: 0, 0 + index: -1 +cat-tree/cat-stand + rotate: false + xy: 348, 86 + size: 198, 11 + orig: 198, 11 + offset: 0, 0 + index: -1 +cat-tree/destroy-ladder + rotate: false + xy: 2, 657 + size: 522, 38 + orig: 522, 38 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-1 + rotate: false + xy: 574, 760 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cloudy + rotate: false + xy: 504, 564 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +cursorr + rotate: false + xy: 444, 512 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +dream/cliff + rotate: false + xy: 2, 6 + size: 81, 87 + orig: 81, 87 + offset: 0, 0 + index: -1 +dream/fairy-godfather + rotate: false + xy: 2, 697 + size: 567, 77 + orig: 567, 77 + offset: 0, 0 + index: -1 +dream/fairy-godfather-magic + rotate: false + xy: 2, 578 + size: 500, 77 + orig: 500, 77 + offset: 0, 0 + index: -1 +dream/shovel + rotate: false + xy: 928, 7 + size: 19, 64 + orig: 19, 64 + offset: 0, 0 + index: -1 +ego/axe-wood + rotate: false + xy: 2, 952 + size: 660, 70 + orig: 660, 70 + offset: 0, 0 + index: -1 +ego/burnt + rotate: false + xy: 2, 530 + size: 480, 46 + orig: 480, 46 + offset: 0, 0 + index: -1 +ego/crawl + rotate: false + xy: 748, 644 + size: 273, 25 + orig: 273, 25 + offset: 0, 0 + index: -1 +ego/frustrated-talk + rotate: false + xy: 921, 394 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/georgia + rotate: false + xy: 928, 432 + size: 90, 30 + orig: 90, 30 + offset: 0, 0 + index: -1 +ego/get-sick + rotate: false + xy: 911, 236 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/grow + rotate: false + xy: 928, 464 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 +ego/hold-up-to-window + rotate: false + xy: 911, 198 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/in-love + rotate: false + xy: 2, 776 + size: 570, 30 + orig: 570, 30 + offset: 0, 0 + index: -1 +ego/reach + rotate: false + xy: 949, 35 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared-walk + rotate: false + xy: 921, 356 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/spear + rotate: false + xy: 433, 358 + size: 90, 100 + orig: 90, 100 + offset: 0, 0 + index: -1 +ego/squat + rotate: false + xy: 791, 292 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/swing-shovel + rotate: false + xy: 2, 880 + size: 630, 70 + orig: 630, 70 + offset: 0, 0 + index: -1 +ending-castle/Untitled + rotate: false + xy: 634, 911 + size: 28, 39 + orig: 28, 39 + offset: 0, 0 + index: -1 +ending-castle/game-player + rotate: false + xy: 634, 911 + size: 28, 39 + orig: 28, 39 + offset: 0, 0 + index: -1 +ending-castle/duke + rotate: false + xy: 2, 480 + size: 440, 48 + orig: 440, 48 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/foreground + rotate: false + xy: 664, 913 + size: 344, 109 + orig: 344, 109 + offset: 0, 0 + index: -1 +held/bloodclot-head-1 + rotate: false + xy: 632, 587 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-2 + rotate: false + xy: 348, 2 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 464, 2 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-4 + rotate: false + xy: 580, 4 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-5 + rotate: false + xy: 696, 4 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-6 + rotate: false + xy: 812, 4 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +inside-antique/antique-sigh + rotate: false + xy: 525, 433 + size: 198, 21 + orig: 198, 21 + offset: 0, 0 + index: -1 +inside-antique/beard + rotate: false + xy: 432, 304 + size: 78, 52 + orig: 78, 52 + offset: 0, 0 + index: -1 +inside-antique/shopkeep-talk + rotate: false + xy: 949, 12 + size: 72, 21 + orig: 72, 21 + offset: 0, 0 + index: -1 +inside-cafeteria/knights-stand + rotate: false + xy: 526, 502 + size: 490, 80 + orig: 490, 80 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder-guard + rotate: false + xy: 85, 6 + size: 74, 87 + orig: 74, 87 + offset: 0, 0 + index: -1 +inside-cafeteria/warriors-stand + rotate: false + xy: 525, 304 + size: 264, 126 + orig: 264, 126 + offset: 0, 0 + index: -1 +inside-castle/game-player-talk + rotate: false + xy: 526, 456 + size: 400, 44 + orig: 400, 44 + offset: 0, 0 + index: -1 +inside-castle/hands-1 + rotate: false + xy: 526, 584 + size: 104, 104 + orig: 104, 104 + offset: 0, 0 + index: -1 +inside-castle/pull-sword + rotate: false + xy: 634, 719 + size: 380, 190 + orig: 380, 190 + offset: 0, 0 + index: -1 +inside-castle/trophy + rotate: false + xy: 928, 73 + size: 64, 16 + orig: 64, 16 + offset: 0, 0 + index: -1 +inside-house/candle + rotate: false + xy: 919, 274 + size: 102, 32 + orig: 102, 32 + offset: 0, 0 + index: -1 +inside-jail/warden + rotate: false + xy: 748, 584 + size: 258, 58 + orig: 258, 58 + offset: 0, 0 + index: -1 +outside-castle/Untitled + rotate: false + xy: 791, 330 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/peddler-talk + rotate: false + xy: 791, 330 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/balloons + rotate: false + xy: 571, 722 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 +outside-castle/blanket + rotate: false + xy: 919, 308 + size: 103, 46 + orig: 103, 46 + offset: 0, 0 + index: -1 +outside-castle/note + rotate: false + xy: 462, 512 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +outside-jail/Untitled + rotate: false + xy: 2, 808 + size: 600, 70 + orig: 600, 70 + offset: 0, 0 + index: -1 +outside-jail/alarm-clock + rotate: false + xy: 484, 565 + size: 16, 11 + orig: 16, 11 + offset: 0, 0 + index: -1 +outside-jail/axe + rotate: false + xy: 995, 99 + size: 22, 33 + orig: 22, 33 + offset: 0, 0 + index: -1 +outside-jail/rope + rotate: false + xy: 161, 7 + size: 185, 86 + orig: 185, 86 + offset: 0, 0 + index: -1 +outside-jail/spear + rotate: false + xy: 1010, 971 + size: 11, 51 + orig: 11, 51 + offset: 0, 0 + index: -1 +outsidehouse/fg1 + rotate: false + xy: 791, 368 + size: 128, 63 + orig: 128, 63 + offset: 0, 0 + index: -1 +outsidehouse/fgtest + rotate: false + xy: 271, 308 + size: 75, 75 + orig: 75, 75 + offset: 0, 0 + index: -1 +outsidehouse/lamb-walk + rotate: false + xy: 911, 168 + size: 108, 28 + orig: 108, 28 + offset: 0, 0 + index: -1 +outsidehouse/sheep-anim + rotate: false + xy: 2, 457 + size: 429, 21 + orig: 429, 21 + offset: 0, 0 + index: -1 +outsidehouse/sheep-walk + rotate: false + xy: 725, 433 + size: 198, 21 + orig: 198, 21 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-1 + rotate: false + xy: 348, 380 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-2 + rotate: false + xy: 348, 303 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-3 + rotate: false + xy: 187, 308 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 911, 91 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +title/balloon + rotate: false + xy: 571, 690 + size: 60, 30 + orig: 60, 30 + offset: 0, 0 + index: -1 +wizard/Untitled + rotate: false + xy: 444, 460 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 +wizard/disappear + rotate: false + xy: 633, 671 + size: 380, 46 + orig: 380, 46 + offset: 0, 0 + index: -1 +wizard/magic-hands + rotate: false + xy: 484, 512 + size: 40, 50 + orig: 40, 50 + offset: 0, 0 + index: -1 +wizard/stand + rotate: false + xy: 504, 609 + size: 20, 46 + orig: 20, 46 + offset: 0, 0 + index: -1 +wizard + rotate: false + xy: 504, 609 + size: 20, 46 + orig: 20, 46 + offset: 0, 0 + index: -1 + +pack3.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/abc + rotate: false + xy: 2, 29 + size: 320, 62 + orig: 320, 62 + offset: 0, 0 + index: -1 +bg4 + rotate: false + xy: 2, 819 + size: 360, 202 + orig: 360, 202 + offset: 0, 0 + index: -1 +black + rotate: false + xy: 278, 3 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 +cat-tree/background + rotate: false + xy: 2, 577 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/background + rotate: false + xy: 2, 335 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ego/idea + rotate: false + xy: 968, 709 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/love-1 + rotate: false + xy: 968, 637 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-2 + rotate: false + xy: 968, 565 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-3 + rotate: false + xy: 968, 493 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-4 + rotate: false + xy: 968, 421 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-5 + rotate: false + xy: 968, 349 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-6 + rotate: false + xy: 968, 277 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-7 + rotate: false + xy: 968, 205 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-8 + rotate: false + xy: 968, 133 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-9 + rotate: false + xy: 968, 61 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/shock + rotate: false + xy: 324, 5 + size: 360, 48 + orig: 360, 48 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/background + rotate: false + xy: 2, 93 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +held/background + rotate: false + xy: 364, 781 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/background + rotate: false + xy: 686, 781 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/background + rotate: false + xy: 324, 539 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/background + rotate: false + xy: 324, 297 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/brian-working + rotate: false + xy: 686, 9 + size: 320, 44 + orig: 320, 44 + offset: 0, 0 + index: -1 +inside-house/background + rotate: false + xy: 646, 539 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/background + rotate: false + xy: 646, 297 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/candle + rotate: false + xy: 196, 2 + size: 80, 25 + orig: 80, 25 + offset: 0, 0 + index: -1 +inside-stash/background + rotate: false + xy: 324, 55 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/background + rotate: false + xy: 646, 55 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +space/Untitled + rotate: false + xy: 324, 781 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +space/bullet + rotate: false + xy: 2, 3 + size: 192, 24 + orig: 192, 24 + offset: 0, 0 + index: -1 + +pack4.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/brush + rotate: false + xy: 372, 54 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +behindhouse/fgleft + rotate: false + xy: 209, 2 + size: 161, 50 + orig: 161, 50 + offset: 0, 0 + index: -1 +bg5 + rotate: false + xy: 694, 296 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ego/cat-toy + rotate: false + xy: 2, 2 + size: 205, 50 + orig: 205, 50 + offset: 0, 0 + index: -1 +ego/flying + rotate: false + xy: 968, 8 + size: 34, 44 + orig: 34, 44 + offset: 0, 0 + index: -1 +ego/glad + rotate: false + xy: 540, 6 + size: 140, 46 + orig: 140, 46 + offset: 0, 0 + index: -1 +ego/love-10 + rotate: false + xy: 968, 918 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-11 + rotate: false + xy: 968, 846 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-12 + rotate: false + xy: 968, 774 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-13 + rotate: false + xy: 968, 702 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-14 + rotate: false + xy: 968, 630 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-15 + rotate: false + xy: 968, 558 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +inside-antique/portrait + rotate: false + xy: 1004, 540 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-castle/Untitled + rotate: false + xy: 764, 8 + size: 160, 44 + orig: 160, 44 + offset: 0, 0 + index: -1 +inside-castle/background-sunrise + rotate: false + xy: 324, 780 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/inside-castle-sunrise + rotate: false + xy: 324, 780 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/door + rotate: false + xy: 454, 3 + size: 84, 49 + orig: 84, 49 + offset: 0, 0 + index: -1 +inside-castle/gameplayer + rotate: false + xy: 926, 8 + size: 40, 44 + orig: 40, 44 + offset: 0, 0 + index: -1 +inside-jail/bars + rotate: false + xy: 646, 780 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/bars- + rotate: false + xy: 646, 538 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/background-sunrise + rotate: false + xy: 324, 538 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/brush + rotate: false + xy: 694, 54 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/flies + rotate: false + xy: 324, 65 + size: 45, 15 + orig: 45, 15 + offset: 0, 0 + index: -1 +outside-castle/peddler + rotate: false + xy: 1004, 16 + size: 18, 36 + orig: 18, 36 + offset: 0, 0 + index: -1 +outside-jail/background + rotate: false + xy: 2, 780 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/closed-stash + rotate: false + xy: 968, 990 + size: 52, 30 + orig: 52, 30 + offset: 0, 0 + index: -1 +outsidehouse/background + rotate: false + xy: 2, 538 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/background-trees + rotate: false + xy: 372, 296 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/note + rotate: false + xy: 968, 540 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +pathfind-test + rotate: false + xy: 986, 540 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +space/background + rotate: false + xy: 2, 296 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title/background + rotate: false + xy: 2, 54 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +wizard/experiment-1 + rotate: false + xy: 324, 481 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-2 + rotate: false + xy: 324, 424 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-3 + rotate: false + xy: 324, 367 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-4 + rotate: false + xy: 324, 310 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-5 + rotate: false + xy: 324, 253 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-6 + rotate: false + xy: 324, 196 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-7 + rotate: false + xy: 324, 139 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-8 + rotate: false + xy: 324, 82 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 682, 6 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 +wizard/talk-angry + rotate: false + xy: 372, 2 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 + +pack5.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/fg + rotate: false + xy: 646, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/fg + rotate: false + xy: 646, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +castle-gate/frankie + rotate: false + xy: 2, 19 + size: 312, 35 + orig: 312, 35 + offset: 0, 0 + index: -1 +cat-tree/grandma + rotate: false + xy: 608, 18 + size: 275, 36 + orig: 275, 36 + offset: 0, 0 + index: -1 +cloud + rotate: false + xy: 2, 2 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +space/cloud + rotate: false + xy: 2, 2 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +dawn + rotate: false + xy: 2, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/clouds1 + rotate: false + xy: 324, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/clouds2 + rotate: false + xy: 2, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ego/love-16 + rotate: false + xy: 968, 952 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-17 + rotate: false + xy: 968, 880 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-18 + rotate: false + xy: 968, 808 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-19 + rotate: false + xy: 968, 736 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-20 + rotate: false + xy: 968, 664 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-21 + rotate: false + xy: 968, 592 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-22 + rotate: false + xy: 968, 520 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-23 + rotate: false + xy: 968, 448 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-24 + rotate: false + xy: 968, 376 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-25 + rotate: false + xy: 968, 304 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-26 + rotate: false + xy: 968, 232 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/stand + rotate: false + xy: 885, 18 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ending-castle/ending-castle2-assets/collision + rotate: false + xy: 324, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/closed-blinds + rotate: false + xy: 2, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/darken + rotate: false + xy: 646, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/desk + rotate: false + xy: 324, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/fg + rotate: false + xy: 646, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/desk + rotate: false + xy: 646, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/open-stash + rotate: false + xy: 316, 13 + size: 290, 41 + orig: 290, 41 + offset: 0, 0 + index: -1 +outsidehouse/fence + rotate: false + xy: 324, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +testscreen/subject + rotate: false + xy: 19, 2 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +title/clouds + rotate: false + xy: 2, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +wizard/experiment-10 + rotate: false + xy: 968, 118 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-11 + rotate: false + xy: 968, 61 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-9 + rotate: false + xy: 968, 175 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 + +pack6.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +castle-gate/Untitled + rotate: false + xy: 406, 19 + size: 192, 35 + orig: 192, 35 + offset: 0, 0 + index: -1 +castle-gate/goon-2-search + rotate: false + xy: 600, 22 + size: 192, 32 + orig: 192, 32 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-2 + rotate: false + xy: 964, 13 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +dream/fountain + rotate: false + xy: 646, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/fountain + rotate: false + xy: 646, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/island + rotate: false + xy: 204, 2 + size: 30, 20 + orig: 30, 20 + offset: 0, 0 + index: -1 +ego/scoot + rotate: false + xy: 204, 24 + size: 200, 30 + orig: 200, 30 + offset: 0, 0 + index: -1 +goon-2-walk + rotate: false + xy: 794, 20 + size: 168, 34 + orig: 168, 34 + offset: 0, 0 + index: -1 +castle-gate/goon-2-walk + rotate: false + xy: 794, 20 + size: 168, 34 + orig: 168, 34 + offset: 0, 0 + index: -1 +held/flesh + rotate: false + xy: 236, 2 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +held/hand + rotate: false + xy: 646, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +held/head + rotate: false + xy: 646, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/glow + rotate: false + xy: 2, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/teddy + rotate: false + xy: 316, 6 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +inside-cafeteria/fg + rotate: false + xy: 2, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/fight + rotate: false + xy: 324, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/glow + rotate: false + xy: 324, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/books + rotate: false + xy: 280, 3 + size: 34, 19 + orig: 34, 19 + offset: 0, 0 + index: -1 +inside-castle/fight-1 + rotate: false + xy: 2, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-castle/magic + rotate: false + xy: 258, 2 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +inside-house/glow + rotate: false + xy: 646, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/fg + rotate: false + xy: 2, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/glow + rotate: false + xy: 324, 56 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/cauldron + rotate: false + xy: 2, 16 + size: 200, 38 + orig: 200, 38 + offset: 0, 0 + index: -1 +outsidehouse/foreground + rotate: false + xy: 324, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +wizard/experiment-12 + rotate: false + xy: 968, 967 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-13 + rotate: false + xy: 968, 910 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-14 + rotate: false + xy: 968, 853 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-15 + rotate: false + xy: 968, 796 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-16 + rotate: false + xy: 968, 739 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-17 + rotate: false + xy: 968, 682 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-18 + rotate: false + xy: 968, 625 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-19 + rotate: false + xy: 968, 568 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-20 + rotate: false + xy: 968, 511 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-21 + rotate: false + xy: 968, 454 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-22 + rotate: false + xy: 968, 397 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-23 + rotate: false + xy: 968, 340 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-24 + rotate: false + xy: 968, 283 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-25 + rotate: false + xy: 968, 226 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-26 + rotate: false + xy: 968, 169 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-27 + rotate: false + xy: 968, 112 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-28 + rotate: false + xy: 968, 55 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 + +pack7.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +behindhouse/house + rotate: false + xy: 2, 781 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cat-tree/inventory + rotate: false + xy: 968, 248 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +cat-tree/owl + rotate: false + xy: 312, 25 + size: 152, 28 + orig: 152, 28 + offset: 0, 0 + index: -1 +cat-tree/sillhoute + rotate: false + xy: 646, 539 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/pedestals + rotate: false + xy: 324, 297 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +dream/sign + rotate: false + xy: 968, 336 + size: 41, 58 + orig: 41, 58 + offset: 0, 0 + index: -1 +ego/crowbar + rotate: false + xy: 166, 17 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/shoot + rotate: false + xy: 466, 17 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/sigh + rotate: false + xy: 2, 17 + size: 162, 36 + orig: 162, 36 + offset: 0, 0 + index: -1 +ego/talk + rotate: false + xy: 612, 17 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/thorw + rotate: false + xy: 886, 17 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/warden + rotate: false + xy: 968, 205 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +ending-castle/warden-2 + rotate: false + xy: 968, 162 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +inside-antique/open-blinds + rotate: false + xy: 646, 781 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-antique/shopkeep + rotate: false + xy: 347, 2 + size: 18, 21 + orig: 18, 21 + offset: 0, 0 + index: -1 +inside-castle/pedestal-overlay + rotate: false + xy: 2, 55 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/sillhoute + rotate: false + xy: 324, 55 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/chest-top + rotate: false + xy: 968, 86 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +inside-jail/window + rotate: false + xy: 968, 55 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 +inside-jail/window-bent + rotate: false + xy: 988, 55 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 +inventory + rotate: false + xy: 968, 292 + size: 42, 42 + orig: 42, 42 + offset: 0, 0 + index: -1 +inventory-overlay + rotate: false + xy: 324, 781 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/house + rotate: false + xy: 2, 539 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/sheep + rotate: false + xy: 312, 2 + size: 33, 21 + orig: 33, 21 + offset: 0, 0 + index: -1 +space/later + rotate: false + xy: 2, 297 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +space/susp + rotate: false + xy: 758, 17 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/suspended + rotate: false + xy: 758, 17 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +talk-bg + rotate: false + xy: 968, 120 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +testscreen/test + rotate: false + xy: 646, 297 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +the-end + rotate: false + xy: 646, 55 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title/logo + rotate: false + xy: 324, 539 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +wizard/experiment-29 + rotate: false + xy: 968, 966 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-30 + rotate: false + xy: 968, 909 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-31 + rotate: false + xy: 968, 852 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-32 + rotate: false + xy: 968, 795 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-33 + rotate: false + xy: 968, 738 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-34 + rotate: false + xy: 968, 681 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-35 + rotate: false + xy: 968, 624 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-36 + rotate: false + xy: 968, 567 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-37 + rotate: false + xy: 968, 510 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-38 + rotate: false + xy: 968, 453 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-39 + rotate: false + xy: 968, 396 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 + +pack8.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +castle-gate/throw-walkie-1 + rotate: false + xy: 324, 402 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-2 + rotate: false + xy: 646, 644 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-3 + rotate: false + xy: 2, 83 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-4 + rotate: false + xy: 324, 264 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-5 + rotate: false + xy: 646, 506 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-6 + rotate: false + xy: 639, 368 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-7 + rotate: false + xy: 639, 230 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-8 + rotate: false + xy: 639, 92 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-9 + rotate: false + xy: 317, 126 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-10 + rotate: false + xy: 954, 366 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 954, 324 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-12 + rotate: false + xy: 954, 282 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-13 + rotate: false + xy: 954, 240 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-14 + rotate: false + xy: 954, 198 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-15 + rotate: false + xy: 954, 156 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-16 + rotate: false + xy: 954, 114 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-3 + rotate: false + xy: 442, 15 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-4 + rotate: false + xy: 961, 618 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-5 + rotate: false + xy: 961, 576 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 961, 534 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 961, 492 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 961, 450 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 961, 408 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/tree-and-rock + rotate: false + xy: 2, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +ego/base + rotate: false + xy: 1006, 952 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/grow-talk + rotate: false + xy: 968, 952 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +ego/swing + rotate: false + xy: 2, 221 + size: 288, 75 + orig: 288, 75 + offset: 0, 0 + index: -1 +ego/throw + rotate: false + xy: 204, 16 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +held/bloodclot-head-7 + rotate: false + xy: 632, 8 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-8 + rotate: false + xy: 748, 8 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-9 + rotate: false + xy: 864, 30 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/title + rotate: false + xy: 2, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder + rotate: false + xy: 491, 86 + size: 29, 38 + orig: 29, 38 + offset: 0, 0 + index: -1 +inside-castle/roof + rotate: false + xy: 961, 660 + size: 57, 57 + orig: 57, 57 + offset: 0, 0 + index: -1 +inside-castle/way-back-tree + rotate: false + xy: 646, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-house/candle-aura + rotate: false + xy: 332, 28 + size: 108, 27 + orig: 108, 27 + offset: 0, 0 + index: -1 +inside-house/safe-screen + rotate: false + xy: 2, 6 + size: 200, 75 + orig: 200, 75 + offset: 0, 0 + index: -1 +inside-jail/chest-top-open + rotate: false + xy: 968, 990 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +outside-castle/walk-behind + rotate: false + xy: 324, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-jail/bent-bar-window + rotate: false + xy: 292, 221 + size: 17, 33 + orig: 17, 33 + offset: 0, 0 + index: -1 +outside-jail/candle + rotate: false + xy: 864, 3 + size: 80, 25 + orig: 80, 25 + offset: 0, 0 + index: -1 +outside-jail/guard-sleep + rotate: false + xy: 317, 57 + size: 172, 67 + orig: 172, 67 + offset: 0, 0 + index: -1 +outsidehouse/fg2 + rotate: false + xy: 961, 719 + size: 59, 61 + orig: 59, 61 + offset: 0, 0 + index: -1 +space/blergh-talk + rotate: false + xy: 853, 615 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-1 + rotate: false + xy: 531, 373 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-2 + rotate: false + xy: 531, 206 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-3 + rotate: false + xy: 209, 54 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-4 + rotate: false + xy: 853, 448 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-5 + rotate: false + xy: 846, 281 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-6 + rotate: false + xy: 846, 114 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-7 + rotate: false + xy: 524, 39 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +talk-bg-2 + rotate: false + xy: 292, 256 + size: 21, 40 + orig: 21, 40 + offset: 0, 0 + index: -1 +title + rotate: false + xy: 2, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +title-overlay + rotate: false + xy: 324, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +white + rotate: false + xy: 332, 2 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 +wizard/cloud + rotate: false + xy: 968, 920 + size: 40, 30 + orig: 40, 30 + offset: 0, 0 + index: -1 + +pack9.png +size: 1024,512 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +castle-gate/stash-closed + rotate: false + xy: 656, 383 + size: 70, 41 + orig: 70, 41 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-17 + rotate: false + xy: 728, 384 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-18 + rotate: false + xy: 518, 87 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-19 + rotate: false + xy: 788, 384 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-20 + rotate: false + xy: 518, 45 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +dream/corner-l + rotate: false + xy: 542, 442 + size: 112, 59 + orig: 112, 59 + offset: 0, 0 + index: -1 +dream/corner-r + rotate: false + xy: 542, 381 + size: 112, 59 + orig: 112, 59 + offset: 0, 0 + index: -1 +ego/scared + rotate: false + xy: 518, 129 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +outsidehouse/door + rotate: false + xy: 542, 321 + size: 88, 58 + orig: 88, 58 + offset: 0, 0 + index: -1 +space/bloodclot-explode-10 + rotate: false + xy: 110, 336 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-11 + rotate: false + xy: 2, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-12 + rotate: false + xy: 110, 169 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-13 + rotate: false + xy: 218, 336 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-14 + rotate: false + xy: 110, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-15 + rotate: false + xy: 218, 169 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-16 + rotate: false + xy: 326, 336 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-17 + rotate: false + xy: 218, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-18 + rotate: false + xy: 326, 169 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-19 + rotate: false + xy: 434, 336 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-20 + rotate: false + xy: 326, 2 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-8 + rotate: false + xy: 2, 336 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-9 + rotate: false + xy: 2, 169 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-10 + rotate: false + xy: 824, 426 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-11 + rotate: false + xy: 434, 28 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-12 + rotate: false + xy: 908, 426 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-13 + rotate: false + xy: 518, 244 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-14 + rotate: false + xy: 518, 167 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-5 + rotate: false + xy: 434, 259 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-6 + rotate: false + xy: 656, 426 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-7 + rotate: false + xy: 434, 182 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-8 + rotate: false + xy: 740, 426 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-9 + rotate: false + xy: 434, 105 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png new file mode 100644 index 00000000..182dd4a8 Binary files /dev/null and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png new file mode 100644 index 00000000..e60ca94e Binary files /dev/null and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png new file mode 100644 index 00000000..7a3d1a12 Binary files /dev/null and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png new file mode 100644 index 00000000..34f1bc18 Binary files /dev/null and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png new file mode 100644 index 00000000..96ba10e1 Binary files /dev/null and b/desktop/resources/packed/pack5.png differ diff --git a/desktop/resources/packed/pack6.png b/desktop/resources/packed/pack6.png new file mode 100644 index 00000000..23277faa Binary files /dev/null and b/desktop/resources/packed/pack6.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png new file mode 100644 index 00000000..db790ace Binary files /dev/null and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png new file mode 100644 index 00000000..84bc43b2 Binary files /dev/null and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/resources/packed/pack9.png b/desktop/resources/packed/pack9.png new file mode 100644 index 00000000..a7c3c382 Binary files /dev/null and b/desktop/resources/packed/pack9.png differ diff --git a/desktop/resources/particles/appear b/desktop/resources/particles/appear new file mode 100644 index 00000000..37a0e0e3 --- /dev/null +++ b/desktop/resources/particles/appear @@ -0,0 +1,193 @@ +Untitled +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 500.0 +lowMax: 500.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 70.0 +lowMax: 70.0 +highMin: 80.0 +highMax: 80.0 +relative: false +scalingCount: 3 +scaling0: 0.7346939 +scaling1: 0.48979592 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5205479 +timeline2: 0.94520545 +- Life - +lowMin: 500.0 +lowMax: 500.0 +highMin: 1000.0 +highMax: 1000.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: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.9931507 +- X Offset - +active: false +- Y 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 +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 20.0 +lowMax: 20.0 +highMin: 50.0 +highMax: 50.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.94520545 +- 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: 10.0 +lowMax: 10.0 +highMin: 40.0 +highMax: 40.0 +relative: true +scalingCount: 3 +scaling0: 0.3877551 +scaling1: 0.67346936 +scaling2: 0.8876405 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.72602737 +timeline2: 0.98197246 +- Velocity - +active: true +lowMin: 50.0 +lowMax: 50.0 +highMin: 60.0 +highMax: 60.0 +relative: true +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.1632653 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.7191781 +- Angle - +active: true +lowMin: 50.0 +lowMax: 130.0 +highMin: 20.0 +highMax: 170.0 +relative: false +scalingCount: 2 +scaling0: 0.040816326 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: true +lowMin: -45.0 +lowMax: 45.0 +highMin: -90.0 +highMax: 95.0 +relative: true +scalingCount: 2 +scaling0: 0.3469388 +scaling1: 0.8979592 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 30.0 +lowMax: 30.0 +highMin: 50.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 0.10204082 +scaling1: 0.877551 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.9109589 +- Tint - +colorsCount: 6 +colors0: 0.29803923 +colors1: 0.078431375 +colors2: 0.20784314 +colors3: 0.07450981 +colors4: 0.2 +colors5: 0.29803923 +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.28070176 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.51369864 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloud.png diff --git a/desktop/resources/space/beam.png b/desktop/resources/particles/beam.png similarity index 100% rename from desktop/resources/space/beam.png rename to desktop/resources/particles/beam.png diff --git a/desktop/resources/particles/blowup b/desktop/resources/particles/blowup new file mode 100644 index 00000000..47998aba --- /dev/null +++ b/desktop/resources/particles/blowup @@ -0,0 +1,439 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 2500.0 +lowMax: 2500.0 +- Count - +min: 0 +max: 100 +- 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: 400.0 +highMax: 400.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: 75.0 +lowMax: 75.0 +highMin: 150.0 +highMax: 150.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: false +- Angle - +active: false +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 180.0 +highMax: 180.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.7019608 +colors2: 1.0 +colors3: 0.39607844 +colors4: 0.19215687 +colors5: 0.6 +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.07017544 +scaling1: 0.8947368 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.23287672 +timeline2: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +beam.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 250.0 +highMax: 250.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.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: 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.5 +lowMax: 0.5 +highMin: 2.0 +highMax: 2.0 +relative: true +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.1632653 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.77397263 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 700.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.46575344 +- Angle - +active: true +lowMin: 110.0 +lowMax: 250.0 +highMin: 120.0 +highMax: 120.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.89726025 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 10.0 +lowMax: 10.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +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 +- Tint - +colorsCount: 9 +colors0: 0.93333334 +colors1: 1.0 +colors2: 1.0 +colors3: 0.46666667 +colors4: 0.7529412 +colors5: 1.0 +colors6: 0.4392157 +colors7: 0.79607844 +colors8: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.17938553 +timeline2: 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.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +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: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 100.0 +highMax: 100.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.2739726 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 2000.0 +highMax: 2000.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: 25.0 +highMax: 25.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.3561644 +- Velocity - +active: true +lowMin: 75.0 +lowMax: 75.0 +highMin: 250.0 +highMax: 250.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.040816326 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.47260273 +timeline2: 1.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 360.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -180.0 +highMax: 180.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.63529414 +colors1: 0.60784316 +colors2: 0.6039216 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.84210527 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.15068494 +timeline2: 0.9041096 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/candle b/desktop/resources/particles/candle new file mode 100644 index 00000000..1815c9ca --- /dev/null +++ b/desktop/resources/particles/candle @@ -0,0 +1,218 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 10000.0 +lowMax: 10000.0 +- Count - +min: 0 +max: 1000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 7 +scaling0: 0.97959185 +scaling1: 0.0 +scaling2: 0.97959185 +scaling3: 0.0 +scaling4: 1.0 +scaling5: 0.0 +scaling6: 0.0 +timelineCount: 7 +timeline0: 0.0 +timeline1: 0.13013698 +timeline2: 0.32876712 +timeline3: 0.45890412 +timeline4: 0.63013697 +timeline5: 0.74657536 +timeline6: 0.93835616 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20000.0 +highMax: 20000.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: 1.0 +lowMax: 1.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: -120.0 +highMax: -100.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: 3.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.14035088 +scaling2: 0.0877193 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.23972602 +timeline2: 0.65753424 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/ego/dot.png diff --git a/desktop/resources/particles/cloud-georgia b/desktop/resources/particles/cloud-georgia new file mode 100644 index 00000000..97cc7e94 --- /dev/null +++ b/desktop/resources/particles/cloud-georgia @@ -0,0 +1,304 @@ +base +- Delay - +active: false +- Duration - +lowMin: 2000.0 +lowMax: 2000.0 +- Count - +min: 0 +max: 10 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.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: 30.0 +lowMax: 30.0 +highMin: 40.0 +highMax: 40.0 +relative: false +scalingCount: 7 +scaling0: 0.6122449 +scaling1: 0.7755102 +scaling2: 0.877551 +scaling3: 0.7755102 +scaling4: 0.9183673 +scaling5: 0.877551 +scaling6: 1.0 +timelineCount: 7 +timeline0: 0.0 +timeline1: 0.10273973 +timeline2: 0.28767124 +timeline3: 0.46575344 +timeline4: 0.67808217 +timeline5: 0.8287671 +timeline6: 1.0 +- Velocity - +active: false +- Angle - +active: false +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 40.0 +highMax: -40.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 6 +scaling0: 0.12280702 +scaling1: 0.57894737 +scaling2: 0.5263158 +scaling3: 0.61403507 +scaling4: 0.64912283 +scaling5: 0.24561404 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.09589041 +timeline2: 0.3561644 +timeline3: 0.60958904 +timeline4: 0.8835617 +timeline5: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloud-georgia.png + + +top +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 15 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 2000.0 +highMax: 2000.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: -15.0 +lowMax: 15.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -15.0 +lowMax: 15.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: 15.0 +lowMax: 10.0 +highMin: 0.0 +highMax: 10.0 +relative: true +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: 0.0 +highMax: 4.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: -20.0 +highMax: 20.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.9647059 +colors2: 0.9647059 +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: 1.0 +scaling2: 0.5614035 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.5479452 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloud-georgia.png diff --git a/desktop/resources/particles/cloud-georgia.png b/desktop/resources/particles/cloud-georgia.png new file mode 100644 index 00000000..0e7ae358 Binary files /dev/null and b/desktop/resources/particles/cloud-georgia.png differ diff --git a/desktop/resources/particles/cloud.png b/desktop/resources/particles/cloud.png new file mode 100644 index 00000000..d7f74afc Binary files /dev/null and b/desktop/resources/particles/cloud.png differ diff --git a/desktop/resources/title/cloud1.png b/desktop/resources/particles/cloud1.png similarity index 100% rename from desktop/resources/title/cloud1.png rename to desktop/resources/particles/cloud1.png diff --git a/desktop/resources/title/cloud2.png b/desktop/resources/particles/cloud2.png similarity index 100% rename from desktop/resources/title/cloud2.png rename to desktop/resources/particles/cloud2.png diff --git a/desktop/resources/dream/cloudy.png b/desktop/resources/particles/cloudy.png similarity index 100% rename from desktop/resources/dream/cloudy.png rename to desktop/resources/particles/cloudy.png diff --git a/desktop/resources/particles/cloudy2 b/desktop/resources/particles/cloudy2 new file mode 100644 index 00000000..27601b2a --- /dev/null +++ b/desktop/resources/particles/cloudy2 @@ -0,0 +1,170 @@ +Untitled +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 50 +- 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: 4000.0 +highMax: 5000.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: true +lowMin: 5.0 +lowMax: -5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 5.0 +lowMax: -5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: ellipse +edges: true +side: both +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 360.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 320.0 +highMax: 320.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 40.0 +lowMax: 40.0 +highMin: 90.0 +highMax: 110.0 +relative: false +scalingCount: 3 +scaling0: 0.7346939 +scaling1: 0.8367347 +scaling2: 0.71428573 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 0.9520548 +- Velocity - +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 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.37671232 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 1.0 +lowMax: 360.0 +highMin: -50.0 +highMax: 50.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.92156863 +colors1: 0.9372549 +colors2: 0.94509804 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.21052632 +scaling2: 0.05263158 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.48630136 +timeline2: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +cloudy.png diff --git a/desktop/resources/outside-jail/dither.png b/desktop/resources/particles/dither.png similarity index 100% rename from desktop/resources/outside-jail/dither.png rename to desktop/resources/particles/dither.png diff --git a/desktop/resources/wizard/dot.png b/desktop/resources/particles/dot.png similarity index 100% rename from desktop/resources/wizard/dot.png rename to desktop/resources/particles/dot.png diff --git a/desktop/resources/particles/dream-magic b/desktop/resources/particles/dream-magic new file mode 100644 index 00000000..05079fb2 --- /dev/null +++ b/desktop/resources/particles/dream-magic @@ -0,0 +1,195 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1500.0 +highMax: 1500.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3000.0 +highMax: 2500.0 +relative: false +scalingCount: 4 +scaling0: 0.8979592 +scaling1: 0.8979592 +scaling2: 1.0 +scaling3: 0.3 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.10958904 +timeline2: 0.66 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 320.0 +highMax: 320.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 240.0 +highMax: 240.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 1.0 +lowMax: 1.0 +highMin: 1.0 +highMax: 5.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.97959185 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.19863014 +timeline2: 0.8356164 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 100.0 +highMax: 250.0 +relative: false +scalingCount: 4 +scaling0: 0.46938777 +scaling1: 1.0 +scaling2: 0.6938776 +scaling3: 0.46938777 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.034246575 +timeline2: 0.15068494 +timeline3: 0.60958904 +- Angle - +active: true +lowMin: 270.0 +lowMax: 270.0 +highMin: 80.0 +highMax: 100.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.6369863 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -22000.0 +highMax: 22000.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.97959185 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5753425 +timeline2: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: -50.0 +lowMax: -50.0 +highMin: -180.0 +highMax: -180.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.65753424 +- Tint - +colorsCount: 21 +colors0: 1.0 +colors1: 0.12156863 +colors2: 0.047058824 +colors3: 1.0 +colors4: 0.69411767 +colors5: 0.047058824 +colors6: 0.16470589 +colors7: 1.0 +colors8: 0.047058824 +colors9: 0.047058824 +colors10: 0.8784314 +colors11: 1.0 +colors12: 0.12941177 +colors13: 0.047058824 +colors14: 1.0 +colors15: 0.7019608 +colors16: 0.047058824 +colors17: 1.0 +colors18: 1.0 +colors19: 0.6862745 +colors20: 0.047058824 +timelineCount: 7 +timeline0: 0.0 +timeline1: 0.13825652 +timeline2: 0.2581899 +timeline3: 0.45141587 +timeline4: 0.67518044 +timeline5: 0.8323154 +timeline6: 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.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.04109589 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/explode b/desktop/resources/particles/explode new file mode 100644 index 00000000..f3b6d5cf --- /dev/null +++ b/desktop/resources/particles/explode @@ -0,0 +1,165 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 700.0 +lowMax: 700.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 250.0 +highMax: 250.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.15753424 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1000.0 +highMax: 2000.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: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 5.0 +highMax: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 2.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 100.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.5714286 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5205479 +timeline2: 1.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.97959185 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 1280.0 +highMax: -1280.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -40.0 +highMax: -40.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 0.8979592 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.34931508 +timeline2: 1.0 +- Tint - +colorsCount: 3 +colors0: 0.7372549 +colors1: 0.95686275 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.31578946 +scaling1: 0.75438595 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.19178082 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/fire-particle b/desktop/resources/particles/fire-particle new file mode 100644 index 00000000..2efe627b --- /dev/null +++ b/desktop/resources/particles/fire-particle @@ -0,0 +1,339 @@ +Untitled +- Delay - +active: true +lowMin: 2000.0 +lowMax: 2000.0 +- Duration - +lowMin: 800.0 +lowMax: 800.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.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 +- 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: 8.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.1632653 +scaling2: 0.63265306 +scaling3: 0.4489796 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.26027396 +timeline2: 0.31506848 +timeline3: 0.6164383 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 15.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.42465752 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.4520548 +- Tint - +colorsCount: 6 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +colors3: 0.21176471 +colors4: 0.21176471 +colors5: 0.21176471 +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.01754386 +scaling1: 1.0 +scaling2: 0.8947368 +scaling3: 0.14035088 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.0890411 +timeline2: 0.5890411 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: true +lowMin: 2000.0 +lowMax: 2000.0 +- Duration - +lowMin: 800.0 +lowMax: 800.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 75.0 +highMax: 75.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.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: 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: 6.0 +highMax: 10.0 +relative: false +scalingCount: 6 +scaling0: 0.0 +scaling1: 0.26530612 +scaling2: 0.9183673 +scaling3: 0.4489796 +scaling4: 0.53061223 +scaling5: 0.0 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.14383562 +timeline2: 0.30136988 +timeline3: 0.5273973 +timeline4: 0.8561644 +timeline5: 1.0 +- Velocity - +active: true +lowMin: 10.0 +lowMax: 10.0 +highMin: 300.0 +highMax: 1000.0 +relative: false +scalingCount: 6 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.12244898 +scaling3: 0.36734694 +scaling4: 0.12244898 +scaling5: 0.0 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.15753424 +timeline2: 0.19863014 +timeline3: 0.32876712 +timeline4: 0.42465752 +timeline5: 1.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -15.0 +highMax: 15.0 +relative: true +scalingCount: 3 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5410959 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Tint - +colorsCount: 9 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +colors3: 1.0 +colors4: 1.0 +colors5: 1.0 +colors6: 0.0 +colors7: 0.0 +colors8: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.19104992 +timeline2: 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.7368421 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8082192 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: true +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +fire-particle.png diff --git a/desktop/resources/inside-antique/fire-particle.png b/desktop/resources/particles/fire-particle.png similarity index 100% rename from desktop/resources/inside-antique/fire-particle.png rename to desktop/resources/particles/fire-particle.png diff --git a/desktop/resources/space/flesh.png b/desktop/resources/particles/flesh.png similarity index 100% rename from desktop/resources/space/flesh.png rename to desktop/resources/particles/flesh.png diff --git a/desktop/resources/particles/fountain b/desktop/resources/particles/fountain new file mode 100644 index 00000000..de7c246b --- /dev/null +++ b/desktop/resources/particles/fountain @@ -0,0 +1,618 @@ +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 +- 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: 5.0 +lowMax: 5.0 +highMin: 90.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.71929824 +scaling2: 0.57894737 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.21917808 +timeline2: 0.79452056 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 40 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 8.0 +highMax: 8.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: -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 +- 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: 2.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 30.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.877551 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.58219177 +timeline2: 0.74657536 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 135.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: false +- Wind - +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: -10.0 +highMax: -10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Tint - +colorsCount: 3 +colors0: 0.87058824 +colors1: 0.9254902 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +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: true +behind: false +premultipliedAlpha: false +- Image Path - +magic.png diff --git a/desktop/resources/particles/gandarf-cloud b/desktop/resources/particles/gandarf-cloud new file mode 100644 index 00000000..d44160ea --- /dev/null +++ b/desktop/resources/particles/gandarf-cloud @@ -0,0 +1,560 @@ +wave +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 5000.0 +highMax: 5000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -5.0 +lowMax: 5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -10.0 +lowMax: -10.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: 1.0 +lowMax: 1.0 +highMin: 1.0 +highMax: 1.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: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -100.0 +highMax: -80.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: false +- Wind - +active: true +lowMin: -20.0 +lowMax: -30.0 +highMin: 20.0 +highMax: 30.0 +relative: false +scalingCount: 8 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +timelineCount: 8 +timeline0: 0.0 +timeline1: 0.09589041 +timeline2: 0.25342464 +timeline3: 0.39726028 +timeline4: 0.51369864 +timeline5: 0.65068495 +timeline6: 0.82191783 +timeline7: 0.9589041 +- Gravity - +active: true +lowMin: -5.0 +lowMax: -5.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 9 +scaling0: 0.0 +scaling1: 0.97959185 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +scaling8: 0.0 +timelineCount: 9 +timeline0: 0.0 +timeline1: 0.15753424 +timeline2: 0.25342464 +timeline3: 0.36301368 +timeline4: 0.47260273 +timeline5: 0.6164383 +timeline6: 0.72602737 +timeline7: 0.82191783 +timeline8: 1.0 +- Tint - +colorsCount: 6 +colors0: 0.6039216 +colors1: 0.047058824 +colors2: 1.0 +colors3: 1.0 +colors4: 0.047058824 +colors5: 0.047058824 +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.2631579 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.1780822 +timeline2: 0.65753424 +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: 5000.0 +lowMax: 5000.0 +- Count - +min: 5 +max: 150 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 25.0 +highMax: 25.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1500.0 +highMax: 1500.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.0890411 +- Life Offset - +active: false +- X 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 +- Y Offset - +active: true +lowMin: 5.0 +lowMax: 5.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: 30.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 5.0 +highMin: 15.0 +highMax: 15.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 180.0 +highMax: 360.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -30.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.827451 +colors1: 0.94509804 +colors2: 1.0 +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.2631579 +scaling2: 0.0877193 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.17123288 +timeline2: 0.25342464 +timeline3: 0.9931507 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +cloud.png + + +wave +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 5000.0 +highMax: 5000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -5.0 +lowMax: 5.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -10.0 +lowMax: -10.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: 1.0 +lowMax: 1.0 +highMin: 1.0 +highMax: 1.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: 10.0 +highMax: 10.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -100.0 +highMax: -80.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: false +- Wind - +active: true +lowMin: -30.0 +lowMax: -30.0 +highMin: 30.0 +highMax: 30.0 +relative: false +scalingCount: 8 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +timelineCount: 8 +timeline0: 0.0 +timeline1: 0.09589041 +timeline2: 0.25342464 +timeline3: 0.39726028 +timeline4: 0.51369864 +timeline5: 0.65068495 +timeline6: 0.82191783 +timeline7: 0.9589041 +- Gravity - +active: true +lowMin: -5.0 +lowMax: -5.0 +highMin: 5.0 +highMax: 5.0 +relative: false +scalingCount: 7 +scaling0: 0.0 +scaling1: 0.93877554 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +timelineCount: 7 +timeline0: 0.0 +timeline1: 0.11643836 +timeline2: 0.28767124 +timeline3: 0.36301368 +timeline4: 0.5753425 +timeline5: 0.77397263 +timeline6: 0.8835617 +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.9764706 +colors2: 1.0 +colors3: 0.047058824 +colors4: 1.0 +colors5: 0.6627451 +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.31578946 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.20547946 +timeline2: 0.739726 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/glad-jump b/desktop/resources/particles/glad-jump new file mode 100644 index 00000000..72fcd09e --- /dev/null +++ b/desktop/resources/particles/glad-jump @@ -0,0 +1,163 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 100.0 +lowMax: 100.0 +- Count - +min: 0 +max: 100 +- 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: 800.0 +highMax: 800.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X 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 +- Y 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 +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 18.0 +lowMax: 18.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Spawn Height - +lowMin: 5.0 +lowMax: 5.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.5714286 +scaling2: 0.6122449 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.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: 10.0 +lowMax: 3.0 +highMin: 40.0 +highMax: 30.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.15068494 +timeline2: 0.37671232 +- Angle - +active: true +lowMin: 220.0 +lowMax: 320.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 3 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.21232876 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.5647059 +colors1: 0.7607843 +colors2: 1.0 +colors3: 0.34509805 +colors4: 0.8352941 +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: 1.0 +scaling1: 1.0 +scaling2: 1.0 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.05479452 +timeline2: 0.34246576 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/dream/dot.png diff --git a/desktop/resources/particles/grow-explode b/desktop/resources/particles/grow-explode new file mode 100644 index 00000000..8de337ea --- /dev/null +++ b/desktop/resources/particles/grow-explode @@ -0,0 +1,291 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 300.0 +lowMax: 300.0 +- Count - +min: 0 +max: 300 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.63265306 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3000.0 +highMax: 3000.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: 14.0 +highMax: 14.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 75.0 +lowMax: 75.0 +highMin: 300.0 +highMax: 300.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.8979592 +scaling2: 0.3877551 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.11643836 +timeline2: 1.0 +- Angle - +active: true +lowMin: -90.0 +lowMax: -90.0 +highMin: 0.0 +highMax: 360.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.4178082 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 3600.0 +highMax: -3600.0 +relative: false +scalingCount: 2 +scaling0: 0.3265306 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.15068494 +timeline2: 0.48630136 +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.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: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +flesh.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 300.0 +lowMax: 300.0 +- Count - +min: 0 +max: 500 +- Emission - +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 - +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 +- 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: 1.0 +lowMax: 1.0 +highMin: 5.0 +highMax: 3.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 200.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -360.0 +highMax: 360.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 360.0 +highMax: -360.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.101960786 +colors2: 0.03137255 +timelineCount: 1 +timeline0: 0.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: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/jet b/desktop/resources/particles/jet new file mode 100644 index 00000000..696ca850 --- /dev/null +++ b/desktop/resources/particles/jet @@ -0,0 +1,316 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 1500 +- Emission - +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 - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.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: 20.0 +lowMax: 20.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 60.0 +lowMax: 30.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: 15.0 +lowMax: 15.0 +highMin: 1.0 +highMax: 4.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.28767124 +timeline2: 1.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 180.0 +lowMax: 180.0 +highMin: -40.0 +highMax: 40.0 +relative: true +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.19607843 +colors2: 0.047058824 +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.49122807 +scaling2: 0.31578946 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.1849315 +timeline2: 0.7328767 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +/Users/brycecovert/dev/advent/desktop/resources/dot.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 1500 +- Emission - +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 - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.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: 20.0 +lowMax: 20.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 60.0 +lowMax: 30.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: 15.0 +lowMax: 15.0 +highMin: 1.0 +highMax: 4.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.28767124 +timeline2: 1.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 180.0 +lowMax: 180.0 +highMin: -40.0 +highMax: 40.0 +relative: true +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.19607843 +colors2: 0.047058824 +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: 1.0 +scaling2: 0.75438595 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.7191781 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +/Users/brycecovert/dev/advent/desktop/resources/dot.png diff --git a/desktop/resources/particles/lightning b/desktop/resources/particles/lightning new file mode 100644 index 00000000..e3030775 --- /dev/null +++ b/desktop/resources/particles/lightning @@ -0,0 +1,362 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 200.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: 0.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: 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: 0.0 +lowMax: 0.0 +highMin: 50.0 +highMax: 50.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 400.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 260.0 +lowMax: 265.0 +highMin: 250.0 +highMax: 255.0 +relative: false +scalingCount: 11 +scaling0: 0.36734694 +scaling1: 1.0 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +scaling8: 0.0 +scaling9: 1.0 +scaling10: 0.4489796 +timelineCount: 11 +timeline0: 0.0 +timeline1: 0.11643836 +timeline2: 0.19178082 +timeline3: 0.30136988 +timeline4: 0.46575344 +timeline5: 0.5 +timeline6: 0.6712329 +timeline7: 0.70547944 +timeline8: 0.8287671 +timeline9: 0.9246575 +timeline10: 0.98630136 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.29803923 +colors1: 1.0 +colors2: 0.76862746 +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.877193 +scaling2: 1.0 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.02739726 +timeline2: 0.9041096 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: true +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +lightning.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 400.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: 0.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: 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: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 100.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 300.0 +lowMax: 305.0 +highMin: 200.0 +highMax: 255.0 +relative: false +scalingCount: 11 +scaling0: 0.36734694 +scaling1: 1.0 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +scaling8: 0.0 +scaling9: 1.0 +scaling10: 0.4489796 +timelineCount: 11 +timeline0: 0.0 +timeline1: 0.11643836 +timeline2: 0.19178082 +timeline3: 0.30136988 +timeline4: 0.46575344 +timeline5: 0.5 +timeline6: 0.6712329 +timeline7: 0.70547944 +timeline8: 0.8287671 +timeline9: 0.9246575 +timeline10: 0.98630136 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.29803923 +colors1: 1.0 +colors2: 0.76862746 +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.877193 +scaling2: 1.0 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.02739726 +timeline2: 0.9041096 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: true +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +lightning.png diff --git a/desktop/resources/particles/lightning.png b/desktop/resources/particles/lightning.png new file mode 100644 index 00000000..eef89c03 Binary files /dev/null and b/desktop/resources/particles/lightning.png differ diff --git a/desktop/resources/particles/lightnting b/desktop/resources/particles/lightnting new file mode 100644 index 00000000..147463a2 --- /dev/null +++ b/desktop/resources/particles/lightnting @@ -0,0 +1,362 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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: 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: 0.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: 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: 0.0 +lowMax: 0.0 +highMin: 50.0 +highMax: 50.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 400.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 260.0 +lowMax: 265.0 +highMin: 250.0 +highMax: 255.0 +relative: false +scalingCount: 11 +scaling0: 0.36734694 +scaling1: 1.0 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +scaling8: 0.0 +scaling9: 1.0 +scaling10: 0.4489796 +timelineCount: 11 +timeline0: 0.0 +timeline1: 0.11643836 +timeline2: 0.19178082 +timeline3: 0.30136988 +timeline4: 0.46575344 +timeline5: 0.5 +timeline6: 0.6712329 +timeline7: 0.70547944 +timeline8: 0.8287671 +timeline9: 0.9246575 +timeline10: 0.98630136 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.29803923 +colors1: 1.0 +colors2: 0.77254903 +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.877193 +scaling2: 1.0 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.02739726 +timeline2: 0.9041096 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: true +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +lightning.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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: 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: 0.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: 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: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 400.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 300.0 +lowMax: 305.0 +highMin: 200.0 +highMax: 255.0 +relative: false +scalingCount: 11 +scaling0: 0.36734694 +scaling1: 1.0 +scaling2: 0.0 +scaling3: 1.0 +scaling4: 0.0 +scaling5: 1.0 +scaling6: 0.0 +scaling7: 1.0 +scaling8: 0.0 +scaling9: 1.0 +scaling10: 0.4489796 +timelineCount: 11 +timeline0: 0.0 +timeline1: 0.11643836 +timeline2: 0.19178082 +timeline3: 0.30136988 +timeline4: 0.46575344 +timeline5: 0.5 +timeline6: 0.6712329 +timeline7: 0.70547944 +timeline8: 0.8287671 +timeline9: 0.9246575 +timeline10: 0.98630136 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.29803923 +colors1: 1.0 +colors2: 0.76862746 +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.877193 +scaling2: 1.0 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.02739726 +timeline2: 0.9041096 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: true +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +lightning.png diff --git a/desktop/resources/particles/magic b/desktop/resources/particles/magic new file mode 100644 index 00000000..7c72eaf9 --- /dev/null +++ b/desktop/resources/particles/magic @@ -0,0 +1,301 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 3050.0 +lowMax: 3050.0 +- Count - +min: 0 +max: 200 +- Emission - +lowMin: 500.0 +lowMax: 500.0 +highMin: 70.0 +highMax: 70.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.97959185 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.12328767 +- 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: line +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 2.0 +highMax: 3.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: true +lowMin: 3.0 +lowMax: 3.0 +highMin: 10.0 +highMax: 17.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.08163265 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.7123288 +timeline2: 0.80136985 +timeline3: 0.9794521 +- Angle - +active: true +lowMin: 80.0 +lowMax: 100.0 +highMin: -40.0 +highMax: 40.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.9591837 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.7328767 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -180.0 +highMax: 180.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.53333336 +colors1: 1.0 +colors2: 0.54509807 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.7719298 +scaling2: 0.3859649 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.10958904 +timeline2: 0.93835616 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: true +lowMin: 2000.0 +lowMax: 2000.0 +- Duration - +lowMin: 50.0 +lowMax: 50.0 +- Count - +min: 0 +max: 1000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3000.0 +highMax: 3000.0 +relative: false +scalingCount: 4 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.001 +timeline2: 0.38941097 +timeline3: 0.89041096 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1500.0 +highMax: 3000.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: false +- Y Offset - +active: false +- Spawn Shape - +shape: line +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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: 1.0 +lowMax: 1.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: 30.0 +highMax: 350.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.3877551 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39041096 +timeline2: 1.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5068493 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.043137256 +colors1: 0.9019608 +colors2: 0.09411765 +colors3: 0.047058824 +colors4: 0.69803923 +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: 1.0 +scaling2: 0.33333334 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.63013697 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/inside-house/dot.png diff --git a/desktop/resources/particles/magic-frog b/desktop/resources/particles/magic-frog new file mode 100644 index 00000000..cd1e0898 --- /dev/null +++ b/desktop/resources/particles/magic-frog @@ -0,0 +1,278 @@ +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: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.6164383 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.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: false +- Y Offset - +active: false +- Spawn Shape - +shape: line +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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: 3.0 +highMax: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 80.0 +highMax: 100.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.6392157 +colors1: 0.76862746 +colors2: 0.03529412 +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: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +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: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.6164383 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.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: false +- Y Offset - +active: false +- Spawn Shape - +shape: line +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 60.0 +highMax: 120.0 +relative: false +scalingCount: 4 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.4178082 +timeline2: 0.5753425 +timeline3: 0.96575344 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.03529412 +colors1: 0.76862746 +colors2: 0.5882353 +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: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png 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/resources/outside-jail/magic.png b/desktop/resources/particles/magic.png similarity index 100% rename from desktop/resources/outside-jail/magic.png rename to desktop/resources/particles/magic.png diff --git a/desktop/resources/particles/outside-particles b/desktop/resources/particles/outside-particles new file mode 100644 index 00000000..27be10fd --- /dev/null +++ b/desktop/resources/particles/outside-particles @@ -0,0 +1,426 @@ +wind +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 2 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 0.7755102 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10000.0 +highMax: 5000.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: true +lowMin: -25.0 +lowMax: -25.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y 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 +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 320.0 +highMax: 320.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: -16.0 +lowMax: -16.0 +highMin: 240.0 +highMax: 240.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 1.0 +lowMax: 1.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.41095892 +timeline2: 1.0 +- Velocity - +active: true +lowMin: 1.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 0.0 +relative: false +scalingCount: 5 +scaling0: 1.0 +scaling1: 0.30612245 +scaling2: 0.877551 +scaling3: 0.59183675 +scaling4: 1.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.60958904 +timeline3: 0.8150685 +timeline4: 0.98630136 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 180.0 +highMax: 0.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.37671232 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: true +lowMin: 0.0 +lowMax: 10.0 +highMin: -10.0 +highMax: 20.0 +relative: true +scalingCount: 4 +scaling0: 1.0 +scaling1: 0.67346936 +scaling2: 0.93877554 +scaling3: 0.48979592 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2739726 +timeline2: 0.5479452 +timeline3: 0.93835616 +- Gravity - +active: true +lowMin: 25.0 +lowMax: 25.0 +highMin: -25.0 +highMax: -25.0 +relative: false +scalingCount: 5 +scaling0: 0.75510204 +scaling1: 0.26530612 +scaling2: 0.7346939 +scaling3: 0.2857143 +scaling4: 0.81632656 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.3219178 +timeline2: 0.51369864 +timeline3: 0.8767123 +timeline4: 1.0 +- Tint - +colorsCount: 3 +colors0: 0.972549 +colors1: 0.972549 +colors2: 0.972549 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 5 +scaling0: 0.0 +scaling1: 0.2982456 +scaling2: 0.22807017 +scaling3: 0.2982456 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.12328767 +timeline2: 0.34246576 +timeline3: 0.6232877 +timeline4: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +wind +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 3 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 0.5102041 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10000.0 +highMax: 5000.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: true +lowMin: -25.0 +lowMax: -25.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y 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 +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 320.0 +highMax: 320.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: -16.0 +lowMax: -16.0 +highMin: 240.0 +highMax: 240.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 1.0 +lowMax: 1.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.41095892 +timeline2: 1.0 +- Velocity - +active: true +lowMin: 1.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 0.0 +relative: false +scalingCount: 5 +scaling0: 1.0 +scaling1: 0.30612245 +scaling2: 0.877551 +scaling3: 0.59183675 +scaling4: 1.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.60958904 +timeline3: 0.8150685 +timeline4: 0.98630136 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 180.0 +highMax: 0.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.37671232 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: true +lowMin: 0.0 +lowMax: -15.0 +highMin: 10.0 +highMax: -20.0 +relative: true +scalingCount: 4 +scaling0: 1.0 +scaling1: 0.67346936 +scaling2: 0.93877554 +scaling3: 0.48979592 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2739726 +timeline2: 0.5479452 +timeline3: 0.93835616 +- Gravity - +active: true +lowMin: 25.0 +lowMax: 25.0 +highMin: -25.0 +highMax: -25.0 +relative: false +scalingCount: 5 +scaling0: 0.75510204 +scaling1: 0.26530612 +scaling2: 0.7346939 +scaling3: 0.2857143 +scaling4: 0.81632656 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.3219178 +timeline2: 0.51369864 +timeline3: 0.8767123 +timeline4: 1.0 +- Tint - +colorsCount: 3 +colors0: 0.972549 +colors1: 0.972549 +colors2: 0.972549 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 5 +scaling0: 0.0 +scaling1: 0.2982456 +scaling2: 0.22807017 +scaling3: 0.2982456 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.12328767 +timeline2: 0.34246576 +timeline3: 0.6232877 +timeline4: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/particle-clouds b/desktop/resources/particles/particle-clouds new file mode 100644 index 00000000..81faf792 --- /dev/null +++ b/desktop/resources/particles/particle-clouds @@ -0,0 +1,566 @@ +wind +- Delay - +active: true +lowMin: 0.0 +lowMax: 0.0 +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 2000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10000.0 +highMax: 5000.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: true +lowMin: -640.0 +lowMax: -640.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -480.0 +lowMax: -480.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: line +- 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: -16.0 +lowMax: -16.0 +highMin: 960.0 +highMax: 960.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 1.0 +lowMax: 1.0 +highMin: 4.0 +highMax: 4.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.3877551 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5205479 +timeline2: 1.0 +- Velocity - +active: true +lowMin: 3.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 0.0 +relative: false +scalingCount: 5 +scaling0: 1.0 +scaling1: 0.30612245 +scaling2: 0.877551 +scaling3: 0.59183675 +scaling4: 1.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.60958904 +timeline3: 0.8150685 +timeline4: 0.98630136 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 180.0 +highMax: 0.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.37671232 +timeline2: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 140.0 +relative: true +scalingCount: 4 +scaling0: 1.0 +scaling1: 0.67346936 +scaling2: 0.93877554 +scaling3: 0.48979592 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2739726 +timeline2: 0.5479452 +timeline3: 0.93835616 +- Gravity - +active: true +lowMin: 100.0 +lowMax: 100.0 +highMin: -100.0 +highMax: -100.0 +relative: false +scalingCount: 5 +scaling0: 0.75510204 +scaling1: 0.26530612 +scaling2: 0.7346939 +scaling3: 0.2857143 +scaling4: 0.81632656 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.3219178 +timeline2: 0.51369864 +timeline3: 0.8767123 +timeline4: 1.0 +- Tint - +colorsCount: 3 +colors0: 0.88235295 +colors1: 0.9411765 +colors2: 0.972549 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.31578946 +scaling1: 0.49122807 +scaling2: 0.5964912 +scaling3: 0.3508772 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.047945205 +timeline2: 0.48630136 +timeline3: 0.9794521 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +clouds +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 10 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 2.0 +highMax: 2.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 30000.0 +highMax: 5000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -640.0 +lowMax: 640.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 480.0 +lowMax: 70.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: 300.0 +lowMax: 200.0 +highMin: 100.0 +highMax: 300.0 +relative: true +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: 10.0 +highMax: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 180.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +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 +- Wind - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -5.0 +highMax: -5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 5 +scaling0: 0.0 +scaling1: 0.6315789 +scaling2: 0.80701756 +scaling3: 0.6315789 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.13013698 +timeline2: 0.4520548 +timeline3: 0.8356164 +timeline4: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +cloud2.png + + +clouds +- Delay - +active: false +- Duration - +lowMin: 3000.0 +lowMax: 3000.0 +- Count - +min: 0 +max: 10 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 2.0 +highMax: 2.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 30000.0 +highMax: 15000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: false +- X Offset - +active: true +lowMin: -640.0 +lowMax: 640.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: 480.0 +lowMax: 70.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: 300.0 +lowMax: 200.0 +highMin: 100.0 +highMax: 300.0 +relative: true +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: 10.0 +highMax: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 180.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +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 +- Wind - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -5.0 +highMax: -5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 5 +scaling0: 0.0 +scaling1: 0.61403507 +scaling2: 0.80701756 +scaling3: 0.57894737 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.08219178 +timeline2: 0.4520548 +timeline3: 0.8150685 +timeline4: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +cloud1.png diff --git a/desktop/resources/particles/puke b/desktop/resources/particles/puke new file mode 100644 index 00000000..7481bc95 --- /dev/null +++ b/desktop/resources/particles/puke @@ -0,0 +1,449 @@ +Untitled +- Delay - +active: true +lowMin: 1800.0 +lowMax: 1800.0 +- Duration - +lowMin: 150.0 +lowMax: 150.0 +- Count - +min: 0 +max: 100 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 5 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 0.0 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.1369863 +timeline2: 0.19863014 +timeline3: 0.44520548 +timeline4: 1.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: 200.0 +highMax: 100.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.40816328 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.0890411 +timeline2: 0.41095892 +- Angle - +active: true +lowMin: 200.0 +lowMax: 280.0 +highMin: 70.0 +highMax: 20.0 +relative: true +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.79591835 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.30136988 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.36862746 +colors1: 1.0 +colors2: 0.047058824 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.21232876 +timeline2: 0.42465752 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/inside-jail/dot.png + + +Untitled +- Delay - +active: true +lowMin: 1500.0 +lowMax: 1500.0 +- Duration - +lowMin: 200.0 +lowMax: 200.0 +- Count - +min: 0 +max: 100 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 5 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 0.0 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.1369863 +timeline2: 0.19863014 +timeline3: 0.44520548 +timeline4: 1.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: 200.0 +highMax: 300.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.18367347 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.15068494 +timeline2: 0.49315068 +- Angle - +active: true +lowMin: 200.0 +lowMax: 280.0 +highMin: 50.0 +highMax: 70.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.5068493 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -10.0 +highMax: -10.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.26712328 +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.39607844 +colors2: 0.047058824 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.15068494 +timeline2: 0.36301368 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/inside-jail/dot.png + + +Untitled +- Delay - +active: true +lowMin: 1300.0 +lowMax: 1300.0 +- Duration - +lowMin: 100.0 +lowMax: 100.0 +- Count - +min: 0 +max: 100 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 10.0 +highMax: 10.0 +relative: false +scalingCount: 5 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 0.0 +scaling4: 0.0 +timelineCount: 5 +timeline0: 0.0 +timeline1: 0.1369863 +timeline2: 0.19863014 +timeline3: 0.44520548 +timeline4: 1.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: 5.0 +lowMax: 5.0 +highMin: 200.0 +highMax: 400.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.2857143 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.15753424 +timeline2: 0.49315068 +- Angle - +active: true +lowMin: 200.0 +lowMax: 280.0 +highMin: 30.0 +highMax: 50.0 +relative: true +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: -10.0 +highMax: -10.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.42857143 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.7328767 +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 0.91764706 +colors2: 0.047058824 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39041096 +timeline2: 0.56164384 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/inside-jail/dot.png diff --git a/desktop/resources/particles/smoke-particle b/desktop/resources/particles/smoke-particle new file mode 100644 index 00000000..0656fbc5 --- /dev/null +++ b/desktop/resources/particles/smoke-particle @@ -0,0 +1,313 @@ +Untitled +- Delay - +active: true +lowMin: 1500.0 +lowMax: 1500.0 +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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 +- 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: 8.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.1632653 +scaling2: 0.63265306 +scaling3: 0.4489796 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.26027396 +timeline2: 0.31506848 +timeline3: 0.6164383 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 30.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: -20.0 +highMin: 15.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.42465752 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.4520548 +- Tint - +colorsCount: 6 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +colors3: 0.21176471 +colors4: 0.21176471 +colors5: 0.21176471 +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.01754386 +scaling1: 1.0 +scaling2: 0.8947368 +scaling3: 0.14035088 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.0890411 +timeline2: 0.5890411 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: true +lowMin: 1500.0 +lowMax: 1500.0 +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.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 +- 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: 8.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.1632653 +scaling2: 0.63265306 +scaling3: 0.4489796 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.26027396 +timeline2: 0.31506848 +timeline3: 0.6164383 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 50.0 +highMax: 40.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 0.0 +lowMax: -20.0 +highMin: 15.0 +highMax: 0.0 +relative: true +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.42465752 +- Rotation - +active: true +lowMin: 50.0 +lowMax: 30.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: false +- Gravity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 50.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.4520548 +- Tint - +colorsCount: 3 +colors0: 1.0 +colors1: 1.0 +colors2: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.01754386 +scaling1: 1.0 +scaling2: 0.8947368 +scaling3: 0.14035088 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.0890411 +timeline2: 0.5890411 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: false +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/particles/step b/desktop/resources/particles/step new file mode 100644 index 00000000..5f1d0b5e --- /dev/null +++ b/desktop/resources/particles/step @@ -0,0 +1,152 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 100.0 +lowMax: 100.0 +- Count - +min: 0 +max: 100 +- Emission - +lowMin: 2.0 +lowMax: 2.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Life - +lowMin: 500.0 +lowMax: 500.0 +highMin: 1000.0 +highMax: 5500.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: 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: 1.0 +lowMax: 1.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 10.0 +lowMax: 10.0 +highMin: 20.0 +highMax: 25.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.94520545 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 0.0 +highMax: 180.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: true +lowMin: 10.0 +lowMax: 10.0 +highMin: -30.0 +highMax: -30.0 +relative: false +scalingCount: 3 +scaling0: 0.0 +scaling1: 0.79591835 +scaling2: 1.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.24657534 +timeline2: 0.9589041 +- Tint - +colorsCount: 3 +colors0: 0.8 +colors1: 0.6392157 +colors2: 0.37254903 +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.3508772 +scaling2: 0.0 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.001 +timeline2: 0.7671233 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/robovm.ini b/desktop/resources/robovm.ini new file mode 100644 index 00000000..ad648ee3 --- /dev/null +++ b/desktop/resources/robovm.ini @@ -0,0 +1,2 @@ +ms128M +mx512M diff --git a/desktop/resources/safe-sound.mp3 b/desktop/resources/safe-sound.mp3 new file mode 100644 index 00000000..55a6fb0e Binary files /dev/null and b/desktop/resources/safe-sound.mp3 differ diff --git a/desktop/resources/safe-sound.ogg.mp3 b/desktop/resources/safe-sound.ogg.mp3 new file mode 100644 index 00000000..55a6fb0e Binary files /dev/null and b/desktop/resources/safe-sound.ogg.mp3 differ diff --git a/desktop/resources/scratch.mp3 b/desktop/resources/scratch.mp3 new file mode 100644 index 00000000..cca952f4 Binary files /dev/null and b/desktop/resources/scratch.mp3 differ diff --git a/desktop/resources/scratch.ogg.mp3 b/desktop/resources/scratch.ogg.mp3 new file mode 100644 index 00000000..cca952f4 Binary files /dev/null and b/desktop/resources/scratch.ogg.mp3 differ diff --git a/desktop/resources/secret-hideout.mp3 b/desktop/resources/secret-hideout.mp3 deleted file mode 100644 index 51228a7d..00000000 Binary files a/desktop/resources/secret-hideout.mp3 and /dev/null differ diff --git a/desktop/resources/space/Blergh b/desktop/resources/space/Blergh deleted file mode 100644 index 68028d33..00000000 Binary files a/desktop/resources/space/Blergh and /dev/null differ diff --git a/desktop/resources/space/blergh-appear.png b/desktop/resources/space/blergh-appear.png deleted file mode 100644 index cfea7d3d..00000000 Binary files a/desktop/resources/space/blergh-appear.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow.png b/desktop/resources/space/blergh-grow.png deleted file mode 100644 index fdd59406..00000000 Binary files a/desktop/resources/space/blergh-grow.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow2.png b/desktop/resources/space/blergh-grow2.png deleted file mode 100644 index 0a423e49..00000000 Binary files a/desktop/resources/space/blergh-grow2.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow3.png b/desktop/resources/space/blergh-grow3.png deleted file mode 100644 index 9633288b..00000000 Binary files a/desktop/resources/space/blergh-grow3.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow4.png b/desktop/resources/space/blergh-grow4.png deleted file mode 100644 index 6b0fa411..00000000 Binary files a/desktop/resources/space/blergh-grow4.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow5.png b/desktop/resources/space/blergh-grow5.png deleted file mode 100644 index 3b3ddf80..00000000 Binary files a/desktop/resources/space/blergh-grow5.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow6.png b/desktop/resources/space/blergh-grow6.png deleted file mode 100644 index 4915c181..00000000 Binary files a/desktop/resources/space/blergh-grow6.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow7.png b/desktop/resources/space/blergh-grow7.png deleted file mode 100644 index 6ffda81b..00000000 Binary files a/desktop/resources/space/blergh-grow7.png and /dev/null differ diff --git a/desktop/resources/space/blergh-grow8.png b/desktop/resources/space/blergh-grow8.png deleted file mode 100644 index 267aedf5..00000000 Binary files a/desktop/resources/space/blergh-grow8.png and /dev/null differ diff --git a/desktop/resources/space/blergh-stand copy.png b/desktop/resources/space/blergh-stand copy.png deleted file mode 100644 index a344657c..00000000 Binary files a/desktop/resources/space/blergh-stand copy.png and /dev/null differ diff --git a/desktop/resources/space/blergh-swing.png b/desktop/resources/space/blergh-swing.png deleted file mode 100644 index 380439ed..00000000 Binary files a/desktop/resources/space/blergh-swing.png and /dev/null differ diff --git a/desktop/resources/space/bloodclot-explode.png b/desktop/resources/space/bloodclot-explode.png deleted file mode 100644 index 1140c092..00000000 Binary files a/desktop/resources/space/bloodclot-explode.png and /dev/null differ diff --git a/desktop/resources/space/bloodclot-head-talk.png b/desktop/resources/space/bloodclot-head-talk.png deleted file mode 100644 index 794210a2..00000000 Binary files a/desktop/resources/space/bloodclot-head-talk.png and /dev/null differ diff --git a/desktop/resources/space/jump.ogg.mp3 b/desktop/resources/space/jump.ogg.mp3 new file mode 100644 index 00000000..4bc5742c Binary files /dev/null and b/desktop/resources/space/jump.ogg.mp3 differ diff --git a/desktop/resources/space/shock.ogg.mp3 b/desktop/resources/space/shock.ogg.mp3 new file mode 100644 index 00000000..488d6081 Binary files /dev/null and b/desktop/resources/space/shock.ogg.mp3 differ diff --git a/desktop/resources/space/swingsword.ogg.mp3 b/desktop/resources/space/swingsword.ogg.mp3 new file mode 100644 index 00000000..12ce2b55 Binary files /dev/null and b/desktop/resources/space/swingsword.ogg.mp3 differ diff --git a/desktop/resources/town-music-2.mp3 b/desktop/resources/town-music-2.mp3 deleted file mode 100644 index 4831e102..00000000 Binary files a/desktop/resources/town-music-2.mp3 and /dev/null differ diff --git a/desktop/resources/town-music.mp3 b/desktop/resources/town-music.mp3 deleted file mode 100644 index 872f7a27..00000000 Binary files a/desktop/resources/town-music.mp3 and /dev/null differ diff --git a/desktop/resources/wizard/experiment.png b/desktop/resources/wizard/experiment.png deleted file mode 100644 index fdd169b4..00000000 Binary files a/desktop/resources/wizard/experiment.png and /dev/null differ diff --git a/desktop/settings.edn b/desktop/settings.edn index e6723941..6be0291c 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 75.0, :music-volume 30.0} \ No newline at end of file diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 7d259362..d9cd2084 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -435,13 +435,15 @@ (continue [this screen entities] entities) - (done? [this screen entities] (not (nil? @selected-index))) + (done? [this screen entities] + (not (nil? @selected-index))) (terminate [this screen entities] - (screen! @(resolve 'advent.screens.scene/scene) :on-reactivate) - entities) + (-> entities + (assoc-in [:state :active?] true) + (assoc-in [:cursor :override] nil))) (skip-type [this screen entities] - :skip)) + :none)) (let [zipper (nth-child zipper (inc (* 2 @selected-index))) node (zip/node zipper)] @@ -511,27 +513,29 @@ (skip-type [this screen entities] :none))) -(defn play-sound [entities sound-file] - (let [m (music sound-file)] - (run-action entities - (begin [this screen entities] - (music! m :play) - entities) +(defn play-sound + ([entities sound-file vol] + (let [s (sound sound-file)] + (run-action entities + (begin [this screen entities] + (utils/play-sound! screen entities s (constantly vol))) - (continue [this screen entities] entities) + (continue [this screen entities] entities) - (done? [this screen entities] - (not (music! m :is-playing))) + (done? [this screen entities] + (not (seq (filter + #(= s (:sound %)) + (get-in entities [:current-sounds :value]))))) - (terminate [this screen entities] - entities) - (skip-type [this screen entities] - :none)))) + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))))) (defn give [entities item] (run-action entities (begin [this screen entities] - (sound! (sound "pickup.mp3") :play (utils/current-sound-volume)) + #_(sound! (utils/load-sound "pickup.mp3") :play (utils/current-sound-volume)) (-> entities (update-in [:state :inventory] #(conj % item)) @@ -647,11 +651,13 @@ :none)) (run-action entities (begin [this screen entities] + (utils/stop-all-sounds! entities) (let [ego (get-in entities [:room :entities :ego]) old-music (get-music (get-in entities [:room :music]) (get-in entities [:state :time])) entities (as-> entities e (assoc-in e [:room] (get-in entities [:rooms new-background])) (assoc-in e [:room :entities :ego] ego) + (assoc-in e [:current-sounds :value] []) (if between (between screen e) e) (assoc-in e [:state :last-room] new-background) (assoc-in e [:tweens :fade-in] (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 time)) @@ -718,12 +724,12 @@ (-> entities (update-in [:room :entities :ego] #(actions/start-animation screen % :glad) ) (assoc-in [:tweens :jump] (tween/tween :jump screen [:room :entities :ego :y] current-y to-y 0.3 :ease tween/ease-out-cubic)) - (assoc-in [:room :entities :glad-jump] (doto (assoc (particle-effect "ego/glad-jump") + (assoc-in [:room :entities :glad-jump] (doto (assoc (particle-effect "particles/glad-jump") :x (get-in entities [:room :entities :ego :x]) :y (get-in entities [:room :entities :ego :y]) :baseline (get-in entities [:room :entities :ego :baseline])) (particle-effect! :reset) (particle-effect! :start))) - (assoc-in [:room :entities :cloud] (assoc (texture "space/cloud.png") + (assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png") :x (get-in entities [:room :entities :ego :x]) :y (get-in entities [:room :entities :ego :y]) :origin-x 7 @@ -782,11 +788,87 @@ :none))) + + + +(defn fade-in-georgia [entities] + (actions/run-action entities + (begin [this screen entities] + (particle-effect! (get-in entities [:room :entities :georgia-cloud]) :reset) + (particle-effect! (get-in entities [:room :entities :georgia-cloud]) :start) + (-> entities + (assoc-in [:room :entities :georgia-face :x] (- (get-in entities [:room :entities :ego :x]) 30)) + (assoc-in [:room :entities :georgia-face :y] (+ (get-in entities [:room :entities :ego :y]) 30)) + + (assoc-in [:room :entities :georgia-cloud :x] (- (get-in entities [:room :entities :ego :x]) 30)) + (assoc-in [:room :entities :georgia-cloud :y] (+ (get-in entities [:room :entities :ego :y]) 30)) + (assoc-in [:tweens :fade-georgia] + (tween/tween :fade-georgia screen [:room :entities :georgia-face :opacity] 0.0 1.0 1.0 :ease tween/ease-in-cubic)))) + + (continue [this screen entities] + (assoc-in entities [:room :entities :georgia-cloud :opacity] (get-in entities [:room :entities :georgia-face :opacity]))) + + (done? [this screen entities] + (nil? (get-in entities [:tweens :fade-georgia]))) + + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))) + +(defn fade-out-georgia [entities] + (actions/run-action entities + (begin [this screen entities] + (particle-effect! (get-in entities [:room :entities :georgia-cloud]) :allow-completion) + (-> entities + (assoc-in [:tweens :fade-georgia] + (tween/tween :fade-georgia screen [:room :entities :georgia-face :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic)))) + + (continue [this screen entities] + entities) + + (done? [this screen entities] + (nil? (get-in entities [:tweens :fade-georgia]))) + + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))) + +(defn georgia-say [entities msg] + (fade-in-georgia entities) + (actions/talk entities :georgia-face msg) + (fade-out-georgia entities) + (transition-music entities nil :duration 1.0)) + +(defn wait-for-animation [entities target anim] + (actions/run-action entities + (begin [this screen entities] + entities) + + (continue [this screen entities] + entities) + + (done? [this screen entities] + (animation! (actions/find-animation (get-in entities [:room :entities target]) anim) + :is-animation-finished + (- (:total-time screen) (get-in entities [:room :entities target :anim-start])))) + + (terminate [this screen entities] + entities) + (skip-type [this screen entities] + :none))) + (defn in-love [entities] (let [seen-love (get-in @entities [:state :has-seen-love?])] (when (or (not seen-love) (< (rand-int 10) 3)) + (transition-music entities :love :duration 1.0) - (play-animation entities :ego :love) - (actions/update-state entities (fn [s] (assoc s :has-seen-love? true))) + (begin-animation entities :georgia-face :love) + (fade-in-georgia entities) + (update-state entities (fn [s] (assoc s :has-seen-love? true))) + (wait-for-animation entities :georgia-face :love) + (fade-out-georgia entities) + (do-stop entities :georgia-face) (transition-music entities nil :duration 1.0)))) diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj index c09158fd..1c36a82d 100644 --- a/desktop/src-common/advent/core.clj +++ b/desktop/src-common/advent/core.clj @@ -24,8 +24,15 @@ (defgame advent :on-create (fn [this] - (on-gl (set-screen! this title/title-screen)))) + (set-screen! this title/title-screen))) (defn reload [] (on-gl (set-screen! advent title/title-screen))) + +(set-screen-wrapper! (fn [screen screen-fn] + (try (screen-fn) + (catch Exception e + (.log Gdx/app "ERROR" (with-out-str (.printStackTrace e))) + (.printStackTrace e) + (set-screen! advent title/title-screen))))) diff --git a/desktop/src-common/advent/pathfind.clj b/desktop/src-common/advent/pathfind.clj index 0888ebf9..a8e17ac3 100644 --- a/desktop/src-common/advent/pathfind.clj +++ b/desktop/src-common/advent/pathfind.clj @@ -122,11 +122,16 @@ (defn map-from-resource [filename] (let [pm (pixmap filename) black (color 0 0 0 255) - painful (color 255 0 0 255)] - (vec (take-nth scale (for [x (range (pixmap! pm :get-width))] - (vec (take-nth scale (for [y (reverse (range (pixmap! pm :get-height))) - :let [current-color (color (pixmap! pm :get-pixel x y))]] - (cond - (color! current-color :equals black) 0 - (color! current-color :equals painful) 2 - :else 1))))))))) + painful (color 255 0 0 255) + result (transient []) + scale (long scale) + height (long (pixmap! pm :get-height))] + (doseq [^long x (range (/ (pixmap! pm :get-width) scale)) + ^long y (range (/ height scale)) + :let [ + current-color (color (pixmap! pm :get-pixel (unchecked-multiply scale x) (unchecked-subtract height (unchecked-multiply scale y))))]] + (conj! result (cond + (color! current-color :equals black) 0 + (color! current-color :equals painful) 2 + :else 1))) + (partition (/ (pixmap! pm :get-height) scale) (persistent! result) ))) diff --git a/desktop/src-common/advent/saves.clj b/desktop/src-common/advent/saves.clj new file mode 100644 index 00000000..53c27136 --- /dev/null +++ b/desktop/src-common/advent/saves.clj @@ -0,0 +1,14 @@ +(ns advent.saves) + +(def saves + {:autosave "Autosave" + :beginning "Our tale's beginning" + :after-dream "The dream is over" + :after-cat "The Cat Whisperer" + :after-strength "Pro (arm) Wrestler" + :after-wisdom "The Wise Guy" + :after-jail "Prisoner On The Loose" + :in-jail "In The Slammer"}) + +(def name->save + (into {} (map vector (vals saves) (keys saves)))) diff --git a/desktop/src-common/advent/screens/credits.clj b/desktop/src-common/advent/screens/credits.clj index f83ba5c7..f8ad15ed 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -94,14 +94,14 @@ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) (let [font (bitmap-font "ego/font.fnt" )] {:font font - :fade (assoc (texture "black.png") + :fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.0 :origin-x 0 :origin-y 0) :remaining-messages credit-messages - :the-end (assoc (texture "the-end.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) + :the-end (assoc (utils/get-texture "the-end.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 5.0 :ease tween/ease-out-cubic)}})) diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 02d8c56c..548efae1 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -50,7 +50,7 @@ :on-talk (fn [{:keys [create-talk target-id color text x y scale scene-viewport] :as screen} [entities]] (let [font (bitmap-font "ego/font.fnt" ) - p (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + p (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) _ (nine-patch! p :set-padding 25 25 5 15) bg (drawable :nine-patch (:object p)) @@ -122,7 +122,7 @@ :choices [] :last-pos [0 0] :font font - :np (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + :np (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) :x 5 :y 5 :width 1270)}})) :on-render diff --git a/desktop/src-common/advent/screens/fade.clj b/desktop/src-common/advent/screens/fade.clj index ed5c0c8d..2345107e 100644 --- a/desktop/src-common/advent/screens/fade.clj +++ b/desktop/src-common/advent/screens/fade.clj @@ -19,9 +19,11 @@ (fn [screen entities] (utils/setup-viewport screen 320 240) - {:fade (assoc (texture "black.png") - :scale-x 80 - :scale-y 80 + {:fade (assoc (utils/get-texture "black.png") + :scale-x 100 + :scale-y 100 + :x -1 + :y -1 :opacity 0.0 :origin-x 0 :origin-y 0)}) diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index 98908048..7ff71f3b 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -22,6 +22,12 @@ (assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:opacity] 1.0 0.0 0.2 :ease tween/ease-out-cubic :finish #(assoc % :shown? false))))) +(defn mouse-interact [screen [entities]] + (let [[x y] (utils/unproject screen) + selected-entity (first (filter #((:box %) x y) (:items entities)))] + (if selected-entity + (assoc entities :highlighted-item (:item selected-entity)) + (assoc entities :highlighted-item nil)))) (defscreen inventory-screen :on-show @@ -30,8 +36,8 @@ (let [highlighted-text (assoc (label "Hello" (style :label (utils/get-font "ego/font.fnt") (color :white))) :x 0 :y 850 :width 1280 )] (label! highlighted-text :set-alignment Align/center) - {:overlay (assoc (texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) - :fade (assoc (texture "black.png") + {:overlay (assoc (utils/get-texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) + :fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.7 @@ -97,12 +103,8 @@ :box (zone/box (- offset-x padding) (- offset-y padding) (+ offset-x item-width padding padding) (+ offset-y item-width padding padding))))) (assoc-in [:tweens :fade-in] (tween/tween :fade-in screen [:opacity] 0.0 1.0 0.2 :ease tween/ease-out-cubic))))) - :on-mouse-moved (fn [screen [entities]] - (let [[x y] (utils/unproject screen) - selected-entity (first (filter #((:box %) x y) (:items entities)))] - (if selected-entity - (assoc entities :highlighted-item (:item selected-entity)) - (assoc entities :highlighted-item nil)))) + :on-mouse-moved mouse-interact + :on-touch-down mouse-interact :on-touch-up (fn [screen [entities]] (when (and (:shown? entities) (= (button-code :left) (:button screen)) (= 1.0 (:opacity entities))) diff --git a/desktop/src-common/advent/screens/rooms/.#behind_house.clj b/desktop/src-common/advent/screens/rooms/.#behind_house.clj deleted file mode 120000 index db1830a8..00000000 --- a/desktop/src-common/advent/screens/rooms/.#behind_house.clj +++ /dev/null @@ -1 +0,0 @@ -brycecovert@brometheus.local.31618 \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj index fe8665d2..cc17f80c 100644 --- a/desktop/src-common/advent/screens/rooms/behind_house.clj +++ b/desktop/src-common/advent/screens/rooms/behind_house.clj @@ -46,17 +46,17 @@ (actions/do-dialogue entities :ego "I can see Gandarf moving around in the corner of the room." :ego "It's hard to make out from this angle.")))}} - :layers {:day [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) - (assoc (texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) - (assoc (texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)] - :night [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) - (assoc (texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) - (assoc (texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]} - :entities {:stick (assoc (texture "behindhouse/stick.png") + :layers {:day [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) + (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) + (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)] + :night [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240) + (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5) + (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]} + :entities {:stick (assoc (utils/get-texture "behindhouse/stick.png") :x 26 :y 80 :baseline 160 :script (actions/get-script entities (actions/walk-to entities :ego [50 80]) @@ -64,7 +64,7 @@ (actions/remove-entity entities :stick) (actions/give entities :stick) (actions/talk entities :ego "This stick might be useful."))) - :peeling (assoc (texture "behindhouse/house-cover.png") + :peeling (assoc (utils/get-texture "behindhouse/house-cover.png") :x 60 :y 92 :baseline 148 :script (actions/get-script entities (cond (= :night (get-in @entities [:state :time])) @@ -75,7 +75,7 @@ (actions/play-animation entities :ego :start-squat :stop? false) (actions/talk entities :ego "I can see Gandarf, the wizard inside." :animate? false :stop? false) (actions/talk entities :ego "It looks like he's opening his Magi-safe." :animate? false :stop? false) - (actions/play-sound entities "safe-sound.ogg") + (actions/play-sound entities "safe-sound.ogg" 0.1) (actions/talk entities :ego "So that's the code to his safe..." :animate? false :stop? false) (actions/play-animation entities :ego :end-squat) (actions/talk entities :ego "A lot of good it'll do me to know his password while he's still there.")) diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index a5d970ee..5027fc04 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -238,9 +238,9 @@ (defn make [screen] - (let [throw-walkie (utils/make-anim "castle-gate/throw-walkie.png" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)])) - walkie-visible (animation 1.0 [(last (utils/split-texture "castle-gate/throw-walkie.png" [205 136] (range 9)))]) - walkie-invisible (animation 1.0 [(first (utils/split-texture "castle-gate/throw-walkie.png" [205 136] (range 9)))])] + (let [throw-walkie (utils/make-anim-seq "castle-gate/throw-walkie" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)])) + walkie-visible (animation 1.0 [(utils/get-texture "castle-gate/throw-walkie-9.png")]) + walkie-invisible (animation 1.0 [(utils/get-texture "castle-gate/throw-walkie-1.png")])] (rooms/make :music {:day :town-2 :night :night} :timers {:taunt [1.0 6.0 flip-coin]} :interactions {:right-dir {:box [280 40 320 83] @@ -271,10 +271,10 @@ (Thread/sleep 2000) (actions/walk-straight-to entities :ego [285 71]))}}} - :layers {:day [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] - :night [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} + :layers {:day [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] + :night [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} :entities {:frankie (make-frankie screen) :goon-1 (make-goon-1 screen) :goon-2 (make-goon-2 screen) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index f717155b..ca1a0cde 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -1,6 +1,7 @@ (ns advent.screens.rooms.cat-tree (:require [advent.screens.rooms :as rooms] [advent.actions :as actions] + [advent.saves :as saves] [advent.screens.items :as items] [advent.screens.rooms.common :as common] [advent.utils :as utils] @@ -208,12 +209,12 @@ (actions/give entities :feather)) (defn make [screen] - (let [cat-stand-sheet (texture! (texture "cat-tree/cat-stand.png") :split 22 10) + (let [cat-stand-sheet (texture! (utils/get-texture "cat-tree/cat-stand.png") :split 22 10) cat-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])] (aget cat-stand-sheet 0 i))) - cat-walk (animation 0.2 [(texture "cat-tree/pounce.png")]) + cat-walk (animation 0.2 [(utils/get-texture "cat-tree/pounce.png")]) destroy-ladder (utils/make-anim "cat-tree/destroy-ladder.png" [29 38] 0.1 (range 18)) - ladder-entity (assoc (texture "inside-cafeteria/ladder.png") :x 130 :y 60 :baseline 162 + ladder-entity (assoc (utils/get-texture "inside-cafeteria/ladder.png") :x 130 :y 60 :baseline 162 :origin-x 0 :destroy-ladder destroy-ladder) grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) @@ -221,11 +222,11 @@ grandma-squat-2 (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [5 5 4 3]) grandma-talk (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 2 0 2 0 2 0 2 0 2 0 1 0 2 0 0]) grandma-kiss (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 8 9 10 9 10 9 10 9 8 0]) - grandma-cry (utils/make-anim "cat-tree/grandma-cry.png" [58 40] 0.15 (flatten [(range 20) 0 0 0 0 0 0 0 0 0])) + grandma-cry (utils/make-anim-seq "cat-tree/grandma-cry" [58 40] 0.15 (flatten [(range 20) 0 0 0 0 0 0 0 0 0])) owl-stand (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [0 0 0 0 0 0 0 2]) owl-talk (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [1 0 1 0 1 0 0 0 2 0]) owl-puke (utils/make-anim "cat-tree/owl.png" [19 28] 0.10 [0 0 2 2 3 2 2 3 3 2 3 3 3 4 5 6 7 4 4 3 3 2 2 2 2 2]) - puke (particle-effect "cat-tree/puke")] + puke (particle-effect "particles/puke")] (rooms/make :music {:day :town-2 :night :night} :ladder ladder-entity :blank (rooms/make-entity :blank @@ -290,14 +291,14 @@ (actions/walk-to entities :ego [165 45] :face :left) (actions/do-dialogue entities :grandma "No thank you, handsome."))) }} - :layers {:day [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) - (assoc (texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) - (assoc (texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)] - :night [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) - (assoc (texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) - (assoc (texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]} + :layers {:day [(assoc (utils/get-texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) + (assoc (utils/get-texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) + (assoc (utils/get-texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)] + :night [(assoc (utils/get-texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) + (assoc (utils/get-texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240) + (assoc (utils/get-texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]} :entities { :outside-particles (common/make-outside-particles) :cat (actions/start-animation screen @@ -313,7 +314,7 @@ (if (get-in @entities [:room :entities :ladder]) (do (actions/talk entities :ego "I think he's going for it!") (actions/play-animation entities :ego :cat-toy-first-half :stop? false) - (sound! (sound "cat-tree/cat.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "cat-tree/cat.ogg") :play (utils/current-sound-volume)) (actions/walk-straight-to entities :cat [138 40] :update-baseline? false :speed 3) (actions/play-animation entities :ego :cat-toy-last-half) (actions/play-animation entities :grandma :squat-1 :stop? false) @@ -328,7 +329,7 @@ :grandma "Come here young man.") (actions/walk-straight-to entities :ego [133 35]) (actions/talk entities :grandma "For your impressive display of courage and bravery, I give you this. ") - (sound! (sound "cat-tree/kiss.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "cat-tree/kiss.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :grandma :kiss) (actions/play-animation entities :ego :get-sick :stop? false) (actions/walk-straight-to entities :ego [165 45]) @@ -337,7 +338,8 @@ :ego "What's this?") (actions/give entities :kiss) (actions/do-dialogue entities :ego "A kiss for an inventory item?" - :ego "Sounds like the game designer was running out of good ideas.")) + :ego "Sounds like the game designer was running out of good ideas.") + (utils/snapshot-state @entities :after-cat)) (actions/talk entities :ego "I guess I'm too far away."))) :default (actions/get-script entities (actions/talk entities :ego "Kitty seems disinterested in it."))}) cat-stand) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 353df08a..cbfd6865 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -14,7 +14,7 @@ [play-clj.g2d :refer :all]) (:import [com.badlogic.gdx.graphics Color])) -(defn go-to-jail [entities] +(defn go-to-jail [entities & [time]] (actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key :ladder} (:inventory %)) (:chest-contents %)))) (actions/update-state entities #(assoc % :inventory [])) @@ -22,11 +22,12 @@ (actions/transition-background entities :inside-jail [130 85] :between (fn [s e] (-> e (assoc-in [:state :time] :night) - (update-in [:room :entities :ego] #(actions/start-animation s % :crawl-stand))))) + (update-in [:room :entities :ego] #(actions/start-animation s % :crawl-stand)))) + :time time) (actions/play-animation entities :ego :standup)) (defn make-wizard [screen wizard-spec] - (let [wizard-sheet (texture! (texture "wizard/talk.png") :split 20 46) + (let [wizard-sheet (texture! (utils/get-texture "wizard/talk.png") :split 20 46) wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])] (aget wizard-sheet 0 i))) wizard-talk-angry (utils/make-anim "wizard/talk-angry.png" [20 50] 0.2 [0 2 0 2 1 2 0 3 0 2 0 1 0 2]) @@ -428,7 +429,7 @@ (defn make-outside-particles [] - (doto (assoc (particle-effect "outside-particles") :x 160 :y 120 + (doto (assoc (particle-effect "particles/outside-particles") :x 160 :y 120 :baseline 238) (particle-effect! :set-position 160 120))) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 9d700f35..c8778d25 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -7,6 +7,7 @@ [advent.screens.items :as items] [advent.tween :as tween] [advent.utils :as utils] + [advent.saves :as saves] [clojure.zip :as zip] [clojure.set :as set] [clojure.string :as str] @@ -178,9 +179,10 @@ "Show yourself!" {:run #(actions/talk entities :ego %)}]}) (actions/talk entities :fairy-godfather "Taaaaaaaaaaaaaaaaaa-") - (sound! (sound "dream/appear.ogg") :play (utils/current-sound-volume)) + (particle-effect! (get-in @entities [:room :entities :magic]) :reset) (particle-effect! (get-in @entities [:room :entities :magic]) :start) + (actions/begin-animation entities :fairy-godfather :magic) (fade-in entities) (actions/transition-music entities :dream :duration 0.25 ) (actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!") @@ -197,7 +199,8 @@ :fairy-godfather "Behold!") (particle-effect! (get-in @entities [:room :entities :magic]) :reset) (particle-effect! (get-in @entities [:room :entities :magic]) :start) - (sound! (sound "dream/appear.ogg") :play (utils/current-sound-volume)) + (actions/play-animation entities :fairy-godfather :magic) + (fade-in-tools entities) (Thread/sleep 2500) @@ -240,7 +243,8 @@ :fairy-godfather "Choose the broom or shovel, and cast it into the pit of fate." :ego "But..." :fairy-godfather "No buts.") - (actions/update-state entities #(assoc % :seen-intro? true))) + (utils/snapshot-state @entities :beginning) + (actions/update-state entities #(assoc % :seen-intro? true :time :day))) (defn swing [entities] (actions/run-action entities @@ -338,8 +342,9 @@ (defn make [screen] (let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) - fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])] - (rooms/make :music :dream + fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6]) + fairy-godfather-magic-anim (utils/make-anim "dream/fairy-godfather-magic.png" [100 77] 0.15 [0 1 2 3 4 4 4 4 3 2 1 0])] + (rooms/make :music {:intro :wind :day :dream} :interactions {:pit {:box [54 0 219 36] :script (actions/get-script entities (actions/walk-to entities :ego [154 41]) @@ -367,19 +372,18 @@ :ego "It seems like misery!" :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?"))}}} :timers {:return [15.0 15.0 return-from-island]} - :layers [(assoc (texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) - (assoc (texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) - (assoc (texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) - (assoc (texture "dream/background.png") :x 0 :y 0 :baseline 2) - (assoc (texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) - (assoc (texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) - (assoc (texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] - :wind-sound {:sound (sound "dream/wind.ogg") - :id nil} - :entities {:magic (assoc (particle-effect "dream/magic") :x 160 :y 80 :baseline 240) + :layers [(assoc (utils/get-texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/get-texture "dream/island.png") :x 180 :y 180 :baseline 0 :parallax 0.3 :scale-x 1.1 :scale-y 1.1) + (assoc (utils/get-texture "dream/cliff.png") :x 50 :y 133 :baseline 1 :parallax 0.6 :scale-x 1.2 :scale-y 1.2) + (assoc (utils/get-texture "dream/background.png") :x 0 :y 0 :baseline 2) + (assoc (utils/get-texture "dream/corner-l.png") :x -10 :y -10 :baseline 240 :parallax 2.0 ) + (assoc (utils/get-texture "dream/corner-r.png") :x (- 320 80) :y -20 :baseline 240 :parallax 3.2) + (assoc (utils/get-texture "dream/pedestals.png") :x 0 :y 0 :baseline 139)] + + :entities {:magic (assoc (particle-effect "particles/dream-magic") :x 160 :y 80 :baseline 240) - :clouds (assoc (particle-effect "dream/cloudy2") :x 160 :y 120 :baseline 241) - :case (assoc (texture "dream/case.png") + :clouds (assoc (particle-effect "particles/cloudy2") :x 160 :y 120 :baseline 241) + :case (assoc (utils/get-texture "dream/case.png") :x 144 :y 122 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities)) @@ -416,11 +420,11 @@ (do (actions/walk-to entities :ego [148 76] :face :right) (actions/do-dialogue entities :fairy-godfather "What are you doing?" :ego "Erm... Nothing."))))}) - :sword (assoc (texture "dream/sword.png") + :sword (assoc (utils/get-texture "dream/sword.png") :x 144 :y 122 :baseline 139) - :explode (assoc (particle-effect "dream/explode") :x 150 :y 138 :baseline 240) - :broom (assoc (texture "dream/broom.png") :x 286 :y 122 + :explode (assoc (particle-effect "particles/explode") :x 150 :y 138 :baseline 240) + :broom (assoc (utils/get-texture "dream/broom.png") :x 286 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[286 122] [286 128]]) true) :update-fn (partial utils/update-path-location 0.30) @@ -435,7 +439,7 @@ (actions/give entities :broom)) (read-broom-plaque entities)))) - :shovel (assoc (texture "dream/shovel.png") :x 33 :y 122 + :shovel (assoc (utils/get-texture "dream/shovel.png") :x 33 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[22 122] [22 128]]) true) :update-fn (partial utils/update-path-location 0.33) @@ -450,10 +454,10 @@ (actions/give entities :shovel)) (read-shovel-plaque entities)))) - :sign (assoc (texture "dream/sign.png") :x 229 :y 33 :baseline 207) - :plaque-1 (assoc (texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :script (actions/get-script entities (read-shovel-plaque entities))) - :plaque-2 (assoc (texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities))) - :plaque-3 (assoc (texture "dream/plaque3.png") :x 283 :y 98 :baseline 139 :script (actions/get-script entities (read-broom-plaque entities))) + :sign (assoc (utils/get-texture "dream/sign.png") :x 229 :y 33 :baseline 207) + :plaque-1 (assoc (utils/get-texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :script (actions/get-script entities (read-shovel-plaque entities))) + :plaque-2 (assoc (utils/get-texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities))) + :plaque-3 (assoc (utils/get-texture "dream/plaque3.png") :x 283 :y 98 :baseline 139 :script (actions/get-script entities (read-broom-plaque entities))) :outside-particles (common/make-outside-particles) :fairy-godfather (assoc (animation->texture screen fairy-godfather-anim) :x 200 :y 130 @@ -464,12 +468,18 @@ :anim fairy-godfather-anim :anim-start 0 :path (catmull-rom-spline (map #(apply vector-2* %) [[200 130] [200 134]]) true) :scaled true + :magic-sound (utils/load-sound "dream/appear.ogg") + :anim-sound-frames {fairy-godfather-magic-anim {1 [:magic-sound 0.8]}} :left {:walk fairy-godfather-anim :talk fairy-godfather-talk-anim - :stand fairy-godfather-anim} + :stand fairy-godfather-anim + :magic fairy-godfather-magic-anim} :right {:walk (utils/flip fairy-godfather-anim) :stand (utils/flip fairy-godfather-anim) - :talk (utils/flip fairy-godfather-talk-anim)} + :talk (utils/flip fairy-godfather-talk-anim) + :magic fairy-godfather-magic-anim} + :anim-merges {fairy-godfather-magic-anim {:origin-x 59} + :default {:origin-x 31}} :facing :left :update-fn (fn [s es e] (if (:path e) (utils/update-path-location 0.2 s es e) @@ -486,10 +496,7 @@ (actions/play-animation entities :ego :sigh))})} :collision "dream/collision.png" :scale-fn (utils/scaler-fn-from-image "dream/scale.png" 0.1 1.3) - :stop-fn (fn [_ entities] - (when-let [wind-sound-id (get-in entities [:room :wind-sound :id])] - (sound! (get-in entities [:room :wind-sound :sound]) :stop wind-sound-id)) - entities) + :apply-state (fn [_ entities] (utils/fast-forward-particle (get-in entities [:room :entities :outside-particles])) @@ -502,6 +509,5 @@ entities) (if (actions/has-item? entities :shovel) (update-in entities [:room :entities] dissoc :shovel) - entities) - (assoc-in entities [:room :wind-sound :id] (sound! (get-in entities [:room :wind-sound :sound]) :loop 0.2)))) + entities))) :start-pos [140 55]))) diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index b583ec6d..36b61dc1 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -18,15 +18,15 @@ (defn make [screen] (let [ - peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36) + peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) peddler-stand (utils/flip (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] (aget peddler-sheet 0 i)))) warden-stand (utils/make-anim "ending-castle/warden-2.png" [21 41] 0.21 (flatten [(repeat 7 0) 1])) game-player-stand (utils/make-anim "ending-castle/game-player.png" [14 39] 0.2 (flatten [(repeat 5 0) 1] )) - ladder-guard-stand-1 (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) - ladder-guard-stand-2 (utils/flip (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")])) + ladder-guard-stand-1 (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-stand-2 (utils/flip (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")])) grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) cat-stand (utils/make-anim "cat-tree/cat-stand.png" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])) duke-stand (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 (flatten [(repeat 4 0) 1])) @@ -37,8 +37,8 @@ scaler (utils/scaler-fn-with-baseline 20 0.01 1.20)] (rooms/make :music :dream :interactions {} - :layers [(assoc (texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) - (assoc (texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] + :layers [(assoc (utils/get-texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) + (assoc (utils/get-texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] :apply-state (fn [screen e] (update-in e [:room :entities :ego] dissoc :talk-override )) :entities {:peddler (assoc (animation->texture screen peddler-stand) @@ -57,7 +57,7 @@ :update-fn (fn [screen entities gandarf] (assoc gandarf :y (or (get-in entities [:gandarf-cloud :y]) (:y gandarf))))) - :gandarf-cloud (doto (assoc (particle-effect "wizard/gandarf-cloud") :x 215 :y 400 + :gandarf-cloud (doto (assoc (particle-effect "particles/gandarf-cloud") :x 215 :y 400 :baseline 200) (particle-effect! :set-position 215 130)) :duke (assoc (animation->texture screen duke-stand) @@ -70,7 +70,7 @@ :reach duke-reach :reach-talk duke-reach-talk :knight duke-knight) - :magic-frog-particle (doto (assoc (particle-effect "inside-house/magic-frog") :x 140 :y 49 + :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 140 :y 49 :baseline 241) (particle-effect! :set-position 150 49)) :ladder-guard-1 (assoc (animation->texture screen ladder-guard-stand-1) diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index a6500df6..fe139020 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -57,8 +57,8 @@ (actions/talk entities who msg))) (defn make [screen] - (let [bloodclot-talk (utils/make-anim "held/bloodclot-head.png" [114 82] 0.1 [0 1 2 1 0 3 3 0 1 2 1 0 3 4 5 6 5 3 3 1 2 1 3 3 3 3 3 0 0 0 7 8 7]) - bloodclot-stand (utils/make-anim "held/bloodclot-head.png" [114 82] 0.1 (flatten [(repeat 15 0) 7 8 7]))] + (let [bloodclot-talk (utils/make-anim-seq "held/bloodclot-head" [114 82] 0.1 [0 1 2 1 0 3 3 0 1 2 1 0 3 4 5 6 5 3 3 1 2 1 3 3 3 3 3 0 0 0 7 8 7]) + bloodclot-stand (utils/make-anim-seq "held/bloodclot-head" [114 82] 0.1 (flatten [(repeat 15 0) 7 8 7]))] (rooms/make :music :fight :interactions {:bloodclot {:box [182 42 270 196] :script (actions/get-script entities @@ -78,8 +78,8 @@ (actions/talk entities :bloodclot-head "Don't make me laugh kid!"))) }} :timers {:taunt [5.0 1.0 add-second]} - :layers [(assoc (texture "held/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "held/hand.png") :x 0 :y 0 :baseline 240)] + :layers [(assoc (utils/get-texture "held/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "held/hand.png") :x 0 :y 0 :baseline 240)] :entities {:bloodclot-head (assoc (animation->texture screen bloodclot-stand) :x 211 :y 115 :baseline 240 :origin-x 57 :origin-y 0 diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 534e958b..3f693c72 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -163,7 +163,7 @@ (assoc-in [:room :entities :glow :opacity] 0.0)))) (defn make [screen] - (let [shopkeep-sheet (texture! (texture "inside-antique/shopkeep-talk.png") :split 18 21) + (let [shopkeep-sheet (texture! (utils/get-texture "inside-antique/shopkeep-talk.png") :split 18 21) shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0 1])] (aget shopkeep-sheet 0 i))) shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]] @@ -171,7 +171,7 @@ shopkeep-sigh (utils/make-anim "inside-antique/antique-sigh.png" [22 21] 0.12 (flatten [ (range 9) 0 0 ])) beard (utils/make-anim "inside-antique/beard.png" [26 52] 0.5 [0 1 0 2]) - teddy (assoc (texture "inside-antique/teddy.png") + teddy (assoc (utils/get-texture "inside-antique/teddy.png") :x 255 :y 95 :baseline 160 @@ -268,10 +268,10 @@ :ego "It's a tapestry of Rupert the Lion!" :ego "He's the town of Remington's mascot."))} } - :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-antique/desk.png") :x 0 :y 0 :baseline 113) + :layers [(assoc (utils/get-texture "inside-antique/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-antique/desk.png") :x 0 :y 0 :baseline 113) - (assoc (texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5) + (assoc (utils/get-texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5) ] :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 148 :y 122 :baseline 112 :stand shopkeep-stand @@ -299,23 +299,23 @@ (actions/get-script entities (actions/talk entities :shopkeep "No thanks, sonny.")))) :stand) - :glow (assoc (texture "inside-antique/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.3) - :closed-blinds (assoc (texture "inside-antique/closed-blinds.png") :x 0 :y 0 :baseline 0 :opacity 1.0) - :open-blinds (assoc (texture "inside-antique/open-blinds.png") :x 0 :y 0 :baseline 0 :opacity 0.0) - :darken (assoc (texture "inside-antique/darken.png") :x 0 :y 0 :baseline 321 :opacity 0.4 ) + :glow (assoc (utils/get-texture "inside-antique/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.3) + :closed-blinds (assoc (utils/get-texture "inside-antique/closed-blinds.png") :x 0 :y 0 :baseline 0 :opacity 1.0) + :open-blinds (assoc (utils/get-texture "inside-antique/open-blinds.png") :x 0 :y 0 :baseline 0 :opacity 0.0) + :darken (assoc (utils/get-texture "inside-antique/darken.png") :x 0 :y 0 :baseline 321 :opacity 0.4 ) :beard (assoc (animation->texture screen beard) :anim beard :anim-start 0 :x 70 :y 86 :baseline 120) - :smoke-particle (doto (assoc (particle-effect "inside-antique/smoke-particle") :x 162 :y 108 + :smoke-particle (doto (assoc (particle-effect "particles/smoke-particle") :x 162 :y 108 :baseline 240) (particle-effect! :set-position 162 108)) - :fire-particle (doto (assoc (particle-effect "inside-antique/fire-particle") :x 162 :y 108 + :fire-particle (doto (assoc (particle-effect "particles/fire-particle") :x 162 :y 108 :baseline 240) (particle-effect! :set-position 162 108)) - :bowl (assoc (texture "inside-antique/bowl.png") + :bowl (assoc (utils/get-texture "inside-antique/bowl.png") :x 165 :y 110 :baseline 125 @@ -335,7 +335,7 @@ (actions/talk entities :ego "I'll just try another one of these mints.")) (actions/play-animation entities :ego :reach) (actions/update-state entities (fn [s] (assoc s :mints-eaten (inc (s :mints-eaten))))) - (sound! (sound (str "inside-antique/fire-" (get-in @entities [:state :mints-eaten]) ".ogg")) :play (utils/current-sound-volume)) + (sound! (utils/load-sound (str "inside-antique/fire-" (get-in @entities [:state :mints-eaten]) ".ogg")) :play (utils/current-sound-volume)) (cond (= 2 (get-in @entities [:state :mints-eaten])) (do (particle-effect! (get-in @entities [:room :entities :smoke-particle]) :reset) @@ -352,7 +352,7 @@ :shopkeep "Pronto!")))))) :teddy teddy} :portrait (rooms/make-entity :portrait - (assoc (texture "inside-antique/portrait.png") + (assoc (utils/get-texture "inside-antique/portrait.png") :x 112 :y 114 :baseline 120 diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 33940e7a..ede3296a 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -1,5 +1,6 @@ (ns advent.screens.rooms.inside-cafeteria - (:require [advent.screens.rooms :as rooms] + (:require [advent.saves :as saves] + [advent.screens.rooms :as rooms] [advent.screens.items :as items] [advent.actions :as actions] [advent.utils :as utils] @@ -10,7 +11,7 @@ [play-clj.g2d :refer :all])) (defn make-fight-entity [] - (assoc (texture "inside-cafeteria/fight.png") + (assoc (utils/get-texture "inside-cafeteria/fight.png") :x 0 :y 0 :baseline 1000)) @@ -73,14 +74,15 @@ (if (actions/has-item? @entities :flask-1-strength) (do (actions/do-dialogue entities :ego "One sec.") - (sound! (sound "ego/potion.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "ego/potion.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :ego :grow :stop? false) (play-battle entities :win) (actions/do-dialogue entities :warriors "Congratulations young master. Thou art worthy in might." :warriors "Take thy servant's medal of strength.") (actions/give entities :medal) - (actions/glad entities)) + (actions/glad entities) + (utils/snapshot-state @entities :after-strength)) (do (play-battle entities :lose) (actions/do-dialogue entities @@ -165,13 +167,13 @@ {:run #(actions/respond entities % "Goodbye.")}]})) (defn make [screen] - (let [#_#_warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) + (let [#_#_warriors-stand-sheet (texture! (utils/get-texture "inside-cafeteria/warriors-stand.png") :split 66 126) #_#_warriors-stand (animation 0.2 (for [i [0 0 0 0 0 0 1 1 0 0 1 1 1 0 0 2 2 2 2 3 3 3 0 0 0 2 2 2 ]] (aget warriors-stand-sheet 0 i))) - #_#_ladder-guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + #_#_ladder-guard-sheet (texture! (utils/get-texture "inside-cafeteria/ladder-guard.png") :split 37 87) #_#_ladder-guard-stand (animation 0.1 [(aget ladder-guard-sheet 0 0)]) - ladder-guard-stand (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) - ladder-guard-talk (animation 0.1 [ (texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-stand (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-talk (animation 0.1 [ (utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) warriors-stand (utils/make-anim "inside-cafeteria/knights-stand.png" [49 80] 0.6 (take 100 (repeatedly #(rand-int 10)))) knight-a-stand (utils/make-anim "inside-cafeteria/knight-a.png" [70 85] 0.2 (flatten [(repeat 3 [(repeat 7 0) (repeat 7 1) (repeat 7 0) (repeat 7 2)]) [3 4 5 6 7 8 9]])) @@ -183,9 +185,7 @@ hands-fight-win (utils/make-anim "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten (concat base-fight [1 1 1 1 1 0 1 0 1 2 2 1 1 2 2 1 1 2 2 2 1 1 0 1 1 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3]))) - hands-fight-lose (utils/make-anim "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten (concat - base-fight - [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 4 4 4 0 0 1 1 0 0 4 4 4 5 5 5 5 4 4 4 5 5 5 5 4 4 4 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6])))] + hands-fight-lose (utils/make-anim "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 5 5 5 6 6 6 6 6 6]))] (rooms/make :music :town-1 :interactions {:right-dir {:box [272 45 320 120] @@ -196,10 +196,10 @@ (actions/walk-to entities :ego [126 80] :skip-type :end)) :cursor :right} } - :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-cafeteria/doorway.png") :x 306 :y 34 :baseline 202) - (assoc (texture "inside-cafeteria/glow.png") :y 0 :baseline 240 :additive? true :opacity 0.3) - (assoc (texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5) + :layers [(assoc (utils/get-texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-cafeteria/doorway.png") :x 306 :y 34 :baseline 202) + (assoc (utils/get-texture "inside-cafeteria/glow.png") :y 0 :baseline 240 :additive? true :opacity 0.3) + (assoc (utils/get-texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5) ] :entities {:warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 31 :y 36 :baseline 180 @@ -234,7 +234,7 @@ "Do not durst telleth a soul about that ladder!" "No thank you, young sire.")))) :stand) - :ladder (assoc (texture "inside-cafeteria/ladder.png") :x 205 :y 70 :baseline 170 + :ladder (assoc (utils/get-texture "inside-cafeteria/ladder.png") :x 205 :y 70 :baseline 170 :script (actions/get-script entities (actions/talk entities :ladder-guard "Do not toucheth, young sire.")))} :collision "inside-cafeteria/collision.png" diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index ed256d9e..1cbc875d 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -1,6 +1,7 @@ (ns advent.screens.rooms.inside-castle (:require [advent.screens.rooms :as rooms] [advent.actions :as actions] + [advent.saves :as saves] [advent.screens.rooms.common :as common] [advent.screens.items :as items] [advent.utils :as utils] @@ -45,16 +46,14 @@ (actions/has-obtained? entities :sword) 0.0 :else - (* (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0))) - (- 1.0 (get-in entities [:fade :opacity])) - (get-in entities [:volume :value] 1.0))))) + (* 0.2 (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0))))))) (defn bloodclot-appear [entities] (actions/run-action entities (begin [this screen entities] (particle-effect! (get-in entities [:room :entities :appear]) :reset) (particle-effect! (get-in entities [:room :entities :appear]) :start) - (sound! (sound "inside-house/disappear.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/disappear.ogg") :play (utils/current-sound-volume)) (-> entities (assoc-in [:tweens :bloodclot-head-appear] (tween/tween :bloodclot-head-appear screen [:room :entities :bloodclot-head :opacity] 0.0 1.0 1.0 :ease tween/ease-in-quadratic)) @@ -208,7 +207,7 @@ :game-player "But I'm not much of a hero." :game-player "The knights of Remington have muscles the size of tree trunks." :game-player "But me...") - (sound! (sound "inside-castle/flex.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-castle/flex.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :game-player :flex) (actions/do-dialogue entities :game-player "I'd never be able to prove my strength.")) :choices actions/previous-choices} @@ -336,13 +335,13 @@ add-monocle-if-necessary)) (defn make [screen] - (let [game-player-talk-sheet (texture! (texture "inside-castle/game-player-talk.png") :split 40 44) + (let [game-player-talk-sheet (texture! (utils/get-texture "inside-castle/game-player-talk.png") :split 40 44) game-player-talk-up (animation 0.15 (for [i [0 2 0 2 0 2 0 3 0 2 0 1 0 0 0 0 2 0 2 0 3 0 1 0 1 0 0 1 0 2 0 3 0]] (aget game-player-talk-sheet 0 i))) game-player-stand-up (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]] (aget game-player-talk-sheet 0 i))) - game-player-stand-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.1 [0 1 1 2 0 2 2 1 0 2 2 2 2 2 1 1 ]) + game-player-stand-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.1 (flatten (repeat 4 [0 1 1 2 0 2 2 1 0 2 2 2 2 2 1 1 ]))) game-player-talk-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.2 [2 3 2 2 3 2 3 2]) game-player-pause-from-work (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.15 [2 3 4 5 6 7]) game-player-get-to-work (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.15 (reverse [2 3 4 5 6 7])) @@ -427,19 +426,20 @@ :script (actions/get-script entities (actions/do-dialogue entities :ego "That's Georgia McGorgeous' house." - :ego "One day, when I'm a knight, I'll ask her to be my girlfriend.") + :ego "One day, when I'm a knight, she'll say...") + #_(actions/georgia-say entities "Kiss me, brave Sir Tick!") (actions/in-love entities))}} - :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) - (assoc (texture "inside-castle/bookstack.png") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)] - :night [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] - :sunrise [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]} - :blackout (assoc (texture "black.png") + :layers {:day [(assoc (utils/get-texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) + (assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) + (assoc (utils/get-texture "inside-castle/bookstack.png") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)] + :night [(assoc (utils/get-texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) + (assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] + :sunrise [(assoc (utils/get-texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) + (assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]} + :blackout (assoc (utils/get-texture "black.png") :x 0 :y 0 :width 320 :height 240 :opacity 0.8 @@ -456,7 +456,7 @@ entities (nil? magic) (do - (assoc-in entities [:room :entities :magic] (assoc (doto (particle-effect "inside-castle/magic") + (assoc-in entities [:room :entities :magic] (assoc (doto (particle-effect "particles/magic-sword") (particle-effect! :reset)) :x 25 :y 108 @@ -485,14 +485,14 @@ :door (assoc (animation->texture screen door) :x 160 :y 97 :baseline 99 :open door - :door-sound (sound "door.ogg") - :anim-sound-frames {door {1 [:door-sound 1.0]}} + :door-sound (utils/load-sound "door.ogg") + :anim-sound-frames {door {1 [:door-sound 0.1]}} ) - :sword (assoc (texture "inside-castle/sword.png") + :sword (assoc (utils/get-texture "inside-castle/sword.png") :x 22 :y 110 :baseline 95) - :walkie-talkie (assoc (texture "inside-castle/walkie-talkie.png") + :walkie-talkie (assoc (utils/get-texture "inside-castle/walkie-talkie.png") :x 257 :y 135 :baseline 0 @@ -519,14 +519,15 @@ (brian-get-to-work entities)) (actions/do-dialogue entities :ego "Can't you give me your trophy of wisdom?" :game-player "If you want my trophy, you'll have to help me with my riddles.")))) - :books (assoc (texture "inside-castle/books.png") + :books (assoc (utils/get-texture "inside-castle/books.png") :x 230 :y 30 :baseline 191 :script (actions/get-script entities (walk-to-player entities) (actions/talk entities :game-player "Don't touch my books!"))) - :game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 + :game-player (assoc (utils/get-texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 :talk-color (color 1.0 0.3 0.2 1.0) :script (actions/get-script entities (do-game-player-dialogue entities)) + :writing-sound (utils/load-sound "inside-castle/writing.ogg") :facing :left :scripts #(condp = % :wool (actions/get-script entities @@ -575,7 +576,8 @@ (actions/give entities :trophy) (actions/remove-entity entities :trophy) (actions/glad entities) - (actions/talk entities :ego "Thanks!")) + (actions/talk entities :ego "Thanks!") + (utils/snapshot-state @entities :after-wisdom)) (actions/do-dialogue entities :ego "What about this?" :game-player "No, that's not the solution. Keep looking.")) (brian-get-to-work entities)) :trophy (actions/get-script entities @@ -602,7 +604,8 @@ :talk game-player-talk-up} :get-to-work game-player-get-to-work :pause-from-work game-player-pause-from-work - :anim-sound-frames {game-player-stand-up {11 [:blink 0.3] }} + :anim-sound-frames {game-player-stand-up {11 [:blink 0.3] } + game-player-stand-down {1 [:writing-sound 0.07]}} :flex game-player-flex)} :monocle (rooms/make-entity :monocle (assoc (animation->texture screen monocle) :x 209 :y 160 :baseline 240 @@ -621,12 +624,17 @@ (actions/give entities :monocle) (actions/talk entities :ego "It looks like a monocle."))})) - :chorus {:sound (sound "inside-castle/chorus.wav")} + :chorus {:sound (utils/load-sound "inside-castle/chorus.ogg")} :collision "inside-castle/collision.png" :scale-fn (utils/scaler-fn-from-image "inside-castle/scale.png" 0.25 1.00) - :apply-state (fn [_ entities] + :apply-state (fn [screen entities] (utils/fast-forward-particle (get-in entities [:room :entities :outside-particles])) (as-> entities entities + (utils/play-sound! screen entities + (get-in entities [:room :chorus :sound]) + get-chorus-volume + 0.5 + :loop) (if (actions/has-obtained? entities :trophy) (update-in entities [:room :entities] #(dissoc % :trophy)) entities) @@ -640,23 +648,5 @@ (if (#{:night :sunrise} (get-in entities [:state :time])) (make-night entities) entities))) - :update-fn (fn [screen entities] - #_(when (and (actions/has-obtained? entities :sword) - (get-in entities [:room :entities :magic]) - (particle-effect! (get-in entities [:room :entities :magic]) :is-complete)) - ) - (let [chorus-volume (get-chorus-volume entities)] - (if (= 0.0 chorus-volume) - (if (get-in entities [:room :chorus :instance]) - (do (sound! (get-in entities [:room :chorus :sound]) :stop) - (update-in entities [:room :chorus] dissoc :instance)) - entities) - (let [chorus (get-in entities [:room :chorus])] - (if (:instance chorus) - (do (sound! (:sound chorus) :set-volume - (:instance chorus) - (utils/current-sound-volume chorus-volume)) - entities) - (assoc-in entities [:room :chorus :instance] (sound! (:sound chorus) :loop - (utils/current-sound-volume chorus-volume)))))))) + :start-pos [245 90]))) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 73a2fc54..c875a1f7 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -123,19 +123,19 @@ :wizard "Ok, I'll deliver some more myself. Don't touch anything while I'm gone.") (actions/update-state entities (fn [s] (assoc s :mints-eaten 0 :wizard-left? true))) - (sound! (sound "inside-house/disappear.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/disappear.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :wizard :disappear :stop? false) (actions/remove-entity entities :wizard))} "Nevermind." {:run #(actions/do-dialogue entities :ego %)}]})) (defn make [screen] - (let [safelock-sheet (texture! (texture "inside-house/safe-lock.png") :split 9 2) + (let [safelock-sheet (texture! (utils/get-texture "inside-house/safe-lock.png") :split 9 2) safe-lock (animation 0.1 (for [i (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])] (aget safelock-sheet 0 i))) - candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2]) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) - experiment-left (utils/flip (utils/make-anim (texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] + candle (utils/make-anim "inside-house/candle.png" [34 32] 0.2 [1 0 1 2]) + candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1] ) + experiment-left (utils/flip (utils/make-anim-seq "wizard/experiment" [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] (rooms/make :music :inside-fangald :interactions {:down-dir {:box [151 0 320 40] :script (actions/get-script entities @@ -159,10 +159,10 @@ :window {:box [119 120 203 190] :script (actions/get-script entities (actions/talk entities :ego "It's a really big window!"))}} - :layers [(assoc (texture "inside-house/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) - (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) - (assoc (texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)] + :layers [(assoc (utils/get-texture "inside-house/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) + (assoc (utils/get-texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) + (assoc (utils/get-texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)] :entities { :wizard (common/make-wizard screen {:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0 :script (actions/get-script entities (do-wizard-dialogue entities)) @@ -205,13 +205,13 @@ :anim-start 0 :script (actions/get-script entities (actions/do-dialogue entities :ego "It's just a candle."))) :candle-aura (assoc (animation->texture screen candle-aura) :x 172 :y 97 :baseline 239 :additive? true :origin-x 13 :opacity 0.5 :anim candle-aura :anim-start 0) - :candle-smoke (doto (assoc (particle-effect "inside-house/candle") :x 172 :y 112 + :candle-smoke (doto (assoc (particle-effect "particles/candle") :x 172 :y 112 :baseline 200) (particle-effect! :set-position 172 112)) - :magic-frog-particle (doto (assoc (particle-effect "inside-house/magic-frog") :x 230 :y 0 + :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 230 :y 0 :baseline 241) (particle-effect! :set-position 237 0)) - :flask (assoc (texture "inside-house/flask.png") + :flask (assoc (utils/get-texture "inside-house/flask.png") :x 265 :y 80 :baseline 240 :script (actions/get-script entities (actions/remove-entity entities :flask) @@ -219,7 +219,7 @@ (when (get-in @entities [:room :entities :wizard]) (actions/do-dialogue entities :ego "Hey you think I could have this flask?" :wizard "Sure.")))) - :frog-legs (assoc (texture "inside-house/frog-legs.png") + :frog-legs (assoc (utils/get-texture "inside-house/frog-legs.png") :x 180 :y 77 :baseline 240 :script (actions/get-script entities (if (get-in @entities [:room :entities :wizard]) diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 0258f240..3f3cff7f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -2,6 +2,7 @@ (:require [clojure.core.async :refer [chan]] [advent.screens.rooms :as rooms] [advent.screens.rooms.common :as common] + [advent.saves :as saves] [advent.actions :as actions] [advent.screens.items :as items] [advent.utils :as utils] @@ -191,10 +192,12 @@ (actions/talk entities :ego "I probably shouldn't leave without my belongings.") (do (actions/transition-background entities :outside-jail [50 46] :face :right) (if (get-in @entities [:state :dropped-ball?]) - (actions/do-dialogue entities :ego "Yes I made it!" - :ego "But what now?" - :ego "I have till sunrise before Bloodclot comes and destroys the town." - :ego "Maybe Gandarf can help me!") + (do + (actions/do-dialogue entities :ego "Yes I made it!" + :ego "But what now?" + :ego "I have till sunrise before Bloodclot comes and destroys the town." + :ego "Maybe Gandarf can help me!") + (utils/snapshot-state @entities :after-jail)) (do (actions/do-dialogue entities :ego "Yes I made it!" :guard "Hmm?" @@ -209,7 +212,7 @@ (defn make [screen] - (let [warden-sheet (texture! (texture "inside-jail/warden.png") :split 43 58) + (let [warden-sheet (texture! (utils/get-texture "inside-jail/warden.png") :split 43 58) warden-talk (animation 0.2 (for [i [1 0 1 0 1 0 1 0 0 0 2 0]] (aget warden-sheet 0 i))) warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])] @@ -219,7 +222,7 @@ warden-sleep (animation 0.25 (for [i (flatten [ 3 4 3 4 3 4 3 4 3 4 5 5 2 2 2 2 2 2])] (aget warden-sheet 0 i))) candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1])] + candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1])] (rooms/make :music :inside-antique :interactions { :lock {:box [172 102 190 124] @@ -305,10 +308,10 @@ :door {:box [257 62 301 152] :cursor :down :script (actions/get-script entities (leave entities))}} - :layers [(assoc (texture "inside-jail/background.png") :x 0 :y 0 :baseline 0 :night-profile :none) - (assoc (texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165 :night-profile :none) - (assoc (texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35 :night-profile :none) - (assoc (texture "inside-jail/fg.png") :x 0 :y 5 :baseline 241 :parallax 1.5 :night-profile :none)] + :layers [(assoc (utils/get-texture "inside-jail/background.png") :x 0 :y 0 :baseline 0 :night-profile :none) + (assoc (utils/get-texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165 :night-profile :none) + (assoc (utils/get-texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35 :night-profile :none) + (assoc (utils/get-texture "inside-jail/fg.png") :x 0 :y 5 :baseline 241 :parallax 1.5 :night-profile :none)] :hotspots [{:box [121 40 258 44] :fn (fn [screen entities] @@ -331,7 +334,7 @@ (actions/begin-animation entities :warden :sleep)) entities) entities) entities)))}] - :entities {:warden (assoc (texture "inside-jail/warden.png" ) + :entities {:warden (assoc (utils/get-texture "inside-jail/warden.png" ) :x 40 :y 60 :baseline 166 :stand warden-stand :talk warden-talk @@ -340,8 +343,8 @@ :anim warden-stand :anim-start 0 :night-profile :none - :inhale (sound "inside-jail/inhale.ogg") - :exhale (sound "inside-jail/exhale.ogg") + :inhale (utils/load-sound "inside-jail/inhale.ogg") + :exhale (utils/load-sound "inside-jail/exhale.ogg") :talk-color (color 0.9 0.3 0.9 1.0) :anim-sound-frames {warden-stand {31 [:blink 0.15] 51 [:blink 0.15]} @@ -367,13 +370,13 @@ :ego "I can't kill him just for doing his job.")) :rope (actions/get-script entities (tie-up-warden entities "I'll tie him up.")) :ball-n-chain (actions/get-script entities (tie-up-warden entities "I'll lock him up."))}) - :chest-top (assoc (texture "inside-jail/chest-top.png") + :chest-top (assoc (utils/get-texture "inside-jail/chest-top.png") :x 193 :y (- 240 165) :baseline 166 :origin-x 0 :origin-y 0 :night-profile :none - :open (animation 0.8 [(texture "inside-jail/chest-top-open.png")]) - :close (animation 0.8 [(texture "inside-jail/chest-top.png")])) - :ball-n-chain (assoc (texture "inside-jail/ball-n-chain.png") + :open (animation 0.8 [(utils/get-texture "inside-jail/chest-top-open.png")]) + :close (animation 0.8 [(utils/get-texture "inside-jail/chest-top.png")])) + :ball-n-chain (assoc (utils/get-texture "inside-jail/ball-n-chain.png") :x 80 :y 80 :baseline 160 :night-profile :none :script (actions/get-script entities @@ -381,7 +384,7 @@ (actions/play-animation entities :ego :squat) (actions/remove-entity entities :ball-n-chain) (actions/give entities :ball-n-chain))) - :moveable-bars (assoc (texture "inside-jail/moveable-bars.png") + :moveable-bars (assoc (utils/get-texture "inside-jail/moveable-bars.png") :night-profile :none :x 132 :y 77 :baseline 163) :candle (assoc (animation->texture screen candle) @@ -393,10 +396,10 @@ :additive? true :origin-x 13 :origin-y 13 :opacity 0.5 :anim candle-aura :anim-start 0 :night-profile :none :script (actions/get-script entities (actions/talk entities :ego "Just a candle.")) :scripts {:default (actions/get-script entities (actions/talk entities :ego "I might catch the place on fire."))}) - :candle-smoke (doto (assoc (particle-effect "inside-jail/candle") :x 215 :y 130 + :candle-smoke (doto (assoc (particle-effect "particles/candle") :x 215 :y 130 :baseline 200) (particle-effect! :set-position 215 130)) - :crowbar (assoc (texture "inside-jail/crowbar.png") + :crowbar (assoc (utils/get-texture "inside-jail/crowbar.png") :x 304 :y 65 :baseline 175 :night-profile :none :script (actions/get-script entities @@ -407,7 +410,7 @@ (actions/give entities :crowbar) (actions/talk entities :ego "It's a crowbar.")) (actions/talk entities :ego "I can't reach it.")))) - :closed-window (assoc (texture "inside-jail/window.png") + :closed-window (assoc (utils/get-texture "inside-jail/window.png") :night-profile :none :x 99 :y 111 :baseline 128)} :collision "inside-jail/collision-locked.png" diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj index a9125147..edfd17d2 100644 --- a/desktop/src-common/advent/screens/rooms/inside_stash.clj +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -49,7 +49,7 @@ (defn make [screen] (let [candle-flame (utils/make-anim "inside-stash/candle.png" [4 4] 0.1 (range 4)) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) + candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1] ) ] (rooms/make :music {:day :secret-hideout :night :secret-hideout} :interactions @@ -81,8 +81,8 @@ :scripts {:sword (actions/get-script entities (actions/talk entities :ego "There's not enough room to swing my sword here.")) :crowbar (actions/get-script entities (bust-chest entities))}}} - :layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] - :entities {:lid (assoc (texture "inside-stash/lid.png") + :layers [(assoc (utils/get-texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] + :entities {:lid (assoc (utils/get-texture "inside-stash/lid.png") :x 156 :y 116 :baseline 125 :night-profile :none) :candle-flame (assoc (animation->texture screen candle-flame) :x 165 :y 135 :baseline 1 diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 78e6eea2..46e9514e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -14,7 +14,7 @@ (defn flies-vol [entities] - (utils/proximity-volume entities [201 175] :scale 0.5)) + (utils/proximity-volume entities [201 175] :scale 0.20)) (defn do-initial-peddler-conversation [entities] (actions/do-dialogue entities @@ -275,16 +275,16 @@ add-note-if-necessary)) (defn make [screen] - (let [peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36) + (let [peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])] (aget peddler-sheet 0 i))) peddler-stand (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] (aget peddler-sheet 0 i))) - balloon-sheet (texture! (texture "outside-castle/balloons.png") :split 20 36) + balloon-sheet (texture! (utils/get-texture "outside-castle/balloons.png") :split 20 36) balloon-stand (animation 0.25 (for [i [1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 1 0 1 2 1 0 1 2 1 0 1 2 1 0 1 2]] (aget balloon-sheet 0 i))) - steer-sheet (texture! (texture "outside-castle/steer.png") :split 50 35) + steer-sheet (texture! (utils/get-texture "outside-castle/steer.png") :split 50 35) steer-stand (animation 0.2 (for [i [0 0 0 0 0 0 0 0 0 1 0 2 0 1 0 2 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 3 3 3 3 3 3 0 0 0 0]] (aget steer-sheet 0 i))) flies-stand (utils/make-anim "outside-castle/flies.png" [15 15] 0.075 (flatten (repeat 2 [0 1 2 1])))] @@ -320,23 +320,23 @@ (actions/play-animation entities :ego :squat) (actions/talk entities :ego "No one will notice one missing.") (actions/give entities :carrot))))}} - :flies-sound {:sound (sound "outside-castle/flies2.ogg") + :flies-sound {:sound (utils/load-sound "outside-castle/flies2.ogg") :id nil} - :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] - :night [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] - :sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) - (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} + :layers {:day [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1) + (assoc (utils/get-texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] + :night [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] + :sunrise [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) + (assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} :entities {:peddler (actions/start-animation screen - (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil - :anim-sound-frames {peddler-stand {23 [:scratch 1.0]} - peddler-talk {23 [:scratch 1.0]}} - :scratch (sound "outside-castle/scratch.ogg") + (assoc (utils/get-texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil + :anim-sound-frames {peddler-stand {23 [:scratch 0.25]} + peddler-talk {23 [:scratch 0.25]}} + :scratch (utils/load-sound "outside-castle/scratch.ogg") :talk peddler-talk :stand peddler-stand :talk-color (color 1.0 0.9 0.4 1.0) :script (actions/get-script @@ -361,6 +361,8 @@ :steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80 :stand steer-stand :night-profile :sprite + :moo (utils/load-sound "outside-castle/moo.ogg") + :anim-sound-frames {steer-stand {10 [:moo 0.2]}} :script (actions/get-script entities (actions/walk-to entities :ego [168 150] :face :right) (actions/do-dialogue entities @@ -419,7 +421,7 @@ (actions/give entities :flies) (actions/talk entities :ego "Hopefully they won't fly out of my backpack."))} )} - :note (rooms/make-entity :note (assoc (texture "outside-castle/note.png") + :note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png") :x 198 :y 66 :baseline 174 :script (actions/get-script entities (actions/walk-to entities :ego [210 79] :face :left) @@ -430,22 +432,10 @@ :collision "outside-castle/collision.png" :scale-fn (utils/scaler-fn-from-image "outside-castle/scale-map.png" 0.20 1.00) :start-pos [259 80] - :apply-state (fn [_ entities] + :apply-state (fn [screen entities] (utils/fast-forward-particle (get-in entities [:room :entities :outside-particles])) - (-> + (as-> entities entities (if (#{:night :sunrise} (get-in entities [:state :time])) (make-night entities) entities) - (assoc-in [:room :flies-sound :id] (sound! (get-in entities [:room :flies-sound :sound]) :loop (flies-vol entities))))) - - :update-fn (fn [_ entities] - (when-let [flies-sound-id (get-in entities [:room :flies-sound :id])] - (sound! (get-in entities [:room :flies-sound :sound]) :set-volume flies-sound-id (flies-vol entities))) - entities) - - :stop-fn (fn [_ entities] - (when-let [flies-sound-id (get-in entities [:room :flies-sound :id])] - (sound! (get-in entities [:room :flies-sound :sound]) :stop flies-sound-id)) - entities) - - ))) + (utils/play-sound! screen entities (get-in entities [:room :flies-sound :sound]) flies-vol 0.5 :loop)))))) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index fb437c47..e4b9e740 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -171,7 +171,9 @@ (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) (Thread/sleep 1500) - (actions/transition-background entities :outside-house [257 90] :face :left)) + (actions/transition-background entities :outside-house [257 90] :face :left) + (dotimes [_ 160] + (particle-effect! (get-in @entities [:rooms :inside-house :entities :magic-frog-particle]) :update 0.2))) (defn do-prophecy [entities] {:run #(do (actions/respond entities % @@ -564,9 +566,9 @@ (defn make [screen] - (let [sheep-stand-sheet (texture! (texture "outsidehouse/sheep-anim.png") :split 33 21) - sheep-walk-sheet (texture! (texture "outsidehouse/sheep-walk.png") :split 33 21) - lamb-walk-sheet (texture! (texture "outsidehouse/lamb-walk.png") :split 27 28) + (let [sheep-stand-sheet (texture! (utils/get-texture "outsidehouse/sheep-anim.png") :split 33 21) + sheep-walk-sheet (texture! (utils/get-texture "outsidehouse/sheep-walk.png") :split 33 21) + lamb-walk-sheet (texture! (utils/get-texture "outsidehouse/lamb-walk.png") :split 27 28) sheep-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 9 10 (repeat 25 11) (repeat 15 12)])] (aget sheep-stand-sheet 0 i))) door (utils/make-anim "outsidehouse/door.png" [22 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3])) @@ -624,20 +626,20 @@ entities (walk-to-castle entities)) :cursor :left}} - :layers {:day [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) + :layers {:day [(assoc (utils/get-texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) - (assoc (texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) - (assoc (texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) - (assoc (texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)] - :night [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) + (assoc (utils/get-texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) + (assoc (utils/get-texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) + (assoc (utils/get-texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)] + :night [(assoc (utils/get-texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (utils/get-texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) - (assoc (texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) - (assoc (texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) - (assoc (texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)]} + (assoc (utils/get-texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) + (assoc (utils/get-texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) + (assoc (utils/get-texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)]} :entities {:sheep (actions/start-animation screen (assoc (animation->texture screen sheep-stand) :x 38 :y 160 :baseline 80 :scale-x (scaler [38 160]) @@ -701,6 +703,11 @@ (actions/get-script entities (actions/talk entities :ego "That's just cruel.")) nil) + + :eat-sound (utils/load-sound "outsidehouse/sheep-eat.ogg") + :bleet-sound (utils/load-sound "outsidehouse/sheep-bleet.ogg") + :anim-sound-frames {sheep-stand {11 [:eat-sound 0.3] + 35 [:bleet-sound 0.5]}} :left {:walk (utils/flip sheep-walk) :stand (utils/flip sheep-stand)} :right {:walk sheep-walk @@ -709,17 +716,17 @@ sheep-stand) :outside-particles (common/make-outside-particles) - :magic (assoc (doto (particle-effect "outsidehouse/magic") ) + :magic (assoc (doto (particle-effect "particles/magic") ) :x 153 :y 105 :baseline 238) :door (assoc (animation->texture screen door) :x 253 :y 88 :baseline 122 :open door - :door-sound (sound "door.ogg") - :anim-sound-frames {door {1 [:door-sound 1.0]}} + :door-sound (utils/load-sound "door.ogg") + :anim-sound-frames {door {1 [:door-sound 0.1]}} ) - :lamb (assoc (texture "outsidehouse/lamb.png") + :lamb (assoc (utils/get-texture "outsidehouse/lamb.png") :x 10 :y 163 :baseline 77 :right {:stand (animation 0.1 [lamb-stand]) :walk lamb-walk} @@ -761,7 +768,7 @@ :sword (actions/get-script entities (actions/do-dialogue entities :wizard "The Sword of Blergh!" :wizard "Good job, Tick."))}})) - :note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png") + :note (rooms/make-entity :note (assoc (utils/get-texture "outsidehouse/note.png") :x 277 :y 74 :baseline 160 :night-profile :none :script (actions/get-script entities diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 07373c5b..a56626fc 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -93,18 +93,15 @@ (actions/walk-straight-to entities :ego [142 96]) (actions/talk entities :ego "This must be Frankie Rockfist's secret stash!"))) -(defn fountain-vol [entities] - (utils/proximity-volume entities [172 120] :scale 0.5)) - (defn make [screen] - (let [guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + (let [guard-sheet (texture! (utils/get-texture "inside-cafeteria/ladder-guard.png") :split 37 87) guard-stand (animation 0.1 [(aget guard-sheet 0 0)]) guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget guard-sheet 0 i))) guard-sleep (utils/make-anim "outside-jail/guard-sleep.png" [43 67] 0.1 (range 4)) open-stash (utils/make-anim "outside-jail/open-stash.png" [58 41] 0.075 (reverse (range 5))) close-stash (utils/make-anim "outside-jail/open-stash.png" [58 41] 0.075 (range 5)) candle-flame (utils/make-anim "outside-jail/candle.png" [20 25] 0.075 (range 4)) - candle-aura (utils/make-anim (texture "outside-jail/candle-aura2.png") [135 135] 0.3 [0 1 2 1] )] + candle-aura (utils/make-anim "outside-jail/candle-aura2.png" [135 135] 0.3 [0 1 2 1] )] (rooms/make :music {:day :town-1 :night :night} :interactions {:down-dir {:box [30 0 227 40] :script (actions/get-script entities @@ -215,10 +212,10 @@ (actions/remove-item entities :flask-2) (actions/give entities :flask-water) (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}} - :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] - :night [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]} + :layers {:day [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] + :night [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) + (assoc (utils/get-texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]} :entities {:warden {:object nil :x 36 :y 86 @@ -234,17 +231,17 @@ :anim-start 0) :candle-aura (assoc (animation->texture screen candle-aura) :x 14 :y 82 :baseline 240 :additive? true :origin-x 67 :origin-y 67 :scale-x 1 :scale-y 1 :opacity 0.5 :anim candle-aura :anim-start 0 :night-profile :none) - :fountain-particle (assoc (doto (particle-effect "outside-jail/fountain") + :fountain-particle (assoc (doto (particle-effect "particles/fountain") (particle-effect! :reset) (particle-effect! :start)) :x 172 :y 140 :baseline 114) - :axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite) - :bent-bar-window (assoc (texture "outside-jail/bent-bar-window.png") + :axe (assoc (utils/get-texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite) + :bent-bar-window (assoc (utils/get-texture "outside-jail/bent-bar-window.png") :x 69 :y (- 240 63) :baseline 2) :outside-particles (common/make-outside-particles)} - :fountain-sound {:sound (sound "outside-jail/fountain-2.ogg") + :fountain-sound {:sound (utils/load-sound "outside-jail/fountain-2.ogg") :id nil} @@ -258,13 +255,13 @@ :sleep guard-sleep :script (actions/get-script entities (search-guard entities)) :night-profile :sprite)) - :rope (rooms/make-entity :rope (assoc (texture "outside-jail/rope.png") + :rope (rooms/make-entity :rope (assoc (utils/get-texture "outside-jail/rope.png") :x 14 :y 20 :baseline 1 :night-profile :sprite)) - :spear (rooms/make-entity :spear (assoc (texture "outside-jail/spear.png") + :spear (rooms/make-entity :spear (assoc (utils/get-texture "outside-jail/spear.png") :night-profile :none :x 60 :y 65 :baseline 180 :script (actions/get-script entities (grab-spear entities)))) - :alarm-clock (rooms/make-entity :alarm-clock (assoc (texture "outside-jail/alarm-clock.png") + :alarm-clock (rooms/make-entity :alarm-clock (assoc (utils/get-texture "outside-jail/alarm-clock.png") :x 217 :y 83 :baseline 160 :script (actions/get-script entities (actions/walk-to entities :ego [189 65] :face :right) @@ -281,21 +278,15 @@ :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) :start-pos [145 15] - :update-fn (fn [_ entities] - (when-let [fountain-sound-id (get-in entities [:room :fountain-sound :id])] - (sound! (get-in entities [:room :fountain-sound :sound]) :set-volume fountain-sound-id (fountain-vol entities))) - entities) - - :stop-fn (fn [_ entities] - (when-let [fountain-sound-id (get-in entities [:room :fountain-sound :id])] - (sound! (get-in entities [:room :fountain-sound :sound]) :stop fountain-sound-id)) - entities) - - :apply-state (fn [_ entities] + :apply-state (fn [screen entities] (utils/fast-forward-particle (get-in entities [:room :entities :outside-particles])) (as-> entities entities - (assoc-in entities [:room :fountain-sound :id] (sound! (get-in entities [:room :fountain-sound :sound]) :loop (fountain-vol entities))) + (utils/play-sound! screen entities (get-in entities [:room :fountain-sound :sound]) + (utils/sourced-volume-fn :fountain 0.15 [172 120]) + (utils/get-sound-pan 172) + :loop) + (if (= :night (get-in entities [:state :time])) (make-night entities) (update-in entities [:room :entities] dissoc :candle-aura :candle-flame)) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index fd784e4d..3e717dbc 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -2,6 +2,7 @@ (:require [advent.screens.rooms :as rooms] [advent.screens.rooms.common :as common] [advent.screens.rooms.held :as held] + [advent.saves :as saves] [advent.actions :as actions] [advent.screens.items :as items] [advent.utils :as utils] @@ -34,9 +35,12 @@ (not (get-in entities [:state :blergh-dead?])) (actions/has-item? entities :magic-slingshot)) ((actions/get-script entities - (sound! (sound "space/shock.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "space/shock.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :bloodclot-head :shoot :stop? false) + (actions/update-entity entities :lightning #(assoc % :opacity 1.0)) (actions/begin-animation entities :bloodclot-head :keep-shoot) + (Thread/sleep 2000) + (actions/update-entity entities :lightning #(assoc % :opacity 0.0)) (actions/do-dialogue entities :bloodclot-head "Dang! Come a little closer!")) entities)) nil) @@ -58,7 +62,7 @@ (begin [this screen entities] (particle-effect! (get-in entities [:room :entities :appear]) :reset) (particle-effect! (get-in entities [:room :entities :appear]) :start) - (sound! (sound "inside-house/disappear.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/disappear.ogg") :play (utils/current-sound-volume)) (-> entities (assoc-in [:tweens :bloodclot-head-appear] (tween/tween :bloodclot-head-appear screen [:room :entities :bloodclot-head :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic)) @@ -87,9 +91,9 @@ (actions/run-action entities (begin [this screen entities] - (sound! (sound "space/jump.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "space/jump.ogg") :play (utils/current-sound-volume)) (-> entities - (assoc-in [:room :entities :cloud] (assoc (texture "space/cloud.png") + (assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png") :x (- (get-in entities [:room :entities :ego :x]) 10) :y (get-in entities [:room :entities :ego :y]) :origin-x 7 @@ -134,7 +138,7 @@ (actions/run-action entities (begin [this screen entities] - (sound! (sound "space/swingsword.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "space/swingsword.ogg") :play (utils/current-sound-volume)) (-> entities (update-in [:room :entities :ego] #(actions/start-animation screen % :swing)) @@ -175,26 +179,27 @@ (defn make [screen] - (let [bloodclot-head-talk-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) - bloodclot-head-stand-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3]) - bloodclot-head-shoot-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11]) - bloodclot-head-keep-shoot-anim (utils/make-anim "space/bloodclot-head-talk.png" [82 75] 0.05 [12 13]) + (let [bloodclot-head-talk-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) + bloodclot-head-stand-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3]) + bloodclot-head-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11]) + bloodclot-head-keep-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [12 13]) blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.75 [0 1]) - bloodclot-explode (utils/make-anim "space/bloodclot-explode.png" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 4 5 5 5 5 5 4 4 4 4 5 5 4 4 4 4 5 5 5 4 5 5 5 5 5 5 5 5 6 5 5 5 5 6 6 5 5 5 5 5 5 5 6 6 6 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 7 5 6 6 6 6 6 7 7 7 7 6 6 6 6 6 6 6 6 6 6 7 7 7 7 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 10 11 12 13 14 15 16 17 18 19]) + bloodclot-explode (utils/make-anim-seq "space/bloodclot-explode" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 4 5 5 5 5 5 4 4 4 4 5 5 4 4 4 4 5 5 5 4 5 5 5 5 5 5 5 5 6 5 5 5 5 6 6 5 5 5 5 5 5 5 6 6 6 5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 7 6 7 7 5 6 6 6 6 6 7 7 7 7 6 6 6 6 6 6 6 6 6 6 7 7 7 7 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 10 11 12 13 14 15 16 17 18 19]) bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) - effect (particle-effect "space/appear") - blowup-effect (particle-effect "space/blowup") - grow-explode (particle-effect "space/grow-explode")] + effect (particle-effect "particles/appear") + blowup-effect (particle-effect "particles/blowup") + lightning-effect (particle-effect "particles/lightning") + grow-explode (particle-effect "particles/grow-explode")] (rooms/make :music :fight :interactions {} - :layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)] + :layers [(assoc (utils/get-texture "space/background.png") :x 0 :y 0 :baseline 0)] :timers {:taunt [10.0 8.0 taunt] :shock [5.0 15.0 shock]} :entities {:appear (assoc effect :x 240 :y 50 :baseline 200) - :later (assoc (texture "space/later.png") + :later (assoc (utils/get-texture "space/later.png") :x 0 :y 0 :baseline 240 :opacity 0.0) @@ -203,7 +208,11 @@ :baseline 200) :blowup (assoc blowup-effect :x 225 :y 175 - :baseline 240) + :baseline 241) + :lightning (assoc lightning-effect + :x 225 :y 160 + :baseline 240 + :opacity 0.0) :bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim) :x 195 :y 138 :baseline 195 :opacity 0.0 @@ -224,7 +233,9 @@ :script (actions/get-script entities - (actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!")) + (actions/do-dialogue entities + :bloodclot-head "No time to talk." + :bloodclot-head "It's lunch time.")) :scripts {:sword (actions/get-script entities (if (actions/has-item? entities :magic-slingshot) (if (get-in @entities [:state :broke-jewel?]) @@ -243,11 +254,13 @@ (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" :bloodclot-head "Take this!") - (sound! (sound "space/shock.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "space/shock.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :bloodclot-head :shoot :stop? false) (actions/begin-animation entities :bloodclot-head :keep-shoot) + (actions/update-entity entities :lightning #(assoc % :opacity 1.0)) (actions/play-animation entities :ego :shock :stop? false) (actions/begin-animation entities :bloodclot-head :stand) + (actions/update-entity entities :lightning #(assoc % :opacity 0.0)) (actions/play-animation entities :ego :burnt :stop? false) (actions/play-animation entities :ego :passed-out :continue? true) (actions/do-dialogue entities :bloodclot-head "Oh shucks. I overcooked him." @@ -256,8 +269,9 @@ :bloodclot-head "And THEN the feast will begin." :bloodclot-head "Starting with his precious Georgia McGorgeous.") (bloodclot-disappear entities) - (common/go-to-jail entities) - (actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Bloodclot a lesson!")))) + (common/go-to-jail entities 5.0) + (actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Bloodclot a lesson!") + (utils/snapshot-state @entities :in-jail)))) :magic-slingshot (actions/get-script entities (actions/do-dialogue entities :ego "Hey Bloodclot!" @@ -285,7 +299,7 @@ :bullet (assoc (animation->texture screen bullet) :x 37 :y 85 :baseline 241 :walk bullet) - :broken-jewel (assoc (texture "space/broken-jewel.png") + :broken-jewel (assoc (utils/get-texture "space/broken-jewel.png") :x 225 :y 170 :baseline 240) :collision "space/collision.png" :scale-fn (constantly 1.5) diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj index 6aa13657..f1ab2efd 100644 --- a/desktop/src-common/advent/screens/safe.clj +++ b/desktop/src-common/advent/screens/safe.clj @@ -32,25 +32,25 @@ (first (filter (fn [{:keys [in?] :as button}] (when (in? x y) button)) - [{:in? (button-box 9 17) :sound (sound "inside-house/safe-1.ogg") :id 1 } - {:in? (button-box 29 17) :sound (sound "inside-house/safe-2.ogg") :id 2} - {:in? (button-box 49 17) :sound (sound "inside-house/safe-3.ogg") :id 3} - {:in? (button-box 70 17) :sound (sound "inside-house/safe-4.ogg") :id 4} - {:in? (button-box 91 17) :sound (sound "inside-house/safe-5.ogg") :id 5}]))) + [{:in? (button-box 9 17) :sound (utils/load-sound "inside-house/safe-1.ogg") :id 1 } + {:in? (button-box 29 17) :sound (utils/load-sound "inside-house/safe-2.ogg") :id 2} + {:in? (button-box 49 17) :sound (utils/load-sound "inside-house/safe-3.ogg") :id 3} + {:in? (button-box 70 17) :sound (utils/load-sound "inside-house/safe-4.ogg") :id 4} + {:in? (button-box 91 17) :sound (utils/load-sound "inside-house/safe-5.ogg") :id 5}]))) (defscreen safe-screen :on-show (fn [screen entities] (utils/setup-viewport screen 320 240) - (let [inputed-key (texture "inside-house/inputed-key.png")] - {:fade (assoc (texture "black.png") + (let [inputed-key (utils/get-texture "inside-house/inputed-key.png")] + {:fade (assoc (utils/get-texture "black.png") :scale-x 80 :scale-y 80 :opacity 0.7 :origin-x 0 :origin-y 0) - :safe (assoc (texture "inside-house/safe-screen.png") :x start-x :y start-y) + :safe (assoc (utils/get-texture "inside-house/safe-screen.png") :x start-x :y start-y) :entered-keys (doall (for [i (range 5)] (assoc inputed-key :x (+ start-x 10 (* i 12)) @@ -67,7 +67,7 @@ entities) :show-screen (fn [{:keys [success failure]} [entities]] - (sound! (sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume)) (assoc entities :shown? true :button-choices [] @@ -103,7 +103,7 @@ (< y start-y) (> y (+ start-y 75))) (do - (sound! (sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume)) (close entities))))))) :on-resize (fn [{:keys [width height viewport]} entities] diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index c64e51d1..f67b6468 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -13,6 +13,7 @@ [advent.actions :as actions] [advent.zone :as zone] [advent.utils :as utils] + [advent.saves :as saves] [advent.tween :as tween] [advent.screens.rooms :as rooms] [advent.screens.fade :refer [fade-screen]] @@ -84,109 +85,53 @@ uniform float hue_amount; uniform sampler2D u_texture; -vec3 RGBToHSL(vec3 color) +float Epsilon = 1e-10; + +vec3 RGBtoHCV (vec3 RGB) { - vec3 hsl; // init to 0 to avoid warnings ? (and reverse if + remove first part) - - float fmin = min(min(color.r, color.g), color.b); //Min. value of RGB - float fmax = max(max(color.r, color.g), color.b); //Max. value of RGB - float delta = fmax - fmin; //Delta RGB value - - hsl.z = (fmax + fmin) / 2.0; // Luminance - - if (delta == 0.0)//This is a gray, no chroma... - { - hsl.x = 0.0;// Hue - hsl.y = 0.0;// Saturation - } - else //Chromatic data... - { - if (hsl.z < 0.5) - hsl.y = delta / (fmax + fmin); // Saturation -else -hsl.y = delta / (2.0 - fmax - fmin); // Saturation - -float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta; -float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta; -float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta; - -if (color.r == fmax ) -hsl.x = deltaB - deltaG; // Hue -else if (color.g == fmax) -hsl.x = (1.0 / 3.0) + deltaR - deltaB; // Hue -else if (color.b == fmax) - hsl.x = (2.0 / 3.0) + deltaG - deltaR; // Hue - - if (hsl.x < 0.0) - hsl.x += 1.0; // Hue - else if (hsl.x > 1.0) - hsl.x -= 1.0; // Hue - } - - return hsl; + // Based on work by Sam Hocevar and Emil Persson + vec4 P = (RGB.g < RGB.b) ? vec4 (RGB.bg, -1.0, 2.0/3.0) : vec4 (RGB.gb, 0.0, -1.0/3.0); + vec4 Q = (RGB.r < P.x) ? vec4 (P.xyw, RGB.r) : vec4 (RGB.r, P.yzx); + float C = Q.x - min (Q.w, Q.y); + float H = abs ((Q.w - Q.y) / (6.0 * C + Epsilon) + Q.z); + return vec3 (H, C, Q.x); } -float HueToRGB(float f1, float f2, float hue) +vec3 HUEtoRGB(float H) { - if (hue < 0.0) - hue += 1.0; - else if (hue > 1.0) - hue -= 1.0; - float res; - if ((6.0 * hue) < 1.0) - res = f1 + (f2 - f1) * 6.0 * hue; - else if ((2.0 * hue) < 1.0) - res = f2; - else if ((3.0 * hue) < 2.0) - res = f1 + (f2 - f1) * ((2.0 / 3.0) - hue) * 6.0; - else - res = f1; - return res; + float R = abs(H * 6.0 - 3.0) - 1.0; + float G = 2.0 - abs(H * 6.0 - 2.0); + float B = 2.0 - abs(H * 6.0 - 4.0); + return clamp(vec3(R,G,B), 0.0, 1.0); } -vec3 HSLToRGB(vec3 hsl) +vec3 HSLtoRGB(vec3 HSL) { - vec3 rgb; - - if (hsl.y == 0.0) - rgb = vec3(hsl.z); // Luminance - else - { - float f2; - - if (hsl.z < 0.5) - f2 = hsl.z * (1.0 + hsl.y); - else - f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z); - - float f1 = 2.0 * hsl.z - f2; - - rgb.r = HueToRGB(f1, f2, hsl.x + (1.0/3.0)); - rgb.g = HueToRGB(f1, f2, hsl.x); - rgb.b= HueToRGB(f1, f2, hsl.x - (1.0/3.0)); - } - - return rgb; + vec3 RGB = HUEtoRGB(HSL.x); + float C = (1.0 - abs(2.0 * HSL.z - 1.0)) * HSL.y; + return (RGB - 0.5) * C + HSL.z; } + +vec3 RGBtoHSL(vec3 RGB) + { + vec3 HCV = RGBtoHCV(RGB); + float L = HCV.z - HCV.y * 0.5; + float S = HCV.y / (1.0 - abs(L * 2.0 - 1.0) + Epsilon); + return vec3(HCV.x, S, L); + } + vec3 BlendHue(vec3 base, vec3 blend) { if (blend.r == blend.g && blend.g == blend.b) { return base; } else { - vec3 baseHSL = RGBToHSL(base); - return HSLToRGB(vec3(RGBToHSL(blend).r, baseHSL.g, baseHSL.b)); + vec3 baseHSL = RGBtoHSL(base); + return HSLtoRGB(vec3(RGBtoHSL(blend).r, baseHSL.g, baseHSL.b)); } } -// Color Mode keeps the brightness of the base color and applies both the hue and saturation of the blend color. -vec3 BlendColor(vec3 base, vec3 blend) -{ - vec3 blendHSL = RGBToHSL(blend); - return HSLToRGB(vec3(blendHSL.r, blendHSL.g, RGBToHSL(base).b)); -} - #define BlendOpacity(base, blend, F, O) (F(base, blend) * O + blend * (1.0 - O)) void main() @@ -301,7 +246,7 @@ void main() (get-in @entities [:room :entities :warden]) (do (actions/talk entities :ego "I'll just take a sip!") - (sound! (sound "ego/potion.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "ego/potion.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :ego :grow :stop? false) (actions/talk entities :warden "Huh? What was that?!") (Thread/sleep 1000) @@ -314,7 +259,7 @@ void main() :else (do (actions/talk entities :ego "I'll just take a sip!") - (sound! (sound "ego/potion.ogg") :play (utils/current-sound-volume)) + (sound! (utils/load-sound "ego/potion.ogg") :play (utils/current-sound-volume)) (actions/play-animation entities :ego :grow :stop? false)))) :recipe @@ -493,14 +438,14 @@ void main() nil)) (defn get-ego [screen start-pos start-scale] - (let [player-sheet (texture! (texture "player.png") :split 18 36) - talk-sheet (texture! (texture "ego/talk.png") :split 18 36) - stand-sheet (texture! (texture "ego/stand.png") :split 18 36) - squat-sheet (texture! (texture "ego/squat.png") :split 18 36) - reach-sheet (texture! (texture "ego/reach.png") :split 18 36) - grow-sheet (texture! (texture "ego/grow.png") :split 18 36) - cat-toy-sheet (texture! (texture "ego/cat-toy.png") :split 41 50) - fire-sheet (texture! (texture "ego/fire.png") :split 18 36) + (let [player-sheet (texture! (utils/get-texture "player.png") :split 18 36) + talk-sheet (texture! (utils/get-texture "ego/talk.png") :split 18 36) + stand-sheet (texture! (utils/get-texture "ego/stand.png") :split 18 36) + squat-sheet (texture! (utils/get-texture "ego/squat.png") :split 18 36) + reach-sheet (texture! (utils/get-texture "ego/reach.png") :split 18 36) + grow-sheet (texture! (utils/get-texture "ego/grow.png") :split 18 36) + cat-toy-sheet (texture! (utils/get-texture "ego/cat-toy.png") :split 41 50) + fire-sheet (texture! (utils/get-texture "ego/fire.png") :split 18 36) walk-right (animation 0.075 (for [i (range 8)] (texture (aget player-sheet 0 i)))) @@ -564,7 +509,7 @@ void main() throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 33 6)])) frustrated-talk (utils/make-anim "ego/frustrated-talk.png" [16 36] 0.2 (flatten (range 6))) swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9)) - love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) + love (utils/make-anim-seq "ego/love" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)])) axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 11)])) suspended (utils/make-anim "ego/suspended.png" [18 36] 0.10 [0]) @@ -573,6 +518,13 @@ void main() crawl-stand (utils/make-anim "ego/crawl.png" [39 25] 0.2 [0]) crawl-hide (utils/make-anim "ego/crawl.png" [39 25] 0.1 (flatten [(repeat 10 3) (range 4 7) (repeat 50 6) (reverse (range 4 7) ) (repeat 20 3)])) standup (utils/make-anim "ego/standup.png" [45 55] 0.2 (range 5)) + choose-step-sound (fn [entities] + (if (#{:inside-house :inside-stash :inside-cafeteria :inside-antique :inside-jail} + (get-in entities [:state :last-room])) + (rand-nth [:inside-step-sound-1 :inside-step-sound-2 :inside-step-sound-3 :inside-step-sound-4]) + (rand-nth [:step-sound-1 :step-sound-2 :step-sound-3 :step-sound-4]))) + + ego {:right {:walk walk-right :stand stand-anim @@ -677,33 +629,38 @@ void main() :origin-x 9 :origin-y 0 :scaled true - :milk-sound (sound "outsidehouse/milk.ogg") - :step-sound-1 (sound "ego/step-1.ogg") - :step-sound-2 (sound "ego/step-2.ogg") - :sigh-sound (sound "ego/sigh.ogg") - :breakglass-sound (sound "ego/breakglass.ogg") - :idea-sound (sound "ego/idea.ogg") - :blink (sound "ego/blink2.ogg") + :milk-sound (utils/load-sound "outsidehouse/milk.ogg") + :step-sound-1 (utils/load-sound "ego/step-1.ogg") + :step-sound-2 (utils/load-sound "ego/step-2.ogg") + :step-sound-3 (utils/load-sound "ego/step-3.ogg") + :step-sound-4 (utils/load-sound "ego/step-4.ogg") + + :inside-step-sound-1 (utils/load-sound "ego/inside-step-1.ogg") + :inside-step-sound-2 (utils/load-sound "ego/inside-step-2.ogg") + :inside-step-sound-3 (utils/load-sound "ego/inside-step-3.ogg") + :inside-step-sound-4 (utils/load-sound "ego/inside-step-4.ogg") + :sigh-sound (utils/load-sound "ego/sigh.ogg") + :breakglass-sound (utils/load-sound "ego/breakglass.ogg") + :idea-sound (utils/load-sound "ego/idea.ogg") + :blink (utils/load-sound "ego/blink2.ogg") :scale-x start-scale :scale-y start-scale :talk-color (color 0.6 1.0 1.0 1.0) :stand-override nil :mouse-in? (fn [entities x y] - (let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego]) + (let [{entity-x :x entity-y :y ^TextureRegion region :object scale :scale-x} (get-in entities [:room :entities :ego]) half-width (/ (* (.getRegionWidth region) (or scale 1.0)) 2) height (* (.getRegionHeight region) (or scale 1.0))] - #_(clojure.pprint/pprint [["point" x y] - ["entity " (- entity-x half-width) entity-y (+ entity-x half-width) (+ entity-y height)]]) ((zone/box (- entity-x half-width) entity-y (+ entity-x half-width) (+ entity-y height)) x y))) :get-script get-ego-script :x (first start-pos) :y (last start-pos) :id "ego"} - ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [:step-sound-1 1.0] - 6 [:step-sound-2 0.8]} - (get-in ego [:right :walk]) {2 [:step-sound-1 1.0] - 6 [:step-sound-2 0.8]} + ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [choose-step-sound 0.3] + 6 [choose-step-sound 0.3]} + (get-in ego [:right :walk]) {2 [choose-step-sound 0.3] + 6 [choose-step-sound 0.3]} (get-in ego [:left :talk] ) {2 [:blink 0.15]} (get-in ego [:right :talk] ) {2 [:blink 0.15]} @@ -730,6 +687,7 @@ void main() (get-in ego [:left :swing-shovel]) {3 [:breakglass-sound 1.0]} (get-in ego [:right :swing-shovel]) {3 [:breakglass-sound 1.0]}} :anim-merges {(get-in ego [:right :shock]) {:origin-x 15} + (get-in ego [:left :frustrated-talk]) {:origin-x 7} (get-in ego [:left :swing-shovel]) {:origin-x 26} (get-in ego [:right :swing-shovel]) {:origin-x 26} (get-in ego [:left :glad]) {:origin-x 11} @@ -808,8 +766,8 @@ void main() (defn animate [entity screen] (merge entity (animation->texture (update-in screen [:total-time] #(- % (:anim-start entity))) (:anim entity)) - {:current-frame-index (texture! (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity)))) - :previous-frame-index (texture! (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity) (or (:delta-time screen) 0)))) + {:current-frame-index (animation! ^Animation (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity)))) + :previous-frame-index (animation! ^Animation (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity) (or (:delta-time screen) 0)))) :origin-x (or (get-in entity [:anim-origins (:anim entity) 0]) (:base-origin-x entity) (:origin-x entity)) @@ -826,13 +784,13 @@ void main() ((get-in entities [:state :time]) layers) layers))) -(defn get-state [] - (if (.exists (io/file "save.edn")) - (utils/load) +(defn get-state [selected-save] + (if selected-save + (utils/load-snapshot selected-save) {:object nil :active? true :last-room :dream - :time :day + :time :intro :obtained-items #{} :inventory [] :plaques-read #{} @@ -843,8 +801,7 @@ void main() (defn fade-in-first-time-if-necessary [screen entities] (if (not (get-in entities [:started? :value])) (do (music! (utils/get-current-music entities) :set-volume (utils/current-music-volume (get-in entities [:volume :value]))) - (when (get-in entities [:state :seen-intro?]) - (utils/play-sound (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))]))) + (utils/play-music (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))])) (assoc entities :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 :ease tween/ease-in-cubic :finish #(if (not (get-in % [:state :seen-intro?])) @@ -856,19 +813,44 @@ void main() :object nil})) entities)) -(defn play-key-sounds [entities] - (doseq [[target {:keys [previous-frame-index current-frame-index anim-sound-frames anim x y] :as e}] (get-in entities [:room :entities])] - (when (and (not= previous-frame-index current-frame-index) - ((set (keys anim-sound-frames)) anim)) - (when-let [[snd vol-scale] (get-in anim-sound-frames [anim current-frame-index])] - (let [vol (if (= target :ego) - (-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75) - (* (or vol-scale 1.0)) - (utils/clamp-volume)) - (utils/proximity-volume entities [x y] :scale vol-scale)) - pan (/ (- (:x e) 160 ) 160)] - (sound! (or (snd e) - (snd (:sounds entities))) :play (utils/current-sound-volume vol) 1.0 pan)))))) +(defn play-sound-if-necessary [screen entities target {:keys [previous-frame-index current-frame-index anim-sound-frames anim x y] :as e}] + (if (and (not= previous-frame-index current-frame-index) + ((set (keys anim-sound-frames)) anim)) + (if-let [[snd vol-scale] (get-in anim-sound-frames [anim current-frame-index])] + (let [snd (if (fn? snd) + (snd entities) + snd)] + (utils/play-sound! screen entities + (or (snd e) (snd (:sounds entities))) + (utils/sourced-volume-fn target vol-scale [x y]) + (utils/get-sound-pan x))) + entities) + entities)) + +(defn play-key-sounds [screen entities] + (if (= (get-in entities [:fade :opacity]) 0.0) + (loop [entities entities + [[target e] & rest] (seq (get-in entities [:room :entities]))] + (if e + (recur (play-sound-if-necessary screen entities target e) rest) + entities)) + entities)) + +(defn update-current-sound-vols! [entities] + (loop [entities entities + [{:keys [id sound volume-fn]} & rest] (get-in entities [:current-sounds :value])] + (if id + (do + (sound! sound :set-volume id (utils/scale-vol-from-fade entities (volume-fn entities))) + (recur entities rest)) + entities))) + +(defn remove-ended-sounds [screen entities] + (update-in entities [:current-sounds :value] + (fn [sounds] + (filter #(or (= :loop (:type %)) + (> (:ends-at %) (:total-time screen))) + sounds)))) (defn update-from-room [screen entities] (if-let [update-fn (get-in entities [:room :update-fn])] @@ -917,7 +899,7 @@ void main() (defn get-rendered [entities e] (merge e - (when (not= :day (get-in entities [:state :time])) + (when (= :night (get-in entities [:state :time])) (get-in entities [:time-profiles (:night-profile e :default)])))) @@ -944,6 +926,32 @@ void main() (defn mouse-moved [{:keys [input-x input-y viewport] :as screen} [entities]] (utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]))) +(defn add-georgia-to-all-rooms [screen rooms] + (let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.2 [0 1 0 1 0 0 1 0 1 2]) + georgia-stand (utils/make-anim "ego/georgia.png" [30 30] 0.3 [0 0 0 0 0 0 0 2 0 0 0 0 2]) + georgia-love (utils/make-anim "ego/in-love.png" [30 30] 0.1 [0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 4 5 6 7 8 9 10 11 12 13 14 14 14 15 15 15 14 14 14 14 14 14 14 14 15 15 15 15 15 14 14 14 14 15 15 15 15 15 15 14 14 14 14 14]) + + georgia-face (rooms/make-entity :georgia-face + (assoc (animation->texture screen georgia-stand) + :talk georgia-talk + :anim georgia-stand + :stand georgia-stand + :love georgia-love + :talk-color (Color/valueOf "ffabe0ff") + :anim-start 0 + :x 100 :y 100 :baseline 242 :origin-x 15 :origin-y 15 + :opacity 0.0)) + georgia-cloud (assoc (particle-effect "particles/cloud-georgia") :x 100 :y 100 :baseline 241 :opacity 0.0)] + (reduce (fn [rooms room-key] + (update-in rooms [room-key :entities] + assoc + :georgia-face georgia-face + :georgia-cloud georgia-cloud)) + rooms + (keys rooms)))) + + + (defscreen scene :on-timer (fn [screen [entities]] @@ -954,9 +962,11 @@ void main() (fn [screen entities] (let [screen (assoc screen :total-time 0)] - (let [[cam] (utils/setup-viewport screen 320 240)] + (let [[^OrthographicCamera cam] (utils/setup-viewport screen 320 240)] (set! (. cam zoom) 0.95) - (let [shader (ShaderProgram. v-shader pix-shader) + (let [shader (ShaderProgram. ^String v-shader ^String pix-shader) + + _ (update! screen :shader shader) rooms {:inside-house (rooms.inside-house/make screen) :inside-stash (rooms.inside-stash/make screen) @@ -974,23 +984,28 @@ void main() :castle-gate (rooms.castle-gate/make screen) :outside-jail (rooms.outside-jail/make screen) :outside-castle (rooms.outside-castle/make screen)} + rooms (add-georgia-to-all-rooms screen rooms) entities {:rooms rooms - :step-particles (assoc (particle-effect "ego/step") :x 100 :y 100 :baseline 241) + :step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241) :cam {:zoom 0.95 :paused? false :object nil} + + :current-sounds {:object nil + :value []} :musics {:object nil - :inside-antique (utils/make-music "inside-antique.ogg") - :town-1 (utils/make-music "town-music-1.ogg") - :town-2 (utils/make-music "town-music-2.ogg") - :love (utils/make-music "love.ogg") - :inside-fangald (utils/make-music "inside-fangald.ogg") - :fight (utils/make-music "megaboss.mp3") - :pull-sword (utils/make-music "pull-sword.ogg") - :night (utils/make-music "night.ogg") + :inside-antique (utils/make-music "music/inside-antique.ogg") + :town-1 (utils/make-music "music/town-music-1.ogg") + :town-2 (utils/make-music "music/town-music-2.ogg") + :love (utils/make-music "music/love.ogg") + :inside-fangald (utils/make-music "music/inside-fangald.ogg") + :fight (utils/make-music "music/megaboss.mp3") + :pull-sword (utils/make-music "music/pull-sword.ogg") + :night (utils/make-music "music/night.ogg") :dream (utils/make-music "dream/music.ogg") - :secret-hideout (utils/make-music "secret-hideout.ogg")} - :state (get-state) + :secret-hideout (utils/make-music "music/secret-hideout.ogg") + :wind (utils/make-music "music/wind.ogg")} + :state (get-state @utils/selected-save) :time-profiles {:object nil :default utils/default-night-merge :sprite utils/default-night-merge-sprite @@ -998,11 +1013,11 @@ void main() :closing? {:object nil :value false} - :sounds {:blink (sound "blink-other.ogg") + :sounds {:blink (utils/load-sound "blink-other.ogg") :object nil} :fade {:object nil :opacity 0.0} - :white-fade (assoc (texture "white.png") + :white-fade (assoc (utils/get-texture "white.png") :scale-x 20 :scale-y 20 :baseline 9500 @@ -1029,7 +1044,7 @@ void main() :all-items (assoc items/items :object nil) :started? {:value false :object nil} - :room (as-> (get rooms (:last-room (get-state))) room + :room (as-> (get rooms (:last-room (get-state @utils/selected-save))) room (assoc-in room [:entities :ego] (get-ego screen (:start-pos room) ((:scale-fn room) (:start-pos room)))))}] (doseq [[k [start time fn]] (get-in entities [:room :timers])] @@ -1052,11 +1067,13 @@ void main() nil) :on-render - (fn [{:keys [camera ^FitViewport viewport] :as screen} [entities]] + (fn [{:keys [^OrthographicCamera camera ^FitViewport viewport] :as screen} [entities]] (.apply viewport) (if (get-in entities [:closing? :value]) (let [entities (utils/apply-tweens screen entities (:tweens entities)) + entities (update-current-sound-vols! entities) + entities (remove-ended-sounds screen entities) layers (get-layers entities) all-entities (concat (vals entities) layers (vals (get-in entities [:room :entities])))] (screen! fade-screen :update-fade :opacity (get-in entities [:fade :opacity])) @@ -1072,6 +1089,7 @@ void main() entities (update-from-room screen entities) entities (update-from-hotspots screen entities) entities (assoc-in entities [:room :entities :ego :last-frame] (get-in entities [:room :entities :ego :object])) + entities (update-in entities [:room :entities] (fn [entities] (into entities (for [[id entity] entities] @@ -1116,12 +1134,10 @@ void main() (set! (. camera zoom) (:zoom (:cam entities))) (set! (.. camera position x) (:x (:cam entities) 160.0)) (set! (.. camera position y) (:y (:cam entities) 120.0))) - (let [entities (utils/update-override screen entities)] - - - (when (= (get-in entities [:fade :opacity]) - 0.0) - (play-key-sounds entities)) + (let [entities (utils/update-override screen entities) + entities (play-key-sounds screen entities) + entities (update-current-sound-vols! entities) + entities (remove-ended-sounds screen entities)] (doseq [m (vals (get-in entities [:musics]))] (when m (music! m :set-volume (utils/current-music-volume (get-in entities [:volume :value]))))) @@ -1132,14 +1148,14 @@ void main() entities)))) - :on-resize (fn [{:keys [viewport width height]} [entities]] + :on-resize (fn [{:keys [^FitViewport viewport width height]} [entities]] (.update viewport width height)) :on-hide (fn [screen [entities]] (doseq [snd (->> (get-in entities [:musics]) vals (filter identity))] - (utils/stop-sound snd))) + (utils/stop-music snd))) :on-mouse-moved mouse-moved @@ -1148,7 +1164,7 @@ void main() mouse-moved :on-touch-down - (fn [{:keys [input-x input-y viewport] :as screen} [entities]] + (fn [{:keys [input-x input-y ^FitViewport viewport] :as screen} [entities]] (when (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport) (.getScreenWidth viewport) (.getScreenHeight viewport) input-x input-y) @@ -1162,7 +1178,7 @@ void main() interacting-entity (get-interacting-entity entities x y)] (assoc-in entities [:cursor :down-target] (or (:id interacting-entity ) (:id interaction) nil)))))) - :on-touch-up (fn [{:keys [input-x input-y viewport] :as screen} [entities]] + :on-touch-up (fn [{:keys [input-x input-y ^FitViewport viewport] :as screen} [entities]] (when (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport) (.getScreenWidth viewport) (.getScreenHeight viewport) @@ -1197,7 +1213,9 @@ void main() (tween/tween :fade-out-music screen [:volume :value] 1.0 0.0 1.0)) (assoc-in [:tweens :fade-out] (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish #(do (.clear @(resolve 'advent.core/am)) + :finish #(do + (utils/stop-all-sounds! %) + (.clear @(resolve 'advent.core/am)) (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.title/title-screen)) %)))))) @@ -1240,8 +1258,8 @@ void main() entities) :on-resize - (fn [screen entities] - (.update (:viewport screen) (:width screen) (:height screen) true)) + (fn [{:keys [^FitViewport viewport width height]} entities] + (.update viewport width height true)) ) (defscreen hud @@ -1250,27 +1268,27 @@ void main() (let [screen (assoc screen :total-time 0)] (utils/setup-viewport screen 320 240) - {:close (assoc (texture "close.png") + {:close (assoc (utils/get-texture "close.png") :x 304 :y 224 :width 16 :height 16 :baseline 9000 :opacity 0.8) - :inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000 + :inventory (assoc (utils/get-texture "inventory.png") :x 278 :y 0 :baseline 9000 :mouse-in? (zone/box 278 0 320 42) :opacity 0.8) :fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)})) :on-render - (fn [{:keys [viewport] :as screen} [entities]] + (fn [{:keys [^FitViewport viewport] :as screen} [entities]] (.apply viewport) (let [entities (utils/apply-tweens screen entities (:tweens entities))] - #_(label! (:fps entities) :set-text (str (game :fps))) - (render! screen [ (:inventory entities) (:close entities)]) + (label! (:fps entities) :set-text (str (game :fps))) + (render! screen [ (:fps entities) (:inventory entities) (:close entities)]) entities)) :on-resize - (fn [screen entities] - (.update (:viewport screen) (:width screen) (:height screen) true)) + (fn [{:keys [^FitViewport viewport width height]} entities] + (.update viewport width height true)) :on-mouse-moved (fn [screen [entities]] diff --git a/desktop/src-common/advent/screens/test.clj b/desktop/src-common/advent/screens/test.clj index 5fd16515..fdb54235 100644 --- a/desktop/src-common/advent/screens/test.clj +++ b/desktop/src-common/advent/screens/test.clj @@ -32,8 +32,8 @@ (utils/setup-viewport screen 320 240) - {:overlay (assoc (texture "testscreen/test.png" ) :x 0 :y 0 :origin-x 0 :origin-y 0) - :subject (assoc (texture "testscreen/subject.png" ) :x 160 :y 120 :origin-x 7 :origin-y 7 :scale-x 5 :scale-y 5 )}) + {:overlay (assoc (utils/get-texture "testscreen/test.png" ) :x 0 :y 0 :origin-x 0 :origin-y 0) + :subject (assoc (utils/get-texture "testscreen/subject.png" ) :x 160 :y 120 :origin-x 7 :origin-y 7 :scale-x 5 :scale-y 5 )}) :on-render (fn [screen [entities]] diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index d8b2a480..1abde9f6 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -5,6 +5,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all] [advent.utils :as utils] + [advent.saves :as saves] [advent.tween :as tween] [advent.screens.scene :as scene] [advent.screens.dialogue :as dialogue] @@ -21,14 +22,14 @@ [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen])) - (defn get-color [e mouse-pos] (if (utils/intersects? e mouse-pos) (color :yellow) (color 1.0 0.3 0.3 1.0))) (defn style-label [e font mouse-pos] - (label! e :set-style (style :label font (get-color e mouse-pos))) + (when (:interactable e) + (label! e :set-style (style :label font (get-color e mouse-pos)))) e) (defn style-slider [s mouse-pos] @@ -48,6 +49,26 @@ (def do-once (atom false)) +(defn quit [screen entities] + (do (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) + (-> entities + (assoc-in [:tweens :fade-out] + (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 + :finish (fn [entities] + (System/exit 0) + entities) + :ease tween/ease-in-cubic))))) + +(defn fly-balloon [screen entities] + (let [speed 0.03 + pos-f (- (* (:total-time screen) speed) (int (* (:total-time screen) speed))) + v (vector-2 0 0) + a (catmull-rom-spline! (:path (:balloon entities)) :value-at v pos-f)] + (-> entities + (update-in [:balloon] + merge {:x (vector-2! v :x) + :y (vector-2! v :y)})))) + (defn fly-ego [screen entities] (let [speed 0.07 pos-f (- (* (:total-time screen) speed) (int (* (:total-time screen) speed))) @@ -69,92 +90,175 @@ flipped)) (defn quest-label [] - (if (:seen-intro? (scene/get-state)) + (if (:seen-intro? (utils/load-snapshot :autosave)) "Continue quest" "Begin quest")) +(defn start-playing [screen entities save] + (do (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) + (-> entities + (assoc-in [:tweens :fade-out] + (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 + :finish (fn [entities] + (utils/stop-music (:music entities)) + (reset! utils/selected-save save) + (set-screen! @(resolve 'advent.core/advent) scene/scene scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen fade/fade-screen + ) + entities) + :ease tween/ease-in-cubic)) + (assoc-in [:tweens :fade-out-music] + (tween/tween :fade-out-music screen [:volume] 1.0 0.0 1.0))))) + +(defn make-label + ([msg] + (make-label msg nil)) + ([msg col] + (let [font (utils/get-font "ego/font.fnt")] + (-> msg + (label (style :label font (or col (color 1.0 0.3 0.3 1.0)))) + (assoc :x 0 :y 0 :height 32 :origin-x 0 :origin-y 0 :z 8) + center + (doto (label! :set-alignment Align/center)))))) + +(defn make-slider [initial-value] + (let [ui-skin (skin "ui/ui.json")] + (-> + (slider {:min 0 :max 100 :step 1} ui-skin :set-value initial-value) + (assoc :width 305 + :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) + :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle) + :z 8)))) + +(defn stack-y [label base index] + (assoc label :y (- base (* 32 index)))) + +(defn main-menu [] + (let [start-playing-label (quest-label) + is-starting? (= "Begin quest" start-playing-label)] + {:start-playing (-> (make-label start-playing-label) + (stack-y 305 0) + (assoc :z 8 + :interactable true)) + :rewind (-> (make-label "Previous chapter" (when is-starting? (color :white))) + (stack-y 305 1) + (assoc :z 8 + :interactable (not is-starting?))) + + :music-label (-> (make-label "Music" (color :white)) + (stack-y 305 2) + (assoc :z 8)) + + :music-volume-slider (-> (make-slider (:music-volume @utils/settings)) + center + (stack-y 305 3) + (assoc :z 8)) + + :sound-label (-> (make-label "FX" (color :white)) + (stack-y 305 4) + (assoc :z 8)) + :sound-volume-slider (-> (make-slider (:sound-volume @utils/settings)) + center + (stack-y 305 5) + (assoc :z 8)) + + :fullscreen (-> (make-label "Fullscreen") + (stack-y 305 6) + (assoc :z 8 :interactable true)) + :quit (-> (make-label "End quest") + (stack-y 305 7) + (assoc :z 8 :interactable true))})) + +(defn get-selected-save [entities [x y]] + (first (filter + (every-pred :save #(utils/intersects? % [x y])) + (vals entities)))) + +(defn saves-menu [] + (into {:back (-> (make-label "Back") + (stack-y 305 7) + (assoc :z 8 + :interactable true))} + (for [[name index] (map #(vector %1 %2) + (utils/snapshot-list) (range))] + [name (-> (make-label name) + (stack-y 305 index) + (assoc :z 8 + :interactable true + :save (saves/name->save name)))]))) + +(defn style-ui [entities] + (doseq [entity (vals entities) + :let [[x y] (:last-pos entities)] + :when (and (:object entity) x y)] + (cond (label? entity) + (style-label entity (get-in entities [:font]) [x y]) + + (slider? entity) + (style-slider entity [x y]))) + entities) + (defscreen title-screen :on-show (fn [screen entities] (utils/setup-viewport screen 1280 960) - (utils/load-settings!) + (when (utils/has-saved-settings?) + (utils/load-settings!)) (let [font (utils/get-font "ego/font.fnt") - start-playing (assoc (label (quest-label) (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y 280 :height 32 :origin-x 0 :origin-y 0) - start-playing (center start-playing) - copyright (assoc (label "DEMO - Copyright Bryce Covert - Not for distribution" (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y 0 :height 32 :origin-x 0 :origin-y 0) - copyright (center copyright) - fullscreen (assoc (label "Fullscreen" (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y (- 280 (* 32 5)) :height 32 :origin-x 0 :origin-y 0) - fullscreen (center fullscreen) - quit (assoc (label "End quest" (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y (- 280 (* 32 6)) :height 32 :origin-x 0 :origin-y 0) - quit (center quit) - music (utils/make-music "intro.ogg") - ui-skin (skin "ui/ui.json") - ] - (label! start-playing :set-alignment Align/center) - (label! quit :set-alignment Align/center) - (label! fullscreen :set-alignment Align/center) + music (utils/make-music "music/intro.ogg") + balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))] + (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) - {:background (assoc (texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) - :cloud-background (assoc (texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) - :logo (assoc (texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) - :fade (assoc (texture "black.png") - :scale-x 80 - :scale-y 80 - :opacity 1.0 - :origin-x 0 - :origin-y 0) - :flying-ego (assoc (texture "ego/flying.png") - :left (flip (texture "ego/flying.png")) - :right (texture "ego/flying.png") - :scale-x 5 - :scale-y 5 - :origin-x 2 - :origin-y 0 - :path (catmull-rom-spline (map #(apply vector-2* %) [[-800 450] [1280 450] [2000 100] [0 100] [-800 300] [1280 300] [2000 450]]) true) - :x 450 - :y 650) - :particle-clouds (assoc (particle-effect "title/particle-clouds" :reset :start) :x 640 :y 480 ) - :ego-jet (assoc (particle-effect "ego/jet" :reset :start) :x 450 :y 650 ) - :toolbox (center (assoc (nine-patch {:region (:object (texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) - :y 58 :width 500 :height 282)) + (let [entities {:background (assoc (utils/get-texture "title/background.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 0) + :cloud-background (assoc (utils/get-texture "title/clouds.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 2) + :logo (assoc (utils/get-texture "title/logo.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 6) + :fade (assoc (utils/get-texture "black.png") + :scale-x 80 + :scale-y 80 + :opacity 1.0 + :origin-x 0 + :origin-y 0 + :z 100) + :flying-ego (assoc (utils/get-texture "ego/flying.png") + :left (flip (utils/get-texture "ego/flying.png")) + :right (utils/get-texture "ego/flying.png") + :scale-x 5 + :scale-y 5 + :origin-x 2 + :origin-y 0 + :path (catmull-rom-spline (map #(apply vector-2* %) [[-800 450] [1280 450] [2000 100] [0 100] [-800 300] [1280 300] [2000 450]]) true) + :x 450 + :y 650 + :z 5) + :balloon (assoc (animation->texture (assoc screen :total-time 0.0) balloon) :x 100 :y 100 :scale-x 4 :scale-y 4 + :anim balloon + :path (catmull-rom-spline (map #(apply vector-2* %) + [[50 50] [70 100] [100 200] [151 206] [300 225] + [480 300] [560 400] [650 440] [700 550] [750 600] + [860 650] [950 700] [1030 800] [1280 960] [1300 1000] + [-50 1000] [-50 -50]]) true) + :z 3) + :particle-clouds (assoc (particle-effect "particles/particle-clouds" :reset :start) :x 640 :y 480 :z 1) + :ego-jet (assoc (particle-effect "particles/jet" :reset :start) :x 450 :y 650 :z 4) - :music-label (-> (label "Music" (style :label font (color 1.0 1.0 1.0 1.0))) - (assoc :x 0 :y (- 280 (* 32 1)) :height 32 :origin-x 0 :origin-y 0) - center) - :music-volume-slider (-> (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings)) - (assoc :x (- (/ 1280 2) 150) - :width 300 - :y (- 280 (* 32 2)) - :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) - :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle))) + :toolbox (-> (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + :y 58 :width 500 :height 297 + :z 7) + center) + :main-menu (main-menu) + :saves-menu (saves-menu) + :font font + :music music + :volume 1.0 + :copyright (make-label "DEMO - Copyright Bryce Covert - Not for distribution") + :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 + :finish #(do - :sound-label (-> - (label "FX" (style :label font (color 1.0 1.0 1.0 1.0))) - (assoc :x 0 :y (- 280 (* 32 3)) :height 32 :origin-x 0 :origin-y 0) - center) - - - :sound-volume-slider (assoc (slider {:min 0 :max 100 :step 1 } ui-skin :set-value (:sound-volume @utils/settings)) - :width 300 - :x ( - (/ 1280 2) - 150) - :y (- 280 (* 32 4)) - :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) - :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle)) - :font font - :music music - :volume 1.0 - :start-playing start-playing - :quit quit - :fullscreen fullscreen - :copyright copyright - :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 - :finish #(do - - (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) - (utils/play-sound (:music %)) %) - :ease tween/ease-in-quadratic)}})) + (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) + (utils/play-music (:music %)) %) + :ease tween/ease-in-quadratic)}} + ] + (merge entities (:main-menu entities))))) :on-render (fn [{:keys [^FitViewport viewport] :as screen} [entities]] @@ -162,13 +266,17 @@ (clear!) (let [entities (utils/apply-tweens screen entities (:tweens entities)) entities (fly-ego screen entities) - ] - (label! (:fullscreen entities) :set-text (if (.isFullscreen Gdx/graphics) - "Fullscreen" - "Windowed")) + entities (fly-balloon screen entities) + entities (update-in entities [:balloon] merge (animation->texture screen (:anim (:balloon entities)))) + entities (style-ui entities)] + (when (:fullscreen entities) + (label! (:fullscreen entities) :set-text (if (.isFullscreen Gdx/graphics) + "Fullscreen" + "Windowed"))) + (music! (:music entities) :set-volume (utils/current-music-volume (:volume entities))) - (render! screen [(:background entities) (:particle-clouds entities) (:cloud-background entities) (:ego-jet entities) (:flying-ego entities) (:logo entities) (:toolbox entities) (:start-playing entities) (:quit entities) (:fullscreen entities) (:music-label entities) (:music-volume-slider entities) (:sound-label entities) (:sound-volume-slider entities) (:copyright entities) (:fade entities) ]) + (render! screen (sort-by :z (filter :object (vals entities))) ) entities)) :show-screen (fn [entities] @@ -176,12 +284,11 @@ :on-mouse-moved (fn [screen [entities]] (let [[x y] (utils/unproject screen)] - (style-label (:start-playing entities) (get-in entities [:font]) [x y]) - (style-label (:fullscreen entities) (get-in entities [:font]) [x y]) - (style-label (:quit entities) (get-in entities [:font]) [x y]) - (style-slider (:music-volume-slider entities) [x y]) - (style-slider (:sound-volume-slider entities) [x y]) - entities)) + (assoc entities :last-pos [x y]))) + + :on-touch-dragged (fn [screen [entities]] + (let [[x y] (utils/unproject screen)] + (assoc entities :last-pos [x y]))) :on-key-up (fn [screen entities] (when (= (key-code :escape) (:key screen)) @@ -199,40 +306,40 @@ entities) :on-touch-up (fn [screen [entities]] - (when-not (get-in entities [:tweens :fade-out]) - (let [[x y] (utils/unproject screen)] + (let [[x y] (utils/unproject screen) + selected-save (get-selected-save entities [x y])] (cond - (utils/intersects? (:start-playing entities) [x y]) - (do (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) - (-> entities - (assoc-in [:tweens :fade-out] - (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish (fn [entities] - (utils/stop-sound (:music entities)) - (set-screen! @(resolve 'advent.core/advent) scene/scene scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen inventory/inventory-screen safe/safe-screen fade/fade-screen - ) - entities) - :ease tween/ease-in-cubic)) - (assoc-in [:tweens :fade-out-music] - (tween/tween :fade-out-music screen [:volume] 1.0 0.0 1.0)))) - (utils/intersects? (:quit entities) [x y]) - (do (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) - (-> entities - (assoc-in [:tweens :fade-out] - (tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 1.0 - :finish (fn [entities] - (System/exit 0) - entities) - :ease tween/ease-in-cubic)))) + (utils/intersects? (:start-playing entities) [x y]) + + (start-playing screen entities (if (= "Begin quest" (quest-label)) + nil + :autosave)) - (utils/intersects? (:fullscreen entities) [x y]) - (utils/toggle-fullscreen!) - - :else - nil)))) + (and (utils/intersects? (:rewind entities) [x y]) + (-> entities :rewind :interactable)) + (-> (apply dissoc entities (keys (:main-menu entities))) + (merge (:saves-menu entities))) + + (utils/intersects? (:quit entities) [x y]) + (quit screen entities) + + (utils/intersects? (:fullscreen entities) [x y]) + (utils/toggle-fullscreen!) + + (and (:back entities) (utils/intersects? (:back entities) [x y])) + (-> (apply dissoc entities (keys (:saves-menu entities))) + (merge (:main-menu entities))) + + selected-save + (start-playing screen entities (:save selected-save)) + + :else + nil)))) :on-resize (fn [{:keys [viewport width height]} [entities]] (.update viewport width height false) nil)) + + diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 5effb62e..3d38bd7c 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -5,13 +5,16 @@ [play-clj.utils :refer :all] [play-clj.math :refer :all] [play-clj.g2d :refer :all] + [play-clj.entities :refer [->TextureEntity]] [clojure.java.io :as io] [clojure.edn :as edn] - [clojure.string :as str]) + [clojure.string :as str] + [advent.saves :as saves]) (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Blending Pixmap$Filter Texture Texture$TextureFilter] - [com.badlogic.gdx.graphics.g2d TextureRegion] + [com.badlogic.gdx.graphics.g2d TextureRegion Animation] [com.badlogic.gdx.utils.viewport FitViewport] [com.badlogic.gdx.scenes.scene2d Actor Stage] + [com.badlogic.gdx.math CatmullRomSpline] [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen] [java.lang Object])) @@ -25,6 +28,8 @@ (def settings (atom {:music-volume 50.0 :sound-volume 75.0})) +(def selected-save (atom nil)) + (defn current-music-volume [& [factor]] (* (Math/pow (/ (:music-volume @settings) 100.0) 2) 0.25 @@ -48,24 +53,68 @@ resized )) +(defn get-texture [path] + (let [atlas-name (str/replace path #".png" "") + atlas (texture-atlas "packed/pack.atlas")] + (texture (texture-atlas! atlas :find-region atlas-name)))) + + +(defn snapshot-list [] + (let [prefs (.getPreferences (Gdx/app) "ticks-tales-saves")] + (if (.contains prefs "snapshot-list") + (edn/read-string (.getString prefs "snapshot-list")) + []))) + +(defn snapshot-state [entities name] + (doto (.getPreferences (Gdx/app) "ticks-tales-saves") + (.putString (saves/saves name) (pr-str (entities :state))) + (.putString "snapshot-list" (pr-str (filter (complement #{"Autosave"}) + (cons (saves/saves name) + (filter (complement #{(saves/saves name)}) + (snapshot-list)))))) + .flush)) + (defn save [entities] - (spit "save.edn" (entities :state))) + (snapshot-state entities :autosave)) + +(defn has-save? + ([] (has-save? :autosave)) + ([key] + (let [name (saves/saves key)] + (-> (.getPreferences (Gdx/app) "ticks-tales-saves") + (.contains name))))) + +(defn load-snapshot [key] + (doto (let [name (saves/saves key)] + (-> (.getPreferences (Gdx/app) "ticks-tales-saves") + (.getString name) + edn/read-string + (assoc :active? true))) + println)) (defn load [] - (assoc (edn/read-string (slurp "save.edn")) :active? true)) - -(defn load-settings! [] - (when (.exists (io/file "settings.edn")) - (reset! settings (edn/read-string (slurp "settings.edn"))))) + (load-snapshot :autosave)) (defn save-settings! [] - (spit "settings.edn" @settings)) + (doto (.getPreferences (Gdx/app) "ticks-tales-saves") + (.putString "settings" (pr-str @settings)) + .flush)) + +(defn has-saved-settings? [] + (-> (.getPreferences (Gdx/app) "ticks-tales-saves") + (.contains "settings"))) + +(defn load-settings! [] + (reset! settings + (-> (.getPreferences (Gdx/app) "ticks-tales-saves") + (.getString "settings") + edn/read-string))) (defn get-font [filename] (let [font (bitmap-font filename) tr (bitmap-font! font :get-region) tx (.getTexture tr)] - (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) + (call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) font)) (def +screen-width+ 320) @@ -112,26 +161,40 @@ (Math/sqrt (+ (* dx dx) (* dy dy))))) -(defn flip [anim] +(defn flip [^Animation anim] (animation (animation! anim :get-frame-duration) (for [src-frame (animation! anim :get-key-frames) :let [frame (texture (texture! src-frame :get-texture))]] (do - (texture! frame :set-region src-frame) + (texture! frame :set-region ^TextureRegion src-frame) (texture! frame :flip true false) frame)))) -(defn split-texture [file [w h] frames] - (let [sheet (texture! (texture file) :split w h)] - (for [i frames] - (aget sheet 0 i)))) +(defn split-texture [file [tile-width tile-height] frames] + (let [sheet (get-texture file) + sheet-obj ^TextureRegion (:object sheet) + width ^int (int (.getRegionWidth sheet-obj)) + x ^int (int (.getRegionX sheet-obj)) + y ^int (int (.getRegionY sheet-obj))] + (for [frame frames + :let [new-tex ^TextureRegion (TextureRegion. sheet-obj)]] + (do + (.setRegion new-tex + (unchecked-add x (unchecked-multiply tile-width frame)) + y + tile-width + tile-height) + (->TextureEntity new-tex)))) + ) (defn make-anim [file [w h] speed frames] (animation speed (split-texture file [w h] frames))) +(defn make-anim-seq [file [w h] speed frames] + (animation speed (map #(get-texture (str file "-" (inc %) ".png")) frames))) (defn make-bird [screen p] - (let [bird-sheet (texture! (texture "outside-castle/bird.png") :split 1 2) + (let [bird-sheet (texture! (get-texture "outside-castle/bird.png") :split 1 2) bird-stand (animation 0.15 (for [i [0 1]] (aget bird-sheet 0 i)))] (assoc (animation->texture screen bird-stand) @@ -145,7 +208,7 @@ (let [speed 0.05 pos-f (- (* (:total-time screen) speed) (int (* (:total-time screen) speed))) v (vector-2 0 0) - a (catmull-rom-spline! (:path entity) :value-at v pos-f)] + a (catmull-rom-spline! ^CatmullRomSpline (:path entity) :value-at v pos-f)] (assoc entity :x (vector-2! v :x) :y (vector-2! v :y))))))) (defn path-point [speed screen entities entity] @@ -156,7 +219,7 @@ (if (:path entity) (let [pos-f (- (path-point speed screen entities entity) (int (* (- (:total-time screen) (:path-start-time entity 0.0)) speed))) v (vector-2 0 0) - a (catmull-rom-spline! (:path entity) :value-at v pos-f)] + a (catmull-rom-spline! ^CatmullRomSpline (:path entity) :value-at v pos-f)] (assoc entity :x (vector-2! v :x) :y (vector-2! v :y))) entity)) @@ -182,14 +245,24 @@ (update-in entities [:room :interactions] (fn [i] (remove #(= id (:id %)) i)))) -(defn play-sound [snd] +(defn play-music [snd] (music! snd :play)) -(defn stop-sound [snd] +(defn stop-music [snd] (music! snd :stop)) (defn make-music [r] - (doto (music r) (music! :set-looping true))) + (try + (doto (music r) (music! :set-looping true)) + (catch Exception _ + (doto (music (str r ".mp3")) (music! :set-looping true))))) + +(defn load-sound [f] + (try + (sound f) + (catch Exception e + (println e) + (sound (str f ".mp3"))))) @@ -201,8 +274,8 @@ (defn intersects? [e [x y]] (and (:object e) - (< (:x e) x (+ (:x e) (or (:width e) (.getWidth (:object e))))) - (< (:y e) y (+ (:y e) (or (:height e) (.getHeight (:object e))))))) + (< (:x e) x (+ (:x e) (or (:width e) (.getWidth ^Actor (:object e))))) + (< (:y e) y (+ (:y e) (or (:height e) (.getHeight ^Actor (:object e))))))) (defn get-current-music [entities] (let [time (get-in entities [:state :time]) @@ -247,7 +320,7 @@ (and is-script-running (= :none (get-in entities [:actions :last-skip-type]))))) -(defn update-override [{:keys [viewport] :as screen} entities] +(defn update-override [{:keys [^FitViewport viewport] :as screen} entities] (let [raw-pos (get-in entities [:cursor :last-pos]) last-pos (unproject screen raw-pos) mouse-override (find-override entities last-pos) @@ -330,3 +403,44 @@ (.getDeclaredField (name "config")) (doto (.setAccessible true)) (.get Gdx/graphics))) 60)))) + +(defn get-sound-pan [x] + (/ (- x 160 ) 160)) + +(defn sourced-volume-fn [target vol-scale [x y]] + (fn [entities] + (if (= target :ego) + (-> (* (/ (get-in entities [:room :entities :ego :scale-x]) 1.5) 0.75) + (* (or vol-scale 1.0)) + (clamp-volume)) + (proximity-volume entities [x y] :scale vol-scale)) + )) + +(defn scale-vol-from-fade [entities vol] + (* vol + (- 1.0 (get-in entities [:fade :opacity])))) + +(defn play-sound! + ([screen entities snd volume-fn] + (play-sound! screen entities snd volume-fn 0.5)) + + ([screen entities snd volume-fn pan] + (play-sound! screen entities snd volume-fn pan :once)) + + ([screen entities snd volume-fn pan type] + (let [vol (volume-fn entities) + sound-id (if (= :once type) + (sound! snd :play (scale-vol-from-fade entities (current-sound-volume vol)) 1.0 pan) + (sound! snd :loop (scale-vol-from-fade entities (current-sound-volume vol)) 1.0 pan)) ] + (update-in entities [:current-sounds :value] + conj {:id sound-id + :sound snd + :volume-fn volume-fn + :type type + :ends-at (if (= type :once) + (+ (:total-time screen) (sound! snd :duration)) + nil)})))) + +(defn stop-all-sounds! [entities] + (doseq [snd (get-in entities [:current-sounds :value])] + (sound! (:sound snd) :stop (:id snd)))) diff --git a/desktop/test.sh b/desktop/test.sh new file mode 100755 index 00000000..993e1ed9 --- /dev/null +++ b/desktop/test.sh @@ -0,0 +1,93 @@ +#!/bin/bash +git mv resources/castle-gate/coinflip.pxa asset-work/castle-gate/coinflip.pxa +git mv resources/castle-gate/frankie.pxa asset-work/castle-gate/frankie.pxa +git mv resources/castle-gate/goon-1.pxa asset-work/castle-gate/goon-1.pxa +git mv resources/castle-gate/goon-2-flip.pxa asset-work/castle-gate/goon-2-flip.pxa +git mv resources/castle-gate/goon-2-search.pxa asset-work/castle-gate/goon-2-search.pxa +git mv resources/castle-gate/goon-2-talk.pxa asset-work/castle-gate/goon-2-talk.pxa +git mv resources/castle-gate/goon-2-walk.pxa asset-work/castle-gate/goon-2-walk.pxa +git mv resources/castle-gate/goon-2.pxa asset-work/castle-gate/goon-2.pxa +git mv resources/castle-gate/throw-walkie.pxa asset-work/castle-gate/throw-walkie.pxa +git mv resources/cat-tree/cat.pxa asset-work/cat-tree/cat.pxa +git mv resources/cat-tree/grandma-cry.pxa asset-work/cat-tree/grandma-cry.pxa +git mv resources/cat-tree/grandma.pxa asset-work/cat-tree/grandma.pxa +git mv resources/cat-tree/ladderbreak.pxa asset-work/cat-tree/ladderbreak.pxa +git mv resources/cat-tree/monocle.pxa asset-work/cat-tree/monocle.pxa +git mv resources/cat-tree/owl.pxa asset-work/cat-tree/owl.pxa +git mv resources/dream/fairy-godfather.pxa asset-work/dream/fairy-godfather.pxa +git mv resources/ego/axe.pxa asset-work/ego/axe.pxa +git mv resources/ego/burnt.pxa asset-work/ego/burnt.pxa +git mv resources/ego/cat-toy.pxa asset-work/ego/cat-toy.pxa +git mv resources/ego/crawl.pxa asset-work/ego/crawl.pxa +git mv resources/ego/crowbar.pxa asset-work/ego/crowbar.pxa +git mv resources/ego/fire.pxa asset-work/ego/fire.pxa +git mv resources/ego/frog.pxa asset-work/ego/frog.pxa +git mv resources/ego/frustratedtalk.pxa asset-work/ego/frustratedtalk.pxa +git mv resources/ego/get-sick.pxa asset-work/ego/get-sick.pxa +git mv resources/ego/glad.pxa asset-work/ego/glad.pxa +git mv resources/ego/grow-talk.pxa asset-work/ego/grow-talk.pxa +git mv resources/ego/grow.pxa asset-work/ego/grow.pxa +git mv resources/ego/hold-up-to-window.pxa asset-work/ego/hold-up-to-window.pxa +git mv resources/ego/idea.pxa asset-work/ego/idea.pxa +git mv resources/ego/love.pxa asset-work/ego/love.pxa +git mv resources/ego/pant.pxa asset-work/ego/pant.pxa +git mv resources/ego/reach.pxa asset-work/ego/reach.pxa +git mv resources/ego/scared-walk.pxa asset-work/ego/scared-walk.pxa +git mv resources/ego/scared.pxa asset-work/ego/scared.pxa +git mv resources/ego/shock.pxa asset-work/ego/shock.pxa +git mv resources/ego/shoot.pxa asset-work/ego/shoot.pxa +git mv resources/ego/sigh.pxa asset-work/ego/sigh.pxa +git mv resources/ego/spear.pxa asset-work/ego/spear.pxa +git mv resources/ego/squat.pxa asset-work/ego/squat.pxa +git mv resources/ego/stand.pxa asset-work/ego/stand.pxa +git mv resources/ego/standup.pxa asset-work/ego/standup.pxa +git mv resources/ego/suspended.pxa asset-work/ego/suspended.pxa +git mv resources/ego/swing.pxa asset-work/ego/swing.pxa +git mv resources/ego/swingshovel.pxa asset-work/ego/swingshovel.pxa +git mv resources/ego/talk.pxa asset-work/ego/talk.pxa +git mv resources/ego/throw.pxa asset-work/ego/throw.pxa +git mv resources/ending-castle/duke.pxa asset-work/ending-castle/duke.pxa +git mv resources/ending-castle/game-player.pxa asset-work/ending-castle/game-player.pxa +git mv resources/ending-castle/warden.pxa asset-work/ending-castle/warden.pxa +git mv resources/ending-castle/warden2.pxa asset-work/ending-castle/warden2.pxa +git mv resources/held/bloodclot-head.pxa asset-work/held/bloodclot-head.pxa +git mv resources/inside-antique/antique-sigh.pxa asset-work/inside-antique/antique-sigh.pxa +git mv resources/inside-antique/clock.pxa asset-work/inside-antique/clock.pxa +git mv resources/inside-cafeteria/knighta.pxa asset-work/inside-cafeteria/knighta.pxa +git mv resources/inside-cafeteria/knights-stand.pxa asset-work/inside-cafeteria/knights-stand.pxa +git mv resources/inside-castle/brian-working.pxa asset-work/inside-castle/brian-working.pxa +git mv resources/inside-castle/door.pxa asset-work/inside-castle/door.pxa +git mv resources/inside-castle/game-player-talk.pxa asset-work/inside-castle/game-player-talk.pxa +git mv resources/inside-castle/hands.pxa asset-work/inside-castle/hands.pxa +git mv resources/inside-house/candle-aura.pxa asset-work/inside-house/candle-aura.pxa +git mv resources/inside-jail/candle.pxa asset-work/inside-jail/candle.pxa +git mv resources/inside-jail/warden.pxa asset-work/inside-jail/warden.pxa +git mv resources/inside-stash/candle.pxa asset-work/inside-stash/candle.pxa +git mv resources/left.pxa asset-work/left.pxa +git mv resources/outside-castle/talk.pxa asset-work/outside-castle/talk.pxa +git mv resources/outside-jail/axe-wood.pxa asset-work/outside-jail/axe-wood.pxa +git mv resources/outside-jail/axe.pxa asset-work/outside-jail/axe.pxa +git mv resources/outside-jail/candle-aura.pxa asset-work/outside-jail/candle-aura.pxa +git mv resources/outside-jail/candle.pxa asset-work/outside-jail/candle.pxa +git mv resources/outside-jail/fountain.pxa asset-work/outside-jail/fountain.pxa +git mv resources/outside-jail/guard-sleep.pxa asset-work/outside-jail/guard-sleep.pxa +git mv resources/outside-jail/open-stash.pxa asset-work/outside-jail/open-stash.pxa +git mv resources/outsidehouse/cauldron.pxa asset-work/outsidehouse/cauldron.pxa +git mv resources/outsidehouse/door.pxa asset-work/outsidehouse/door.pxa +git mv resources/outsidehouse/lamb.pxa asset-work/outsidehouse/lamb.pxa +git mv resources/outsidehouse/sheep-walk.pxa asset-work/outsidehouse/sheep-walk.pxa +git mv resources/outsidehouse/sheep.pxa asset-work/outsidehouse/sheep.pxa +git mv resources/right.pxa asset-work/right.pxa +git mv resources/space/blergh-appear.pxa asset-work/space/blergh-appear.pxa +git mv resources/space/bloodclot-head-talk.pxa asset-work/space/bloodclot-head-talk.pxa +git mv resources/space/bloodclot-stand.pxa asset-work/space/bloodclot-stand.pxa +git mv resources/space/bloodclot-talk.pxa asset-work/space/bloodclot-talk.pxa +git mv resources/space/bullet.pxa asset-work/space/bullet.pxa +git mv resources/space/explode.pxa asset-work/space/explode.pxa +git mv resources/space/grow.pxa asset-work/space/grow.pxa +git mv resources/title/balloon.pxa asset-work/title/balloon.pxa +git mv resources/wizard/disappear.pxa asset-work/wizard/disappear.pxa +git mv resources/wizard/experiment.pxa asset-work/wizard/experiment.pxa +git mv resources/wizard/magic-hands.pxa asset-work/wizard/magic-hands.pxa +git mv resources/wizard/talk-angry.pxa asset-work/wizard/talk-angry.pxa +git mv resources/wizard/talk.pxa resources/wizard/talk.pxa diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 00000000..5eb45ce3 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,3 @@ +target +checkouts +advent.core.IOSLauncher diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index fd3d53ff..473b57e2 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -5,15 +5,15 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - advent + Tick's Tales CFBundleExecutable - advent + tickstales CFBundleIdentifier - advent.core + com.brycecovertoperations.tickstales CFBundleInfoDictionaryVersion 6.0 CFBundleName - advent + tickstales CFBundlePackageType APPL CFBundleShortVersionString diff --git a/ios/build.sh b/ios/build.sh new file mode 100755 index 00000000..9beeacc1 --- /dev/null +++ b/ios/build.sh @@ -0,0 +1,2 @@ +#!/bin/bash +rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa diff --git a/ios/libs/libObjectAL.a b/ios/libs/libObjectAL.a index 95969cb7..64a843e4 100644 Binary files a/ios/libs/libObjectAL.a and b/ios/libs/libObjectAL.a differ diff --git a/ios/libs/libgdx-box2d.a b/ios/libs/libgdx-box2d.a index a8bcffca..d32d6657 100644 Binary files a/ios/libs/libgdx-box2d.a and b/ios/libs/libgdx-box2d.a differ diff --git a/ios/libs/libgdx-bullet.a b/ios/libs/libgdx-bullet.a index bb80ec0e..9ff9bcdc 100644 Binary files a/ios/libs/libgdx-bullet.a and b/ios/libs/libgdx-bullet.a differ diff --git a/ios/libs/libgdx.a b/ios/libs/libgdx.a index cf8eadaa..371d37bb 100644 Binary files a/ios/libs/libgdx.a and b/ios/libs/libgdx.a differ diff --git a/ios/project.clj b/ios/project.clj index 3ef92c86..4a1f6ce7 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -1,17 +1,24 @@ (defproject advent "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.3.0"] - [com.badlogicgames.gdx/gdx-backend-robovm "1.3.0"] - [com.badlogicgames.gdx/gdx-box2d "1.3.0"] - [com.badlogicgames.gdx/gdx-bullet "1.3.0"] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.3"] + [com.badlogicgames.gdx/gdx-backend-robovm "1.5.3"] + [org.clojure/data.priority-map "0.0.5"] + [org.clojure/core.async "0.1.346.0-17112a-alpha"] [org.clojure/clojure "1.6.0"] - [play-clj "0.3.9"]] + [org.robovm/robovm-cocoatouch "1.7.0"] + [org.robovm/robovm-objc "1.7.0"] + [org.robovm/robovm-rt "1.7.0"] + [play-clj "0.4.5-BRYCE"]] :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java"] + :plugins [[lein-fruit "0.2.4-SNAPSHOT"]] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :ios {:robovm-opts ["-forcelinkclasses" "advent.**:clojure.**:com.badlogic.**:play_clj.**" - "-libs" "libs/libObjectAL.a:libs/libgdx.a:libs/libgdx-box2d.a:libs/libgdx-bullet.a" + "-libs" "libs/libObjectAL.a:libs/libgdx.a" "-frameworks" "UIKit:OpenGLES:QuartzCore:CoreGraphics:OpenAL:AudioToolbox:AVFoundation" - "-resources" "../desktop/resources/**"]} + "-resources" "../desktop/resources/**" + ] + :robovm-path "/Users/brycecovert/dev/robovm/robovm-1.7.0/" + :versionn 1.1} :aot :all :main advent.core.IOSLauncher) diff --git a/ios/src/java/advent/core/IOSLauncher.java b/ios/src/java/advent/core/IOSLauncher.java index 9f60f9be..e7d8b8e0 100644 --- a/ios/src/java/advent/core/IOSLauncher.java +++ b/ios/src/java/advent/core/IOSLauncher.java @@ -8,10 +8,18 @@ import com.badlogic.gdx.backends.iosrobovm.*; import org.robovm.apple.foundation.*; import org.robovm.apple.uikit.*; +import org.robovm.apple.glkit.GLKViewDrawableColorFormat; +import org.robovm.apple.glkit.GLKViewDrawableDepthFormat; public class IOSLauncher extends IOSApplication.Delegate { protected IOSApplication createApplication() { IOSApplicationConfiguration config = new IOSApplicationConfiguration(); + config.colorFormat = GLKViewDrawableColorFormat.SRGBA8888; + config.depthFormat = GLKViewDrawableDepthFormat._24; + config.orientationPortrait = false; + config.orientationLandscape = true; + config.preferredFramesPerSecond = 30; + RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core")); try { Game game = (Game) RT.var("advent.core", "advent").deref();