progress on artwork

2018-01-23 21:54:23 -08:00
parent 2257276b97
commit cdf4178a62
29 changed files with 180 additions and 64 deletions
--- a/desktop/asset-work/tongue-fight/Sprite-0002.ase
+++ b/desktop/asset-work/tongue-fight/Sprite-0002.ase
--- a/desktop/asset-work/tongue-fight/falling-bg.ase
+++ b/desktop/asset-work/tongue-fight/falling-bg.ase
--- a/desktop/asset-work/tongue-fight/falling-bg_0.png
+++ b/desktop/asset-work/tongue-fight/falling-bg_0.png
--- a/desktop/asset-work/tongue-fight/falling-bg_1.png
+++ b/desktop/asset-work/tongue-fight/falling-bg_1.png
--- a/desktop/asset-work/tongue-fight/falling-bg_2.png
+++ b/desktop/asset-work/tongue-fight/falling-bg_2.png
--- a/desktop/asset-work/tongue-fight/falling-bg_3.png
+++ b/desktop/asset-work/tongue-fight/falling-bg_3.png
--- a/desktop/asset-work/tongue-fight/falling-bg_4.png
+++ b/desktop/asset-work/tongue-fight/falling-bg_4.png
--- a/desktop/asset-work/tongue-fight/falling-bg_5.png
+++ b/desktop/asset-work/tongue-fight/falling-bg_5.png
--- a/desktop/asset-work/tongue-fight/sword-spin_0.png
+++ b/desktop/asset-work/tongue-fight/sword-spin_0.png
--- a/desktop/asset-work/tongue-fight/sword-spin_1.png
+++ b/desktop/asset-work/tongue-fight/sword-spin_1.png
--- a/desktop/asset-work/tongue-fight/sword-spin_2.png
+++ b/desktop/asset-work/tongue-fight/sword-spin_2.png
--- a/desktop/asset-work/tongue-fight/sword-spin_3.png
+++ b/desktop/asset-work/tongue-fight/sword-spin_3.png
--- a/desktop/asset-work/tongue-fight/sword-spin_4.png
+++ b/desktop/asset-work/tongue-fight/sword-spin_4.png
--- a/desktop/asset-work/tongue-fight/sword-spin_5.png
+++ b/desktop/asset-work/tongue-fight/sword-spin_5.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_0.ase
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_0.ase
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_0.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_0.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_1.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_1.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_2.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_2.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_3.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_3.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_4.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_4.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_5.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_5.png
--- a/desktop/asset-work/tongue-fight/tongue-attack-hit_6.png
+++ b/desktop/asset-work/tongue-fight/tongue-attack-hit_6.png
--- a/desktop/resources/packed/global.atlas
+++ b/desktop/resources/packed/global.atlas
@@ -557,14 +557,14 @@ ego/tongue-hit
  orig: 119, 134
  offset: 0, 0
  index: 0
-ego/tongue-stance
+ego/tongue-idle
  rotate: false
  xy: 2, 16
  size: 119, 134
  orig: 119, 134
  offset: 0, 0
  index: 0
-ego/tongue-idle
+ego/tongue-stance
  rotate: false
  xy: 2, 16
  size: 119, 134
--- a/desktop/resources/packed/tongue-fight.atlas
+++ b/desktop/resources/packed/tongue-fight.atlas
@@ -1,382 +1,472 @@

 tongue-fight.png
-size: 1024,512
+size: 1024,1024
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 background
  rotate: false
-  xy: 2, 270
+  xy: 2, 774
  size: 320, 240
  orig: 320, 240
  offset: 0, 0
  index: -1
+falling-bg
+  rotate: false
+  xy: 880, 406
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 0
+falling-bg
+  rotate: false
+  xy: 880, 276
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 1
+falling-bg
+  rotate: false
+  xy: 824, 146
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 2
+falling-bg
+  rotate: false
+  xy: 687, 112
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 3
+falling-bg
+  rotate: false
+  xy: 817, 16
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 4
 hair-0
  rotate: false
