diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 01539377..da42871e 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -168,6 +168,9 @@ "Goodbye." {:run #(actions/respond entities % :ladder-guard "Goodbye.")}]})) +(defn pace [xs speed] + (mapcat #(repeat (- 4 speed) %) xs)) + (defn make [screen] (let [#_#_warriors-stand-sheet (texture! (utils/get-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 ]] @@ -183,16 +186,16 @@ #_#_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-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 - (repeat 15 [7 8]) - (repeat 15 [9]) - (repeat 10 [7 8]) - (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-win (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.025 (flatten [(pace [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] 0) + (pace (flatten (repeat 15 [7 8])) 0) + (pace (flatten (repeat 15 [9])) 0) + (pace (flatten (repeat 15 [7 8])) 1) + (pace (flatten (repeat 15 [9])) 0) + (pace (flatten (repeat 15 [7 8])) 2) + (pace (flatten (repeat 15 [9])) 0) + (pace (flatten (repeat 15 [10 11])) 3) + (pace (flatten (repeat 15 [9])) 0) + (pace [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] 0)])) 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" diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 1085b983..05ecf6f6 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -422,7 +422,7 @@ :ego "It's Angus, Remington's buff bull." :ego "He's used in all of the town's rodeos." :ego "Farmer Doug feeds him wild high-protein grass diet to keep him in tiptop shape." - :ego "He looks mean, I'd rather not pet him.")) + :ego "Phew! His stench has attracted a lot of flies.")) :scripts #(condp = % :grass (actions/get-script entities (actions/walk-to entities :ego [168 150] :face :right)