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

more antique shop tweaking.

Browse Source
This commit is contained in:
Remington Covert
2014-12-10 21:56:33 -08:00
parent 07e4181889
commit c0ef31966e
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/inside-antique/background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 58 KiB

BIN
desktop/resources/inside-antique/beard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

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

@@ -100,6 +100,7 @@
(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))))
beard (utils/make-anim "inside-antique/beard.png" [12 32] 0.5 [0 1 0 2])
teddy (assoc (texture "inside-antique/teddy.png")
:x 250
:y 80
@@ -143,7 +144,25 @@
(actions/walk-to entities :ego [151 60] :face :right)
(actions/play-animation entities :ego :hold-up-to-window)
(actions/talk entities :ego "The portrait says 'Herb' on the back.")
(actions/update-state entities (fn [state] (update-in state [:clues] #(conj % :name)) )))}}}
(actions/update-state entities (fn [state] (update-in state [:clues] #(conj % :name)) )))}}
:grandfather-clock {:box [50 137 90 185]
:script (actions/get-script entities
(actions/do-dialogue entities :ego "Cool grandfather clock!"
:shopkeep "It's quite the exquisit piece, isn't it?"))}
:shelf {:box [0 40 48 210]
:script (actions/get-script entities
(actions/walk-to entities :ego [55 35])
(actions/talk entities :ego "All of these trinkets seem too bulky to fit in my pack."))}
:flowers {:box [171 125 181 155]
:script (actions/get-script entities
(actions/talk entities :ego "I've never been a fan of flowers."))}
:lian {:box [272 100 313 160]
:script (actions/get-script entities
(actions/walk-to entities :ego [220 35] :face :right)
(actions/do-dialogue entities
:ego "It's a tapestry of Rupert the Lion!"
:ego "He's the town of Remington's mascot."))}
}
:layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)]
:entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 137 :y 128 :baseline 112
:stand shopkeep-stand
@@ -156,6 +175,12 @@
)
:stand)
:portrait portrait
:beard (assoc (animation->texture screen beard)
:anim beard
:anim-start 0
:x 65
:y 109
:baseline 120)
:bowl (assoc (texture "inside-antique/bowl.png")
:x 155
:y 125