antique has an emote.

This commit is contained in:
2015-07-27 19:49:16 -07:00
parent 151421da6a
commit b251b2f75b
14 changed files with 70 additions and 15 deletions

View File

@@ -57,11 +57,17 @@
:shopkeep "If you really met him, you'll have to prove it."
:shopkeep "What is my son's name?"))
:choices ["... Bud?"
{:run #(actions/respond entities % :shopkeep "No. *sigh* That's not it.")}
{:run #(do (actions/respond entities % :shopkeep "No. That's not it.")
(actions/play-animation entities :shopkeep :sigh)
(actions/do-dialogue entities :ego "Oh. I must be thinking of another long lost son."))}
"... Steve?"
{:run #(actions/respond entities % :shopkeep "No. *sigh* That's not it.")}
{:run #(do (actions/respond entities % :shopkeep "No. That's not it.")
(actions/play-animation entities :shopkeep :sigh)
(actions/do-dialogue entities :ego "Oh. I must be thinking of another long lost son."))}
"... Bob?"
{:run #(actions/respond entities % :shopkeep "No. *sigh* That's not it.")}
{:run #(do (actions/respond entities % :shopkeep "No. That's not it.")
(actions/play-animation entities :shopkeep :sigh)
(actions/do-dialogue entities :ego "Oh. I must be thinking of another long lost son."))}
(when ((get-in @entities [:state :clues]) :name)
"Herb.")
{:run #(do (actions/respond entities %
@@ -71,11 +77,12 @@
(actions/update-state entities (fn [s] (assoc s :allowed-to-keep-teddy? true))))}]}]}
"How's life in the antique shop biz?"
{:run #(actions/respond entities %
:shopkeep "Pretty lonely."
:shopkeep "My long lost son used to help me run this shop, but he's been gone for five years now."
:shopkeep "I've been couped up in here by myself ever since."
:shopkeep "Now all I have is this grandfather clock to keep me company.")
{:run #(do (actions/respond entities %
:shopkeep "Pretty lonely."
:shopkeep "My long lost son used to help me run this shop, but he's been gone for five years now."
:shopkeep "I've been couped up in here by myself ever since.")
(actions/play-animation entities :shopkeep :sigh)
(actions/do-dialogue entities :shopkeep "Now all I have is this grandfather clock to keep me company."))
:choices actions/previous-choices}
"Nevermind." {:run #(actions/respond entities % :shopkeep "Feel free to look around.")}]}))
@@ -90,6 +97,7 @@
(aget shopkeep-sheet 0 i)))
shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]]
(aget shopkeep-sheet 0 i)))
shopkeep-sigh (utils/make-anim "inside-antique/antique-sigh.png" [22 21] 0.2 (flatten [ (range 9) 0 0 0 0 0 0 ]))
portrait (rooms/make-entity :portrait (assoc (texture "inside-antique/portrait.png")
:x 112
:y 114
@@ -176,18 +184,21 @@
:scale-y 1.6
:talk-color (color 0.2 1.0 0.2 1.0)
:talk shopkeep-talk
:sigh shopkeep-sigh
:anim-merges {shopkeep-sigh {:origin-x 9}
:default {:origin-x 9}}
:script (actions/get-script entities (do-antique-dialogue entities))
:scripts #(condp = %
:teddy (actions/get-script entities
(if (get-in @entities [:state :allowed-to-keep-teddy?])
(actions/talk entities :shopkeep "Please give the teddy bear to Herb when you see him.")
(actions/talk entities :shopkeep "That belonged to my long lost son.")))
:portrait (actions/get-script entities
(if (get-in @entities [:state :allowed-to-keep-teddy?])
(actions/talk entities :shopkeep "That's a portrait of my little Herb. "
:shopkeep "Please put it back before you leave." )
(actions/talk entities :shopkeep "That's a portrait of my long lost son. "
:shopkeep "Please put it back before you leave.")))
:portrait (actions/get-script entities
(if (get-in @entities [:state :allowed-to-keep-teddy?])
(actions/talk entities :shopkeep "That's a portrait of my little Herb. "
:shopkeep "Please put it back before you leave." )
(actions/talk entities :shopkeep "That's a portrait of my long lost son. "
:shopkeep "Please put it back before you leave.")))
(actions/get-script entities
(actions/talk entities :shopkeep "No thanks, sonny.")))
)