diff --git a/desktop/resources/inside-house/background.png b/desktop/resources/inside-house/background.png index 948b0e8c..e19da54e 100644 Binary files a/desktop/resources/inside-house/background.png and b/desktop/resources/inside-house/background.png differ diff --git a/desktop/resources/inside-house/background.psd b/desktop/resources/inside-house/background.psd index bedcaa5e..742f2fdf 100644 Binary files a/desktop/resources/inside-house/background.psd and b/desktop/resources/inside-house/background.psd differ diff --git a/desktop/resources/inside-house/collision.png b/desktop/resources/inside-house/collision.png index 6ceb6641..fa5aeb4f 100644 Binary files a/desktop/resources/inside-house/collision.png and b/desktop/resources/inside-house/collision.png differ diff --git a/desktop/resources/inside-house/desk.png b/desktop/resources/inside-house/desk.png index 4e0f1447..fb3b36b9 100644 Binary files a/desktop/resources/inside-house/desk.png and b/desktop/resources/inside-house/desk.png differ diff --git a/desktop/resources/wizard.png b/desktop/resources/wizard.png new file mode 100644 index 00000000..95d2f95b Binary files /dev/null and b/desktop/resources/wizard.png differ diff --git a/desktop/resources/wizard.psd b/desktop/resources/wizard.psd new file mode 100644 index 00000000..9fe19a9c Binary files /dev/null and b/desktop/resources/wizard.psd differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index e69f703b..38cece3b 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -154,7 +154,9 @@ peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])] (aget peddler-sheet 0 i))) peddler-stand (animation 0.2 (for [i (flatten [(repeat 5 0) 6])] - (aget peddler-sheet 0 i)))] + (aget peddler-sheet 0 i))) + wizard (texture "wizard.png") + _ (texture! wizard :flip true false)] {:inside-house (make-background :interactions {:down-dir {:box [151 0 320 20] :script (actions/get-script entities @@ -164,7 +166,7 @@ :layers [(assoc (texture "inside-house/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240)] - :entities {} + :entities {:wizard (assoc wizard :x 228 :y 80 :baseline 160 :scale-x 1.75 :scale-y 1.75)} :collision "inside-house/collision.png" :scale-fn (scaler-fn-with-baseline 110 0.10 1.75)) :outside-house