notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progress on making dialogue appearance better.

Browse Source
This commit is contained in:
Remington Covert
2014-12-16 22:56:07 -08:00
parent 23d5828830
commit 044dd1f301
6 changed files with 184 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
desktop/src-common/advent/actions.clj
View File

@@ -250,11 +250,20 @@
(let [_ (swap! initial-time #(or % (:total-time screen)))
target-y (get-in entities [:room :entities target-id :y])
target-x (get-in entities [:room :entities target-id :x])
width (or (get-in entities [:room :entities target-id :width])
(.getRegionWidth (get-in entities [:room :entities target-id :object])))
origin-x (get-in entities [:room :entities target-id :origin-x])
target-x (if (nil? origin-x) (+ target-x (/ width 2)) target-x )
height (or (get-in entities [:room :entities target-id :height])
(.getRegionHeight (get-in entities [:room :entities target-id :object])))
scaled (get-in entities [:room :entities target-id :scaled])
scale-fn (get-in entities [:room :scale-fn])
scale (scale-fn [target-x target-y])
height (* scale 36)]
scale (if scaled
(scale-fn [target-x target-y])
1)
height (* scale height)]
(screen! dialogue/talking-screen :on-talk :text text
:x (get-in entities [:room :entities target-id :x]) :y (+ (get-in entities [:room :entities target-id :y]) height)
:x target-x :y (+ (get-in entities [:room :entities target-id :y]) height)
:color (get-in entities [:room :entities target-id :talk-color])
:target-id target-id