diff --git a/desktop/resources/inside-cafeteria/background.png b/desktop/resources/inside-cafeteria/background.png index ae35bac1..7049c405 100644 Binary files a/desktop/resources/inside-cafeteria/background.png and b/desktop/resources/inside-cafeteria/background.png differ diff --git a/desktop/resources/inside-cafeteria/knights.png b/desktop/resources/inside-cafeteria/knights.png new file mode 100644 index 00000000..ae531049 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knights.png differ diff --git a/desktop/resources/inside-cafeteria/ladder-guard-2.png b/desktop/resources/inside-cafeteria/ladder-guard-2.png new file mode 100644 index 00000000..4a9ecfb2 Binary files /dev/null and b/desktop/resources/inside-cafeteria/ladder-guard-2.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 6099bb07..1b734fba 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -134,12 +134,17 @@ {:run #(actions/respond entities % "Goodbye.")}]})) (defn make [screen] - (let [warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) - warriors-stand (animation 0.2 (for [i [0 0 0 0 0 0 1 1 0 0 1 1 1 0 0 2 2 2 2 3 3 3 0 0 0 2 2 2 ]] + (let [#_#_warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) + #_#_warriors-stand (animation 0.2 (for [i [0 0 0 0 0 0 1 1 0 0 1 1 1 0 0 2 2 2 2 3 3 3 0 0 0 2 2 2 ]] (aget warriors-stand-sheet 0 i))) - ladder-guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) - 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]] + #_#_ladder-guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + #_#_ladder-guard-stand (animation 0.1 [(aget ladder-guard-sheet 0 0)]) + ladder-guard-stand (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) + ladder-guard-talk (animation 0.1 [ (texture "inside-cafeteria/ladder-guard-2.png")]) + warriors-stand (animation 0.1 [ (texture "inside-cafeteria/knights.png")]) + + + #_#_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