ego is all atlased

2017-05-27 16:33:45 -07:00
parent 26b0952345
commit 5332683347
36 changed files with 238 additions and 253 deletions
--- a/desktop/asset-work/global/ego/love_0.png
+++ b/desktop/asset-work/global/ego/love_0.png
--- a/desktop/asset-work/global/ego/love_1.png
+++ b/desktop/asset-work/global/ego/love_1.png
--- a/desktop/asset-work/global/ego/love_10.png
+++ b/desktop/asset-work/global/ego/love_10.png
--- a/desktop/asset-work/global/ego/love_11.png
+++ b/desktop/asset-work/global/ego/love_11.png
--- a/desktop/asset-work/global/ego/love_12.png
+++ b/desktop/asset-work/global/ego/love_12.png
--- a/desktop/asset-work/global/ego/love_13.png
+++ b/desktop/asset-work/global/ego/love_13.png
--- a/desktop/asset-work/global/ego/love_14.png
+++ b/desktop/asset-work/global/ego/love_14.png
--- a/desktop/asset-work/global/ego/love_15.png
+++ b/desktop/asset-work/global/ego/love_15.png
--- a/desktop/asset-work/global/ego/love_16.png
+++ b/desktop/asset-work/global/ego/love_16.png
--- a/desktop/asset-work/global/ego/love_17.png
+++ b/desktop/asset-work/global/ego/love_17.png
--- a/desktop/asset-work/global/ego/love_18.png
+++ b/desktop/asset-work/global/ego/love_18.png
--- a/desktop/asset-work/global/ego/love_19.png
+++ b/desktop/asset-work/global/ego/love_19.png
--- a/desktop/asset-work/global/ego/love_2.png
+++ b/desktop/asset-work/global/ego/love_2.png
--- a/desktop/asset-work/global/ego/love_20.png
+++ b/desktop/asset-work/global/ego/love_20.png
--- a/desktop/asset-work/global/ego/love_21.png
+++ b/desktop/asset-work/global/ego/love_21.png
--- a/desktop/asset-work/global/ego/love_22.png
+++ b/desktop/asset-work/global/ego/love_22.png
--- a/desktop/asset-work/global/ego/love_23.png
+++ b/desktop/asset-work/global/ego/love_23.png
--- a/desktop/asset-work/global/ego/love_24.png
+++ b/desktop/asset-work/global/ego/love_24.png
--- a/desktop/asset-work/global/ego/love_25.png
+++ b/desktop/asset-work/global/ego/love_25.png
--- a/desktop/asset-work/global/ego/love_3.png
+++ b/desktop/asset-work/global/ego/love_3.png
--- a/desktop/asset-work/global/ego/love_4.png
+++ b/desktop/asset-work/global/ego/love_4.png
--- a/desktop/asset-work/global/ego/love_5.png
+++ b/desktop/asset-work/global/ego/love_5.png
--- a/desktop/asset-work/global/ego/love_6.png
+++ b/desktop/asset-work/global/ego/love_6.png
--- a/desktop/asset-work/global/ego/love_7.png
+++ b/desktop/asset-work/global/ego/love_7.png
--- a/desktop/asset-work/global/ego/love_8.png
+++ b/desktop/asset-work/global/ego/love_8.png
--- a/desktop/asset-work/global/ego/love-10.png
+++ b/desktop/asset-work/global/ego/love-10.png
--- a/desktop/asset-work/global/ego/player.png
+++ b/desktop/asset-work/global/ego/player.png
--- a/desktop/asset-work/global/ego/whistle_0.png
+++ b/desktop/asset-work/global/ego/whistle_0.png
--- a/desktop/asset-work/global/ego/whistle_1.png
+++ b/desktop/asset-work/global/ego/whistle_1.png
--- a/desktop/asset-work/global/ego/whistle_2.png
+++ b/desktop/asset-work/global/ego/whistle_2.png
--- a/desktop/asset-work/global/ego/whistle_3.png
+++ b/desktop/asset-work/global/ego/whistle_3.png
--- a/desktop/pom.xml
+++ b/desktop/pom.xml
@@ -3,7 +3,7 @@
  <groupId>advent</groupId>
  <artifactId>advent</artifactId>
  <packaging>jar</packaging>
-  <version>1.2.2</version>
+  <version>2.0.5-SNAPSHOT</version>
  <name>advent</name>
  <description>FIXME: write description</description>
  <build>
@@ -15,9 +15,6 @@
      </resource>
    </resources>
    <testResources>
-      <testResource>
-        <directory>dev-resources</directory>
-      </testResource>
      <testResource>
        <directory>resources</directory>
      </testResource>
