new fight incorporated.

desktop/src-common/advent/screens/rooms/inside_cafeteria.clj

@@ -12,9 +12,11 @@
             [play-clj.g2d :refer :all]))
 
 (defn make-fight-entity []
-  (assoc (utils/get-texture "inside-cafeteria/fight.png")
+  (assoc (utils/get-texture "black.png")
     :x 0
     :y 0
+    :scale-x 21
+    :scale-y 21
     :baseline 1000))
 
 (defn play-battle [entities anim]
@@ -181,11 +183,17 @@
 
         #_#_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-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.1 (flatten [0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 0 1 1 1 1 0 0 0 4 0 1  1 1 1 1  1 1 1 4 0 4 0 4 0 4 5 5 5 5 5 5 5 5 5 5 5 5
-        hands-fight-win (utils/make-anim-seq "inside-cafeteria/hands-fight.png" [104 104] 0.075 (flatten (concat 
+                                                                                                                 (repeat 15 [7 8])
-                                                                                                      base-fight
+                                                                                                                 (repeat 15 [9])
-                                                                                                      [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])))
+                                                                                                                 (repeat 10 [7 8])
-        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]))]
+                                                                                                                 (repeat 15 [9])
+                                                                                                                 (repeat 5 [7 8])
+                                                                                                                 (repeat 15 [9])
+                                                                                                                 (repeat 10 [10 11])
+                                                                                                                 (repeat 15 [9])
+                                                                                                                 0 0 0 0  2 1 1 2 2 1 1 2 2 2 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-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.1 (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
@@ -241,8 +249,10 @@
                 :collision "inside-cafeteria/collision.png"
                 :fight (make-fight-entity) 
                 :hands-fight (assoc (animation->texture screen hands-fight-win)
-                               :x 121
+                               :origin-x 128
-                               :y 37
+                               :origin-y 96
+                               :x 150
+                               :y 120
                                :baseline 1001
                                :win hands-fight-win
                                :lose hands-fight-lose)