diff --git a/desktop/resources/inside-cafeteria/hands-fight.png b/desktop/resources/inside-cafeteria/hands-fight.png new file mode 100644 index 00000000..0d21ce9d Binary files /dev/null and b/desktop/resources/inside-cafeteria/hands-fight.png differ diff --git a/desktop/resources/inside-castle/Untitled.png b/desktop/resources/inside-castle/Untitled.png new file mode 100644 index 00000000..0d21ce9d Binary files /dev/null and b/desktop/resources/inside-castle/Untitled.png differ diff --git a/desktop/resources/inside-castle/hands-fight.png b/desktop/resources/inside-castle/hands-fight.png new file mode 100644 index 00000000..0d21ce9d Binary files /dev/null and b/desktop/resources/inside-castle/hands-fight.png differ diff --git a/desktop/resources/inside-castle/hands.pxa/0.pxi b/desktop/resources/inside-castle/hands.pxa/0.pxi new file mode 100644 index 00000000..57913251 Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/0.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/1.pxi b/desktop/resources/inside-castle/hands.pxa/1.pxi new file mode 100644 index 00000000..4e5770a7 Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/1.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/2.pxi b/desktop/resources/inside-castle/hands.pxa/2.pxi new file mode 100644 index 00000000..23f929ef Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/2.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/3.pxi b/desktop/resources/inside-castle/hands.pxa/3.pxi new file mode 100644 index 00000000..9659bc0c Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/3.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/4.pxi b/desktop/resources/inside-castle/hands.pxa/4.pxi new file mode 100644 index 00000000..8e81e710 Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/4.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/5.pxi b/desktop/resources/inside-castle/hands.pxa/5.pxi new file mode 100644 index 00000000..ce09c2e0 Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/5.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/6.pxi b/desktop/resources/inside-castle/hands.pxa/6.pxi new file mode 100644 index 00000000..18d5add7 Binary files /dev/null and b/desktop/resources/inside-castle/hands.pxa/6.pxi differ diff --git a/desktop/resources/inside-castle/hands.pxa/CelData.plist b/desktop/resources/inside-castle/hands.pxa/CelData.plist new file mode 100644 index 00000000..8f638e26 --- /dev/null +++ b/desktop/resources/inside-castle/hands.pxa/CelData.plist @@ -0,0 +1,34 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 25d076de..28a13050 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -56,6 +56,7 @@ (actions/transition-music entities :town-2 :fight) (actions/add-entity entities :fight (get-in @entities [:room :fight])) + (actions/add-entity entities :hands-fight (get-in @entities [:room :hands-fight])) (actions/do-dialogue entities :warriors "[Todo animation here]" :warriors "You lost, young master. Go hitherto, unto thy gym."))))} @@ -129,7 +130,7 @@ ladder-guard-stand (animation 0.1 [(aget ladder-guard-sheet 0 0)]) ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget ladder-guard-sheet 0 i))) - ] + hands-fight-win (utils/make-anim "inside-cafeteria/hands-fight.png" [104 104] 0.075 [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])] (rooms/make :music :town-1 :interactions {:right-dir {:box [300 0 320 120] @@ -163,6 +164,12 @@ (actions/talk entities :ladder-guard "Do not toucheth, young sire.")))} :collision "inside-cafeteria/collision.png" :fight (make-fight-entity) + :hands-fight (assoc (animation->texture screen hands-fight-win) + :x 122 + :y 38 + :baseline 1001 + :anim hands-fight-win + :anim-start 0) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50) :apply-state (fn [entities] (as-> entities entities