-  xy: 687, 72
+  xy: 987, 848
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 0
 hair-0
  rotate: false
-  xy: 114, 113
+  xy: 996, 844
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 1
 hair-0
  rotate: false
-  xy: 53, 45
+  xy: 987, 838
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 2
 hair-0
  rotate: false
-  xy: 791, 96
+  xy: 977, 836
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 3
 hair-0
  rotate: false
-  xy: 831, 140
+  xy: 1005, 844
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 4
 hair-1
  rotate: false
-  xy: 2, 11
+  xy: 977, 894
  size: 23, 16
  orig: 23, 16
  offset: 0, 0
  index: 0
 hair-1
  rotate: false
-  xy: 28, 37
+  xy: 977, 876
  size: 23, 16
  orig: 23, 16
  offset: 0, 0
  index: 1
 hair-1
  rotate: false
-  xy: 791, 106
+  xy: 977, 858
  size: 23, 16
  orig: 23, 16
  offset: 0, 0
  index: 2
 hair-2
  rotate: false
-  xy: 2, 55
+  xy: 928, 948
  size: 47, 66
  orig: 47, 66
  offset: 0, 0
  index: 0
 hair-2
  rotate: false
-  xy: 791, 150
+  xy: 928, 880
  size: 47, 66
  orig: 47, 66
  offset: 0, 0
  index: 1
 hair-2
  rotate: false
-  xy: 51, 55
+  xy: 928, 812
  size: 47, 66
  orig: 47, 66
  offset: 0, 0
  index: 2
 hair-3
  rotate: false
-  xy: 1009, 452
+  xy: 1014, 844
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 0
 hair-3
  rotate: false
-  xy: 840, 166
+  xy: 996, 834
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 1
 hair-3
  rotate: false
-  xy: 854, 196
+  xy: 986, 828
  size: 7, 8
  orig: 7, 8
  offset: 0, 0
  index: 2
 hair-4
  rotate: false
-  xy: 1009, 482
+  xy: 1003, 986
  size: 12, 28
  orig: 12, 28
  offset: 0, 0
  index: 0
 hair-4
  rotate: false
-  xy: 840, 188
+  xy: 1003, 956
  size: 12, 28
  orig: 12, 28
  offset: 0, 0
  index: 1
 hair-4
  rotate: false
-  xy: 100, 93
+  xy: 1003, 926
  size: 12, 28
  orig: 12, 28
  offset: 0, 0
  index: 2
 hair-5
  rotate: false
-  xy: 840, 176
+  xy: 1002, 854
  size: 8, 10
  orig: 8, 10
  offset: 0, 0
  index: 0
 hair-5
  rotate: false
-  xy: 854, 206
+  xy: 1012, 854
  size: 8, 10
  orig: 8, 10
  offset: 0, 0
  index: 1
 hair-5
  rotate: false
-  xy: 100, 81
+  xy: 977, 846
  size: 8, 10
  orig: 8, 10
  offset: 0, 0
  index: 2
 hair-6
  rotate: false
-  xy: 1018, 454
+  xy: 1017, 981
  size: 4, 6
  orig: 4, 6
  offset: 0, 0
  index: 0
 hair-6
  rotate: false
-  xy: 1018, 446
+  xy: 1017, 973
  size: 4, 6
  orig: 4, 6
  offset: 0, 0
  index: 1
 hair-6
  rotate: false
-  xy: 28, 29
+  xy: 1017, 965
  size: 4, 6
  orig: 4, 6
  offset: 0, 0
  index: 2
 hair-7
  rotate: false
-  xy: 2, 2
+  xy: 1017, 1007
  size: 5, 7
  orig: 5, 7
  offset: 0, 0
  index: 0
 hair-7
  rotate: false
-  xy: 9, 2
+  xy: 1017, 998
  size: 5, 7
  orig: 5, 7
  offset: 0, 0
  index: 1
 hair-7
  rotate: false
-  xy: 16, 2
+  xy: 1017, 989
  size: 5, 7
  orig: 5, 7
  offset: 0, 0
  index: 2
 hair-8
  rotate: false
