fixing visual glitches.

2015-11-06 08:29:08 -08:00
parent 4328db3303
commit 6457aff70d
26 changed files with 1554 additions and 1512 deletions
--- a/desktop/asset-work/ego/stand.png
+++ b/desktop/asset-work/ego/stand.png
--- a/desktop/asset-work/ego/stand.pxa/0.pxi
+++ b/desktop/asset-work/ego/stand.pxa/0.pxi
--- a/desktop/asset-work/ego/stand.pxa/1.pxi
+++ b/desktop/asset-work/ego/stand.pxa/1.pxi
--- a/desktop/asset-work/ego/stand.pxa/2.pxi
+++ b/desktop/asset-work/ego/stand.pxa/2.pxi
--- a/desktop/asset-work/ego/stand.pxa/3.pxi
+++ b/desktop/asset-work/ego/stand.pxa/3.pxi
--- a/desktop/asset-work/ego/stand.pxa/4.pxi
+++ b/desktop/asset-work/ego/stand.pxa/4.pxi
--- a/desktop/asset-work/ego/stand.pxa/5.pxi
+++ b/desktop/asset-work/ego/stand.pxa/5.pxi
--- a/desktop/asset-work/ego/stand.pxa/6.pxi
+++ b/desktop/asset-work/ego/stand.pxa/6.pxi
--- a/desktop/asset-work/inside-cafeteria/hands-fight-1.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-1.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-2.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-2.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-3.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-3.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-4.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-4.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-5.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-5.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-6.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-6.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight-7.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight-7.png
--- a/desktop/asset-work/inside-cafeteria/hands-fight.png
+++ b/desktop/asset-work/inside-cafeteria/hands-fight.png
--- a/desktop/resources/packed/pack.atlas
+++ b/desktop/resources/packed/pack.atlas
--- a/desktop/resources/packed/pack.png
+++ b/desktop/resources/packed/pack.png
--- a/desktop/resources/packed/pack2.png
+++ b/desktop/resources/packed/pack2.png
--- a/desktop/resources/packed/pack3.png
+++ b/desktop/resources/packed/pack3.png
--- a/desktop/resources/packed/pack4.png
+++ b/desktop/resources/packed/pack4.png
--- a/desktop/resources/packed/pack5.png
+++ b/desktop/resources/packed/pack5.png
--- a/desktop/resources/packed/pack6.png
+++ b/desktop/resources/packed/pack6.png
--- a/desktop/resources/packed/pack7.png
+++ b/desktop/resources/packed/pack7.png
--- a/desktop/resources/packed/pack8.png
+++ b/desktop/resources/packed/pack8.png
--- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
@@ -180,10 +180,10 @@
        #_#_ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]]
                                           (aget ladder-guard-sheet 0 i)))
        base-fight (repeat 3 [0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 1 0 1 0 1 0 0 0 0 1 1 1 1 0 0 0 4 0 1  2 2 2 2 2 2 1 1 1 1  2 2 2 2 2 2 1 1 1 0 0 0 1 1 2 2 2 1 1 1 1 0 0 0 0 0 0 0 0 1 1 0 1 0 4 0 1 0 4 0 4 0 4 0 4 0 4 4 4 4 4 4 5 5 5 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0 ])
-        hands-fight-win (utils/make-anim "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten (concat 
+        hands-fight-win (utils/make-anim-seq "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten (concat 
                                                                                                      base-fight
                                                                                                      [1 1 1 1 1 0 1 0 1 2 2 1 1 2 2 1 1 2 2 2 1 1 0 1 1 2 2 2  2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3])))
-        hands-fight-lose (utils/make-anim "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 5 5 5  6 6 6 6 6 6]))]
+        hands-fight-lose (utils/make-anim-seq "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 5 5 5  6 6 6 6 6 6]))]
    (rooms/make :music :town-1
                :name "Cafeteria"
                :interactions
@@ -239,8 +239,8 @@
                :collision "inside-cafeteria/collision.png"
                :fight (make-fight-entity) 
                :hands-fight (assoc (animation->texture screen hands-fight-win)
-                               :x 122
+                               :x 121
-                               :y 38
+                               :y 37
                               :baseline 1001
                               :win hands-fight-win
                               :lose hands-fight-lose)