@@ -68,21 +65,24 @@
      </releases>
    </repository>
  </repositories>
+  <dependencyManagement>
+    <dependencies/>
+  </dependencyManagement>
  <dependencies>
    <dependency>
      <groupId>com.badlogicgames.gdx</groupId>
      <artifactId>gdx</artifactId>
-      <version>1.9.3</version>
+      <version>1.9.4</version>
    </dependency>
    <dependency>
      <groupId>com.badlogicgames.gdx</groupId>
      <artifactId>gdx-backend-lwjgl</artifactId>
-      <version>1.9.3</version>
+      <version>1.9.4</version>
    </dependency>
    <dependency>
      <groupId>com.badlogicgames.gdx</groupId>
      <artifactId>gdx-platform</artifactId>
-      <version>1.9.3</version>
+      <version>1.9.4</version>
      <classifier>natives-desktop</classifier>
    </dependency>
    <dependency>
@@ -90,10 +90,15 @@
      <artifactId>clojure</artifactId>
      <version>1.8.0</version>
    </dependency>
+    <dependency>
+      <groupId>org.clojars.notid</groupId>
+      <artifactId>tools.logging</artifactId>
+      <version>0.3.2-SNAPSHOT</version>
+    </dependency>
    <dependency>
      <groupId>play-clj</groupId>
      <artifactId>play-clj</artifactId>
-      <version>0.4.5-BRYCE</version>
+      <version>0.4.6-BRYCE</version>
    </dependency>
    <dependency>
      <groupId>log4j</groupId>
@@ -108,41 +113,7 @@
    <dependency>
      <groupId>org.clojure</groupId>
      <artifactId>core.async</artifactId>
-      <version>0.1.338.0-5c5012-alpha</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure</groupId>
-      <artifactId>tools.logging</artifactId>
-      <version>0.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.im4java</groupId>
-      <artifactId>im4java</artifactId>
-      <version>1.4.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure</groupId>
-      <artifactId>tools.nrepl</artifactId>
-      <version>0.2.7</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.clojure</groupId>
-          <artifactId>clojure</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>clojure-complete</groupId>
-      <artifactId>clojure-complete</artifactId>
-      <version>0.2.3</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.clojure</groupId>
-          <artifactId>clojure</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
+      <version>0.2.385</version>
    </dependency>
    <dependency>
      <groupId>com.badlogicgames.gdx</groupId>
@@ -150,6 +121,12 @@
      <version>1.5.3</version>
      <scope>test</scope>
    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>tools.nrepl</artifactId>
+      <version>0.2.12</version>
+      <scope>test</scope>
+    </dependency>
    <dependency>
      <groupId>play-clj-nrepl</groupId>
      <artifactId>play-clj-nrepl</artifactId>
--- a/desktop/resources/packed/global.atlas
+++ b/desktop/resources/packed/global.atlas
@@ -6,665 +6,672 @@ filter: Nearest,Nearest
 repeat: none
 black
  rotate: false
-  xy: 574, 823
+  xy: 974, 905
  size: 32, 24
  orig: 32, 24
  offset: 0, 0
  index: -1
 close
  rotate: false
-  xy: 290, 485
+  xy: 634, 917
  size: 16, 16
  orig: 16, 16
  offset: 0, 0
  index: -1
 ego/Untitled
  rotate: false
-  xy: 664, 891
+  xy: 828, 905
  size: 144, 36
  orig: 144, 36
  offset: 0, 0
  index: -1
 ego/talk
  rotate: false
-  xy: 664, 891
+  xy: 828, 905
  size: 144, 36
  orig: 144, 36
  offset: 0, 0
  index: -1
 ego/axe
  rotate: false
-  xy: 2, 697
+  xy: 2, 711
  size: 420, 70
  orig: 420, 70
  offset: 0, 0
  index: -1
 ego/axe-wood
  rotate: false
-  xy: 2, 921
+  xy: 2, 935
  size: 660, 70
  orig: 660, 70
  offset: 0, 0
  index: -1
 ego/base
  rotate: false
-  xy: 956, 891
+  xy: 996, 753
  size: 16, 36
  orig: 16, 36
  offset: 0, 0
  index: -1
-ego/whistle-1
+ego/whistle
  rotate: false
-  xy: 956, 891
+  xy: 996, 753
  size: 16, 36
  orig: 16, 36
  offset: 0, 0
-  index: -1
+  index: 0
 ego/burnt
  rotate: false
-  xy: 2, 769
+  xy: 2, 783
  size: 480, 46
  orig: 480, 46
  offset: 0, 0
  index: -1
 ego/cat-toy
  rotate: false