-  xy: 316, 262
+  xy: 1016, 898
  size: 6, 6
  orig: 6, 6
  offset: 0, 0
  index: 0
 hair-8
  rotate: false
-  xy: 316, 254
+  xy: 1016, 890
  size: 6, 6
  orig: 6, 6
  offset: 0, 0
  index: 1
 hair-8
  rotate: false
-  xy: 316, 246
+  xy: 1016, 882
  size: 6, 6
  orig: 6, 6
  offset: 0, 0
  index: 2
 hair-9
  rotate: false
-  xy: 302, 250
+  xy: 1003, 906
  size: 12, 18
  orig: 12, 18
  offset: 0, 0
  index: 0
 hair-9
  rotate: false
-  xy: 817, 130
+  xy: 1002, 886
  size: 12, 18
  orig: 12, 18
  offset: 0, 0
  index: 1
 hair-9
  rotate: false
-  xy: 1009, 462
+  xy: 1002, 866
  size: 12, 18
  orig: 12, 18
  offset: 0, 0
  index: 2
 heart
  rotate: false
-  xy: 276, 244
+  xy: 977, 990
  size: 24, 24
  orig: 24, 24
  offset: 0, 0
  index: 0
 heart
  rotate: false
-  xy: 276, 218
+  xy: 977, 964
  size: 24, 24
  orig: 24, 24
  offset: 0, 0
  index: 1
 heart
  rotate: false
-  xy: 2, 29
+  xy: 977, 938
  size: 24, 24
  orig: 24, 24
  offset: 0, 0
  index: 2
 heart
  rotate: false
-  xy: 791, 124
+  xy: 977, 912
  size: 24, 24
  orig: 24, 24
  offset: 0, 0
  index: 3
+sword-spin
+  rotate: false
+  xy: 324, 776
+  size: 300, 238
+  orig: 300, 238
+  offset: 0, 0
+  index: 0
+sword-spin
+  rotate: false
+  xy: 626, 776
+  size: 300, 238
+  orig: 300, 238
+  offset: 0, 0
+  index: 1
+sword-spin
+  rotate: false
+  xy: 324, 536
+  size: 300, 238
+  orig: 300, 238
+  offset: 0, 0
+  index: 2
+sword-spin
+  rotate: false
+  xy: 2, 534
+  size: 300, 238
+  orig: 300, 238
+  offset: 0, 0
+  index: 3
+sword-spin
+  rotate: false
+  xy: 626, 536
+  size: 300, 238
+  orig: 300, 238
+  offset: 0, 0
+  index: 4
+sword-spin
+  rotate: false
+  xy: 304, 296
+  size: 300, 238
+  orig: 300, 238
+  offset: 0, 0
+  index: 5
 tongue-attack
  rotate: false
-  xy: 461, 218
+  xy: 413, 149
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 0
 tongue-attack
  rotate: false
-  xy: 598, 218
+  xy: 413, 2
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 1
 tongue-attack
  rotate: false
-  xy: 735, 218
+  xy: 550, 149
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 2
 tongue-attack-hit
  rotate: false
-  xy: 2, 123
+  xy: 2, 387
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 0
 tongue-attack-hit
  rotate: false
-  xy: 324, 365
+  xy: 139, 387
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 1
 tongue-attack-hit
  rotate: false
-  xy: 139, 123
+  xy: 2, 240
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 2
 tongue-attack-hit
  rotate: false
-  xy: 461, 365
+  xy: 139, 240
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 3
 tongue-attack-hit
  rotate: false
-  xy: 598, 365
+  xy: 276, 149
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 4
 tongue-attack-hit
  rotate: false
-  xy: 735, 365
+  xy: 2, 93
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 5
 tongue-attack-hit
  rotate: false
-  xy: 872, 365
+  xy: 139, 93
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 6
 tongue-attack-hit
  rotate: false
