diff --git a/desktop/asset-work/inventory-overlay.png b/desktop/asset-work/global/inventory-overlay.png similarity index 100% rename from desktop/asset-work/inventory-overlay.png rename to desktop/asset-work/global/inventory-overlay.png diff --git a/desktop/asset-work/global/open-inventory-1.png b/desktop/asset-work/global/open-inventory_0.png similarity index 100% rename from desktop/asset-work/global/open-inventory-1.png rename to desktop/asset-work/global/open-inventory_0.png diff --git a/desktop/asset-work/global/open-inventory-2.png b/desktop/asset-work/global/open-inventory_1.png similarity index 100% rename from desktop/asset-work/global/open-inventory-2.png rename to desktop/asset-work/global/open-inventory_1.png diff --git a/desktop/asset-work/global/open-inventory-11.png b/desktop/asset-work/global/open-inventory_10.png similarity index 100% rename from desktop/asset-work/global/open-inventory-11.png rename to desktop/asset-work/global/open-inventory_10.png diff --git a/desktop/asset-work/global/open-inventory-12.png b/desktop/asset-work/global/open-inventory_11.png similarity index 100% rename from desktop/asset-work/global/open-inventory-12.png rename to desktop/asset-work/global/open-inventory_11.png diff --git a/desktop/asset-work/global/open-inventory-13.png b/desktop/asset-work/global/open-inventory_12.png similarity index 100% rename from desktop/asset-work/global/open-inventory-13.png rename to desktop/asset-work/global/open-inventory_12.png diff --git a/desktop/asset-work/global/open-inventory-3.png b/desktop/asset-work/global/open-inventory_2.png similarity index 100% rename from desktop/asset-work/global/open-inventory-3.png rename to desktop/asset-work/global/open-inventory_2.png diff --git a/desktop/asset-work/global/open-inventory-4.png b/desktop/asset-work/global/open-inventory_3.png similarity index 100% rename from desktop/asset-work/global/open-inventory-4.png rename to desktop/asset-work/global/open-inventory_3.png diff --git a/desktop/asset-work/global/open-inventory-5.png b/desktop/asset-work/global/open-inventory_4.png similarity index 100% rename from desktop/asset-work/global/open-inventory-5.png rename to desktop/asset-work/global/open-inventory_4.png diff --git a/desktop/asset-work/global/open-inventory-6.png b/desktop/asset-work/global/open-inventory_5.png similarity index 100% rename from desktop/asset-work/global/open-inventory-6.png rename to desktop/asset-work/global/open-inventory_5.png diff --git a/desktop/asset-work/global/open-inventory-7.png b/desktop/asset-work/global/open-inventory_6.png similarity index 100% rename from desktop/asset-work/global/open-inventory-7.png rename to desktop/asset-work/global/open-inventory_6.png diff --git a/desktop/asset-work/global/open-inventory-8.png b/desktop/asset-work/global/open-inventory_7.png similarity index 100% rename from desktop/asset-work/global/open-inventory-8.png rename to desktop/asset-work/global/open-inventory_7.png diff --git a/desktop/asset-work/global/open-inventory-9.png b/desktop/asset-work/global/open-inventory_8.png similarity index 100% rename from desktop/asset-work/global/open-inventory-9.png rename to desktop/asset-work/global/open-inventory_8.png diff --git a/desktop/asset-work/global/open-inventory-10.png b/desktop/asset-work/global/open-inventory_9.png similarity index 100% rename from desktop/asset-work/global/open-inventory-10.png rename to desktop/asset-work/global/open-inventory_9.png diff --git a/desktop/asset-work/inside-house/inputed-key.png b/desktop/asset-work/global/safe/inputed-key.png similarity index 100% rename from desktop/asset-work/inside-house/inputed-key.png rename to desktop/asset-work/global/safe/inputed-key.png diff --git a/desktop/asset-work/white.png b/desktop/asset-work/global/white.png similarity index 100% rename from desktop/asset-work/white.png rename to desktop/asset-work/global/white.png diff --git a/desktop/asset-work/wizard/Untitled.png b/desktop/asset-work/global/wizard/Untitled.png similarity index 100% rename from desktop/asset-work/wizard/Untitled.png rename to desktop/asset-work/global/wizard/Untitled.png diff --git a/desktop/asset-work/wizard/cloud.png b/desktop/asset-work/global/wizard/cloud.png similarity index 100% rename from desktop/asset-work/wizard/cloud.png rename to desktop/asset-work/global/wizard/cloud.png diff --git a/desktop/asset-work/wizard/cloud.pxi b/desktop/asset-work/global/wizard/cloud.pxi similarity index 100% rename from desktop/asset-work/wizard/cloud.pxi rename to desktop/asset-work/global/wizard/cloud.pxi diff --git a/desktop/asset-work/wizard/disappear.png b/desktop/asset-work/global/wizard/disappear.png similarity index 100% rename from desktop/asset-work/wizard/disappear.png rename to desktop/asset-work/global/wizard/disappear.png diff --git a/desktop/asset-work/wizard/disappear.pxa/0.pxi b/desktop/asset-work/global/wizard/disappear.pxa/0.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/0.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/0.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/1.pxi b/desktop/asset-work/global/wizard/disappear.pxa/1.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/1.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/1.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/10.pxi b/desktop/asset-work/global/wizard/disappear.pxa/10.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/10.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/10.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/11.pxi b/desktop/asset-work/global/wizard/disappear.pxa/11.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/11.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/11.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/12.pxi b/desktop/asset-work/global/wizard/disappear.pxa/12.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/12.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/12.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/13.pxi b/desktop/asset-work/global/wizard/disappear.pxa/13.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/13.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/13.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/14.pxi b/desktop/asset-work/global/wizard/disappear.pxa/14.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/14.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/14.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/15.pxi b/desktop/asset-work/global/wizard/disappear.pxa/15.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/15.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/15.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/16.pxi b/desktop/asset-work/global/wizard/disappear.pxa/16.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/16.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/16.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/17.pxi b/desktop/asset-work/global/wizard/disappear.pxa/17.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/17.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/17.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/18.pxi b/desktop/asset-work/global/wizard/disappear.pxa/18.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/18.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/18.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/2.pxi b/desktop/asset-work/global/wizard/disappear.pxa/2.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/2.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/2.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/3.pxi b/desktop/asset-work/global/wizard/disappear.pxa/3.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/3.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/3.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/4.pxi b/desktop/asset-work/global/wizard/disappear.pxa/4.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/4.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/4.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/5.pxi b/desktop/asset-work/global/wizard/disappear.pxa/5.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/5.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/5.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/6.pxi b/desktop/asset-work/global/wizard/disappear.pxa/6.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/6.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/6.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/7.pxi b/desktop/asset-work/global/wizard/disappear.pxa/7.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/7.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/7.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/8.pxi b/desktop/asset-work/global/wizard/disappear.pxa/8.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/8.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/8.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/9.pxi b/desktop/asset-work/global/wizard/disappear.pxa/9.pxi similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/9.pxi rename to desktop/asset-work/global/wizard/disappear.pxa/9.pxi diff --git a/desktop/asset-work/wizard/disappear.pxa/CelData.plist b/desktop/asset-work/global/wizard/disappear.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/wizard/disappear.pxa/CelData.plist rename to desktop/asset-work/global/wizard/disappear.pxa/CelData.plist diff --git a/desktop/asset-work/wizard/dot.png b/desktop/asset-work/global/wizard/dot.png similarity index 100% rename from desktop/asset-work/wizard/dot.png rename to desktop/asset-work/global/wizard/dot.png diff --git a/desktop/asset-work/wizard/drip.ogg b/desktop/asset-work/global/wizard/drip.ogg similarity index 100% rename from desktop/asset-work/wizard/drip.ogg rename to desktop/asset-work/global/wizard/drip.ogg diff --git a/desktop/asset-work/wizard/drip.wav b/desktop/asset-work/global/wizard/drip.wav similarity index 100% rename from desktop/asset-work/wizard/drip.wav rename to desktop/asset-work/global/wizard/drip.wav diff --git a/desktop/asset-work/wizard/experiment.pxa/0.pxi b/desktop/asset-work/global/wizard/experiment.pxa/0.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/0.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/0.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/1.pxi b/desktop/asset-work/global/wizard/experiment.pxa/1.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/1.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/1.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/10.pxi b/desktop/asset-work/global/wizard/experiment.pxa/10.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/10.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/10.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/11.pxi b/desktop/asset-work/global/wizard/experiment.pxa/11.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/11.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/11.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/12.pxi b/desktop/asset-work/global/wizard/experiment.pxa/12.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/12.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/12.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/13.pxi b/desktop/asset-work/global/wizard/experiment.pxa/13.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/13.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/13.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/14.pxi b/desktop/asset-work/global/wizard/experiment.pxa/14.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/14.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/14.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/15.pxi b/desktop/asset-work/global/wizard/experiment.pxa/15.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/15.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/15.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/16.pxi b/desktop/asset-work/global/wizard/experiment.pxa/16.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/16.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/16.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/17.pxi b/desktop/asset-work/global/wizard/experiment.pxa/17.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/17.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/17.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/18.pxi b/desktop/asset-work/global/wizard/experiment.pxa/18.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/18.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/18.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/19.pxi b/desktop/asset-work/global/wizard/experiment.pxa/19.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/19.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/19.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/2.pxi b/desktop/asset-work/global/wizard/experiment.pxa/2.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/2.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/2.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/20.pxi b/desktop/asset-work/global/wizard/experiment.pxa/20.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/20.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/20.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/21.pxi b/desktop/asset-work/global/wizard/experiment.pxa/21.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/21.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/21.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/22.pxi b/desktop/asset-work/global/wizard/experiment.pxa/22.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/22.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/22.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/23.pxi b/desktop/asset-work/global/wizard/experiment.pxa/23.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/23.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/23.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/24.pxi b/desktop/asset-work/global/wizard/experiment.pxa/24.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/24.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/24.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/25.pxi b/desktop/asset-work/global/wizard/experiment.pxa/25.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/25.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/25.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/26.pxi b/desktop/asset-work/global/wizard/experiment.pxa/26.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/26.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/26.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/27.pxi b/desktop/asset-work/global/wizard/experiment.pxa/27.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/27.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/27.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/28.pxi b/desktop/asset-work/global/wizard/experiment.pxa/28.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/28.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/28.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/29.pxi b/desktop/asset-work/global/wizard/experiment.pxa/29.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/29.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/29.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/3.pxi b/desktop/asset-work/global/wizard/experiment.pxa/3.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/3.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/3.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/30.pxi b/desktop/asset-work/global/wizard/experiment.pxa/30.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/30.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/30.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/31.pxi b/desktop/asset-work/global/wizard/experiment.pxa/31.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/31.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/31.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/32.pxi b/desktop/asset-work/global/wizard/experiment.pxa/32.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/32.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/32.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/33.pxi b/desktop/asset-work/global/wizard/experiment.pxa/33.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/33.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/33.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/34.pxi b/desktop/asset-work/global/wizard/experiment.pxa/34.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/34.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/34.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/35.pxi b/desktop/asset-work/global/wizard/experiment.pxa/35.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/35.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/35.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/36.pxi b/desktop/asset-work/global/wizard/experiment.pxa/36.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/36.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/36.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/37.pxi b/desktop/asset-work/global/wizard/experiment.pxa/37.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/37.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/37.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/38.pxi b/desktop/asset-work/global/wizard/experiment.pxa/38.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/38.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/38.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/4.pxi b/desktop/asset-work/global/wizard/experiment.pxa/4.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/4.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/4.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/5.pxi b/desktop/asset-work/global/wizard/experiment.pxa/5.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/5.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/5.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/6.pxi b/desktop/asset-work/global/wizard/experiment.pxa/6.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/6.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/6.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/7.pxi b/desktop/asset-work/global/wizard/experiment.pxa/7.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/7.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/7.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/8.pxi b/desktop/asset-work/global/wizard/experiment.pxa/8.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/8.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/8.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/9.pxi b/desktop/asset-work/global/wizard/experiment.pxa/9.pxi similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/9.pxi rename to desktop/asset-work/global/wizard/experiment.pxa/9.pxi diff --git a/desktop/asset-work/wizard/experiment.pxa/CelData.plist b/desktop/asset-work/global/wizard/experiment.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/wizard/experiment.pxa/CelData.plist rename to desktop/asset-work/global/wizard/experiment.pxa/CelData.plist diff --git a/desktop/asset-work/wizard/experiment-1.png b/desktop/asset-work/global/wizard/experiment_0.png similarity index 100% rename from desktop/asset-work/wizard/experiment-1.png rename to desktop/asset-work/global/wizard/experiment_0.png diff --git a/desktop/asset-work/wizard/experiment-2.png b/desktop/asset-work/global/wizard/experiment_1.png similarity index 100% rename from desktop/asset-work/wizard/experiment-2.png rename to desktop/asset-work/global/wizard/experiment_1.png diff --git a/desktop/asset-work/wizard/experiment-11.png b/desktop/asset-work/global/wizard/experiment_10.png similarity index 100% rename from desktop/asset-work/wizard/experiment-11.png rename to desktop/asset-work/global/wizard/experiment_10.png diff --git a/desktop/asset-work/wizard/experiment-12.png b/desktop/asset-work/global/wizard/experiment_11.png similarity index 100% rename from desktop/asset-work/wizard/experiment-12.png rename to desktop/asset-work/global/wizard/experiment_11.png diff --git a/desktop/asset-work/wizard/experiment-13.png b/desktop/asset-work/global/wizard/experiment_12.png similarity index 100% rename from desktop/asset-work/wizard/experiment-13.png rename to desktop/asset-work/global/wizard/experiment_12.png diff --git a/desktop/asset-work/wizard/experiment-14.png b/desktop/asset-work/global/wizard/experiment_13.png similarity index 100% rename from desktop/asset-work/wizard/experiment-14.png rename to desktop/asset-work/global/wizard/experiment_13.png diff --git a/desktop/asset-work/wizard/experiment-15.png b/desktop/asset-work/global/wizard/experiment_14.png similarity index 100% rename from desktop/asset-work/wizard/experiment-15.png rename to desktop/asset-work/global/wizard/experiment_14.png diff --git a/desktop/asset-work/wizard/experiment-16.png b/desktop/asset-work/global/wizard/experiment_15.png similarity index 100% rename from desktop/asset-work/wizard/experiment-16.png rename to desktop/asset-work/global/wizard/experiment_15.png diff --git a/desktop/asset-work/wizard/experiment-17.png b/desktop/asset-work/global/wizard/experiment_16.png similarity index 100% rename from desktop/asset-work/wizard/experiment-17.png rename to desktop/asset-work/global/wizard/experiment_16.png diff --git a/desktop/asset-work/wizard/experiment-18.png b/desktop/asset-work/global/wizard/experiment_17.png similarity index 100% rename from desktop/asset-work/wizard/experiment-18.png rename to desktop/asset-work/global/wizard/experiment_17.png diff --git a/desktop/asset-work/wizard/experiment-19.png b/desktop/asset-work/global/wizard/experiment_18.png similarity index 100% rename from desktop/asset-work/wizard/experiment-19.png rename to desktop/asset-work/global/wizard/experiment_18.png diff --git a/desktop/asset-work/wizard/experiment-20.png b/desktop/asset-work/global/wizard/experiment_19.png similarity index 100% rename from desktop/asset-work/wizard/experiment-20.png rename to desktop/asset-work/global/wizard/experiment_19.png diff --git a/desktop/asset-work/wizard/experiment-3.png b/desktop/asset-work/global/wizard/experiment_2.png similarity index 100% rename from desktop/asset-work/wizard/experiment-3.png rename to desktop/asset-work/global/wizard/experiment_2.png diff --git a/desktop/asset-work/wizard/experiment-21.png b/desktop/asset-work/global/wizard/experiment_20.png similarity index 100% rename from desktop/asset-work/wizard/experiment-21.png rename to desktop/asset-work/global/wizard/experiment_20.png diff --git a/desktop/asset-work/wizard/experiment-22.png b/desktop/asset-work/global/wizard/experiment_21.png similarity index 100% rename from desktop/asset-work/wizard/experiment-22.png rename to desktop/asset-work/global/wizard/experiment_21.png diff --git a/desktop/asset-work/wizard/experiment-23.png b/desktop/asset-work/global/wizard/experiment_22.png similarity index 100% rename from desktop/asset-work/wizard/experiment-23.png rename to desktop/asset-work/global/wizard/experiment_22.png diff --git a/desktop/asset-work/wizard/experiment-24.png b/desktop/asset-work/global/wizard/experiment_23.png similarity index 100% rename from desktop/asset-work/wizard/experiment-24.png rename to desktop/asset-work/global/wizard/experiment_23.png diff --git a/desktop/asset-work/wizard/experiment-25.png b/desktop/asset-work/global/wizard/experiment_24.png similarity index 100% rename from desktop/asset-work/wizard/experiment-25.png rename to desktop/asset-work/global/wizard/experiment_24.png diff --git a/desktop/asset-work/wizard/experiment-26.png b/desktop/asset-work/global/wizard/experiment_25.png similarity index 100% rename from desktop/asset-work/wizard/experiment-26.png rename to desktop/asset-work/global/wizard/experiment_25.png diff --git a/desktop/asset-work/wizard/experiment-27.png b/desktop/asset-work/global/wizard/experiment_26.png similarity index 100% rename from desktop/asset-work/wizard/experiment-27.png rename to desktop/asset-work/global/wizard/experiment_26.png diff --git a/desktop/asset-work/wizard/experiment-28.png b/desktop/asset-work/global/wizard/experiment_27.png similarity index 100% rename from desktop/asset-work/wizard/experiment-28.png rename to desktop/asset-work/global/wizard/experiment_27.png diff --git a/desktop/asset-work/wizard/experiment-29.png b/desktop/asset-work/global/wizard/experiment_28.png similarity index 100% rename from desktop/asset-work/wizard/experiment-29.png rename to desktop/asset-work/global/wizard/experiment_28.png diff --git a/desktop/asset-work/wizard/experiment-30.png b/desktop/asset-work/global/wizard/experiment_29.png similarity index 100% rename from desktop/asset-work/wizard/experiment-30.png rename to desktop/asset-work/global/wizard/experiment_29.png diff --git a/desktop/asset-work/wizard/experiment-4.png b/desktop/asset-work/global/wizard/experiment_3.png similarity index 100% rename from desktop/asset-work/wizard/experiment-4.png rename to desktop/asset-work/global/wizard/experiment_3.png diff --git a/desktop/asset-work/wizard/experiment-31.png b/desktop/asset-work/global/wizard/experiment_30.png similarity index 100% rename from desktop/asset-work/wizard/experiment-31.png rename to desktop/asset-work/global/wizard/experiment_30.png diff --git a/desktop/asset-work/wizard/experiment-32.png b/desktop/asset-work/global/wizard/experiment_31.png similarity index 100% rename from desktop/asset-work/wizard/experiment-32.png rename to desktop/asset-work/global/wizard/experiment_31.png diff --git a/desktop/asset-work/wizard/experiment-33.png b/desktop/asset-work/global/wizard/experiment_32.png similarity index 100% rename from desktop/asset-work/wizard/experiment-33.png rename to desktop/asset-work/global/wizard/experiment_32.png diff --git a/desktop/asset-work/wizard/experiment-34.png b/desktop/asset-work/global/wizard/experiment_33.png similarity index 100% rename from desktop/asset-work/wizard/experiment-34.png rename to desktop/asset-work/global/wizard/experiment_33.png diff --git a/desktop/asset-work/wizard/experiment-35.png b/desktop/asset-work/global/wizard/experiment_34.png similarity index 100% rename from desktop/asset-work/wizard/experiment-35.png rename to desktop/asset-work/global/wizard/experiment_34.png diff --git a/desktop/asset-work/wizard/experiment-36.png b/desktop/asset-work/global/wizard/experiment_35.png similarity index 100% rename from desktop/asset-work/wizard/experiment-36.png rename to desktop/asset-work/global/wizard/experiment_35.png diff --git a/desktop/asset-work/wizard/experiment-37.png b/desktop/asset-work/global/wizard/experiment_36.png similarity index 100% rename from desktop/asset-work/wizard/experiment-37.png rename to desktop/asset-work/global/wizard/experiment_36.png diff --git a/desktop/asset-work/wizard/experiment-38.png b/desktop/asset-work/global/wizard/experiment_37.png similarity index 100% rename from desktop/asset-work/wizard/experiment-38.png rename to desktop/asset-work/global/wizard/experiment_37.png diff --git a/desktop/asset-work/wizard/experiment-39.png b/desktop/asset-work/global/wizard/experiment_38.png similarity index 100% rename from desktop/asset-work/wizard/experiment-39.png rename to desktop/asset-work/global/wizard/experiment_38.png diff --git a/desktop/asset-work/wizard/experiment-5.png b/desktop/asset-work/global/wizard/experiment_4.png similarity index 100% rename from desktop/asset-work/wizard/experiment-5.png rename to desktop/asset-work/global/wizard/experiment_4.png diff --git a/desktop/asset-work/wizard/experiment-6.png b/desktop/asset-work/global/wizard/experiment_5.png similarity index 100% rename from desktop/asset-work/wizard/experiment-6.png rename to desktop/asset-work/global/wizard/experiment_5.png diff --git a/desktop/asset-work/wizard/experiment-7.png b/desktop/asset-work/global/wizard/experiment_6.png similarity index 100% rename from desktop/asset-work/wizard/experiment-7.png rename to desktop/asset-work/global/wizard/experiment_6.png diff --git a/desktop/asset-work/wizard/experiment-8.png b/desktop/asset-work/global/wizard/experiment_7.png similarity index 100% rename from desktop/asset-work/wizard/experiment-8.png rename to desktop/asset-work/global/wizard/experiment_7.png diff --git a/desktop/asset-work/wizard/experiment-9.png b/desktop/asset-work/global/wizard/experiment_8.png similarity index 100% rename from desktop/asset-work/wizard/experiment-9.png rename to desktop/asset-work/global/wizard/experiment_8.png diff --git a/desktop/asset-work/wizard/experiment-10.png b/desktop/asset-work/global/wizard/experiment_9.png similarity index 100% rename from desktop/asset-work/wizard/experiment-10.png rename to desktop/asset-work/global/wizard/experiment_9.png diff --git a/desktop/asset-work/wizard/explode.ogg b/desktop/asset-work/global/wizard/explode.ogg similarity index 100% rename from desktop/asset-work/wizard/explode.ogg rename to desktop/asset-work/global/wizard/explode.ogg diff --git a/desktop/asset-work/wizard/explode.wav b/desktop/asset-work/global/wizard/explode.wav similarity index 100% rename from desktop/asset-work/wizard/explode.wav rename to desktop/asset-work/global/wizard/explode.wav diff --git a/desktop/asset-work/wizard/flame.png b/desktop/asset-work/global/wizard/flame.png similarity index 100% rename from desktop/asset-work/wizard/flame.png rename to desktop/asset-work/global/wizard/flame.png diff --git a/desktop/asset-work/wizard/gandarf-cloud b/desktop/asset-work/global/wizard/gandarf-cloud similarity index 100% rename from desktop/asset-work/wizard/gandarf-cloud rename to desktop/asset-work/global/wizard/gandarf-cloud diff --git a/desktop/asset-work/wizard/magic-hands.png b/desktop/asset-work/global/wizard/magic-hands.png similarity index 100% rename from desktop/asset-work/wizard/magic-hands.png rename to desktop/asset-work/global/wizard/magic-hands.png diff --git a/desktop/asset-work/wizard/magic-hands.pxa/0.pxi b/desktop/asset-work/global/wizard/magic-hands.pxa/0.pxi similarity index 100% rename from desktop/asset-work/wizard/magic-hands.pxa/0.pxi rename to desktop/asset-work/global/wizard/magic-hands.pxa/0.pxi diff --git a/desktop/asset-work/wizard/magic-hands.pxa/1.pxi b/desktop/asset-work/global/wizard/magic-hands.pxa/1.pxi similarity index 100% rename from desktop/asset-work/wizard/magic-hands.pxa/1.pxi rename to desktop/asset-work/global/wizard/magic-hands.pxa/1.pxi diff --git a/desktop/asset-work/wizard/magic-hands.pxa/CelData.plist b/desktop/asset-work/global/wizard/magic-hands.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/wizard/magic-hands.pxa/CelData.plist rename to desktop/asset-work/global/wizard/magic-hands.pxa/CelData.plist diff --git a/desktop/asset-work/wizard/snap.ogg b/desktop/asset-work/global/wizard/snap.ogg similarity index 100% rename from desktop/asset-work/wizard/snap.ogg rename to desktop/asset-work/global/wizard/snap.ogg diff --git a/desktop/asset-work/wizard/snap.wav b/desktop/asset-work/global/wizard/snap.wav similarity index 100% rename from desktop/asset-work/wizard/snap.wav rename to desktop/asset-work/global/wizard/snap.wav diff --git a/desktop/asset-work/wizard/stand.png b/desktop/asset-work/global/wizard/stand.png similarity index 100% rename from desktop/asset-work/wizard/stand.png rename to desktop/asset-work/global/wizard/stand.png diff --git a/desktop/asset-work/wizard/talk-angry.png b/desktop/asset-work/global/wizard/talk-angry.png similarity index 100% rename from desktop/asset-work/wizard/talk-angry.png rename to desktop/asset-work/global/wizard/talk-angry.png diff --git a/desktop/asset-work/wizard/talk-angry.pxa/0.pxi b/desktop/asset-work/global/wizard/talk-angry.pxa/0.pxi similarity index 100% rename from desktop/asset-work/wizard/talk-angry.pxa/0.pxi rename to desktop/asset-work/global/wizard/talk-angry.pxa/0.pxi diff --git a/desktop/asset-work/wizard/talk-angry.pxa/1.pxi b/desktop/asset-work/global/wizard/talk-angry.pxa/1.pxi similarity index 100% rename from desktop/asset-work/wizard/talk-angry.pxa/1.pxi rename to desktop/asset-work/global/wizard/talk-angry.pxa/1.pxi diff --git a/desktop/asset-work/wizard/talk-angry.pxa/2.pxi b/desktop/asset-work/global/wizard/talk-angry.pxa/2.pxi similarity index 100% rename from desktop/asset-work/wizard/talk-angry.pxa/2.pxi rename to desktop/asset-work/global/wizard/talk-angry.pxa/2.pxi diff --git a/desktop/asset-work/wizard/talk-angry.pxa/3.pxi b/desktop/asset-work/global/wizard/talk-angry.pxa/3.pxi similarity index 100% rename from desktop/asset-work/wizard/talk-angry.pxa/3.pxi rename to desktop/asset-work/global/wizard/talk-angry.pxa/3.pxi diff --git a/desktop/asset-work/wizard/talk-angry.pxa/CelData.plist b/desktop/asset-work/global/wizard/talk-angry.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/wizard/talk-angry.pxa/CelData.plist rename to desktop/asset-work/global/wizard/talk-angry.pxa/CelData.plist diff --git a/desktop/asset-work/wizard/talk.png b/desktop/asset-work/global/wizard/talk.png similarity index 100% rename from desktop/asset-work/wizard/talk.png rename to desktop/asset-work/global/wizard/talk.png diff --git a/desktop/asset-work/wizard/talk.pxa/0.pxi b/desktop/asset-work/global/wizard/talk.pxa/0.pxi similarity index 100% rename from desktop/asset-work/wizard/talk.pxa/0.pxi rename to desktop/asset-work/global/wizard/talk.pxa/0.pxi diff --git a/desktop/asset-work/wizard/talk.pxa/1.pxi b/desktop/asset-work/global/wizard/talk.pxa/1.pxi similarity index 100% rename from desktop/asset-work/wizard/talk.pxa/1.pxi rename to desktop/asset-work/global/wizard/talk.pxa/1.pxi diff --git a/desktop/asset-work/wizard/talk.pxa/2.pxi b/desktop/asset-work/global/wizard/talk.pxa/2.pxi similarity index 100% rename from desktop/asset-work/wizard/talk.pxa/2.pxi rename to desktop/asset-work/global/wizard/talk.pxa/2.pxi diff --git a/desktop/asset-work/wizard/talk.pxa/3.pxi b/desktop/asset-work/global/wizard/talk.pxa/3.pxi similarity index 100% rename from desktop/asset-work/wizard/talk.pxa/3.pxi rename to desktop/asset-work/global/wizard/talk.pxa/3.pxi diff --git a/desktop/asset-work/wizard/talk.pxa/CelData.plist b/desktop/asset-work/global/wizard/talk.pxa/CelData.plist similarity index 100% rename from desktop/asset-work/wizard/talk.pxa/CelData.plist rename to desktop/asset-work/global/wizard/talk.pxa/CelData.plist diff --git a/desktop/asset-work/wizard.png b/desktop/asset-work/global/wizard/wizard.png similarity index 100% rename from desktop/asset-work/wizard.png rename to desktop/asset-work/global/wizard/wizard.png diff --git a/desktop/asset-work/outsidehouse/butterfly.png b/desktop/asset-work/outsidehouse/butterfly.png new file mode 100644 index 00000000..7b6e0439 Binary files /dev/null and b/desktop/asset-work/outsidehouse/butterfly.png differ diff --git a/desktop/project.clj b/desktop/project.clj index 00eaac07..adf41248 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -2,7 +2,7 @@ (def packs (into ["do"] (mapcat (fn [directory] ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")]) - ["outsidehouse"] + ["global" "outsidehouse"] #_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title" "castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard" "cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ]))) diff --git a/desktop/resources/packed/global.atlas b/desktop/resources/packed/global.atlas index 27c7be38..67fa3e05 100644 --- a/desktop/resources/packed/global.atlas +++ b/desktop/resources/packed/global.atlas @@ -6,673 +6,1037 @@ filter: Nearest,Nearest repeat: none black rotate: false - xy: 974, 905 + xy: 94, 17 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 close rotate: false - xy: 634, 917 + xy: 492, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ego/Untitled rotate: false - xy: 828, 905 + xy: 664, 922 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 828, 905 + xy: 664, 922 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/axe rotate: false - xy: 2, 711 + xy: 2, 534 size: 420, 70 orig: 420, 70 offset: 0, 0 index: -1 ego/axe-wood rotate: false - xy: 2, 935 + xy: 2, 952 size: 660, 70 orig: 660, 70 offset: 0, 0 index: -1 ego/base rotate: false - xy: 996, 753 + xy: 128, 5 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 996, 753 + xy: 128, 5 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 0 ego/burnt rotate: false - xy: 2, 783 + xy: 2, 486 size: 480, 46 orig: 480, 46 offset: 0, 0 index: -1 ego/cat-toy rotate: false - xy: 2, 400 + xy: 324, 748 size: 205, 50 orig: 205, 50 offset: 0, 0 index: -1 ego/climb rotate: false - xy: 2, 509 + xy: 324, 800 size: 242, 46 orig: 242, 46 offset: 0, 0 index: -1 ego/crawl rotate: false - xy: 2, 557 + xy: 2, 284 size: 273, 25 orig: 273, 25 offset: 0, 0 index: -1 ego/crowbar rotate: false - xy: 634, 867 + xy: 810, 922 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/dot rotate: false - xy: 574, 860 + xy: 613, 748 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot + rotate: false + xy: 613, 748 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 2, 362 + xy: 2, 189 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 ego/flying rotate: false - xy: 596, 673 + xy: 930, 792 size: 34, 44 orig: 34, 44 offset: 0, 0 index: -1 ego/frog rotate: false - xy: 458, 597 + xy: 890, 846 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/frustrated-talk rotate: false - xy: 484, 793 + xy: 526, 710 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 2, 20 + xy: 476, 450 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 348, 597 + xy: 348, 322 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/glad rotate: false - xy: 634, 819 + xy: 324, 630 size: 140, 46 orig: 140, 46 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 918, 829 + xy: 466, 634 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/grow-talk rotate: false - xy: 986, 969 + xy: 986, 986 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hand-hold rotate: false - xy: 986, 931 + xy: 986, 948 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hold-hand rotate: false - xy: 466, 559 + xy: 944, 664 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 904, 791 + xy: 348, 284 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/ida rotate: false - xy: 292, 589 + xy: 148, 117 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/idea rotate: false - xy: 148, 258 + xy: 292, 316 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/in-love rotate: false - xy: 2, 831 + xy: 2, 848 size: 570, 30 orig: 570, 30 offset: 0, 0 index: -1 ego/jump-straight rotate: false - xy: 2, 104 + xy: 384, 436 size: 90, 48 orig: 90, 48 offset: 0, 0 index: -1 ego/love rotate: false - xy: 582, 791 + xy: 94, 43 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 0 ego/love rotate: false - xy: 94, 184 + xy: 458, 288 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 1 ego/love rotate: false - xy: 424, 711 + xy: 229, 212 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 2 ego/love rotate: false - xy: 94, 112 + xy: 424, 558 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 3 ego/love rotate: false - xy: 476, 711 + xy: 492, 378 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 4 ego/love rotate: false - xy: 528, 721 + xy: 558, 600 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 5 ego/love rotate: false - xy: 580, 719 + xy: 610, 600 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 6 ego/love rotate: false - xy: 632, 709 + xy: 605, 528 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 7 ego/love rotate: false - xy: 684, 709 + xy: 544, 378 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 8 ego/love rotate: false - xy: 492, 639 + xy: 510, 306 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 9 ego/love rotate: false - xy: 736, 709 + xy: 562, 306 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 10 ego/love rotate: false - xy: 788, 719 + xy: 204, 117 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 11 ego/love rotate: false - xy: 840, 719 + xy: 574, 808 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 12 ego/love rotate: false - xy: 892, 719 + xy: 660, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 13 ego/love rotate: false - xy: 944, 719 + xy: 712, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 14 ego/love rotate: false - xy: 204, 290 + xy: 774, 774 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 15 ego/love rotate: false - xy: 204, 218 + xy: 826, 774 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 16 ego/love rotate: false - xy: 544, 647 + xy: 878, 774 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 17 ego/love rotate: false - xy: 632, 637 + xy: 764, 702 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 18 ego/love rotate: false - xy: 684, 637 + xy: 816, 702 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 19 ego/love rotate: false - xy: 736, 637 + xy: 868, 702 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 20 ego/love rotate: false - xy: 788, 609 + xy: 920, 702 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 21 ego/love rotate: false - xy: 840, 609 + xy: 972, 876 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 22 ego/love rotate: false - xy: 892, 609 + xy: 972, 804 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 23 ego/love rotate: false - xy: 944, 609 + xy: 972, 732 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 24 ego/love rotate: false - xy: 229, 427 + xy: 972, 660 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 25 ego/pant rotate: false - xy: 936, 681 + xy: 586, 672 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/player rotate: false - xy: 2, 256 + xy: 2, 115 size: 144, 72 orig: 144, 72 offset: 0, 0 index: -1 ego/poke rotate: false - xy: 2, 52 + xy: 476, 582 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 788, 681 + xy: 510, 268 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 862, 681 + xy: 626, 808 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 926, 867 + xy: 488, 672 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/scoot rotate: false - xy: 2, 330 + xy: 324, 716 size: 200, 30 orig: 200, 30 offset: 0, 0 index: -1 ego/shock rotate: false - xy: 2, 661 + xy: 2, 388 size: 360, 48 orig: 360, 48 offset: 0, 0 index: -1 ego/shoot rotate: false - xy: 780, 867 + xy: 634, 884 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/sigh rotate: false - xy: 664, 905 + xy: 324, 678 size: 162, 36 orig: 162, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 2, 154 + xy: 2, 13 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 776, 791 + xy: 634, 846 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/squat-talk rotate: false - xy: 348, 559 + xy: 700, 808 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 634, 781 + xy: 762, 846 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/standup rotate: false - xy: 2, 452 + xy: 2, 227 size: 225, 55 orig: 225, 55 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 776, 829 + xy: 780, 884 size: 140, 36 orig: 140, 36 offset: 0, 0 index: -1 ego/swing rotate: false - xy: 2, 584 + xy: 2, 311 size: 288, 75 orig: 288, 75 offset: 0, 0 index: -1 ego/swing-shovel rotate: false - xy: 2, 863 + xy: 2, 880 size: 630, 70 orig: 630, 70 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 364, 673 + xy: 364, 398 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 364, 635 + xy: 364, 360 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 300, 210 + xy: 146, 14 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 84, 66 + xy: 991, 574 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 1 ego/whistle rotate: false - xy: 102, 74 + xy: 991, 536 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 2 ego/whistle rotate: false - xy: 120, 74 + xy: 991, 498 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 3 inventory rotate: false - xy: 246, 499 + xy: 146, 57 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 -open-inventory-1 +open-inventory rotate: false - xy: 246, 499 + xy: 146, 57 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-11 + index: 0 +inventory-overlay rotate: false - xy: 536, 581 + xy: 2, 606 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +open-inventory + rotate: false + xy: 190, 2 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-12 + index: 1 +open-inventory rotate: false - xy: 300, 311 + xy: 234, 2 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-13 + index: 2 +open-inventory rotate: false - xy: 300, 253 + xy: 278, 2 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-2 + index: 3 +open-inventory rotate: false - xy: 422, 539 + xy: 568, 450 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-3 + index: 4 +open-inventory rotate: false - xy: 492, 581 + xy: 612, 470 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-4 + index: 5 +open-inventory rotate: false - xy: 281, 441 + xy: 612, 412 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-5 + index: 6 +open-inventory rotate: false - xy: 220, 369 + xy: 891, 416 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-6 + index: 7 +open-inventory rotate: false - xy: 264, 369 + xy: 891, 416 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-7 + index: 9 +open-inventory rotate: false - xy: 256, 311 + xy: 750, 359 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-8 + index: 8 +open-inventory rotate: false - xy: 256, 253 + xy: 794, 359 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-10 + index: 10 +open-inventory rotate: false - xy: 256, 253 + xy: 838, 359 size: 42, 56 orig: 42, 56 offset: 0, 0 - index: -1 -open-inventory-9 + index: 11 +open-inventory rotate: false - xy: 256, 195 + xy: 882, 358 size: 42, 56 orig: 42, 56 offset: 0, 0 + index: 12 +safe/inputed-key + rotate: false + xy: 1013, 647 + size: 9, 11 + orig: 9, 11 + offset: 0, 0 index: -1 save rotate: false - xy: 2, 2 + xy: 930, 774 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 test/abc rotate: false - xy: 664, 943 + xy: 664, 960 size: 320, 62 orig: 320, 62 offset: 0, 0 index: -1 +white + rotate: false + xy: 566, 517 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 +wizard/Untitled + rotate: false + xy: 531, 748 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 +wizard/cloud + rotate: false + xy: 930, 838 + size: 40, 30 + orig: 40, 30 + offset: 0, 0 + index: -1 +wizard/disappear + rotate: false + xy: 2, 438 + size: 380, 46 + orig: 380, 46 + offset: 0, 0 + index: -1 +wizard/experiment + rotate: false + xy: 558, 543 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 0 +wizard/experiment + rotate: false + xy: 613, 751 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 1 +wizard/experiment + rotate: false + xy: 584, 249 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 2 +wizard/experiment + rotate: false + xy: 650, 679 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 3 +wizard/experiment + rotate: false + xy: 697, 679 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 4 +wizard/experiment + rotate: false + xy: 662, 622 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 5 +wizard/experiment + rotate: false + xy: 709, 622 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 6 +wizard/experiment + rotate: false + xy: 756, 645 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 7 +wizard/experiment + rotate: false + xy: 803, 645 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 8 +wizard/experiment + rotate: false + xy: 850, 645 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 9 +wizard/experiment + rotate: false + xy: 897, 645 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 10 +wizard/experiment + rotate: false + xy: 756, 588 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 11 +wizard/experiment + rotate: false + xy: 803, 588 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 12 +wizard/experiment + rotate: false + xy: 850, 588 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 13 +wizard/experiment + rotate: false + xy: 897, 588 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 14 +wizard/experiment + rotate: false + xy: 944, 603 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 15 +wizard/experiment + rotate: false + xy: 662, 565 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 16 +wizard/experiment + rotate: false + xy: 709, 565 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 17 +wizard/experiment + rotate: false + xy: 657, 508 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 18 +wizard/experiment + rotate: false + xy: 704, 508 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 19 +wizard/experiment + rotate: false + xy: 756, 531 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 20 +wizard/experiment + rotate: false + xy: 803, 531 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 21 +wizard/experiment + rotate: false + xy: 850, 531 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 22 +wizard/experiment + rotate: false + xy: 897, 531 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 23 +wizard/experiment + rotate: false + xy: 944, 546 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 24 +wizard/experiment + rotate: false + xy: 751, 474 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 25 +wizard/experiment + rotate: false + xy: 798, 474 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 26 +wizard/experiment + rotate: false + xy: 845, 474 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 27 +wizard/experiment + rotate: false + xy: 892, 474 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 28 +wizard/experiment + rotate: false + xy: 944, 489 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 29 +wizard/experiment + rotate: false + xy: 190, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 30 +wizard/experiment + rotate: false + xy: 237, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 31 +wizard/experiment + rotate: false + xy: 656, 451 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 32 +wizard/experiment + rotate: false + xy: 703, 451 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 33 +wizard/experiment + rotate: false + xy: 656, 394 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 34 +wizard/experiment + rotate: false + xy: 703, 394 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 35 +wizard/experiment + rotate: false + xy: 750, 417 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 36 +wizard/experiment + rotate: false + xy: 797, 417 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 37 +wizard/experiment + rotate: false + xy: 844, 417 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 38 +wizard/flame + rotate: false + xy: 146, 2 + size: 5, 10 + orig: 5, 10 + offset: 0, 0 + index: -1 +wizard/magic-hands + rotate: false + xy: 930, 870 + size: 40, 50 + orig: 40, 50 + offset: 0, 0 + index: -1 +wizard/stand + rotate: false + xy: 991, 612 + size: 20, 46 + orig: 20, 46 + offset: 0, 0 + index: -1 +wizard/wizard + rotate: false + xy: 991, 612 + size: 20, 46 + orig: 20, 46 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 476, 534 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 +wizard/talk-angry + rotate: false + xy: 484, 482 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/global.png b/desktop/resources/packed/global.png index c42d7ffd..d613ad09 100644 Binary files a/desktop/resources/packed/global.png and b/desktop/resources/packed/global.png differ diff --git a/desktop/resources/packed/outsidehouse.atlas b/desktop/resources/packed/outsidehouse.atlas index 696e0ebb..f891cb8c 100644 --- a/desktop/resources/packed/outsidehouse.atlas +++ b/desktop/resources/packed/outsidehouse.atlas @@ -18,6 +18,13 @@ background-trees orig: 320, 240 offset: 0, 0 index: -1 +butterfly + rotate: false + xy: 848, 667 + size: 14, 7 + orig: 14, 7 + offset: 0, 0 + index: -1 cauldron rotate: false xy: 646, 666 @@ -62,7 +69,7 @@ door index: -1 dot rotate: false - xy: 848, 673 + xy: 958, 703 size: 1, 1 orig: 1, 1 offset: 0, 0 diff --git a/desktop/resources/packed/outsidehouse.png b/desktop/resources/packed/outsidehouse.png index 3bcff9f9..33e13849 100644 Binary files a/desktop/resources/packed/outsidehouse.png and b/desktop/resources/packed/outsidehouse.png differ diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 152be672..dc1b6994 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -55,8 +55,6 @@ (fn [screen entities {:keys [create-talk target-id color text x y scale scene-viewport id]}] (let [font (doto (bitmap-font "ego/font.fnt" ) (bitmap-font! :set-use-integer-positions false)) - p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg")) - _ (nine-patch! p :set-padding 25 25 5 15) tr (bitmap-font! font :get-region) scale (* scale (/ utils/ui-scale 2)) @@ -241,8 +239,6 @@ :on-toast (fn [screen entities {:keys [message]}] (let [font (bitmap-font "ego/font.fnt" ) - p (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) - _ (nine-patch! p :set-padding 25 25 5 15) tr (bitmap-font! font :get-region) diff --git a/desktop/src-common/advent/screens/fade.clj b/desktop/src-common/advent/screens/fade.clj index 7c86eff6..8da4f79b 100644 --- a/desktop/src-common/advent/screens/fade.clj +++ b/desktop/src-common/advent/screens/fade.clj @@ -18,16 +18,17 @@ (defscreen fade-screen :on-show (fn [screen entities options] - (utils/setup-viewport screen 320 240) - - {:fade (assoc (utils/get-texture "black.png") - :scale-x 100 - :scale-y 100 - :x -1 - :y -1 - :opacity 1.0 - :origin-x 0 - :origin-y 0)}) + (let [[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")] + (utils/setup-viewport screen 320 240) + + {:fade (assoc (utils/atlas->texture global-atlas "black.png") + :scale-x 100 + :scale-y 100 + :x -1 + :y -1 + :opacity 1.0 + :origin-x 0 + :origin-y 0)})) :on-render @@ -35,6 +36,10 @@ (render! screen [(:fade entities)]) entities) + :on-hide + (fn [screen entities options] + (utils/release-resources screen)) + :update-fade (fn [_ entities {:keys [opacity]}] (assoc-in entities [:fade :opacity] opacity)) diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index b322dfaf..d0131daa 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -114,12 +114,13 @@ (defscreen inventory-screen :on-show (fn [screen entities options] - (let [screen (utils/setup-viewport screen 1280 960) + (let [[screen atlas] (utils/acquire-atlas screen "packed/global.atlas") + screen (utils/setup-viewport screen 1280 960) hovered-text (assoc (label "" (style :label (utils/get-font "ego/font.fnt") (color :white)) :set-font-scale 0.25) :x 0 :y 850 :width 1280 )] (label! hovered-text :set-alignment Align/bottom) (utils/add-actor-to-stage screen hovered-text) - {:overlay (assoc (utils/get-texture "inventory-overlay.png" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) - :fade (assoc (utils/get-texture "black.png") + {:overlay (assoc (utils/atlas->texture atlas "inventory-overlay" ) :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :opacity 0.0) + :fade (assoc (utils/atlas->texture atlas "black.png") :scale-x 80 :scale-y 80 :opacity 0.7 @@ -204,4 +205,7 @@ (right-click screen entities options)))) :on-resize (fn [{:keys [^FitViewport viewport] :as screen} entities {:keys [width height]}] - (.update viewport width height true))) + (.update viewport width height true)) + :on-hide (fn [screen entities options] + (utils/release-resources screen))) + diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 6332198a..703cdec6 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -27,13 +27,13 @@ :time time) (actions/play-animation entities :ego :standup)) -(defn make-wizard [screen wizard-spec] - (let [wizard-sheet (texture! (utils/get-texture "wizard/talk.png") :split 20 46) +(defn make-wizard [screen atlas wizard-spec] + (let [wizard-sheet (texture! (utils/atlas->texture atlas "wizard/talk") :split 20 46) wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])] (aget wizard-sheet 0 i))) - wizard-talk-angry (utils/make-anim "wizard/talk-angry.png" [20 50] 0.2 [0 2 0 2 1 2 0 3 0 2 0 1 0 2]) - wizard-magic-hands (utils/make-anim "wizard/magic-hands.png" [20 50] 0.2 (range 2)) - wizard-disappear (utils/make-anim "wizard/disappear.png" [20 46] 0.075 (range 19)) + wizard-talk-angry (utils/make-anim atlas "wizard/talk-angry" [20 50] 0.2 [0 2 0 2 1 2 0 3 0 2 0 1 0 2]) + wizard-magic-hands (utils/make-anim atlas "wizard/magic-hands" [20 50] 0.2 (range 2)) + wizard-disappear (utils/make-anim atlas "wizard/disappear" [20 46] 0.075 (range 19)) disappear-left (utils/flip wizard-disappear) wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]] (aget wizard-sheet 0 i))) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index df508eb5..e2d72a37 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -604,6 +604,7 @@ (defn make [screen] (let [[screen atlas] (utils/acquire-atlas screen "packed/outsidehouse.atlas") + [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas") sheep-stand-sheet (texture! (utils/atlas->texture atlas "sheep-anim") :split 33 21) sheep-walk-sheet (texture! (utils/atlas->texture atlas "sheep-walk") :split 33 21) lamb-walk-sheet (texture! (utils/atlas->texture atlas "lamb-walk") :split 27 28) @@ -615,7 +616,7 @@ door (utils/make-anim atlas "door" [24 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3])) sheep-walk (animation 0.05 (for [i (range 6)] (aget sheep-walk-sheet 0 i))) - butterfly-stand (utils/make-anim "butterfly.png" [7 7] 0.1 [0 1]) + butterfly-stand (utils/make-anim atlas "butterfly" [7 7] 0.1 [0 1]) cauldron (utils/make-anim atlas "cauldron" [50 38] 0.15 (range 4)) charcoal (utils/make-anim-seq atlas "charcoal" [24 18] 0.25 (range 4)) scaler (utils/scaler-fn-with-baseline 110 0.10 1.00) @@ -677,20 +678,20 @@ entities (walk-to-castle entities)) :cursor :left}} - :layers {:day [(assoc (utils/get-texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (utils/get-texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (utils/get-texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) + :layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) + (assoc (utils/atlas->texture atlas "house") :x 0 :y 0 :baseline 122) + (assoc (utils/atlas->texture atlas "fence") :x 0 :y 0 :baseline 93) - (assoc (utils/get-texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) - (assoc (utils/get-texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) - (assoc (utils/get-texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)] - :night [(assoc (utils/get-texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) - (assoc (utils/get-texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) - (assoc (utils/get-texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 93) + (assoc (utils/atlas->texture atlas "background-trees") :x 0 :y 0 :baseline 44) + (assoc (utils/atlas->texture atlas "fg1") :x 0 :y 0 :baseline 1000 :parallax 1.5) + (assoc (utils/atlas->texture atlas "fg2") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)] + :night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) + (assoc (utils/atlas->texture atlas "house") :x 0 :y 0 :baseline 122) + (assoc (utils/atlas->texture atlas "fence") :x 0 :y 0 :baseline 93) - (assoc (utils/get-texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44) - (assoc (utils/get-texture "outsidehouse/fg1.png") :x 0 :y 0 :baseline 1000 :parallax 1.5) - (assoc (utils/get-texture "outsidehouse/fg2.png") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)]} + (assoc (utils/atlas->texture atlas "background-trees") :x 0 :y 0 :baseline 44) + (assoc (utils/atlas->texture atlas "fg1") :x 0 :y 0 :baseline 1000 :parallax 1.5) + (assoc (utils/atlas->texture atlas "fg2") :x (- 320 55) :y 0 :baseline 1000 :parallax 1.5)]} :entities {:sheep (actions/start-animation screen (assoc (animation->texture screen sheep-stand) :x 38 :y 160 :baseline 80 [:stand 1] sheep-1 @@ -796,7 +797,7 @@ :door-sound (utils/load-sound "door.ogg") :anim-sound-frames {door {1 [:door-sound 0.1]}} ) - :lamb (assoc (utils/get-texture "outsidehouse/lamb.png") + :lamb (assoc (utils/atlas->texture atlas "lamb") :cursor :look :label "Baby lamb" :x 10 :y 163 :baseline 77 @@ -853,13 +854,13 @@ (actions/talk entities :ego "It's a small, sharp piece of charcoal.") ) )) - :wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2 + :wizard (rooms/make-entity :wizard (common/make-wizard screen global-atlas {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2 :script (actions/get-script entities (talk-to-gandarf-outside entities)) :scripts {:default (actions/get-script entities (actions/talk entities :wizard "No time for that!")) :sword (actions/get-script entities (actions/do-dialogue entities :wizard "The Sword of Blergh!" :wizard "Good job, Tick."))}})) - :note (rooms/make-entity :note (assoc (utils/get-texture "outsidehouse/note.png") + :note (rooms/make-entity :note (assoc (utils/atlas->texture atlas "note") :x 277 :y 74 :baseline 160 :label "Paper airplane" :cursor :hand diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj index fa0ee556..a369eb7e 100644 --- a/desktop/src-common/advent/screens/safe.clj +++ b/desktop/src-common/advent/screens/safe.clj @@ -44,14 +44,15 @@ (fn [screen entities options] (utils/setup-viewport screen 320 240) - (let [inputed-key (utils/get-texture "inside-house/inputed-key.png")] - {:fade (assoc (utils/get-texture "black.png") + (let [[screen atlas] (utils/acquire-atlas screen "packed/global.atlas") + inputed-key (utils/atlas->texture atlas "safe/inputed-key.png")] + {:fade (assoc (utils/atlas->texture atlas "black.png") :scale-x 80 :scale-y 80 :opacity 0.7 :origin-x 0 :origin-y 0) - :safe (assoc (utils/get-texture "inside-house/safe-screen.png") :x start-x :y start-y) + :safe (assoc (utils/atlas->texture atlas "safe/safe-screen") :x start-x :y start-y) :entered-keys (doall (for [i (range 5)] (assoc inputed-key :x (+ start-x 12 (* i 12)) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index a845950c..65827fb6 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1266,7 +1266,7 @@ :object nil} :fade {:object nil :opacity 0.0} - :white-fade (assoc (utils/get-texture "white.png") + :white-fade (assoc (utils/atlas->texture global-atlas "white") :scale-x 30 :scale-y 30 :baseline 9500 @@ -1882,13 +1882,13 @@ :width 42 :height 56 :origin-x 21 :origin-y 27 :scale-x utils/ui-scale :scale-y utils/ui-scale - :open (utils/flip (doto (utils/make-anim-seq "open-inventory" [42 56] 0.055 (flatten [(range 6) 6 7 8 7 ])) + :open (utils/flip (doto (utils/make-anim-seq global-atlas "open-inventory" [42 56] 0.055 (flatten [(range 6) 6 7 8 7 ])) (animation! :set-play-mode (play-mode :normal)))) :anim (utils/flip (utils/make-anim global-atlas "inventory" [42 56] 0.1 [0])) :anim-loop? false :default (utils/flip (utils/make-anim global-atlas "inventory" [42 56] 0.1 [0])) - :opened (utils/flip (utils/make-anim-seq "open-inventory" [42 56] 0.1 [7])) - :closing (utils/flip (doto (utils/make-anim-seq "open-inventory" [42 56] 0.055 [7 7 7 7 7 7 7 9 10 11 12 0]) + :opened (utils/flip (utils/make-anim-seq global-atlas "open-inventory" [42 56] 0.1 [7])) + :closing (utils/flip (doto (utils/make-anim-seq global-atlas "open-inventory" [42 56] 0.055 [7 7 7 7 7 7 7 9 10 11 12 0]) (animation! :set-play-mode (play-mode :normal)))) :anim-start 0 :opacity 0.8) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index edb960ee..22a71d7b 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -171,6 +171,7 @@ (defn get-texture ([path] + (println "WARNING: using pack.atlas:" path) (get-texture "packed/pack.atlas" path)) ([atlas path] (atlas->texture (texture-atlas atlas) path))