-  xy: 2, 386
+  xy: 2, 400
  size: 205, 50
  orig: 205, 50
  offset: 0, 0
  index: -1
 ego/climb
  rotate: false
-  xy: 2, 495
+  xy: 2, 509
  size: 242, 46
  orig: 242, 46
  offset: 0, 0
  index: -1
 ego/crawl
  rotate: false
-  xy: 2, 543
+  xy: 2, 557
  size: 273, 25
  orig: 273, 25
  offset: 0, 0
  index: -1
 ego/crowbar
  rotate: false
-  xy: 810, 891
+  xy: 634, 867
  size: 144, 36
  orig: 144, 36
  offset: 0, 0
  index: -1
 ego/dot
  rotate: false
-  xy: 489, 504
+  xy: 574, 860
  size: 1, 1
  orig: 1, 1
  offset: 0, 0
  index: -1
 ego/fire
  rotate: false
-  xy: 2, 348
+  xy: 2, 362
  size: 216, 36
  orig: 216, 36
  offset: 0, 0
  index: -1
 ego/flying
  rotate: false
-  xy: 922, 845
+  xy: 596, 673
  size: 34, 44
  orig: 34, 44
  offset: 0, 0
  index: -1
 ego/frog
  rotate: false
-  xy: 474, 231
+  xy: 458, 597
  size: 32, 36
  orig: 32, 36
  offset: 0, 0
  index: -1
 ego/frustrated-talk
  rotate: false
-  xy: 484, 779
+  xy: 484, 793
  size: 96, 36
  orig: 96, 36
  offset: 0, 0
  index: -1
 ego/georgia
  rotate: false
-  xy: 492, 595
+  xy: 2, 20
  size: 90, 30
  orig: 90, 30
  offset: 0, 0
  index: -1
 ego/get-sick
  rotate: false
-  xy: 484, 741
+  xy: 348, 597
  size: 108, 36
  orig: 108, 36
  offset: 0, 0
  index: -1
 ego/glad
  rotate: false
-  xy: 634, 843
+  xy: 634, 819
  size: 140, 46
  orig: 140, 46
  offset: 0, 0
  index: -1
 ego/grow
  rotate: false
-  xy: 492, 627
+  xy: 918, 829
  size: 90, 36
  orig: 90, 36
  offset: 0, 0
  index: -1
 ego/grow-talk
  rotate: false
-  xy: 986, 955
+  xy: 986, 969
  size: 36, 36
  orig: 36, 36
  offset: 0, 0
  index: -1
 ego/hand-hold
  rotate: false
-  xy: 986, 917
+  xy: 986, 931
  size: 36, 36
  orig: 36, 36
  offset: 0, 0
  index: -1
 ego/hold-hand
  rotate: false
-  xy: 406, 303
+  xy: 466, 559
  size: 16, 36
  orig: 16, 36
  offset: 0, 0
  index: -1
 ego/hold-up-to-window
  rotate: false
-  xy: 480, 703
+  xy: 904, 791
  size: 108, 36
  orig: 108, 36
  offset: 0, 0
  index: -1
 ego/ida
  rotate: false
-  xy: 424, 697
+  xy: 292, 589
  size: 54, 70
  orig: 54, 70
  offset: 0, 0
  index: -1
 ego/idea
  rotate: false
-  xy: 94, 206
+  xy: 148, 258
  size: 54, 70
  orig: 54, 70
  offset: 0, 0
  index: -1
 ego/in-love
  rotate: false
-  xy: 2, 817
+  xy: 2, 831
  size: 570, 30
  orig: 570, 30
  offset: 0, 0
  index: -1
 ego/jump-straight
  rotate: false
-  xy: 2, 126
+  xy: 2, 104
  size: 90, 48
  orig: 90, 48
  offset: 0, 0
  index: -1
-ego/love-1
+ego/love
  rotate: false
-  xy: 2, 2
+  xy: 582, 791
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-10
+  index: 0
+ego/love
  rotate: false
-  xy: 492, 485
+  xy: 94, 184
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-11
+  index: 1
+ego/love
  rotate: false
-  xy: 229, 413
+  xy: 424, 711
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-12
+  index: 2
+ego/love
  rotate: false
-  xy: 220, 341
+  xy: 94, 112
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-13
+  index: 3
+ego/love
  rotate: false
-  xy: 281, 413
+  xy: 476, 711
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-14
+  index: 4
+ego/love
  rotate: false
-  xy: 272, 341
+  xy: 528, 721
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-15
+  index: 5
+ego/love
  rotate: false
