diff --git a/desktop/resources/inside-house/background.png b/desktop/resources/inside-house/background.png new file mode 100644 index 00000000..948b0e8c Binary files /dev/null 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 new file mode 100644 index 00000000..bedcaa5e Binary files /dev/null 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 new file mode 100644 index 00000000..181ae0b4 Binary files /dev/null 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 new file mode 100644 index 00000000..4e0f1447 Binary files /dev/null and b/desktop/resources/inside-house/desk.png differ diff --git a/desktop/resources/inside-house/sillhoute.png b/desktop/resources/inside-house/sillhoute.png new file mode 100644 index 00000000..93c1ea45 Binary files /dev/null and b/desktop/resources/inside-house/sillhoute.png differ diff --git a/desktop/resources/inventory.psd b/desktop/resources/inventory.psd index b42c0bf5..428e0181 100644 Binary files a/desktop/resources/inventory.psd and b/desktop/resources/inventory.psd differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index dd149737..db1ee811 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -155,13 +155,24 @@ (aget peddler-sheet 0 i))) peddler-stand (animation 0.2 (for [i (flatten [(repeat 5 0) 6])] (aget peddler-sheet 0 i)))] - {:outside-house + {:inside-house + (make-background :interactions + { + } + :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 {} + :collision "inside-house/collision.png" + :scale-fn (scaler-fn-with-baseline 110 0.10 1.75)) + :outside-house (make-background :interactions {:door {:box [258 100 281 160] :script (actions/get-script entities (actions/walk-to entities :ego [262 88]) - (actions/talk entities :ego (str "Anyone home?")))} + (actions/talk entities :ego (str "Anyone home?")) + (actions/transition-background entities :inside-house [237 0]))} :sword {:box [274 55 305 88] :script (actions/get-script entities