diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 1b734fba..c607cbdb 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -141,7 +141,8 @@ #_#_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")]) + warriors-stand (utils/make-anim "inside-cafeteria/knights-stand.png" [74 97] 0.6 (take 100 (repeatedly #(rand-int 10)))) + #_#_ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] @@ -165,7 +166,7 @@ } :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0)] :entities { - :warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 5 :y 9 :baseline 180 + :warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 8 :y 19 :baseline 180 :left {:stand (utils/flip warriors-stand) :talk (utils/flip warriors-stand)} @@ -180,7 +181,7 @@ (actions/do-dialogue entities :warriors "We are warriors. We coveteth not earthly possessions.")))) :stand) - :ladder-guard (actions/start-animation screen (assoc (animation->texture screen ladder-guard-stand) :x 202 :y 85 :baseline 155 + :ladder-guard (actions/start-animation screen (assoc (animation->texture screen ladder-guard-stand) :x 180 :y 70 :baseline 170 :stand ladder-guard-stand :talk ladder-guard-talk :talk-color (color 0.2 0.6 1.0 1.0) @@ -192,7 +193,7 @@ "Do not durst telleth a soul about that ladder!" "No thank you, young sire.")))) :stand) - :ladder (assoc (texture "inside-cafeteria/ladder.png") :x 250 :y 85 :baseline 155 + :ladder (assoc (texture "inside-cafeteria/ladder.png") :x 205 :y 70 :baseline 170 :script (actions/get-script entities (actions/talk entities :ladder-guard "Do not toucheth, young sire.")))} :collision "inside-cafeteria/collision.png" @@ -203,7 +204,7 @@ :baseline 1001 :win hands-fight-win :lose hands-fight-lose) - :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50) + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.3) :apply-state (fn [entities] (as-> entities entities (if (actions/has-item? entities :ladder)