-  xy: 324, 341
+  xy: 580, 719
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-16
+  index: 6
+ego/love
  rotate: false
-  xy: 333, 413
+  xy: 632, 709
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-17
+  index: 7
+ego/love
  rotate: false
-  xy: 385, 435
+  xy: 684, 709
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-18
+  index: 8
+ego/love
  rotate: false
-  xy: 437, 435
+  xy: 492, 639
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-19
+  index: 9
+ego/love
  rotate: false
-  xy: 489, 413
+  xy: 736, 709
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-2
+  index: 10
+ego/love
  rotate: false
-  xy: 292, 575
+  xy: 788, 719
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-20
+  index: 11
+ego/love
  rotate: false
-  xy: 376, 341
+  xy: 840, 719
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-21
+  index: 12
+ego/love
  rotate: false
-  xy: 428, 363
+  xy: 892, 719
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-22
+  index: 13
+ego/love
  rotate: false
-  xy: 480, 341
+  xy: 944, 719
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-23
+  index: 14
+ego/love
  rotate: false
-  xy: 428, 291
+  xy: 204, 290
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-24
+  index: 15
+ego/love
  rotate: false
-  xy: 480, 269
+  xy: 204, 218
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-25
+  index: 16
+ego/love
  rotate: false
-  xy: 532, 341
+  xy: 544, 647
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-26
+  index: 17
+ego/love
  rotate: false
-  xy: 532, 269
+  xy: 632, 637
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-3
+  index: 18
+ego/love
  rotate: false
-  xy: 94, 134
+  xy: 684, 637
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-4
+  index: 19
+ego/love
  rotate: false
-  xy: 54, 2
+  xy: 736, 637
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-5
+  index: 20
+ego/love
  rotate: false
-  xy: 150, 206
+  xy: 788, 609
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-6
+  index: 21
+ego/love
  rotate: false
-  xy: 146, 134
+  xy: 840, 609
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-7
+  index: 22
+ego/love
  rotate: false
-  xy: 202, 206
+  xy: 892, 609
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-8
+  index: 23
+ego/love
  rotate: false
-  xy: 198, 134
+  xy: 944, 609
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
-ego/love-9
+  index: 24
+ego/love
  rotate: false
-  xy: 292, 503
+  xy: 229, 427
  size: 50, 70
  orig: 50, 70
  offset: 0, 0
-  index: -1
+  index: 25
 ego/pant
  rotate: false
-  xy: 166, 278
+  xy: 936, 681
  size: 62, 36
  orig: 62, 36
  offset: 0, 0
  index: -1
+ego/player
+  rotate: false
+  xy: 2, 256
+  size: 144, 72
+  orig: 144, 72
+  offset: 0, 0
+  index: -1
 ego/poke
  rotate: false
-  xy: 2, 74
+  xy: 2, 52
  size: 80, 50
  orig: 80, 50
  offset: 0, 0
  index: -1
 ego/reach
  rotate: false
-  xy: 472, 557
+  xy: 788, 681
  size: 72, 36
  orig: 72, 36
  offset: 0, 0
  index: -1
 ego/scared
  rotate: false
-  xy: 344, 507
+  xy: 862, 681
  size: 72, 36
  orig: 72, 36
  offset: 0, 0
  index: -1
 ego/scared-walk
  rotate: false
-  xy: 492, 665
+  xy: 926, 867
  size: 96, 36
  orig: 96, 36
  offset: 0, 0
  index: -1
 ego/scoot
  rotate: false
-  xy: 2, 316
+  xy: 2, 330
  size: 200, 30
  orig: 200, 30
  offset: 0, 0
  index: -1
 ego/shock
  rotate: false
-  xy: 2, 647
+  xy: 2, 661
  size: 360, 48
  orig: 360, 48
  offset: 0, 0
  index: -1
 ego/shoot
  rotate: false
-  xy: 776, 853
+  xy: 780, 867
  size: 144, 36
  orig: 144, 36
  offset: 0, 0
  index: -1
 ego/sigh
  rotate: false
-  xy: 2, 278
+  xy: 664, 905
  size: 162, 36
  orig: 162, 36
  offset: 0, 0
  index: -1
 ego/spear
  rotate: false
-  xy: 2, 176
+  xy: 2, 154
  size: 90, 100
  orig: 90, 100
  offset: 0, 0
  index: -1
 ego/squat
  rotate: false
-  xy: 364, 659
+  xy: 776, 791
  size: 126, 36
  orig: 126, 36
  offset: 0, 0
  index: -1
 ego/squat-talk
  rotate: false
