looking pretty good as long as nothing is overriden.

This commit is contained in:
Bryce Covert
2017-02-09 21:37:03 -08:00
parent 99de5ea972
commit 592a609129
2 changed files with 83 additions and 33 deletions

View File

@@ -309,18 +309,20 @@
(cond-> entities
true (assoc-in [:label :text] hover-text)
utils/mobile? (update-in [:label] assoc :x (* 20 4 utils/ui-scale) :y 12)
utils/mobile? (update-in [:label] assoc :x (* 52 4 utils/ui-scale) :y 12)
(and utils/mobile? (or item-cursor action-cursor)
(= :main action-cursor))
(assoc :action-icon nil)
(and utils/mobile? (or item-cursor action-cursor)
(not= :main action-cursor))
item-cursor
(assoc :action-icon nil)
(and utils/mobile? action-cursor (not item-cursor) (not= :main action-cursor))
(assoc-in [:action-icon]
(assoc
(texture (aget all-icons 0 (.indexOf utils/+all-cursors+ (or item-cursor action-cursor))))
:x 4 :y 4
:x (* utils/ui-scale 32 4) :y (* utils/ui-scale 4)
:width (* 18 4 utils/ui-scale) :height (* 16 4 utils/ui-scale)))
(not utils/mobile?) (update-in [:label] assoc :x scene-x :y scene-y)