diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj index b5a260a6..398bbe9d 100644 --- a/desktop/src-common/advent/screens/rooms.clj +++ b/desktop/src-common/advent/screens/rooms.clj @@ -4,10 +4,10 @@ (defn make-entity [id entity] (merge entity {:mouse-in? (fn [entities x y] - (let [{entity-x :x entity-y :y width :width height :height region :object} (get-in entities [:room :entities id]) + (let [{entity-x :x entity-y :y width :width scale-x :scale-x scale-y :scale-y height :height region :object} (get-in entities [:room :entities id]) width (or width (.getRegionWidth region)) height (or height (.getRegionHeight region))] - ((zone/box entity-x entity-y (+ entity-x width) (+ entity-y height)) x y)))} + ((zone/box entity-x entity-y (+ entity-x (* width (or 1 scale-x))) (+ entity-y (* height (or scale-y 1)))) x y)))} (when (:script entity) {:get-script (fn [cursor [x y]] (if (= :main cursor) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index bc82818b..1c351dad 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -124,7 +124,15 @@ (if (get-in @entities [:room :entities :wizard]) (actions/talk entities :wizard "Don't touch my MagiSafe!!") (open-safe entities)))} - } + :knight {:box [71 70 102 190] + :script (actions/get-script entities + (actions/talk entities :ego "Maybe when I am an older knight, Gandarf will give me his armor!"))} + :shelves {:box [215 100 320 220] + :script (actions/get-script entities + (actions/talk entities :ego "His shelves are full of books and strange ingredients."))} + :window {:box [119 120 203 190] + :script (actions/get-script entities + (actions/talk entities :ego "It's a really big window!"))}} :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)]