-  xy: 418, 507
+  xy: 348, 559
  size: 72, 36
  orig: 72, 36
  offset: 0, 0
  index: -1
 ego/stand
  rotate: false
-  xy: 364, 621
+  xy: 634, 781
  size: 126, 36
  orig: 126, 36
  offset: 0, 0
  index: -1
 ego/standup
  rotate: false
-  xy: 2, 438
+  xy: 2, 452
  size: 225, 55
  orig: 225, 55
  offset: 0, 0
  index: -1
 ego/suspended
  rotate: false
-  xy: 776, 815
+  xy: 776, 829
  size: 140, 36
  orig: 140, 36
  offset: 0, 0
  index: -1
 ego/swing
  rotate: false
-  xy: 2, 570
+  xy: 2, 584
  size: 288, 75
  orig: 288, 75
  offset: 0, 0
  index: -1
 ego/swing-shovel
  rotate: false
-  xy: 2, 849
+  xy: 2, 863
  size: 630, 70
  orig: 630, 70
  offset: 0, 0
  index: -1
 ego/thorw
  rotate: false
-  xy: 344, 583
+  xy: 364, 673
  size: 126, 36
  orig: 126, 36
  offset: 0, 0
  index: -1
 ego/throw
  rotate: false
-  xy: 344, 545
+  xy: 364, 635
  size: 126, 36
  orig: 126, 36
  offset: 0, 0
  index: -1
 ego/warden
  rotate: false
-  xy: 541, 436
+  xy: 300, 210
  size: 42, 41
  orig: 42, 41
  offset: 0, 0
  index: -1
-ego/whistle-2
+ego/whistle
  rotate: false
-  xy: 508, 231
+  xy: 84, 66
  size: 16, 36
  orig: 16, 36
  offset: 0, 0
-  index: -1
-ego/whistle-3
+  index: 1
+ego/whistle
  rotate: false
-  xy: 526, 231
+  xy: 102, 74
  size: 16, 36
  orig: 16, 36
  offset: 0, 0
-  index: -1
-ego/whistle-4
+  index: 2
+ego/whistle
  rotate: false
-  xy: 544, 231
+  xy: 120, 74
  size: 16, 36
  orig: 16, 36
  offset: 0, 0
-  index: -1
+  index: 3
 inventory
  rotate: false
-  xy: 246, 485
+  xy: 246, 499
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-1
  rotate: false
-  xy: 246, 485
+  xy: 246, 499
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-11
  rotate: false
-  xy: 430, 233
+  xy: 536, 581
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-12
  rotate: false
-  xy: 546, 537
+  xy: 300, 311
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-13
  rotate: false
-  xy: 544, 479
+  xy: 300, 253
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-2
  rotate: false
-  xy: 230, 283
+  xy: 422, 539
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-3
  rotate: false
-  xy: 274, 283
+  xy: 492, 581
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-4
  rotate: false
-  xy: 318, 283
+  xy: 281, 441
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-5
  rotate: false
-  xy: 362, 283
+  xy: 220, 369
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-6
  rotate: false
-  xy: 254, 225
+  xy: 264, 369
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-7
  rotate: false
-  xy: 298, 225
+  xy: 256, 311
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-8
  rotate: false
-  xy: 342, 225
+  xy: 256, 253
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-10
  rotate: false
-  xy: 342, 225
+  xy: 256, 253
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 open-inventory-9
  rotate: false
-  xy: 386, 225
+  xy: 256, 195
  size: 42, 56
  orig: 42, 56
  offset: 0, 0
  index: -1
 save
  rotate: false
-  xy: 308, 485
+  xy: 2, 2
  size: 16, 16
  orig: 16, 16
  offset: 0, 0
  index: -1
 test/abc
  rotate: false
-  xy: 664, 929
+  xy: 664, 943
  size: 320, 62
  orig: 320, 62
  offset: 0, 0
--- a/desktop/resources/packed/global.png
+++ b/desktop/resources/packed/global.png
--- a/desktop/src-common/advent/core.clj
+++ b/desktop/src-common/advent/core.clj
@@ -32,6 +32,11 @@

 (set-asset-manager! am)
 (defn create-game [advent] 
+  (set-screen-wrapper! (fn [screen screen-fn]
+                         (try (screen-fn)
+                              (catch Exception e
+                                (.log Gdx/app "ERROR" (with-out-str (.printStackTrace e)))
+                                (set-screen! advent title/title-screen)))))
   (log/log-capture! *ns* :warn :error)
   (log/info "Starting game on version v" (advent.version/version))
   (utils/listen-for-screenshots)
@@ -46,8 +51,4 @@
 (defn reload []
  (on-gl (set-screen! advent title/title-screen)))

-(set-screen-wrapper! (fn [screen screen-fn]
-                       (try (screen-fn)
-                            (catch Exception e
-                              (.log Gdx/app "ERROR" (with-out-str (.printStackTrace e)))
-                              (set-screen! advent title/title-screen)))))
+
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -434,15 +434,15 @@

    nil))

