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

addded portrait back.

Browse Source
This commit is contained in:
Bryce Covert
2014-11-22 15:32:59 -08:00
parent 0f8b5b5449
commit 526ea9848b
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
desktop/src-common/advent/screens/rooms/inside_antique.clj
View File

@@ -83,7 +83,17 @@
shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0 1])] shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0 1])]
(aget shopkeep-sheet 0 i))) (aget shopkeep-sheet 0 i)))
shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]] shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]]
(aget shopkeep-sheet 0 i)))] (aget shopkeep-sheet 0 i)))
portrait (rooms/make-entity :portrait (assoc (texture "inside-antique/portrait.png")
:x 109
:y 120
:baseline 120
:script (actions/get-script entities
(actions/walk-to entities :ego [136 80] :face :left)
(actions/play-animation entities :ego :reach)
(actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.")
(actions/remove-entity entities :portrait)
(actions/give entities :portrait))))]
(rooms/make :music :inside-antique (rooms/make :music :inside-antique
:interactions :interactions
{:down {:box [60 0 290 25] {:down {:box [60 0 290 25]
@@ -94,6 +104,7 @@
(actions/talk entities :shopkeep "Excuse me sonny. Please return my belongings before you leave.") (actions/talk entities :shopkeep "Excuse me sonny. Please return my belongings before you leave.")
(actions/walk-to entities :ego [136 80] :face :left) (actions/walk-to entities :ego [136 80] :face :left)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/add-entity entities :portrait portrait)
(actions/remove-item entities :portrait)) (actions/remove-item entities :portrait))
(actions/walk-to entities :ego [222 3]) (actions/walk-to entities :ego [222 3])
(actions/transition-background entities :inside-castle [182 90]))} (actions/transition-background entities :inside-castle [182 90]))}
@@ -112,16 +123,7 @@
:script (actions/get-script entities (do-antique-dialogue entities)) :script (actions/get-script entities (do-antique-dialogue entities))
) )
:stand) :stand)
:portrait (assoc (texture "inside-antique/portrait.png") :portrait portrait
:x 109
:y 120
:baseline 120
:script (actions/get-script entities
(actions/walk-to entities :ego [136 80] :face :left)
(actions/play-animation entities :ego :reach)
(actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.")
(actions/remove-entity entities :portrait)
(actions/give entities :portrait)))
:bowl (assoc (texture "inside-antique/bowl.png") :bowl (assoc (texture "inside-antique/bowl.png")
:x 155 :x 155
:y 125 :y 125