diff --git a/desktop/asset-work/ego/Untitled.png b/desktop/asset-work/global/ego/Untitled.png similarity index 100% rename from desktop/asset-work/ego/Untitled.png rename to desktop/asset-work/global/ego/Untitled.png diff --git a/desktop/asset-work/ego/axe-wood.png b/desktop/asset-work/global/ego/axe-wood.png similarity index 100% rename from desktop/asset-work/ego/axe-wood.png rename to desktop/asset-work/global/ego/axe-wood.png diff --git a/desktop/asset-work/ego/axe.ogg b/desktop/asset-work/global/ego/axe.ogg similarity index 100% rename from desktop/asset-work/ego/axe.ogg rename to desktop/asset-work/global/ego/axe.ogg diff --git a/desktop/asset-work/ego/axe.png b/desktop/asset-work/global/ego/axe.png similarity index 100% rename from desktop/asset-work/ego/axe.png rename to desktop/asset-work/global/ego/axe.png diff --git a/desktop/asset-work/ego/axe.pxa/0.pxi b/desktop/asset-work/global/ego/axe.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/0.pxi rename to desktop/asset-work/global/ego/axe.pxa/0.pxi diff --git a/desktop/asset-work/ego/axe.pxa/1.pxi b/desktop/asset-work/global/ego/axe.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/1.pxi rename to desktop/asset-work/global/ego/axe.pxa/1.pxi diff --git a/desktop/asset-work/ego/axe.pxa/2.pxi b/desktop/asset-work/global/ego/axe.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/2.pxi rename to desktop/asset-work/global/ego/axe.pxa/2.pxi diff --git a/desktop/asset-work/ego/axe.pxa/3.pxi b/desktop/asset-work/global/ego/axe.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/3.pxi rename to desktop/asset-work/global/ego/axe.pxa/3.pxi diff --git a/desktop/asset-work/ego/axe.pxa/4.pxi b/desktop/asset-work/global/ego/axe.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/4.pxi rename to desktop/asset-work/global/ego/axe.pxa/4.pxi diff --git a/desktop/asset-work/ego/axe.pxa/5.pxi b/desktop/asset-work/global/ego/axe.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/5.pxi rename to desktop/asset-work/global/ego/axe.pxa/5.pxi diff --git a/desktop/asset-work/ego/axe.pxa/6.pxi b/desktop/asset-work/global/ego/axe.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/axe.pxa/6.pxi rename to desktop/asset-work/global/ego/axe.pxa/6.pxi diff --git a/desktop/asset-work/ego/axe.pxa/CelData.plist b/desktop/asset-work/global/ego/axe.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/axe.pxa/CelData.plist rename to desktop/asset-work/global/ego/axe.pxa/CelData.plist diff --git a/desktop/asset-work/ego/axe.wav b/desktop/asset-work/global/ego/axe.wav similarity index 100% rename from desktop/asset-work/ego/axe.wav rename to desktop/asset-work/global/ego/axe.wav diff --git a/desktop/asset-work/ego/base.png b/desktop/asset-work/global/ego/base.png similarity index 100% rename from desktop/asset-work/ego/base.png rename to desktop/asset-work/global/ego/base.png diff --git a/desktop/asset-work/ego/blink2.wav b/desktop/asset-work/global/ego/blink2.wav similarity index 100% rename from desktop/asset-work/ego/blink2.wav rename to desktop/asset-work/global/ego/blink2.wav diff --git a/desktop/asset-work/ego/breakglass.wav b/desktop/asset-work/global/ego/breakglass.wav similarity index 100% rename from desktop/asset-work/ego/breakglass.wav rename to desktop/asset-work/global/ego/breakglass.wav diff --git a/desktop/asset-work/ego/burnt.png b/desktop/asset-work/global/ego/burnt.png similarity index 100% rename from desktop/asset-work/ego/burnt.png rename to desktop/asset-work/global/ego/burnt.png diff --git a/desktop/asset-work/ego/burnt.pxa/0.pxi b/desktop/asset-work/global/ego/burnt.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/0.pxi rename to desktop/asset-work/global/ego/burnt.pxa/0.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/1.pxi b/desktop/asset-work/global/ego/burnt.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/1.pxi rename to desktop/asset-work/global/ego/burnt.pxa/1.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/10.pxi b/desktop/asset-work/global/ego/burnt.pxa/10.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/10.pxi rename to desktop/asset-work/global/ego/burnt.pxa/10.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/11.pxi b/desktop/asset-work/global/ego/burnt.pxa/11.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/11.pxi rename to desktop/asset-work/global/ego/burnt.pxa/11.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/2.pxi b/desktop/asset-work/global/ego/burnt.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/2.pxi rename to desktop/asset-work/global/ego/burnt.pxa/2.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/3.pxi b/desktop/asset-work/global/ego/burnt.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/3.pxi rename to desktop/asset-work/global/ego/burnt.pxa/3.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/4.pxi b/desktop/asset-work/global/ego/burnt.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/4.pxi rename to desktop/asset-work/global/ego/burnt.pxa/4.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/5.pxi b/desktop/asset-work/global/ego/burnt.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/5.pxi rename to desktop/asset-work/global/ego/burnt.pxa/5.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/6.pxi b/desktop/asset-work/global/ego/burnt.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/6.pxi rename to desktop/asset-work/global/ego/burnt.pxa/6.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/7.pxi b/desktop/asset-work/global/ego/burnt.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/7.pxi rename to desktop/asset-work/global/ego/burnt.pxa/7.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/8.pxi b/desktop/asset-work/global/ego/burnt.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/8.pxi rename to desktop/asset-work/global/ego/burnt.pxa/8.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/9.pxi b/desktop/asset-work/global/ego/burnt.pxa/9.pxi similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/9.pxi rename to desktop/asset-work/global/ego/burnt.pxa/9.pxi diff --git a/desktop/asset-work/ego/burnt.pxa/CelData.plist b/desktop/asset-work/global/ego/burnt.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/burnt.pxa/CelData.plist rename to desktop/asset-work/global/ego/burnt.pxa/CelData.plist diff --git a/desktop/asset-work/ego/cat-toy.png b/desktop/asset-work/global/ego/cat-toy.png similarity index 100% rename from desktop/asset-work/ego/cat-toy.png rename to desktop/asset-work/global/ego/cat-toy.png diff --git a/desktop/asset-work/ego/cat-toy.pxa/0.pxi b/desktop/asset-work/global/ego/cat-toy.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/cat-toy.pxa/0.pxi rename to desktop/asset-work/global/ego/cat-toy.pxa/0.pxi diff --git a/desktop/asset-work/ego/cat-toy.pxa/1.pxi b/desktop/asset-work/global/ego/cat-toy.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/cat-toy.pxa/1.pxi rename to desktop/asset-work/global/ego/cat-toy.pxa/1.pxi diff --git a/desktop/asset-work/ego/cat-toy.pxa/2.pxi b/desktop/asset-work/global/ego/cat-toy.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/cat-toy.pxa/2.pxi rename to desktop/asset-work/global/ego/cat-toy.pxa/2.pxi diff --git a/desktop/asset-work/ego/cat-toy.pxa/3.pxi b/desktop/asset-work/global/ego/cat-toy.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/cat-toy.pxa/3.pxi rename to desktop/asset-work/global/ego/cat-toy.pxa/3.pxi diff --git a/desktop/asset-work/ego/cat-toy.pxa/4.pxi b/desktop/asset-work/global/ego/cat-toy.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/cat-toy.pxa/4.pxi rename to desktop/asset-work/global/ego/cat-toy.pxa/4.pxi diff --git a/desktop/asset-work/ego/cat-toy.pxa/CelData.plist b/desktop/asset-work/global/ego/cat-toy.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/cat-toy.pxa/CelData.plist rename to desktop/asset-work/global/ego/cat-toy.pxa/CelData.plist diff --git a/desktop/asset-work/ego/climb.png b/desktop/asset-work/global/ego/climb.png similarity index 100% rename from desktop/asset-work/ego/climb.png rename to desktop/asset-work/global/ego/climb.png diff --git a/desktop/asset-work/ego/climb.pxa/0.pxi b/desktop/asset-work/global/ego/climb.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/0.pxi rename to desktop/asset-work/global/ego/climb.pxa/0.pxi diff --git a/desktop/asset-work/ego/climb.pxa/1.pxi b/desktop/asset-work/global/ego/climb.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/1.pxi rename to desktop/asset-work/global/ego/climb.pxa/1.pxi diff --git a/desktop/asset-work/ego/climb.pxa/10.pxi b/desktop/asset-work/global/ego/climb.pxa/10.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/10.pxi rename to desktop/asset-work/global/ego/climb.pxa/10.pxi diff --git a/desktop/asset-work/ego/climb.pxa/2.pxi b/desktop/asset-work/global/ego/climb.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/2.pxi rename to desktop/asset-work/global/ego/climb.pxa/2.pxi diff --git a/desktop/asset-work/ego/climb.pxa/3.pxi b/desktop/asset-work/global/ego/climb.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/3.pxi rename to desktop/asset-work/global/ego/climb.pxa/3.pxi diff --git a/desktop/asset-work/ego/climb.pxa/4.pxi b/desktop/asset-work/global/ego/climb.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/4.pxi rename to desktop/asset-work/global/ego/climb.pxa/4.pxi diff --git a/desktop/asset-work/ego/climb.pxa/5.pxi b/desktop/asset-work/global/ego/climb.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/5.pxi rename to desktop/asset-work/global/ego/climb.pxa/5.pxi diff --git a/desktop/asset-work/ego/climb.pxa/6.pxi b/desktop/asset-work/global/ego/climb.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/6.pxi rename to desktop/asset-work/global/ego/climb.pxa/6.pxi diff --git a/desktop/asset-work/ego/climb.pxa/7.pxi b/desktop/asset-work/global/ego/climb.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/7.pxi rename to desktop/asset-work/global/ego/climb.pxa/7.pxi diff --git a/desktop/asset-work/ego/climb.pxa/8.pxi b/desktop/asset-work/global/ego/climb.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/8.pxi rename to desktop/asset-work/global/ego/climb.pxa/8.pxi diff --git a/desktop/asset-work/ego/climb.pxa/9.pxi b/desktop/asset-work/global/ego/climb.pxa/9.pxi similarity index 100% rename from desktop/asset-work/ego/climb.pxa/9.pxi rename to desktop/asset-work/global/ego/climb.pxa/9.pxi diff --git a/desktop/asset-work/ego/climb.pxa/CelData.plist b/desktop/asset-work/global/ego/climb.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/climb.pxa/CelData.plist rename to desktop/asset-work/global/ego/climb.pxa/CelData.plist diff --git a/desktop/asset-work/ego/crawl.png b/desktop/asset-work/global/ego/crawl.png similarity index 100% rename from desktop/asset-work/ego/crawl.png rename to desktop/asset-work/global/ego/crawl.png diff --git a/desktop/asset-work/ego/crawl.pxa/0.pxi b/desktop/asset-work/global/ego/crawl.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/0.pxi rename to desktop/asset-work/global/ego/crawl.pxa/0.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/1.pxi b/desktop/asset-work/global/ego/crawl.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/1.pxi rename to desktop/asset-work/global/ego/crawl.pxa/1.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/2.pxi b/desktop/asset-work/global/ego/crawl.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/2.pxi rename to desktop/asset-work/global/ego/crawl.pxa/2.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/3.pxi b/desktop/asset-work/global/ego/crawl.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/3.pxi rename to desktop/asset-work/global/ego/crawl.pxa/3.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/4.pxi b/desktop/asset-work/global/ego/crawl.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/4.pxi rename to desktop/asset-work/global/ego/crawl.pxa/4.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/5.pxi b/desktop/asset-work/global/ego/crawl.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/5.pxi rename to desktop/asset-work/global/ego/crawl.pxa/5.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/6.pxi b/desktop/asset-work/global/ego/crawl.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/6.pxi rename to desktop/asset-work/global/ego/crawl.pxa/6.pxi diff --git a/desktop/asset-work/ego/crawl.pxa/CelData.plist b/desktop/asset-work/global/ego/crawl.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/crawl.pxa/CelData.plist rename to desktop/asset-work/global/ego/crawl.pxa/CelData.plist diff --git a/desktop/asset-work/ego/crowbar.ogg b/desktop/asset-work/global/ego/crowbar.ogg similarity index 100% rename from desktop/asset-work/ego/crowbar.ogg rename to desktop/asset-work/global/ego/crowbar.ogg diff --git a/desktop/asset-work/ego/crowbar.png b/desktop/asset-work/global/ego/crowbar.png similarity index 100% rename from desktop/asset-work/ego/crowbar.png rename to desktop/asset-work/global/ego/crowbar.png diff --git a/desktop/asset-work/ego/crowbar.pxa/0.pxi b/desktop/asset-work/global/ego/crowbar.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/crowbar.pxa/0.pxi rename to desktop/asset-work/global/ego/crowbar.pxa/0.pxi diff --git a/desktop/asset-work/ego/crowbar.pxa/1.pxi b/desktop/asset-work/global/ego/crowbar.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/crowbar.pxa/1.pxi rename to desktop/asset-work/global/ego/crowbar.pxa/1.pxi diff --git a/desktop/asset-work/ego/crowbar.pxa/2.pxi b/desktop/asset-work/global/ego/crowbar.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/crowbar.pxa/2.pxi rename to desktop/asset-work/global/ego/crowbar.pxa/2.pxi diff --git a/desktop/asset-work/ego/crowbar.pxa/3.pxi b/desktop/asset-work/global/ego/crowbar.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/crowbar.pxa/3.pxi rename to desktop/asset-work/global/ego/crowbar.pxa/3.pxi diff --git a/desktop/asset-work/ego/crowbar.pxa/CelData.plist b/desktop/asset-work/global/ego/crowbar.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/crowbar.pxa/CelData.plist rename to desktop/asset-work/global/ego/crowbar.pxa/CelData.plist diff --git a/desktop/asset-work/ego/dot.png b/desktop/asset-work/global/ego/dot.png similarity index 100% rename from desktop/asset-work/ego/dot.png rename to desktop/asset-work/global/ego/dot.png diff --git a/desktop/asset-work/ego/drop.ogg b/desktop/asset-work/global/ego/drop.ogg similarity index 100% rename from desktop/asset-work/ego/drop.ogg rename to desktop/asset-work/global/ego/drop.ogg diff --git a/desktop/asset-work/ego/drop.wav b/desktop/asset-work/global/ego/drop.wav similarity index 100% rename from desktop/asset-work/ego/drop.wav rename to desktop/asset-work/global/ego/drop.wav diff --git a/desktop/asset-work/ego/fire.png b/desktop/asset-work/global/ego/fire.png similarity index 100% rename from desktop/asset-work/ego/fire.png rename to desktop/asset-work/global/ego/fire.png diff --git a/desktop/asset-work/ego/fire.pxa/0.pxi b/desktop/asset-work/global/ego/fire.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/0.pxi rename to desktop/asset-work/global/ego/fire.pxa/0.pxi diff --git a/desktop/asset-work/ego/fire.pxa/1.pxi b/desktop/asset-work/global/ego/fire.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/1.pxi rename to desktop/asset-work/global/ego/fire.pxa/1.pxi diff --git a/desktop/asset-work/ego/fire.pxa/10.pxi b/desktop/asset-work/global/ego/fire.pxa/10.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/10.pxi rename to desktop/asset-work/global/ego/fire.pxa/10.pxi diff --git a/desktop/asset-work/ego/fire.pxa/11.pxi b/desktop/asset-work/global/ego/fire.pxa/11.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/11.pxi rename to desktop/asset-work/global/ego/fire.pxa/11.pxi diff --git a/desktop/asset-work/ego/fire.pxa/2.pxi b/desktop/asset-work/global/ego/fire.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/2.pxi rename to desktop/asset-work/global/ego/fire.pxa/2.pxi diff --git a/desktop/asset-work/ego/fire.pxa/3.pxi b/desktop/asset-work/global/ego/fire.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/3.pxi rename to desktop/asset-work/global/ego/fire.pxa/3.pxi diff --git a/desktop/asset-work/ego/fire.pxa/4.pxi b/desktop/asset-work/global/ego/fire.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/4.pxi rename to desktop/asset-work/global/ego/fire.pxa/4.pxi diff --git a/desktop/asset-work/ego/fire.pxa/5.pxi b/desktop/asset-work/global/ego/fire.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/5.pxi rename to desktop/asset-work/global/ego/fire.pxa/5.pxi diff --git a/desktop/asset-work/ego/fire.pxa/6.pxi b/desktop/asset-work/global/ego/fire.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/6.pxi rename to desktop/asset-work/global/ego/fire.pxa/6.pxi diff --git a/desktop/asset-work/ego/fire.pxa/7.pxi b/desktop/asset-work/global/ego/fire.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/7.pxi rename to desktop/asset-work/global/ego/fire.pxa/7.pxi diff --git a/desktop/asset-work/ego/fire.pxa/8.pxi b/desktop/asset-work/global/ego/fire.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/8.pxi rename to desktop/asset-work/global/ego/fire.pxa/8.pxi diff --git a/desktop/asset-work/ego/fire.pxa/9.pxi b/desktop/asset-work/global/ego/fire.pxa/9.pxi similarity index 100% rename from desktop/asset-work/ego/fire.pxa/9.pxi rename to desktop/asset-work/global/ego/fire.pxa/9.pxi diff --git a/desktop/asset-work/ego/fire.pxa/CelData.plist b/desktop/asset-work/global/ego/fire.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/fire.pxa/CelData.plist rename to desktop/asset-work/global/ego/fire.pxa/CelData.plist diff --git a/desktop/asset-work/ego/flying.png b/desktop/asset-work/global/ego/flying.png similarity index 100% rename from desktop/asset-work/ego/flying.png rename to desktop/asset-work/global/ego/flying.png diff --git a/desktop/asset-work/ego/frog.png b/desktop/asset-work/global/ego/frog.png similarity index 100% rename from desktop/asset-work/ego/frog.png rename to desktop/asset-work/global/ego/frog.png diff --git a/desktop/asset-work/ego/frog.pxa/0.pxi b/desktop/asset-work/global/ego/frog.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/frog.pxa/0.pxi rename to desktop/asset-work/global/ego/frog.pxa/0.pxi diff --git a/desktop/asset-work/ego/frog.pxa/1.pxi b/desktop/asset-work/global/ego/frog.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/frog.pxa/1.pxi rename to desktop/asset-work/global/ego/frog.pxa/1.pxi diff --git a/desktop/asset-work/ego/frog.pxa/CelData.plist b/desktop/asset-work/global/ego/frog.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/frog.pxa/CelData.plist rename to desktop/asset-work/global/ego/frog.pxa/CelData.plist diff --git a/desktop/asset-work/ego/frustrated-talk.png b/desktop/asset-work/global/ego/frustrated-talk.png similarity index 100% rename from desktop/asset-work/ego/frustrated-talk.png rename to desktop/asset-work/global/ego/frustrated-talk.png diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/0.pxi b/desktop/asset-work/global/ego/frustratedtalk.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/0.pxi rename to desktop/asset-work/global/ego/frustratedtalk.pxa/0.pxi diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/1.pxi b/desktop/asset-work/global/ego/frustratedtalk.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/1.pxi rename to desktop/asset-work/global/ego/frustratedtalk.pxa/1.pxi diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/2.pxi b/desktop/asset-work/global/ego/frustratedtalk.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/2.pxi rename to desktop/asset-work/global/ego/frustratedtalk.pxa/2.pxi diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/3.pxi b/desktop/asset-work/global/ego/frustratedtalk.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/3.pxi rename to desktop/asset-work/global/ego/frustratedtalk.pxa/3.pxi diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/4.pxi b/desktop/asset-work/global/ego/frustratedtalk.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/4.pxi rename to desktop/asset-work/global/ego/frustratedtalk.pxa/4.pxi diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/5.pxi b/desktop/asset-work/global/ego/frustratedtalk.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/5.pxi rename to desktop/asset-work/global/ego/frustratedtalk.pxa/5.pxi diff --git a/desktop/asset-work/ego/frustratedtalk.pxa/CelData.plist b/desktop/asset-work/global/ego/frustratedtalk.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/frustratedtalk.pxa/CelData.plist rename to desktop/asset-work/global/ego/frustratedtalk.pxa/CelData.plist diff --git a/desktop/asset-work/ego/georgia.png b/desktop/asset-work/global/ego/georgia.png similarity index 100% rename from desktop/asset-work/ego/georgia.png rename to desktop/asset-work/global/ego/georgia.png diff --git a/desktop/asset-work/ego/georgia.pxa/0.pxi b/desktop/asset-work/global/ego/georgia.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/georgia.pxa/0.pxi rename to desktop/asset-work/global/ego/georgia.pxa/0.pxi diff --git a/desktop/asset-work/ego/georgia.pxa/1.pxi b/desktop/asset-work/global/ego/georgia.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/georgia.pxa/1.pxi rename to desktop/asset-work/global/ego/georgia.pxa/1.pxi diff --git a/desktop/asset-work/ego/georgia.pxa/2.pxi b/desktop/asset-work/global/ego/georgia.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/georgia.pxa/2.pxi rename to desktop/asset-work/global/ego/georgia.pxa/2.pxi diff --git a/desktop/asset-work/ego/georgia.pxa/CelData.plist b/desktop/asset-work/global/ego/georgia.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/georgia.pxa/CelData.plist rename to desktop/asset-work/global/ego/georgia.pxa/CelData.plist diff --git a/desktop/asset-work/ego/get-sick.ogg b/desktop/asset-work/global/ego/get-sick.ogg similarity index 100% rename from desktop/asset-work/ego/get-sick.ogg rename to desktop/asset-work/global/ego/get-sick.ogg diff --git a/desktop/asset-work/ego/get-sick.png b/desktop/asset-work/global/ego/get-sick.png similarity index 100% rename from desktop/asset-work/ego/get-sick.png rename to desktop/asset-work/global/ego/get-sick.png diff --git a/desktop/asset-work/ego/get-sick.pxa/0.pxi b/desktop/asset-work/global/ego/get-sick.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/0.pxi rename to desktop/asset-work/global/ego/get-sick.pxa/0.pxi diff --git a/desktop/asset-work/ego/get-sick.pxa/1.pxi b/desktop/asset-work/global/ego/get-sick.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/1.pxi rename to desktop/asset-work/global/ego/get-sick.pxa/1.pxi diff --git a/desktop/asset-work/ego/get-sick.pxa/2.pxi b/desktop/asset-work/global/ego/get-sick.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/2.pxi rename to desktop/asset-work/global/ego/get-sick.pxa/2.pxi diff --git a/desktop/asset-work/ego/get-sick.pxa/3.pxi b/desktop/asset-work/global/ego/get-sick.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/3.pxi rename to desktop/asset-work/global/ego/get-sick.pxa/3.pxi diff --git a/desktop/asset-work/ego/get-sick.pxa/4.pxi b/desktop/asset-work/global/ego/get-sick.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/4.pxi rename to desktop/asset-work/global/ego/get-sick.pxa/4.pxi diff --git a/desktop/asset-work/ego/get-sick.pxa/5.pxi b/desktop/asset-work/global/ego/get-sick.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/5.pxi rename to desktop/asset-work/global/ego/get-sick.pxa/5.pxi diff --git a/desktop/asset-work/ego/get-sick.pxa/CelData.plist b/desktop/asset-work/global/ego/get-sick.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/get-sick.pxa/CelData.plist rename to desktop/asset-work/global/ego/get-sick.pxa/CelData.plist diff --git a/desktop/asset-work/ego/get-sick.wav b/desktop/asset-work/global/ego/get-sick.wav similarity index 100% rename from desktop/asset-work/ego/get-sick.wav rename to desktop/asset-work/global/ego/get-sick.wav diff --git a/desktop/asset-work/ego/glad-jump b/desktop/asset-work/global/ego/glad-jump similarity index 100% rename from desktop/asset-work/ego/glad-jump rename to desktop/asset-work/global/ego/glad-jump diff --git a/desktop/asset-work/ego/glad.ogg b/desktop/asset-work/global/ego/glad.ogg similarity index 100% rename from desktop/asset-work/ego/glad.ogg rename to desktop/asset-work/global/ego/glad.ogg diff --git a/desktop/asset-work/ego/glad.png b/desktop/asset-work/global/ego/glad.png similarity index 100% rename from desktop/asset-work/ego/glad.png rename to desktop/asset-work/global/ego/glad.png diff --git a/desktop/asset-work/ego/glad.pxa/0.pxi b/desktop/asset-work/global/ego/glad.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/0.pxi rename to desktop/asset-work/global/ego/glad.pxa/0.pxi diff --git a/desktop/asset-work/ego/glad.pxa/1.pxi b/desktop/asset-work/global/ego/glad.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/1.pxi rename to desktop/asset-work/global/ego/glad.pxa/1.pxi diff --git a/desktop/asset-work/ego/glad.pxa/2.pxi b/desktop/asset-work/global/ego/glad.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/2.pxi rename to desktop/asset-work/global/ego/glad.pxa/2.pxi diff --git a/desktop/asset-work/ego/glad.pxa/3.pxi b/desktop/asset-work/global/ego/glad.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/3.pxi rename to desktop/asset-work/global/ego/glad.pxa/3.pxi diff --git a/desktop/asset-work/ego/glad.pxa/4.pxi b/desktop/asset-work/global/ego/glad.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/4.pxi rename to desktop/asset-work/global/ego/glad.pxa/4.pxi diff --git a/desktop/asset-work/ego/glad.pxa/5.pxi b/desktop/asset-work/global/ego/glad.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/5.pxi rename to desktop/asset-work/global/ego/glad.pxa/5.pxi diff --git a/desktop/asset-work/ego/glad.pxa/6.pxi b/desktop/asset-work/global/ego/glad.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/glad.pxa/6.pxi rename to desktop/asset-work/global/ego/glad.pxa/6.pxi diff --git a/desktop/asset-work/ego/glad.pxa/CelData.plist b/desktop/asset-work/global/ego/glad.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/glad.pxa/CelData.plist rename to desktop/asset-work/global/ego/glad.pxa/CelData.plist diff --git a/desktop/asset-work/ego/glad.wav b/desktop/asset-work/global/ego/glad.wav similarity index 100% rename from desktop/asset-work/ego/glad.wav rename to desktop/asset-work/global/ego/glad.wav diff --git a/desktop/asset-work/ego/grow-talk.png b/desktop/asset-work/global/ego/grow-talk.png similarity index 100% rename from desktop/asset-work/ego/grow-talk.png rename to desktop/asset-work/global/ego/grow-talk.png diff --git a/desktop/asset-work/ego/grow-talk.pxa/0.pxi b/desktop/asset-work/global/ego/grow-talk.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/grow-talk.pxa/0.pxi rename to desktop/asset-work/global/ego/grow-talk.pxa/0.pxi diff --git a/desktop/asset-work/ego/grow-talk.pxa/1.pxi b/desktop/asset-work/global/ego/grow-talk.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/grow-talk.pxa/1.pxi rename to desktop/asset-work/global/ego/grow-talk.pxa/1.pxi diff --git a/desktop/asset-work/ego/grow-talk.pxa/CelData.plist b/desktop/asset-work/global/ego/grow-talk.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/grow-talk.pxa/CelData.plist rename to desktop/asset-work/global/ego/grow-talk.pxa/CelData.plist diff --git a/desktop/asset-work/ego/grow.png b/desktop/asset-work/global/ego/grow.png similarity index 100% rename from desktop/asset-work/ego/grow.png rename to desktop/asset-work/global/ego/grow.png diff --git a/desktop/asset-work/ego/grow.pxa/0.pxi b/desktop/asset-work/global/ego/grow.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/grow.pxa/0.pxi rename to desktop/asset-work/global/ego/grow.pxa/0.pxi diff --git a/desktop/asset-work/ego/grow.pxa/1.pxi b/desktop/asset-work/global/ego/grow.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/grow.pxa/1.pxi rename to desktop/asset-work/global/ego/grow.pxa/1.pxi diff --git a/desktop/asset-work/ego/grow.pxa/2.pxi b/desktop/asset-work/global/ego/grow.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/grow.pxa/2.pxi rename to desktop/asset-work/global/ego/grow.pxa/2.pxi diff --git a/desktop/asset-work/ego/grow.pxa/3.pxi b/desktop/asset-work/global/ego/grow.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/grow.pxa/3.pxi rename to desktop/asset-work/global/ego/grow.pxa/3.pxi diff --git a/desktop/asset-work/ego/grow.pxa/4.pxi b/desktop/asset-work/global/ego/grow.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/grow.pxa/4.pxi rename to desktop/asset-work/global/ego/grow.pxa/4.pxi diff --git a/desktop/asset-work/ego/grow.pxa/CelData.plist b/desktop/asset-work/global/ego/grow.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/grow.pxa/CelData.plist rename to desktop/asset-work/global/ego/grow.pxa/CelData.plist diff --git a/desktop/asset-work/ego/hand-hold.png b/desktop/asset-work/global/ego/hand-hold.png similarity index 100% rename from desktop/asset-work/ego/hand-hold.png rename to desktop/asset-work/global/ego/hand-hold.png diff --git a/desktop/asset-work/ego/hand-hold.pxa/0.pxi b/desktop/asset-work/global/ego/hand-hold.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/hand-hold.pxa/0.pxi rename to desktop/asset-work/global/ego/hand-hold.pxa/0.pxi diff --git a/desktop/asset-work/ego/hand-hold.pxa/1.pxi b/desktop/asset-work/global/ego/hand-hold.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/hand-hold.pxa/1.pxi rename to desktop/asset-work/global/ego/hand-hold.pxa/1.pxi diff --git a/desktop/asset-work/ego/hand-hold.pxa/CelData.plist b/desktop/asset-work/global/ego/hand-hold.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/hand-hold.pxa/CelData.plist rename to desktop/asset-work/global/ego/hand-hold.pxa/CelData.plist diff --git a/desktop/asset-work/ego/hold-hand.png b/desktop/asset-work/global/ego/hold-hand.png similarity index 100% rename from desktop/asset-work/ego/hold-hand.png rename to desktop/asset-work/global/ego/hold-hand.png diff --git a/desktop/asset-work/ego/hold-up-to-window.png b/desktop/asset-work/global/ego/hold-up-to-window.png similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.png rename to desktop/asset-work/global/ego/hold-up-to-window.png diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/0.pxi b/desktop/asset-work/global/ego/hold-up-to-window.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/0.pxi rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/0.pxi diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/1.pxi b/desktop/asset-work/global/ego/hold-up-to-window.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/1.pxi rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/1.pxi diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/2.pxi b/desktop/asset-work/global/ego/hold-up-to-window.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/2.pxi rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/2.pxi diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/3.pxi b/desktop/asset-work/global/ego/hold-up-to-window.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/3.pxi rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/3.pxi diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/4.pxi b/desktop/asset-work/global/ego/hold-up-to-window.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/4.pxi rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/4.pxi diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/5.pxi b/desktop/asset-work/global/ego/hold-up-to-window.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/5.pxi rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/5.pxi diff --git a/desktop/asset-work/ego/hold-up-to-window.pxa/CelData.plist b/desktop/asset-work/global/ego/hold-up-to-window.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/hold-up-to-window.pxa/CelData.plist rename to desktop/asset-work/global/ego/hold-up-to-window.pxa/CelData.plist diff --git a/desktop/asset-work/ego/ida.png b/desktop/asset-work/global/ego/ida.png similarity index 100% rename from desktop/asset-work/ego/ida.png rename to desktop/asset-work/global/ego/ida.png diff --git a/desktop/asset-work/ego/idea.ogg b/desktop/asset-work/global/ego/idea.ogg similarity index 100% rename from desktop/asset-work/ego/idea.ogg rename to desktop/asset-work/global/ego/idea.ogg diff --git a/desktop/asset-work/ego/idea.png b/desktop/asset-work/global/ego/idea.png similarity index 100% rename from desktop/asset-work/ego/idea.png rename to desktop/asset-work/global/ego/idea.png diff --git a/desktop/asset-work/ego/idea.pxa/0.pxi b/desktop/asset-work/global/ego/idea.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/idea.pxa/0.pxi rename to desktop/asset-work/global/ego/idea.pxa/0.pxi diff --git a/desktop/asset-work/ego/idea.pxa/1.pxi b/desktop/asset-work/global/ego/idea.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/idea.pxa/1.pxi rename to desktop/asset-work/global/ego/idea.pxa/1.pxi diff --git a/desktop/asset-work/ego/idea.pxa/2.pxi b/desktop/asset-work/global/ego/idea.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/idea.pxa/2.pxi rename to desktop/asset-work/global/ego/idea.pxa/2.pxi diff --git a/desktop/asset-work/ego/idea.pxa/CelData.plist b/desktop/asset-work/global/ego/idea.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/idea.pxa/CelData.plist rename to desktop/asset-work/global/ego/idea.pxa/CelData.plist diff --git a/desktop/asset-work/ego/idea.wav b/desktop/asset-work/global/ego/idea.wav similarity index 100% rename from desktop/asset-work/ego/idea.wav rename to desktop/asset-work/global/ego/idea.wav diff --git a/desktop/asset-work/ego/in-love.png b/desktop/asset-work/global/ego/in-love.png similarity index 100% rename from desktop/asset-work/ego/in-love.png rename to desktop/asset-work/global/ego/in-love.png diff --git a/desktop/asset-work/ego/in-love2.pxa/0.pxi b/desktop/asset-work/global/ego/in-love2.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/0.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/0.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/1.pxi b/desktop/asset-work/global/ego/in-love2.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/1.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/1.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/10.pxi b/desktop/asset-work/global/ego/in-love2.pxa/10.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/10.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/10.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/11.pxi b/desktop/asset-work/global/ego/in-love2.pxa/11.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/11.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/11.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/12.pxi b/desktop/asset-work/global/ego/in-love2.pxa/12.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/12.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/12.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/13.pxi b/desktop/asset-work/global/ego/in-love2.pxa/13.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/13.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/13.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/14.pxi b/desktop/asset-work/global/ego/in-love2.pxa/14.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/14.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/14.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/15.pxi b/desktop/asset-work/global/ego/in-love2.pxa/15.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/15.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/15.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/16.pxi b/desktop/asset-work/global/ego/in-love2.pxa/16.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/16.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/16.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/17.pxi b/desktop/asset-work/global/ego/in-love2.pxa/17.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/17.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/17.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/18.pxi b/desktop/asset-work/global/ego/in-love2.pxa/18.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/18.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/18.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/2.pxi b/desktop/asset-work/global/ego/in-love2.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/2.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/2.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/3.pxi b/desktop/asset-work/global/ego/in-love2.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/3.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/3.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/4.pxi b/desktop/asset-work/global/ego/in-love2.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/4.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/4.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/5.pxi b/desktop/asset-work/global/ego/in-love2.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/5.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/5.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/6.pxi b/desktop/asset-work/global/ego/in-love2.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/6.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/6.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/7.pxi b/desktop/asset-work/global/ego/in-love2.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/7.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/7.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/8.pxi b/desktop/asset-work/global/ego/in-love2.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/8.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/8.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/9.pxi b/desktop/asset-work/global/ego/in-love2.pxa/9.pxi similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/9.pxi rename to desktop/asset-work/global/ego/in-love2.pxa/9.pxi diff --git a/desktop/asset-work/ego/in-love2.pxa/CelData.plist b/desktop/asset-work/global/ego/in-love2.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/in-love2.pxa/CelData.plist rename to desktop/asset-work/global/ego/in-love2.pxa/CelData.plist diff --git a/desktop/asset-work/ego/inside-step-1.wav b/desktop/asset-work/global/ego/inside-step-1.wav similarity index 100% rename from desktop/asset-work/ego/inside-step-1.wav rename to desktop/asset-work/global/ego/inside-step-1.wav diff --git a/desktop/asset-work/ego/inside-step-2.wav b/desktop/asset-work/global/ego/inside-step-2.wav similarity index 100% rename from desktop/asset-work/ego/inside-step-2.wav rename to desktop/asset-work/global/ego/inside-step-2.wav diff --git a/desktop/asset-work/ego/inside-step-3.wav b/desktop/asset-work/global/ego/inside-step-3.wav similarity index 100% rename from desktop/asset-work/ego/inside-step-3.wav rename to desktop/asset-work/global/ego/inside-step-3.wav diff --git a/desktop/asset-work/ego/inside-step-4.wav b/desktop/asset-work/global/ego/inside-step-4.wav similarity index 100% rename from desktop/asset-work/ego/inside-step-4.wav rename to desktop/asset-work/global/ego/inside-step-4.wav diff --git a/desktop/asset-work/ego/jet b/desktop/asset-work/global/ego/jet similarity index 100% rename from desktop/asset-work/ego/jet rename to desktop/asset-work/global/ego/jet diff --git a/desktop/asset-work/ego/jump-straight.png b/desktop/asset-work/global/ego/jump-straight.png similarity index 100% rename from desktop/asset-work/ego/jump-straight.png rename to desktop/asset-work/global/ego/jump-straight.png diff --git a/desktop/asset-work/ego/jump-straight.pxa/0.pxi b/desktop/asset-work/global/ego/jump-straight.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/jump-straight.pxa/0.pxi rename to desktop/asset-work/global/ego/jump-straight.pxa/0.pxi diff --git a/desktop/asset-work/ego/jump-straight.pxa/1.pxi b/desktop/asset-work/global/ego/jump-straight.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/jump-straight.pxa/1.pxi rename to desktop/asset-work/global/ego/jump-straight.pxa/1.pxi diff --git a/desktop/asset-work/ego/jump-straight.pxa/2.pxi b/desktop/asset-work/global/ego/jump-straight.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/jump-straight.pxa/2.pxi rename to desktop/asset-work/global/ego/jump-straight.pxa/2.pxi diff --git a/desktop/asset-work/ego/jump-straight.pxa/3.pxi b/desktop/asset-work/global/ego/jump-straight.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/jump-straight.pxa/3.pxi rename to desktop/asset-work/global/ego/jump-straight.pxa/3.pxi diff --git a/desktop/asset-work/ego/jump-straight.pxa/4.pxi b/desktop/asset-work/global/ego/jump-straight.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/jump-straight.pxa/4.pxi rename to desktop/asset-work/global/ego/jump-straight.pxa/4.pxi diff --git a/desktop/asset-work/ego/jump-straight.pxa/CelData.plist b/desktop/asset-work/global/ego/jump-straight.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/jump-straight.pxa/CelData.plist rename to desktop/asset-work/global/ego/jump-straight.pxa/CelData.plist diff --git a/desktop/asset-work/ego/love-1.png b/desktop/asset-work/global/ego/love-1.png similarity index 100% rename from desktop/asset-work/ego/love-1.png rename to desktop/asset-work/global/ego/love-1.png diff --git a/desktop/asset-work/ego/love-10.png b/desktop/asset-work/global/ego/love-10.png similarity index 100% rename from desktop/asset-work/ego/love-10.png rename to desktop/asset-work/global/ego/love-10.png diff --git a/desktop/asset-work/ego/love-11.png b/desktop/asset-work/global/ego/love-11.png similarity index 100% rename from desktop/asset-work/ego/love-11.png rename to desktop/asset-work/global/ego/love-11.png diff --git a/desktop/asset-work/ego/love-12.png b/desktop/asset-work/global/ego/love-12.png similarity index 100% rename from desktop/asset-work/ego/love-12.png rename to desktop/asset-work/global/ego/love-12.png diff --git a/desktop/asset-work/ego/love-13.png b/desktop/asset-work/global/ego/love-13.png similarity index 100% rename from desktop/asset-work/ego/love-13.png rename to desktop/asset-work/global/ego/love-13.png diff --git a/desktop/asset-work/ego/love-14.png b/desktop/asset-work/global/ego/love-14.png similarity index 100% rename from desktop/asset-work/ego/love-14.png rename to desktop/asset-work/global/ego/love-14.png diff --git a/desktop/asset-work/ego/love-15.png b/desktop/asset-work/global/ego/love-15.png similarity index 100% rename from desktop/asset-work/ego/love-15.png rename to desktop/asset-work/global/ego/love-15.png diff --git a/desktop/asset-work/ego/love-16.png b/desktop/asset-work/global/ego/love-16.png similarity index 100% rename from desktop/asset-work/ego/love-16.png rename to desktop/asset-work/global/ego/love-16.png diff --git a/desktop/asset-work/ego/love-17.png b/desktop/asset-work/global/ego/love-17.png similarity index 100% rename from desktop/asset-work/ego/love-17.png rename to desktop/asset-work/global/ego/love-17.png diff --git a/desktop/asset-work/ego/love-18.png b/desktop/asset-work/global/ego/love-18.png similarity index 100% rename from desktop/asset-work/ego/love-18.png rename to desktop/asset-work/global/ego/love-18.png diff --git a/desktop/asset-work/ego/love-19.png b/desktop/asset-work/global/ego/love-19.png similarity index 100% rename from desktop/asset-work/ego/love-19.png rename to desktop/asset-work/global/ego/love-19.png diff --git a/desktop/asset-work/ego/love-2.png b/desktop/asset-work/global/ego/love-2.png similarity index 100% rename from desktop/asset-work/ego/love-2.png rename to desktop/asset-work/global/ego/love-2.png diff --git a/desktop/asset-work/ego/love-20.png b/desktop/asset-work/global/ego/love-20.png similarity index 100% rename from desktop/asset-work/ego/love-20.png rename to desktop/asset-work/global/ego/love-20.png diff --git a/desktop/asset-work/ego/love-21.png b/desktop/asset-work/global/ego/love-21.png similarity index 100% rename from desktop/asset-work/ego/love-21.png rename to desktop/asset-work/global/ego/love-21.png diff --git a/desktop/asset-work/ego/love-22.png b/desktop/asset-work/global/ego/love-22.png similarity index 100% rename from desktop/asset-work/ego/love-22.png rename to desktop/asset-work/global/ego/love-22.png diff --git a/desktop/asset-work/ego/love-23.png b/desktop/asset-work/global/ego/love-23.png similarity index 100% rename from desktop/asset-work/ego/love-23.png rename to desktop/asset-work/global/ego/love-23.png diff --git a/desktop/asset-work/ego/love-24.png b/desktop/asset-work/global/ego/love-24.png similarity index 100% rename from desktop/asset-work/ego/love-24.png rename to desktop/asset-work/global/ego/love-24.png diff --git a/desktop/asset-work/ego/love-25.png b/desktop/asset-work/global/ego/love-25.png similarity index 100% rename from desktop/asset-work/ego/love-25.png rename to desktop/asset-work/global/ego/love-25.png diff --git a/desktop/asset-work/ego/love-26.png b/desktop/asset-work/global/ego/love-26.png similarity index 100% rename from desktop/asset-work/ego/love-26.png rename to desktop/asset-work/global/ego/love-26.png diff --git a/desktop/asset-work/ego/love-3.png b/desktop/asset-work/global/ego/love-3.png similarity index 100% rename from desktop/asset-work/ego/love-3.png rename to desktop/asset-work/global/ego/love-3.png diff --git a/desktop/asset-work/ego/love-4.png b/desktop/asset-work/global/ego/love-4.png similarity index 100% rename from desktop/asset-work/ego/love-4.png rename to desktop/asset-work/global/ego/love-4.png diff --git a/desktop/asset-work/ego/love-5.png b/desktop/asset-work/global/ego/love-5.png similarity index 100% rename from desktop/asset-work/ego/love-5.png rename to desktop/asset-work/global/ego/love-5.png diff --git a/desktop/asset-work/ego/love-6.png b/desktop/asset-work/global/ego/love-6.png similarity index 100% rename from desktop/asset-work/ego/love-6.png rename to desktop/asset-work/global/ego/love-6.png diff --git a/desktop/asset-work/ego/love-7.png b/desktop/asset-work/global/ego/love-7.png similarity index 100% rename from desktop/asset-work/ego/love-7.png rename to desktop/asset-work/global/ego/love-7.png diff --git a/desktop/asset-work/ego/love-8.png b/desktop/asset-work/global/ego/love-8.png similarity index 100% rename from desktop/asset-work/ego/love-8.png rename to desktop/asset-work/global/ego/love-8.png diff --git a/desktop/asset-work/ego/love-9.png b/desktop/asset-work/global/ego/love-9.png similarity index 100% rename from desktop/asset-work/ego/love-9.png rename to desktop/asset-work/global/ego/love-9.png diff --git a/desktop/asset-work/ego/love.pxa/0.pxi b/desktop/asset-work/global/ego/love.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/0.pxi rename to desktop/asset-work/global/ego/love.pxa/0.pxi diff --git a/desktop/asset-work/ego/love.pxa/1.pxi b/desktop/asset-work/global/ego/love.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/1.pxi rename to desktop/asset-work/global/ego/love.pxa/1.pxi diff --git a/desktop/asset-work/ego/love.pxa/10.pxi b/desktop/asset-work/global/ego/love.pxa/10.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/10.pxi rename to desktop/asset-work/global/ego/love.pxa/10.pxi diff --git a/desktop/asset-work/ego/love.pxa/11.pxi b/desktop/asset-work/global/ego/love.pxa/11.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/11.pxi rename to desktop/asset-work/global/ego/love.pxa/11.pxi diff --git a/desktop/asset-work/ego/love.pxa/12.pxi b/desktop/asset-work/global/ego/love.pxa/12.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/12.pxi rename to desktop/asset-work/global/ego/love.pxa/12.pxi diff --git a/desktop/asset-work/ego/love.pxa/13.pxi b/desktop/asset-work/global/ego/love.pxa/13.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/13.pxi rename to desktop/asset-work/global/ego/love.pxa/13.pxi diff --git a/desktop/asset-work/ego/love.pxa/14.pxi b/desktop/asset-work/global/ego/love.pxa/14.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/14.pxi rename to desktop/asset-work/global/ego/love.pxa/14.pxi diff --git a/desktop/asset-work/ego/love.pxa/15.pxi b/desktop/asset-work/global/ego/love.pxa/15.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/15.pxi rename to desktop/asset-work/global/ego/love.pxa/15.pxi diff --git a/desktop/asset-work/ego/love.pxa/16.pxi b/desktop/asset-work/global/ego/love.pxa/16.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/16.pxi rename to desktop/asset-work/global/ego/love.pxa/16.pxi diff --git a/desktop/asset-work/ego/love.pxa/17.pxi b/desktop/asset-work/global/ego/love.pxa/17.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/17.pxi rename to desktop/asset-work/global/ego/love.pxa/17.pxi diff --git a/desktop/asset-work/ego/love.pxa/18.pxi b/desktop/asset-work/global/ego/love.pxa/18.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/18.pxi rename to desktop/asset-work/global/ego/love.pxa/18.pxi diff --git a/desktop/asset-work/ego/love.pxa/19.pxi b/desktop/asset-work/global/ego/love.pxa/19.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/19.pxi rename to desktop/asset-work/global/ego/love.pxa/19.pxi diff --git a/desktop/asset-work/ego/love.pxa/2.pxi b/desktop/asset-work/global/ego/love.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/2.pxi rename to desktop/asset-work/global/ego/love.pxa/2.pxi diff --git a/desktop/asset-work/ego/love.pxa/20.pxi b/desktop/asset-work/global/ego/love.pxa/20.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/20.pxi rename to desktop/asset-work/global/ego/love.pxa/20.pxi diff --git a/desktop/asset-work/ego/love.pxa/21.pxi b/desktop/asset-work/global/ego/love.pxa/21.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/21.pxi rename to desktop/asset-work/global/ego/love.pxa/21.pxi diff --git a/desktop/asset-work/ego/love.pxa/22.pxi b/desktop/asset-work/global/ego/love.pxa/22.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/22.pxi rename to desktop/asset-work/global/ego/love.pxa/22.pxi diff --git a/desktop/asset-work/ego/love.pxa/23.pxi b/desktop/asset-work/global/ego/love.pxa/23.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/23.pxi rename to desktop/asset-work/global/ego/love.pxa/23.pxi diff --git a/desktop/asset-work/ego/love.pxa/24.pxi b/desktop/asset-work/global/ego/love.pxa/24.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/24.pxi rename to desktop/asset-work/global/ego/love.pxa/24.pxi diff --git a/desktop/asset-work/ego/love.pxa/25.pxi b/desktop/asset-work/global/ego/love.pxa/25.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/25.pxi rename to desktop/asset-work/global/ego/love.pxa/25.pxi diff --git a/desktop/asset-work/ego/love.pxa/3.pxi b/desktop/asset-work/global/ego/love.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/3.pxi rename to desktop/asset-work/global/ego/love.pxa/3.pxi diff --git a/desktop/asset-work/ego/love.pxa/4.pxi b/desktop/asset-work/global/ego/love.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/4.pxi rename to desktop/asset-work/global/ego/love.pxa/4.pxi diff --git a/desktop/asset-work/ego/love.pxa/5.pxi b/desktop/asset-work/global/ego/love.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/5.pxi rename to desktop/asset-work/global/ego/love.pxa/5.pxi diff --git a/desktop/asset-work/ego/love.pxa/6.pxi b/desktop/asset-work/global/ego/love.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/6.pxi rename to desktop/asset-work/global/ego/love.pxa/6.pxi diff --git a/desktop/asset-work/ego/love.pxa/7.pxi b/desktop/asset-work/global/ego/love.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/7.pxi rename to desktop/asset-work/global/ego/love.pxa/7.pxi diff --git a/desktop/asset-work/ego/love.pxa/8.pxi b/desktop/asset-work/global/ego/love.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/8.pxi rename to desktop/asset-work/global/ego/love.pxa/8.pxi diff --git a/desktop/asset-work/ego/love.pxa/9.pxi b/desktop/asset-work/global/ego/love.pxa/9.pxi similarity index 100% rename from desktop/asset-work/ego/love.pxa/9.pxi rename to desktop/asset-work/global/ego/love.pxa/9.pxi diff --git a/desktop/asset-work/ego/love.pxa/CelData.plist b/desktop/asset-work/global/ego/love.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/love.pxa/CelData.plist rename to desktop/asset-work/global/ego/love.pxa/CelData.plist diff --git a/desktop/asset-work/ego/pant.png b/desktop/asset-work/global/ego/pant.png similarity index 100% rename from desktop/asset-work/ego/pant.png rename to desktop/asset-work/global/ego/pant.png diff --git a/desktop/asset-work/ego/pant.pxa/0.pxi b/desktop/asset-work/global/ego/pant.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/pant.pxa/0.pxi rename to desktop/asset-work/global/ego/pant.pxa/0.pxi diff --git a/desktop/asset-work/ego/pant.pxa/1.pxi b/desktop/asset-work/global/ego/pant.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/pant.pxa/1.pxi rename to desktop/asset-work/global/ego/pant.pxa/1.pxi diff --git a/desktop/asset-work/ego/pant.pxa/CelData.plist b/desktop/asset-work/global/ego/pant.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/pant.pxa/CelData.plist rename to desktop/asset-work/global/ego/pant.pxa/CelData.plist diff --git a/desktop/asset-work/ego/poke.png b/desktop/asset-work/global/ego/poke.png similarity index 100% rename from desktop/asset-work/ego/poke.png rename to desktop/asset-work/global/ego/poke.png diff --git a/desktop/asset-work/ego/poke.pxa/0.pxi b/desktop/asset-work/global/ego/poke.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/poke.pxa/0.pxi rename to desktop/asset-work/global/ego/poke.pxa/0.pxi diff --git a/desktop/asset-work/ego/poke.pxa/1.pxi b/desktop/asset-work/global/ego/poke.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/poke.pxa/1.pxi rename to desktop/asset-work/global/ego/poke.pxa/1.pxi diff --git a/desktop/asset-work/ego/poke.pxa/2.pxi b/desktop/asset-work/global/ego/poke.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/poke.pxa/2.pxi rename to desktop/asset-work/global/ego/poke.pxa/2.pxi diff --git a/desktop/asset-work/ego/poke.pxa/3.pxi b/desktop/asset-work/global/ego/poke.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/poke.pxa/3.pxi rename to desktop/asset-work/global/ego/poke.pxa/3.pxi diff --git a/desktop/asset-work/ego/poke.pxa/CelData.plist b/desktop/asset-work/global/ego/poke.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/poke.pxa/CelData.plist rename to desktop/asset-work/global/ego/poke.pxa/CelData.plist diff --git a/desktop/asset-work/ego/potion.ogg b/desktop/asset-work/global/ego/potion.ogg similarity index 100% rename from desktop/asset-work/ego/potion.ogg rename to desktop/asset-work/global/ego/potion.ogg diff --git a/desktop/asset-work/ego/potion.wav b/desktop/asset-work/global/ego/potion.wav similarity index 100% rename from desktop/asset-work/ego/potion.wav rename to desktop/asset-work/global/ego/potion.wav diff --git a/desktop/asset-work/ego/pull-sword.psd b/desktop/asset-work/global/ego/pull-sword.psd similarity index 100% rename from desktop/asset-work/ego/pull-sword.psd rename to desktop/asset-work/global/ego/pull-sword.psd diff --git a/desktop/asset-work/ego/reach.png b/desktop/asset-work/global/ego/reach.png similarity index 100% rename from desktop/asset-work/ego/reach.png rename to desktop/asset-work/global/ego/reach.png diff --git a/desktop/asset-work/ego/reach.pxa/0.pxi b/desktop/asset-work/global/ego/reach.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/reach.pxa/0.pxi rename to desktop/asset-work/global/ego/reach.pxa/0.pxi diff --git a/desktop/asset-work/ego/reach.pxa/1.pxi b/desktop/asset-work/global/ego/reach.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/reach.pxa/1.pxi rename to desktop/asset-work/global/ego/reach.pxa/1.pxi diff --git a/desktop/asset-work/ego/reach.pxa/2.pxi b/desktop/asset-work/global/ego/reach.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/reach.pxa/2.pxi rename to desktop/asset-work/global/ego/reach.pxa/2.pxi diff --git a/desktop/asset-work/ego/reach.pxa/3.pxi b/desktop/asset-work/global/ego/reach.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/reach.pxa/3.pxi rename to desktop/asset-work/global/ego/reach.pxa/3.pxi diff --git a/desktop/asset-work/ego/reach.pxa/CelData.plist b/desktop/asset-work/global/ego/reach.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/reach.pxa/CelData.plist rename to desktop/asset-work/global/ego/reach.pxa/CelData.plist diff --git a/desktop/asset-work/ego/scared-step-old1.wav b/desktop/asset-work/global/ego/scared-step-old1.wav similarity index 100% rename from desktop/asset-work/ego/scared-step-old1.wav rename to desktop/asset-work/global/ego/scared-step-old1.wav diff --git a/desktop/asset-work/ego/scared-step.ogg b/desktop/asset-work/global/ego/scared-step.ogg similarity index 100% rename from desktop/asset-work/ego/scared-step.ogg rename to desktop/asset-work/global/ego/scared-step.ogg diff --git a/desktop/asset-work/ego/scared-step.wav b/desktop/asset-work/global/ego/scared-step.wav similarity index 100% rename from desktop/asset-work/ego/scared-step.wav rename to desktop/asset-work/global/ego/scared-step.wav diff --git a/desktop/asset-work/ego/scared-walk.png b/desktop/asset-work/global/ego/scared-walk.png similarity index 100% rename from desktop/asset-work/ego/scared-walk.png rename to desktop/asset-work/global/ego/scared-walk.png diff --git a/desktop/asset-work/ego/scared-walk.pxa/0.pxi b/desktop/asset-work/global/ego/scared-walk.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/0.pxi rename to desktop/asset-work/global/ego/scared-walk.pxa/0.pxi diff --git a/desktop/asset-work/ego/scared-walk.pxa/1.pxi b/desktop/asset-work/global/ego/scared-walk.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/1.pxi rename to desktop/asset-work/global/ego/scared-walk.pxa/1.pxi diff --git a/desktop/asset-work/ego/scared-walk.pxa/2.pxi b/desktop/asset-work/global/ego/scared-walk.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/2.pxi rename to desktop/asset-work/global/ego/scared-walk.pxa/2.pxi diff --git a/desktop/asset-work/ego/scared-walk.pxa/3.pxi b/desktop/asset-work/global/ego/scared-walk.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/3.pxi rename to desktop/asset-work/global/ego/scared-walk.pxa/3.pxi diff --git a/desktop/asset-work/ego/scared-walk.pxa/4.pxi b/desktop/asset-work/global/ego/scared-walk.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/4.pxi rename to desktop/asset-work/global/ego/scared-walk.pxa/4.pxi diff --git a/desktop/asset-work/ego/scared-walk.pxa/5.pxi b/desktop/asset-work/global/ego/scared-walk.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/5.pxi rename to desktop/asset-work/global/ego/scared-walk.pxa/5.pxi diff --git a/desktop/asset-work/ego/scared-walk.pxa/CelData.plist b/desktop/asset-work/global/ego/scared-walk.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/scared-walk.pxa/CelData.plist rename to desktop/asset-work/global/ego/scared-walk.pxa/CelData.plist diff --git a/desktop/asset-work/ego/scared.png b/desktop/asset-work/global/ego/scared.png similarity index 100% rename from desktop/asset-work/ego/scared.png rename to desktop/asset-work/global/ego/scared.png diff --git a/desktop/asset-work/ego/scared.pxa/0.pxi b/desktop/asset-work/global/ego/scared.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/scared.pxa/0.pxi rename to desktop/asset-work/global/ego/scared.pxa/0.pxi diff --git a/desktop/asset-work/ego/scared.pxa/1.pxi b/desktop/asset-work/global/ego/scared.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/scared.pxa/1.pxi rename to desktop/asset-work/global/ego/scared.pxa/1.pxi diff --git a/desktop/asset-work/ego/scared.pxa/2.pxi b/desktop/asset-work/global/ego/scared.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/scared.pxa/2.pxi rename to desktop/asset-work/global/ego/scared.pxa/2.pxi diff --git a/desktop/asset-work/ego/scared.pxa/3.pxi b/desktop/asset-work/global/ego/scared.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/scared.pxa/3.pxi rename to desktop/asset-work/global/ego/scared.pxa/3.pxi diff --git a/desktop/asset-work/ego/scared.pxa/CelData.plist b/desktop/asset-work/global/ego/scared.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/scared.pxa/CelData.plist rename to desktop/asset-work/global/ego/scared.pxa/CelData.plist diff --git a/desktop/asset-work/ego/scoot.png b/desktop/asset-work/global/ego/scoot.png similarity index 100% rename from desktop/asset-work/ego/scoot.png rename to desktop/asset-work/global/ego/scoot.png diff --git a/desktop/asset-work/ego/scratch.ogg b/desktop/asset-work/global/ego/scratch.ogg similarity index 100% rename from desktop/asset-work/ego/scratch.ogg rename to desktop/asset-work/global/ego/scratch.ogg diff --git a/desktop/asset-work/ego/scratch.wav b/desktop/asset-work/global/ego/scratch.wav similarity index 100% rename from desktop/asset-work/ego/scratch.wav rename to desktop/asset-work/global/ego/scratch.wav diff --git a/desktop/asset-work/ego/scratch_1.wav b/desktop/asset-work/global/ego/scratch_1.wav similarity index 100% rename from desktop/asset-work/ego/scratch_1.wav rename to desktop/asset-work/global/ego/scratch_1.wav diff --git a/desktop/asset-work/ego/shock.png b/desktop/asset-work/global/ego/shock.png similarity index 100% rename from desktop/asset-work/ego/shock.png rename to desktop/asset-work/global/ego/shock.png diff --git a/desktop/asset-work/ego/shock.pxa/0.pxi b/desktop/asset-work/global/ego/shock.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/0.pxi rename to desktop/asset-work/global/ego/shock.pxa/0.pxi diff --git a/desktop/asset-work/ego/shock.pxa/1.pxi b/desktop/asset-work/global/ego/shock.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/1.pxi rename to desktop/asset-work/global/ego/shock.pxa/1.pxi diff --git a/desktop/asset-work/ego/shock.pxa/2.pxi b/desktop/asset-work/global/ego/shock.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/2.pxi rename to desktop/asset-work/global/ego/shock.pxa/2.pxi diff --git a/desktop/asset-work/ego/shock.pxa/3.pxi b/desktop/asset-work/global/ego/shock.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/3.pxi rename to desktop/asset-work/global/ego/shock.pxa/3.pxi diff --git a/desktop/asset-work/ego/shock.pxa/4.pxi b/desktop/asset-work/global/ego/shock.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/4.pxi rename to desktop/asset-work/global/ego/shock.pxa/4.pxi diff --git a/desktop/asset-work/ego/shock.pxa/5.pxi b/desktop/asset-work/global/ego/shock.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/5.pxi rename to desktop/asset-work/global/ego/shock.pxa/5.pxi diff --git a/desktop/asset-work/ego/shock.pxa/6.pxi b/desktop/asset-work/global/ego/shock.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/6.pxi rename to desktop/asset-work/global/ego/shock.pxa/6.pxi diff --git a/desktop/asset-work/ego/shock.pxa/7.pxi b/desktop/asset-work/global/ego/shock.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/7.pxi rename to desktop/asset-work/global/ego/shock.pxa/7.pxi diff --git a/desktop/asset-work/ego/shock.pxa/8.pxi b/desktop/asset-work/global/ego/shock.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/shock.pxa/8.pxi rename to desktop/asset-work/global/ego/shock.pxa/8.pxi diff --git a/desktop/asset-work/ego/shock.pxa/CelData.plist b/desktop/asset-work/global/ego/shock.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/shock.pxa/CelData.plist rename to desktop/asset-work/global/ego/shock.pxa/CelData.plist diff --git a/desktop/asset-work/ego/shoot.png b/desktop/asset-work/global/ego/shoot.png similarity index 100% rename from desktop/asset-work/ego/shoot.png rename to desktop/asset-work/global/ego/shoot.png diff --git a/desktop/asset-work/ego/shoot.pxa/0.pxi b/desktop/asset-work/global/ego/shoot.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/0.pxi rename to desktop/asset-work/global/ego/shoot.pxa/0.pxi diff --git a/desktop/asset-work/ego/shoot.pxa/1.pxi b/desktop/asset-work/global/ego/shoot.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/1.pxi rename to desktop/asset-work/global/ego/shoot.pxa/1.pxi diff --git a/desktop/asset-work/ego/shoot.pxa/2.pxi b/desktop/asset-work/global/ego/shoot.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/2.pxi rename to desktop/asset-work/global/ego/shoot.pxa/2.pxi diff --git a/desktop/asset-work/ego/shoot.pxa/3.pxi b/desktop/asset-work/global/ego/shoot.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/3.pxi rename to desktop/asset-work/global/ego/shoot.pxa/3.pxi diff --git a/desktop/asset-work/ego/shoot.pxa/4.pxi b/desktop/asset-work/global/ego/shoot.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/4.pxi rename to desktop/asset-work/global/ego/shoot.pxa/4.pxi diff --git a/desktop/asset-work/ego/shoot.pxa/5.pxi b/desktop/asset-work/global/ego/shoot.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/5.pxi rename to desktop/asset-work/global/ego/shoot.pxa/5.pxi diff --git a/desktop/asset-work/ego/shoot.pxa/CelData.plist b/desktop/asset-work/global/ego/shoot.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/shoot.pxa/CelData.plist rename to desktop/asset-work/global/ego/shoot.pxa/CelData.plist diff --git a/desktop/asset-work/ego/sigh.ogg b/desktop/asset-work/global/ego/sigh.ogg similarity index 100% rename from desktop/asset-work/ego/sigh.ogg rename to desktop/asset-work/global/ego/sigh.ogg diff --git a/desktop/asset-work/ego/sigh.png b/desktop/asset-work/global/ego/sigh.png similarity index 100% rename from desktop/asset-work/ego/sigh.png rename to desktop/asset-work/global/ego/sigh.png diff --git a/desktop/asset-work/ego/sigh.pxa/0.pxi b/desktop/asset-work/global/ego/sigh.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/0.pxi rename to desktop/asset-work/global/ego/sigh.pxa/0.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/1.pxi b/desktop/asset-work/global/ego/sigh.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/1.pxi rename to desktop/asset-work/global/ego/sigh.pxa/1.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/2.pxi b/desktop/asset-work/global/ego/sigh.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/2.pxi rename to desktop/asset-work/global/ego/sigh.pxa/2.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/3.pxi b/desktop/asset-work/global/ego/sigh.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/3.pxi rename to desktop/asset-work/global/ego/sigh.pxa/3.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/4.pxi b/desktop/asset-work/global/ego/sigh.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/4.pxi rename to desktop/asset-work/global/ego/sigh.pxa/4.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/5.pxi b/desktop/asset-work/global/ego/sigh.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/5.pxi rename to desktop/asset-work/global/ego/sigh.pxa/5.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/6.pxi b/desktop/asset-work/global/ego/sigh.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/6.pxi rename to desktop/asset-work/global/ego/sigh.pxa/6.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/7.pxi b/desktop/asset-work/global/ego/sigh.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/7.pxi rename to desktop/asset-work/global/ego/sigh.pxa/7.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/8.pxi b/desktop/asset-work/global/ego/sigh.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/8.pxi rename to desktop/asset-work/global/ego/sigh.pxa/8.pxi diff --git a/desktop/asset-work/ego/sigh.pxa/CelData.plist b/desktop/asset-work/global/ego/sigh.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/sigh.pxa/CelData.plist rename to desktop/asset-work/global/ego/sigh.pxa/CelData.plist diff --git a/desktop/asset-work/ego/sigh.wav b/desktop/asset-work/global/ego/sigh.wav similarity index 100% rename from desktop/asset-work/ego/sigh.wav rename to desktop/asset-work/global/ego/sigh.wav diff --git a/desktop/asset-work/ego/slingshot.ogg b/desktop/asset-work/global/ego/slingshot.ogg similarity index 100% rename from desktop/asset-work/ego/slingshot.ogg rename to desktop/asset-work/global/ego/slingshot.ogg diff --git a/desktop/asset-work/ego/slingshot.wav b/desktop/asset-work/global/ego/slingshot.wav similarity index 100% rename from desktop/asset-work/ego/slingshot.wav rename to desktop/asset-work/global/ego/slingshot.wav diff --git a/desktop/asset-work/ego/spear.png b/desktop/asset-work/global/ego/spear.png similarity index 100% rename from desktop/asset-work/ego/spear.png rename to desktop/asset-work/global/ego/spear.png diff --git a/desktop/asset-work/ego/spear.pxa/0.pxi b/desktop/asset-work/global/ego/spear.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/spear.pxa/0.pxi rename to desktop/asset-work/global/ego/spear.pxa/0.pxi diff --git a/desktop/asset-work/ego/spear.pxa/1.pxi b/desktop/asset-work/global/ego/spear.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/spear.pxa/1.pxi rename to desktop/asset-work/global/ego/spear.pxa/1.pxi diff --git a/desktop/asset-work/ego/spear.pxa/2.pxi b/desktop/asset-work/global/ego/spear.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/spear.pxa/2.pxi rename to desktop/asset-work/global/ego/spear.pxa/2.pxi diff --git a/desktop/asset-work/ego/spear.pxa/3.pxi b/desktop/asset-work/global/ego/spear.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/spear.pxa/3.pxi rename to desktop/asset-work/global/ego/spear.pxa/3.pxi diff --git a/desktop/asset-work/ego/spear.pxa/4.pxi b/desktop/asset-work/global/ego/spear.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/spear.pxa/4.pxi rename to desktop/asset-work/global/ego/spear.pxa/4.pxi diff --git a/desktop/asset-work/ego/spear.pxa/CelData.plist b/desktop/asset-work/global/ego/spear.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/spear.pxa/CelData.plist rename to desktop/asset-work/global/ego/spear.pxa/CelData.plist diff --git a/desktop/asset-work/ego/squat-talk.png b/desktop/asset-work/global/ego/squat-talk.png similarity index 100% rename from desktop/asset-work/ego/squat-talk.png rename to desktop/asset-work/global/ego/squat-talk.png diff --git a/desktop/asset-work/ego/squat-talk.pxa/0.pxi b/desktop/asset-work/global/ego/squat-talk.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/squat-talk.pxa/0.pxi rename to desktop/asset-work/global/ego/squat-talk.pxa/0.pxi diff --git a/desktop/asset-work/ego/squat-talk.pxa/1.pxi b/desktop/asset-work/global/ego/squat-talk.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/squat-talk.pxa/1.pxi rename to desktop/asset-work/global/ego/squat-talk.pxa/1.pxi diff --git a/desktop/asset-work/ego/squat-talk.pxa/2.pxi b/desktop/asset-work/global/ego/squat-talk.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/squat-talk.pxa/2.pxi rename to desktop/asset-work/global/ego/squat-talk.pxa/2.pxi diff --git a/desktop/asset-work/ego/squat-talk.pxa/3.pxi b/desktop/asset-work/global/ego/squat-talk.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/squat-talk.pxa/3.pxi rename to desktop/asset-work/global/ego/squat-talk.pxa/3.pxi diff --git a/desktop/asset-work/ego/squat-talk.pxa/CelData.plist b/desktop/asset-work/global/ego/squat-talk.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/squat-talk.pxa/CelData.plist rename to desktop/asset-work/global/ego/squat-talk.pxa/CelData.plist diff --git a/desktop/asset-work/ego/squat.png b/desktop/asset-work/global/ego/squat.png similarity index 100% rename from desktop/asset-work/ego/squat.png rename to desktop/asset-work/global/ego/squat.png diff --git a/desktop/asset-work/ego/squat.pxa/0.pxi b/desktop/asset-work/global/ego/squat.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/0.pxi rename to desktop/asset-work/global/ego/squat.pxa/0.pxi diff --git a/desktop/asset-work/ego/squat.pxa/1.pxi b/desktop/asset-work/global/ego/squat.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/1.pxi rename to desktop/asset-work/global/ego/squat.pxa/1.pxi diff --git a/desktop/asset-work/ego/squat.pxa/2.pxi b/desktop/asset-work/global/ego/squat.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/2.pxi rename to desktop/asset-work/global/ego/squat.pxa/2.pxi diff --git a/desktop/asset-work/ego/squat.pxa/3.pxi b/desktop/asset-work/global/ego/squat.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/3.pxi rename to desktop/asset-work/global/ego/squat.pxa/3.pxi diff --git a/desktop/asset-work/ego/squat.pxa/4.pxi b/desktop/asset-work/global/ego/squat.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/4.pxi rename to desktop/asset-work/global/ego/squat.pxa/4.pxi diff --git a/desktop/asset-work/ego/squat.pxa/5.pxi b/desktop/asset-work/global/ego/squat.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/5.pxi rename to desktop/asset-work/global/ego/squat.pxa/5.pxi diff --git a/desktop/asset-work/ego/squat.pxa/6.pxi b/desktop/asset-work/global/ego/squat.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/squat.pxa/6.pxi rename to desktop/asset-work/global/ego/squat.pxa/6.pxi diff --git a/desktop/asset-work/ego/squat.pxa/CelData.plist b/desktop/asset-work/global/ego/squat.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/squat.pxa/CelData.plist rename to desktop/asset-work/global/ego/squat.pxa/CelData.plist diff --git a/desktop/asset-work/ego/stand.png b/desktop/asset-work/global/ego/stand.png similarity index 100% rename from desktop/asset-work/ego/stand.png rename to desktop/asset-work/global/ego/stand.png diff --git a/desktop/asset-work/ego/stand.pxa/0.pxi b/desktop/asset-work/global/ego/stand.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/0.pxi rename to desktop/asset-work/global/ego/stand.pxa/0.pxi diff --git a/desktop/asset-work/ego/stand.pxa/1.pxi b/desktop/asset-work/global/ego/stand.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/1.pxi rename to desktop/asset-work/global/ego/stand.pxa/1.pxi diff --git a/desktop/asset-work/ego/stand.pxa/2.pxi b/desktop/asset-work/global/ego/stand.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/2.pxi rename to desktop/asset-work/global/ego/stand.pxa/2.pxi diff --git a/desktop/asset-work/ego/stand.pxa/3.pxi b/desktop/asset-work/global/ego/stand.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/3.pxi rename to desktop/asset-work/global/ego/stand.pxa/3.pxi diff --git a/desktop/asset-work/ego/stand.pxa/4.pxi b/desktop/asset-work/global/ego/stand.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/4.pxi rename to desktop/asset-work/global/ego/stand.pxa/4.pxi diff --git a/desktop/asset-work/ego/stand.pxa/5.pxi b/desktop/asset-work/global/ego/stand.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/5.pxi rename to desktop/asset-work/global/ego/stand.pxa/5.pxi diff --git a/desktop/asset-work/ego/stand.pxa/6.pxi b/desktop/asset-work/global/ego/stand.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/stand.pxa/6.pxi rename to desktop/asset-work/global/ego/stand.pxa/6.pxi diff --git a/desktop/asset-work/ego/stand.pxa/CelData.plist b/desktop/asset-work/global/ego/stand.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/stand.pxa/CelData.plist rename to desktop/asset-work/global/ego/stand.pxa/CelData.plist diff --git a/desktop/asset-work/ego/standup.png b/desktop/asset-work/global/ego/standup.png similarity index 100% rename from desktop/asset-work/ego/standup.png rename to desktop/asset-work/global/ego/standup.png diff --git a/desktop/asset-work/ego/standup.pxa/0.pxi b/desktop/asset-work/global/ego/standup.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/standup.pxa/0.pxi rename to desktop/asset-work/global/ego/standup.pxa/0.pxi diff --git a/desktop/asset-work/ego/standup.pxa/1.pxi b/desktop/asset-work/global/ego/standup.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/standup.pxa/1.pxi rename to desktop/asset-work/global/ego/standup.pxa/1.pxi diff --git a/desktop/asset-work/ego/standup.pxa/2.pxi b/desktop/asset-work/global/ego/standup.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/standup.pxa/2.pxi rename to desktop/asset-work/global/ego/standup.pxa/2.pxi diff --git a/desktop/asset-work/ego/standup.pxa/3.pxi b/desktop/asset-work/global/ego/standup.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/standup.pxa/3.pxi rename to desktop/asset-work/global/ego/standup.pxa/3.pxi diff --git a/desktop/asset-work/ego/standup.pxa/4.pxi b/desktop/asset-work/global/ego/standup.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/standup.pxa/4.pxi rename to desktop/asset-work/global/ego/standup.pxa/4.pxi diff --git a/desktop/asset-work/ego/standup.pxa/CelData.plist b/desktop/asset-work/global/ego/standup.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/standup.pxa/CelData.plist rename to desktop/asset-work/global/ego/standup.pxa/CelData.plist diff --git a/desktop/asset-work/ego/step b/desktop/asset-work/global/ego/step similarity index 100% rename from desktop/asset-work/ego/step rename to desktop/asset-work/global/ego/step diff --git a/desktop/asset-work/ego/step-1.wav b/desktop/asset-work/global/ego/step-1.wav similarity index 100% rename from desktop/asset-work/ego/step-1.wav rename to desktop/asset-work/global/ego/step-1.wav diff --git a/desktop/asset-work/ego/step-1_1.wav b/desktop/asset-work/global/ego/step-1_1.wav similarity index 100% rename from desktop/asset-work/ego/step-1_1.wav rename to desktop/asset-work/global/ego/step-1_1.wav diff --git a/desktop/asset-work/ego/step-2.wav b/desktop/asset-work/global/ego/step-2.wav similarity index 100% rename from desktop/asset-work/ego/step-2.wav rename to desktop/asset-work/global/ego/step-2.wav diff --git a/desktop/asset-work/ego/step-3.wav b/desktop/asset-work/global/ego/step-3.wav similarity index 100% rename from desktop/asset-work/ego/step-3.wav rename to desktop/asset-work/global/ego/step-3.wav diff --git a/desktop/asset-work/ego/step-4.wav b/desktop/asset-work/global/ego/step-4.wav similarity index 100% rename from desktop/asset-work/ego/step-4.wav rename to desktop/asset-work/global/ego/step-4.wav diff --git a/desktop/asset-work/ego/step.wav b/desktop/asset-work/global/ego/step.wav similarity index 100% rename from desktop/asset-work/ego/step.wav rename to desktop/asset-work/global/ego/step.wav diff --git a/desktop/asset-work/ego/suspended.png b/desktop/asset-work/global/ego/suspended.png similarity index 100% rename from desktop/asset-work/ego/suspended.png rename to desktop/asset-work/global/ego/suspended.png diff --git a/desktop/asset-work/ego/suspended.pxa/0.pxi b/desktop/asset-work/global/ego/suspended.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/0.pxi rename to desktop/asset-work/global/ego/suspended.pxa/0.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/1.pxi b/desktop/asset-work/global/ego/suspended.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/1.pxi rename to desktop/asset-work/global/ego/suspended.pxa/1.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/2.pxi b/desktop/asset-work/global/ego/suspended.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/2.pxi rename to desktop/asset-work/global/ego/suspended.pxa/2.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/3.pxi b/desktop/asset-work/global/ego/suspended.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/3.pxi rename to desktop/asset-work/global/ego/suspended.pxa/3.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/4.pxi b/desktop/asset-work/global/ego/suspended.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/4.pxi rename to desktop/asset-work/global/ego/suspended.pxa/4.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/5.pxi b/desktop/asset-work/global/ego/suspended.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/5.pxi rename to desktop/asset-work/global/ego/suspended.pxa/5.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/6.pxi b/desktop/asset-work/global/ego/suspended.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/6.pxi rename to desktop/asset-work/global/ego/suspended.pxa/6.pxi diff --git a/desktop/asset-work/ego/suspended.pxa/CelData.plist b/desktop/asset-work/global/ego/suspended.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/suspended.pxa/CelData.plist rename to desktop/asset-work/global/ego/suspended.pxa/CelData.plist diff --git a/desktop/asset-work/ego/swing-shovel.png b/desktop/asset-work/global/ego/swing-shovel.png similarity index 100% rename from desktop/asset-work/ego/swing-shovel.png rename to desktop/asset-work/global/ego/swing-shovel.png diff --git a/desktop/asset-work/ego/swing.png b/desktop/asset-work/global/ego/swing.png similarity index 100% rename from desktop/asset-work/ego/swing.png rename to desktop/asset-work/global/ego/swing.png diff --git a/desktop/asset-work/ego/swing.pxa/0.pxi b/desktop/asset-work/global/ego/swing.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/0.pxi rename to desktop/asset-work/global/ego/swing.pxa/0.pxi diff --git a/desktop/asset-work/ego/swing.pxa/1.pxi b/desktop/asset-work/global/ego/swing.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/1.pxi rename to desktop/asset-work/global/ego/swing.pxa/1.pxi diff --git a/desktop/asset-work/ego/swing.pxa/2.pxi b/desktop/asset-work/global/ego/swing.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/2.pxi rename to desktop/asset-work/global/ego/swing.pxa/2.pxi diff --git a/desktop/asset-work/ego/swing.pxa/3.pxi b/desktop/asset-work/global/ego/swing.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/3.pxi rename to desktop/asset-work/global/ego/swing.pxa/3.pxi diff --git a/desktop/asset-work/ego/swing.pxa/4.pxi b/desktop/asset-work/global/ego/swing.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/4.pxi rename to desktop/asset-work/global/ego/swing.pxa/4.pxi diff --git a/desktop/asset-work/ego/swing.pxa/5.pxi b/desktop/asset-work/global/ego/swing.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/5.pxi rename to desktop/asset-work/global/ego/swing.pxa/5.pxi diff --git a/desktop/asset-work/ego/swing.pxa/6.pxi b/desktop/asset-work/global/ego/swing.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/6.pxi rename to desktop/asset-work/global/ego/swing.pxa/6.pxi diff --git a/desktop/asset-work/ego/swing.pxa/7.pxi b/desktop/asset-work/global/ego/swing.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/swing.pxa/7.pxi rename to desktop/asset-work/global/ego/swing.pxa/7.pxi diff --git a/desktop/asset-work/ego/swing.pxa/CelData.plist b/desktop/asset-work/global/ego/swing.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/swing.pxa/CelData.plist rename to desktop/asset-work/global/ego/swing.pxa/CelData.plist diff --git a/desktop/asset-work/ego/swingshovel.pxa/0.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/0.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/0.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/1.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/1.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/1.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/2.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/2.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/2.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/3.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/3.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/3.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/4.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/4.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/4.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/5.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/5.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/5.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/6.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/6.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/6.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/7.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/7.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/7.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/8.pxi b/desktop/asset-work/global/ego/swingshovel.pxa/8.pxi similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/8.pxi rename to desktop/asset-work/global/ego/swingshovel.pxa/8.pxi diff --git a/desktop/asset-work/ego/swingshovel.pxa/CelData.plist b/desktop/asset-work/global/ego/swingshovel.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/swingshovel.pxa/CelData.plist rename to desktop/asset-work/global/ego/swingshovel.pxa/CelData.plist diff --git a/desktop/asset-work/ego/talk.png b/desktop/asset-work/global/ego/talk.png similarity index 100% rename from desktop/asset-work/ego/talk.png rename to desktop/asset-work/global/ego/talk.png diff --git a/desktop/asset-work/ego/talk.pxa/0.pxi b/desktop/asset-work/global/ego/talk.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/0.pxi rename to desktop/asset-work/global/ego/talk.pxa/0.pxi diff --git a/desktop/asset-work/ego/talk.pxa/1.pxi b/desktop/asset-work/global/ego/talk.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/1.pxi rename to desktop/asset-work/global/ego/talk.pxa/1.pxi diff --git a/desktop/asset-work/ego/talk.pxa/2.pxi b/desktop/asset-work/global/ego/talk.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/2.pxi rename to desktop/asset-work/global/ego/talk.pxa/2.pxi diff --git a/desktop/asset-work/ego/talk.pxa/3.pxi b/desktop/asset-work/global/ego/talk.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/3.pxi rename to desktop/asset-work/global/ego/talk.pxa/3.pxi diff --git a/desktop/asset-work/ego/talk.pxa/4.pxi b/desktop/asset-work/global/ego/talk.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/4.pxi rename to desktop/asset-work/global/ego/talk.pxa/4.pxi diff --git a/desktop/asset-work/ego/talk.pxa/5.pxi b/desktop/asset-work/global/ego/talk.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/5.pxi rename to desktop/asset-work/global/ego/talk.pxa/5.pxi diff --git a/desktop/asset-work/ego/talk.pxa/6.pxi b/desktop/asset-work/global/ego/talk.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/6.pxi rename to desktop/asset-work/global/ego/talk.pxa/6.pxi diff --git a/desktop/asset-work/ego/talk.pxa/7.pxi b/desktop/asset-work/global/ego/talk.pxa/7.pxi similarity index 100% rename from desktop/asset-work/ego/talk.pxa/7.pxi rename to desktop/asset-work/global/ego/talk.pxa/7.pxi diff --git a/desktop/asset-work/ego/talk.pxa/CelData.plist b/desktop/asset-work/global/ego/talk.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/talk.pxa/CelData.plist rename to desktop/asset-work/global/ego/talk.pxa/CelData.plist diff --git a/desktop/asset-work/ego/test.psd b/desktop/asset-work/global/ego/test.psd similarity index 100% rename from desktop/asset-work/ego/test.psd rename to desktop/asset-work/global/ego/test.psd diff --git a/desktop/asset-work/ego/thorw.png b/desktop/asset-work/global/ego/thorw.png similarity index 100% rename from desktop/asset-work/ego/thorw.png rename to desktop/asset-work/global/ego/thorw.png diff --git a/desktop/asset-work/ego/throw.png b/desktop/asset-work/global/ego/throw.png similarity index 100% rename from desktop/asset-work/ego/throw.png rename to desktop/asset-work/global/ego/throw.png diff --git a/desktop/asset-work/ego/throw.pxa/0.pxi b/desktop/asset-work/global/ego/throw.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/0.pxi rename to desktop/asset-work/global/ego/throw.pxa/0.pxi diff --git a/desktop/asset-work/ego/throw.pxa/1.pxi b/desktop/asset-work/global/ego/throw.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/1.pxi rename to desktop/asset-work/global/ego/throw.pxa/1.pxi diff --git a/desktop/asset-work/ego/throw.pxa/2.pxi b/desktop/asset-work/global/ego/throw.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/2.pxi rename to desktop/asset-work/global/ego/throw.pxa/2.pxi diff --git a/desktop/asset-work/ego/throw.pxa/3.pxi b/desktop/asset-work/global/ego/throw.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/3.pxi rename to desktop/asset-work/global/ego/throw.pxa/3.pxi diff --git a/desktop/asset-work/ego/throw.pxa/4.pxi b/desktop/asset-work/global/ego/throw.pxa/4.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/4.pxi rename to desktop/asset-work/global/ego/throw.pxa/4.pxi diff --git a/desktop/asset-work/ego/throw.pxa/5.pxi b/desktop/asset-work/global/ego/throw.pxa/5.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/5.pxi rename to desktop/asset-work/global/ego/throw.pxa/5.pxi diff --git a/desktop/asset-work/ego/throw.pxa/6.pxi b/desktop/asset-work/global/ego/throw.pxa/6.pxi similarity index 100% rename from desktop/asset-work/ego/throw.pxa/6.pxi rename to desktop/asset-work/global/ego/throw.pxa/6.pxi diff --git a/desktop/asset-work/ego/throw.pxa/CelData.plist b/desktop/asset-work/global/ego/throw.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/throw.pxa/CelData.plist rename to desktop/asset-work/global/ego/throw.pxa/CelData.plist diff --git a/desktop/asset-work/ego/warden.png b/desktop/asset-work/global/ego/warden.png similarity index 100% rename from desktop/asset-work/ego/warden.png rename to desktop/asset-work/global/ego/warden.png diff --git a/desktop/asset-work/ego/whistle-1.png b/desktop/asset-work/global/ego/whistle-1.png similarity index 100% rename from desktop/asset-work/ego/whistle-1.png rename to desktop/asset-work/global/ego/whistle-1.png diff --git a/desktop/asset-work/ego/whistle-2.png b/desktop/asset-work/global/ego/whistle-2.png similarity index 100% rename from desktop/asset-work/ego/whistle-2.png rename to desktop/asset-work/global/ego/whistle-2.png diff --git a/desktop/asset-work/ego/whistle-3.png b/desktop/asset-work/global/ego/whistle-3.png similarity index 100% rename from desktop/asset-work/ego/whistle-3.png rename to desktop/asset-work/global/ego/whistle-3.png diff --git a/desktop/asset-work/ego/whistle-4.png b/desktop/asset-work/global/ego/whistle-4.png similarity index 100% rename from desktop/asset-work/ego/whistle-4.png rename to desktop/asset-work/global/ego/whistle-4.png diff --git a/desktop/asset-work/ego/whistle.pxa/0.pxi b/desktop/asset-work/global/ego/whistle.pxa/0.pxi similarity index 100% rename from desktop/asset-work/ego/whistle.pxa/0.pxi rename to desktop/asset-work/global/ego/whistle.pxa/0.pxi diff --git a/desktop/asset-work/ego/whistle.pxa/1.pxi b/desktop/asset-work/global/ego/whistle.pxa/1.pxi similarity index 100% rename from desktop/asset-work/ego/whistle.pxa/1.pxi rename to desktop/asset-work/global/ego/whistle.pxa/1.pxi diff --git a/desktop/asset-work/ego/whistle.pxa/2.pxi b/desktop/asset-work/global/ego/whistle.pxa/2.pxi similarity index 100% rename from desktop/asset-work/ego/whistle.pxa/2.pxi rename to desktop/asset-work/global/ego/whistle.pxa/2.pxi diff --git a/desktop/asset-work/ego/whistle.pxa/3.pxi b/desktop/asset-work/global/ego/whistle.pxa/3.pxi similarity index 100% rename from desktop/asset-work/ego/whistle.pxa/3.pxi rename to desktop/asset-work/global/ego/whistle.pxa/3.pxi diff --git a/desktop/asset-work/ego/whistle.pxa/CelData.plist b/desktop/asset-work/global/ego/whistle.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/ego/whistle.pxa/CelData.plist rename to desktop/asset-work/global/ego/whistle.pxa/CelData.plist diff --git a/desktop/asset-work/global/pack.json b/desktop/asset-work/global/pack.json new file mode 100644 index 00000000..0faf94db --- /dev/null +++ b/desktop/asset-work/global/pack.json @@ -0,0 +1,36 @@ +{ + pot: true, + paddingX: 2, + paddingY: 2, + bleed: true, + edgePadding: true, + duplicatePadding: false, + rotation: false, + minWidth: 128, + minHeight: 128, + maxWidth: 1024, + maxHeight: 1024, + square: false, + stripWhitespaceX: false, + stripWhitespaceY: false, + alphaThreshold: -1, + filterMin: Nearest, + filterMag: Nearest, + wrapX: ClampToEdge, + wrapY: ClampToEdge, + format: RGBA4444, + 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/asset-work/global/test/abc.png b/desktop/asset-work/global/test/abc.png new file mode 100644 index 00000000..aee350fb Binary files /dev/null and b/desktop/asset-work/global/test/abc.png differ diff --git a/desktop/asset-work/pack.json b/desktop/asset-work/pack.json index b0814dd7..0faf94db 100644 --- a/desktop/asset-work/pack.json +++ b/desktop/asset-work/pack.json @@ -25,7 +25,7 @@ ignoreBlankImages: true, fast: false, debug: false, - combineSubdirectories: false, + combineSubdirectories: true, flattenPaths: false, premultiplyAlpha: false, useIndexes: true, diff --git a/desktop/project.clj b/desktop/project.clj index 35ed543c..3485f401 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -39,6 +39,7 @@ :profiles { :uberjar { :jvm-opts ["-Duse-repl=false" "-Dui_scale=1.0" "-Dno-steam=true" "-Dclojure.compiler.direct-linking=true" "-Dis-desktop=true"] + :aot :all } :dev { :source-paths ["src" "src-common" "src-dev"] @@ -64,6 +65,7 @@ :source-paths ["src" "src-common" "src-dev"] :jvm-opts ["-Dapp-store=true" "-Dui_scale=1.0" "-Dno-steam=true" "-Dis-desktop=true"] + :aot :all :warn-on-reflection true} :steam {:dependencies [[com.code-disaster.steamworks4j/steamworks4j "1.2.2"]] @@ -78,8 +80,9 @@ [org.clojure/data.csv "0.1.3"] [com.code-disaster.steamworks4j/steamworks4j "1.2.2"]] + :aot :all :warn-on-reflection true} } - :aot :all + :aot [advent.core.desktop-launcher] :main advent.core.desktop-launcher) diff --git a/desktop/resources/packed/global.atlas b/desktop/resources/packed/global.atlas index 1f9a5d56..2e12c849 100644 --- a/desktop/resources/packed/global.atlas +++ b/desktop/resources/packed/global.atlas @@ -1,125 +1,671 @@ global.png -size: 1024,64 -format: RGBA8888 +size: 1024,1024 +format: RGBA4444 filter: Nearest,Nearest repeat: none black rotate: false - xy: 530, 38 + xy: 574, 823 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 close rotate: false - xy: 530, 20 + xy: 290, 485 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +ego/Untitled + rotate: false + xy: 664, 891 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/talk + rotate: false + xy: 664, 891 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/axe + rotate: false + xy: 2, 697 + size: 420, 70 + orig: 420, 70 + offset: 0, 0 + index: -1 +ego/axe-wood + rotate: false + xy: 2, 921 + size: 660, 70 + orig: 660, 70 + offset: 0, 0 + index: -1 +ego/base + rotate: false + xy: 956, 891 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/whistle-1 + rotate: false + xy: 956, 891 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/burnt + rotate: false + xy: 2, 769 + size: 480, 46 + orig: 480, 46 + offset: 0, 0 + index: -1 +ego/cat-toy + rotate: false + xy: 2, 386 + size: 205, 50 + orig: 205, 50 + offset: 0, 0 + index: -1 +ego/climb + rotate: false + xy: 2, 495 + size: 242, 46 + orig: 242, 46 + offset: 0, 0 + index: -1 +ego/crawl + rotate: false + xy: 2, 543 + size: 273, 25 + orig: 273, 25 + offset: 0, 0 + index: -1 +ego/crowbar + rotate: false + xy: 810, 891 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/dot + rotate: false + xy: 489, 504 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +ego/fire + rotate: false + xy: 2, 348 + size: 216, 36 + orig: 216, 36 + offset: 0, 0 + index: -1 +ego/flying + rotate: false + xy: 922, 845 + size: 34, 44 + orig: 34, 44 + offset: 0, 0 + index: -1 +ego/frog + rotate: false + xy: 474, 231 + size: 32, 36 + orig: 32, 36 + offset: 0, 0 + index: -1 +ego/frustrated-talk + rotate: false + xy: 484, 779 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/georgia + rotate: false + xy: 492, 595 + size: 90, 30 + orig: 90, 30 + offset: 0, 0 + index: -1 +ego/get-sick + rotate: false + xy: 484, 741 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/glad + rotate: false + xy: 634, 843 + size: 140, 46 + orig: 140, 46 + offset: 0, 0 + index: -1 +ego/grow + rotate: false + xy: 492, 627 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 +ego/grow-talk + rotate: false + xy: 986, 955 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +ego/hand-hold + rotate: false + xy: 986, 917 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +ego/hold-hand + rotate: false + xy: 406, 303 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/hold-up-to-window + rotate: false + xy: 480, 703 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/ida + rotate: false + xy: 424, 697 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/idea + rotate: false + xy: 94, 206 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 +ego/in-love + rotate: false + xy: 2, 817 + size: 570, 30 + orig: 570, 30 + offset: 0, 0 + index: -1 +ego/jump-straight + rotate: false + xy: 2, 126 + size: 90, 48 + orig: 90, 48 + offset: 0, 0 + index: -1 +ego/love-1 + rotate: false + xy: 2, 2 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-10 + rotate: false + xy: 492, 485 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-11 + rotate: false + xy: 229, 413 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-12 + rotate: false + xy: 220, 341 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-13 + rotate: false + xy: 281, 413 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-14 + rotate: false + xy: 272, 341 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-15 + rotate: false + xy: 324, 341 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-16 + rotate: false + xy: 333, 413 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-17 + rotate: false + xy: 385, 435 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-18 + rotate: false + xy: 437, 435 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-19 + rotate: false + xy: 489, 413 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-2 + rotate: false + xy: 292, 575 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-20 + rotate: false + xy: 376, 341 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-21 + rotate: false + xy: 428, 363 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-22 + rotate: false + xy: 480, 341 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-23 + rotate: false + xy: 428, 291 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-24 + rotate: false + xy: 480, 269 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-25 + rotate: false + xy: 532, 341 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-26 + rotate: false + xy: 532, 269 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-3 + rotate: false + xy: 94, 134 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-4 + rotate: false + xy: 54, 2 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-5 + rotate: false + xy: 150, 206 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-6 + rotate: false + xy: 146, 134 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-7 + rotate: false + xy: 202, 206 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-8 + rotate: false + xy: 198, 134 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-9 + rotate: false + xy: 292, 503 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/pant + rotate: false + xy: 166, 278 + size: 62, 36 + orig: 62, 36 + offset: 0, 0 + index: -1 +ego/poke + rotate: false + xy: 2, 74 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 +ego/reach + rotate: false + xy: 472, 557 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared + rotate: false + xy: 344, 507 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared-walk + rotate: false + xy: 492, 665 + size: 96, 36 + orig: 96, 36 + offset: 0, 0 + index: -1 +ego/scoot + rotate: false + xy: 2, 316 + size: 200, 30 + orig: 200, 30 + offset: 0, 0 + index: -1 +ego/shock + rotate: false + xy: 2, 647 + size: 360, 48 + orig: 360, 48 + offset: 0, 0 + index: -1 +ego/shoot + rotate: false + xy: 776, 853 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/sigh + rotate: false + xy: 2, 278 + size: 162, 36 + orig: 162, 36 + offset: 0, 0 + index: -1 +ego/spear + rotate: false + xy: 2, 176 + size: 90, 100 + orig: 90, 100 + offset: 0, 0 + index: -1 +ego/squat + rotate: false + xy: 364, 659 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/squat-talk + rotate: false + xy: 418, 507 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/stand + rotate: false + xy: 364, 621 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/standup + rotate: false + xy: 2, 438 + size: 225, 55 + orig: 225, 55 + offset: 0, 0 + index: -1 +ego/suspended + rotate: false + xy: 776, 815 + size: 140, 36 + orig: 140, 36 + offset: 0, 0 + index: -1 +ego/swing + rotate: false + xy: 2, 570 + size: 288, 75 + orig: 288, 75 + offset: 0, 0 + index: -1 +ego/swing-shovel + rotate: false + xy: 2, 849 + size: 630, 70 + orig: 630, 70 + offset: 0, 0 + index: -1 +ego/thorw + rotate: false + xy: 344, 583 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/throw + rotate: false + xy: 344, 545 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/warden + rotate: false + xy: 541, 436 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +ego/whistle-2 + rotate: false + xy: 508, 231 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/whistle-3 + rotate: false + xy: 526, 231 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 +ego/whistle-4 + rotate: false + xy: 544, 231 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 inventory rotate: false - xy: 2, 6 + xy: 246, 485 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-1 rotate: false - xy: 2, 6 + xy: 246, 485 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-11 rotate: false - xy: 398, 6 + xy: 430, 233 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-12 rotate: false - xy: 442, 6 + xy: 546, 537 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-13 rotate: false - xy: 486, 6 + xy: 544, 479 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-2 rotate: false - xy: 46, 6 + xy: 230, 283 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-3 rotate: false - xy: 90, 6 + xy: 274, 283 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-4 rotate: false - xy: 134, 6 + xy: 318, 283 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-5 rotate: false - xy: 178, 6 + xy: 362, 283 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-6 rotate: false - xy: 222, 6 + xy: 254, 225 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-7 rotate: false - xy: 266, 6 + xy: 298, 225 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-8 rotate: false - xy: 310, 6 + xy: 342, 225 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-10 rotate: false - xy: 310, 6 + xy: 342, 225 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-9 rotate: false - xy: 354, 6 + xy: 386, 225 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 save rotate: false - xy: 530, 2 + xy: 308, 485 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +test/abc + rotate: false + xy: 664, 929 + size: 320, 62 + orig: 320, 62 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/global.png b/desktop/resources/packed/global.png index 1b8ed9f7..b5cf90b8 100644 Binary files a/desktop/resources/packed/global.png and b/desktop/resources/packed/global.png differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 023232df..c54a0807 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1194,7 +1194,8 @@ :on-show (fn [screen entities options] (log/info "Initializing scene.") - (let [{cam :camera :as screen} (utils/setup-viewport screen 320 240) + (let [[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas") + {cam :camera :as screen} (utils/setup-viewport screen 320 240) screen (assoc screen :total-time 0)] (set! (. cam zoom) utils/min-zoom) (let [shader (ShaderProgram. ^String (v-shader) ^String (pix-shader)) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index d181f561..47706705 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -402,9 +402,9 @@ :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") + :flying-ego (assoc (utils/atlas->texture global-atlas "ego/flying.png") + :left (flip (utils/atlas->texture global-atlas "ego/flying.png")) + :right (utils/atlas->texture global-atlas "ego/flying.png") :scale-x 5 :scale-y 5 :origin-x 2