-(defn get-ego [screen start-pos start-scale]
-  (let [player-sheet (texture! (utils/get-texture "player.png") :split 18 36)
-        talk-sheet (texture! (utils/get-texture "ego/talk.png") :split 18 36)
-        stand-sheet (texture! (utils/get-texture "ego/stand.png") :split 18 36)
-        squat-sheet (texture! (utils/get-texture "ego/squat.png") :split 18 36)
-        reach-sheet (texture! (utils/get-texture "ego/reach.png") :split 18 36)
-        grow-sheet (texture! (utils/get-texture "ego/grow.png") :split 18 36)
-        cat-toy-sheet (texture! (utils/get-texture "ego/cat-toy.png") :split 41 50)
-        fire-sheet (texture! (utils/get-texture "ego/fire.png") :split 18 36)
+(defn get-ego [screen global-atlas start-pos start-scale]
+  (let [player-sheet (texture! (utils/atlas->texture global-atlas "ego/player") :split 18 36)
+        talk-sheet (texture! (utils/atlas->texture global-atlas "ego/talk") :split 18 36)
+        stand-sheet (texture! (utils/atlas->texture global-atlas "ego/stand") :split 18 36)
+        squat-sheet (texture! (utils/atlas->texture global-atlas "ego/squat") :split 18 36)
+        reach-sheet (texture! (utils/atlas->texture global-atlas "ego/reach") :split 18 36)
+        grow-sheet (texture! (utils/atlas->texture global-atlas "ego/grow") :split 18 36)
+        cat-toy-sheet (texture! (utils/atlas->texture global-atlas "ego/cat-toy") :split 41 50)
+        fire-sheet (texture! (utils/atlas->texture global-atlas "ego/fire") :split 18 36)
        walk-right (animation 0.075 (for [i (range 8)]
                                      (texture  (aget player-sheet 0 i))))

@@ -487,46 +487,46 @@
                                     (texture  (aget fire-sheet 0 i))))
        grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0  0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]]
                              (texture (aget grow-sheet 0 i))))
