diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index eefcb0d4..255d0fc3 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -77,6 +77,8 @@ :x x :y y :scale-x 4 :scale-y 4 + :origin-x 0 + :origin-y 0 :item item :box (zone/box (- offset-x padding) (- offset-y padding) (+ offset-x item-width padding) (+ offset-y item-width padding)))))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 516f3155..b386d92c 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -690,8 +690,7 @@ (doseq [e (sort-by :baseline all-entities)] (if (:parallax e) (render-parallax screen e) - (render! screen [e]))) - + (render! screen [e]))) entities))) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 74b231bb..6e871a6f 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -83,7 +83,9 @@ (pixmap! :get-pixel x (- 240 y)) color (.r))] - (+ (* percent-complete (- maximum-size minimum-size)) minimum-size))))) + (if (< y 0) + maximum-size + (+ (* percent-complete (- maximum-size minimum-size)) minimum-size)))))) (defn dist [x1 y1 x2 y2 & {:keys [y-sign x-sign]}] (let [y-sign (or y-sign 1.0)