-  xy: 324, 218
+  xy: 276, 2
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 7
-tongue-idle
-  rotate: false
-  xy: 687, 82
-  size: 102, 134
-  orig: 102, 134
-  offset: 0, 0
-  index: 0
 tongue-windup
  rotate: false
-  xy: 872, 218
+  xy: 550, 2
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 0
 tongue-windup
  rotate: false
-  xy: 276, 71
+  xy: 606, 389
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 1
 tongue-windup
  rotate: false
-  xy: 413, 71
+  xy: 687, 242
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 2
 tongue-windup
  rotate: false
-  xy: 550, 71
+  xy: 743, 389
  size: 135, 145
  orig: 135, 145
  offset: 0, 0
  index: 3

 tongue-fight2.png
+size: 256,256
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+falling-bg
+  rotate: false
+  xy: 2, 8
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 5
+tongue-idle
+  rotate: false
+  xy: 132, 2
+  size: 102, 134
+  orig: 102, 134
+  offset: 0, 0
+  index: 0
+
+tongue-fight3.png
 size: 1024,256
 format: RGBA8888
 filter: Nearest,Nearest
--- a/desktop/resources/packed/tongue-fight.png
+++ b/desktop/resources/packed/tongue-fight.png
--- a/desktop/resources/packed/tongue-fight2.png
+++ b/desktop/resources/packed/tongue-fight2.png
--- a/desktop/resources/packed/tongue-fight3.png
+++ b/desktop/resources/packed/tongue-fight3.png
--- a/desktop/src-common/advent/screens/rooms/cat_tree.clj
+++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj
@@ -308,7 +308,7 @@
                                                             
                                                             (actions/walk-to entities :ego [200 10] :skip-type :end :stop? false)
                                                             (actions/walk-straight-to entities :ego [223 -51])
-                                                             (actions/transition-background entities :outside-house [137 204])
+                                                             (actions/transition-background entities :tongue-fight [137 204])
                                                             (actions/walk-to entities :ego [158 110] :skip-type :end))
                            :cursor :down}
                 :ladder-area-1 (make-ladder-area [123 100 167 199])
--- a/desktop/src-common/advent/screens/rooms/tongue_fight.clj
+++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj
@@ -146,7 +146,9 @@
        tongue-idle (utils/make-anim-seq atlas "tongue-idle/tongue-idle" [135 145] 0.16 (range 5))
        tongue-windup (utils/make-anim-seq atlas "tongue-windup" [135 145] 0.16 [0 1 2 3 2 1 2 3 2 1 0 ])
        tongue-attack (utils/make-anim-seq atlas "tongue-attack" [135 145] 0.08 [0 1 2 2 2 2 2 2 2 2 2 2])
-        tongue-attack-hit (utils/make-anim-seq atlas "tongue-attack-hit" [135 145] 0.1 (range 7))]
+        tongue-attack-hit (utils/make-anim-seq atlas "tongue-attack-hit" [135 145] 0.1 (range 7))
+        falling-bg (utils/make-anim-seq atlas "falling-bg" [128 128] 0.1 (range 6))
+        sword-spin (utils/make-anim-seq atlas "sword-spin" [300 238] 0.1 (range 6))]
    

    (rooms/make :name "Tongue Fight"
@@ -248,6 +250,30 @@
                                        :idle heart
                                        :beat beat
                                        :anim-start 0)
+                           :falling-bg (assoc (animation->texture screen falling-bg)
+                                        :x 0
+                                        :y 0
+                                        :width 320
+                                        :height 240
+                                        :baseline 320
+                                        :opacity 1
+                                        :anim falling-bg
+                                        
+                                        
+                                        :anim-start 0)
+                           :sword-spin (assoc (animation->texture screen sword-spin)
+                                              :x 160
+                                              :y 120 
+                                              :origin-x 150
+                                              :origin-y 120
+                                              :width 300
+                                              :height 238
+                                              :baseline 321
+                                              :opacity 1
+                                              :anim sword-spin
+                                              
+                                              
+                                              :anim-start 0)
                           :tongue (assoc (animation->texture screen tongue-idle)
                                                :x 211
                                                :y 40