-        squat-talk (utils/make-anim "ego/squat-talk.png" [18 36] 0.2 [0 1 0 2 1 0 3])
-        frog (utils/make-anim "ego/frog.png" [16 36] 0.1 [0])
-        frog-nod (utils/make-anim "ego/frog.png" [16 36] 0.2 [0 1 0 1 0 1 0 1])
-        hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3  3 3 3 3 3 3 2 1 0 0 0 0 0 0])
-        jump (utils/make-anim "ego/swing.png" [36 75] 0.2 (flatten [[1 2]]))
-        jump-straight (utils/make-anim "ego/jump-straight.png" [18 48] 0.075 [0 1 1 1 1 1 1 2 3])
-        climb (utils/make-anim "ego/climb.png" [22 46] 0.3 [0 1 3 2 4 3 2 4 3 5 6 5 6 5 6 5 6 5 6 7 8 7 8 9 10 9 10 10 10 10 10 8 8 6 6 1 0])
-        poke (utils/make-anim "ego/poke.png" [20 50] 0.2 [0 1 2 3 2 3 2 3 2 3 1 0])
-        jumping-straight (utils/make-anim "ego/jump-straight.png" [18 48] 0.075 (repeat 30 4))
-        swing (utils/make-anim "ego/swing.png" [36 75] 0.145 (flatten [[3 4 5 6 7 ]]))
-        grow-talk (utils/make-anim "ego/grow-talk.png" [18 36] 0.2 (range 2))
-        get-sick (utils/make-anim "ego/get-sick.png" [18 36] 0.1 (flatten [(range 6) (repeat 10 5) (reverse (range 6) ) 0 0 0 0 0 0]))
-        spear (utils/make-anim "ego/spear.png" [18 100] 0.2 [0 1 2 3 2 3 2 3 2 3 2 1 0])
-        crowbar (utils/make-anim "ego/crowbar.png" [36 36] 0.1 [0 0 0 1 1  2 2 2 2 2 3 2 3 2 3 2 3 2 3 3 3 1 1 0 0 0])
-        shoot (utils/make-anim "ego/shoot.png" [24 36] 0.075 [0 0 0 1 1 2 2 2 2 2 2 2 2 3 4 5 4])
-        pant (utils/make-anim "ego/pant.png" [31 36] 0.5 [0 1])
-        shock (utils/make-anim "ego/shock.png" [40 48] 0.075 (flatten (repeat 2 [(repeat 5 [0 1 2]) (repeat 5 [3 4 5]) (repeat 5 [6 7 8])])))
-        burnt (utils/make-anim "ego/burnt.png" [40 46] 0.12 [1 2 3 2 1 2 3 2 1 0 2 0 4 5 6 7 8 9 10 11 10 9 10 11])
-        passed-out (utils/make-anim "ego/burnt.png" [40 46] 0.12 [9 10 11 10])
-        scared (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1])
-        scared-talk (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1 0 1 0 1 0 1 2 3 2 3 2 3 2 3])
-        scared-walk (utils/make-anim "ego/scared-walk.png" [16 36] 0.05 (range 6))
-        sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ])
-        glad (utils/make-anim "ego/glad.png" [20 46] 0.04 (flatten [0 1 2 3 4 (repeat 8 [5 5 5]) (repeat 20 0)]))
-        milk (utils/make-anim "ego/squat.png" [18 36] 0.05 [0 1 2  2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0])
-        idea (utils/make-anim "ego/idea.png" [18 70] 0.3 [2 0 0 0 0 0 0  2])
-        throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)]  (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3  3] (repeat 33 6)]))
-        frustrated-talk (utils/make-anim "ego/frustrated-talk.png" [16 36] 0.2 (flatten (range 6)))
-        swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9))
-        love (utils/make-anim-seq "ego/love" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22  21  21 21 21 21  6 6 5 5 4 4 3 3 2 2 1 1 0]))
-        whistle (utils/make-anim-seq "ego/whistle" [18 36] 0.2 (flatten [0 1 1 (repeat 200 [2 3])]))
-        axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)]))
-        axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0  (range 11)]))
-        suspended (utils/make-anim "ego/suspended.png" [20 36] 0.10 [0])
-        suspended-talk (utils/make-anim "ego/suspended.png" [20 36] 0.20 (range 7))
-        crawl (utils/make-anim "ego/crawl.png" [39 25] 0.2 (range 4))
-        crawl-stand (utils/make-anim "ego/crawl.png" [39 25] 0.2 [0])
-        crawl-hide (utils/make-anim "ego/crawl.png" [39 25] 0.1 (flatten [(repeat 10 3) (range 4 7) (repeat 50 6) (reverse (range 4 7) ) (repeat 20 3)]))
-        standup (utils/make-anim "ego/standup.png" [45 55] 0.2 (range 5))
-        hand-hold (utils/make-anim "ego/hand-hold.png" [18 36] 0.2 [0 1])
+        squat-talk (utils/make-anim global-atlas "ego/squat-talk" [18 36] 0.2 [0 1 0 2 1 0 3])
+        frog (utils/make-anim global-atlas "ego/frog" [16 36] 0.1 [0])
+        frog-nod (utils/make-anim global-atlas "ego/frog" [16 36] 0.2 [0 1 0 1 0 1 0 1])
+        hold-up-to-window (utils/make-anim global-atlas "ego/hold-up-to-window" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3  3 3 3 3 3 3 2 1 0 0 0 0 0 0])
+        jump (utils/make-anim global-atlas "ego/swing" [36 75] 0.2 (flatten [[1 2]]))
+        jump-straight (utils/make-anim global-atlas "ego/jump-straight" [18 48] 0.075 [0 1 1 1 1 1 1 2 3])
+        climb (utils/make-anim global-atlas "ego/climb" [22 46] 0.3 [0 1 3 2 4 3 2 4 3 5 6 5 6 5 6 5 6 5 6 7 8 7 8 9 10 9 10 10 10 10 10 8 8 6 6 1 0])
+        poke (utils/make-anim global-atlas "ego/poke" [20 50] 0.2 [0 1 2 3 2 3 2 3 2 3 1 0])
+        jumping-straight (utils/make-anim global-atlas "ego/jump-straight" [18 48] 0.075 (repeat 30 4))
+        swing (utils/make-anim global-atlas "ego/swing" [36 75] 0.145 (flatten [[3 4 5 6 7 ]]))
+        grow-talk (utils/make-anim global-atlas "ego/grow-talk" [18 36] 0.2 (range 2))
+        get-sick (utils/make-anim global-atlas "ego/get-sick" [18 36] 0.1 (flatten [(range 6) (repeat 10 5) (reverse (range 6) ) 0 0 0 0 0 0]))
+        spear (utils/make-anim global-atlas "ego/spear" [18 100] 0.2 [0 1 2 3 2 3 2 3 2 3 2 1 0])
+        crowbar (utils/make-anim global-atlas "ego/crowbar" [36 36] 0.1 [0 0 0 1 1  2 2 2 2 2 3 2 3 2 3 2 3 2 3 3 3 1 1 0 0 0])
+        shoot (utils/make-anim global-atlas "ego/shoot" [24 36] 0.075 [0 0 0 1 1 2 2 2 2 2 2 2 2 3 4 5 4])
+        pant (utils/make-anim global-atlas "ego/pant" [31 36] 0.5 [0 1])
+        shock (utils/make-anim global-atlas "ego/shock" [40 48] 0.075 (flatten (repeat 2 [(repeat 5 [0 1 2]) (repeat 5 [3 4 5]) (repeat 5 [6 7 8])])))
+        burnt (utils/make-anim global-atlas "ego/burnt" [40 46] 0.12 [1 2 3 2 1 2 3 2 1 0 2 0 4 5 6 7 8 9 10 11 10 9 10 11])
+        passed-out (utils/make-anim global-atlas "ego/burnt" [40 46] 0.12 [9 10 11 10])
+        scared (utils/make-anim global-atlas "ego/scared" [18 36] 0.05 [0 1])
+        scared-talk (utils/make-anim global-atlas "ego/scared" [18 36] 0.05 [0 1 0 1 0 1 0 1 2 3 2 3 2 3 2 3])
+        scared-walk (utils/make-anim global-atlas "ego/scared-walk" [16 36] 0.05 (range 6))
+        sigh (utils/make-anim global-atlas "ego/sigh" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ])
+        glad (utils/make-anim global-atlas "ego/glad" [20 46] 0.04 (flatten [0 1 2 3 4 (repeat 8 [5 5 5]) (repeat 20 0)]))
+        milk (utils/make-anim global-atlas "ego/squat" [18 36] 0.05 [0 1 2  2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0])
+        idea (utils/make-anim global-atlas "ego/idea" [18 70] 0.3 [2 0 0 0 0 0 0  2])
+        throw (utils/make-anim global-atlas "ego/throw" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)]  (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3  3] (repeat 33 6)]))
+        frustrated-talk (utils/make-anim global-atlas "ego/frustrated-talk" [16 36] 0.2 (flatten (range 6)))
+        swing-shovel (utils/make-anim global-atlas "ego/swing-shovel" [70 70] 0.1 (range 9))
+        love (utils/make-anim-seq global-atlas "ego/love" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22  21  21 21 21 21  6 6 5 5 4 4 3 3 2 2 1 1 0]))
+        whistle (utils/make-anim-seq global-atlas "ego/whistle" [18 36] 0.2 (flatten [0 1 1 (repeat 200 [2 3])]))
+        axe (utils/make-anim global-atlas "ego/axe" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)]))
+        axe-wood (utils/make-anim global-atlas "ego/axe-wood" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0  (range 11)]))
+        suspended (utils/make-anim global-atlas "ego/suspended" [20 36] 0.10 [0])
+        suspended-talk (utils/make-anim global-atlas "ego/suspended" [20 36] 0.20 (range 7))
+        crawl (utils/make-anim global-atlas "ego/crawl" [39 25] 0.2 (range 4))
+        crawl-stand (utils/make-anim global-atlas "ego/crawl" [39 25] 0.2 [0])
+        crawl-hide (utils/make-anim global-atlas "ego/crawl" [39 25] 0.1 (flatten [(repeat 10 3) (range 4 7) (repeat 50 6) (reverse (range 4 7) ) (repeat 20 3)]))
+        standup (utils/make-anim global-atlas "ego/standup" [45 55] 0.2 (range 5))
+        hand-hold (utils/make-anim global-atlas "ego/hand-hold" [18 36] 0.2 [0 1])
        choose-step-sound (fn [entities]
                            (if (#{:inside-house :inside-stash :inside-cafeteria :inside-antique :inside-jail}
                                 (get-in entities [:state :last-room]))
@@ -1299,7 +1299,7 @@
                      :started? {:value false
                                 :object nil}
                      :room (as-> (get rooms (:last-room state)) room
-                                  (assoc-in room [:entities :ego] (get-ego screen (if has-start-pos?
+                                  (assoc-in room [:entities :ego] (get-ego screen global-atlas (if has-start-pos?
                                                                                    start-pos
                                                                                    (:start-pos room))
                                                                           ((:scale-fn room)