This commit is contained in:
Bryce Covert
2015-11-02 09:21:22 -08:00
parent 24d8fa7d23
commit 7aa2db4261
11 changed files with 73 additions and 73 deletions

View File

@@ -130,7 +130,7 @@
(actions/talk entities :game-player "What is it? I'm busy!" :anim :talk-down)
(Thread/sleep 200)
(brian-pause-from-work entities)
(actions/talk entities :game-player "Oh, it's you Tick.")
(actions/talk entities :game-player "Oh, it's you, Tick.")
(actions/present-choices entities
{:choices ["Whatcha doing?"
{:run #(actions/respond entities %
@@ -161,7 +161,7 @@
:game-player "My history books.")
:choices actions/previous-choices}
"... and what?"
{:run #(actions/respond entities % :game-player "Caligraphy."
{:run #(actions/respond entities % :game-player "Calligraphy."
:game-player "With all this writing, I get plenty of practice!")
:choices actions/something-else}
]}
@@ -186,7 +186,7 @@
#(actions/respond entities m :game-player "How about 'Proton: A Life'?"
:game-player "It's a self-help book."
:game-player "It shows you how to be positive when surrounded by a cloud of negativity!")
#(actions/respond entities m :game-player "Have you read my book, 'Disection for Dummies'?"
#(actions/respond entities m :game-player "Have you read my book, 'Dissection for Dummies'?"
:game-player "It gets right to the heart of the matter.")
#(actions/respond entities m :game-player "Have you read 'The Elements: From H to Z'?"
:game-player "It was periodically written on this very table!")])))
@@ -227,7 +227,7 @@
(when (= :balloon (get-in @entities [:state :current-riddle]))
"What was that riddle again?")
{:run #(actions/respond entities %
:game-player "'Filled with air, light as a feather,\nIf you want to keep it, best have a tether.'")
:game-player "'Filled with air, light as a feather,\nWant to keep it? Best have a tether.'")
:choices actions/previous-choices}
(when (= :frog-legs (get-in @entities [:state :current-riddle]))
@@ -283,7 +283,7 @@
(actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities
:bloodclot-head "I am Bloodclot, the goblin!"
:bloodclot-head "I've spent last 100 years training for this day."
:bloodclot-head "I've spent the last 100 years training for this day."
:bloodclot-head "The day when I must best the worthiest of knights in battle."
:bloodclot-head "But I had never expected my foe to be so..."
:bloodclot-head "... appetizing."
@@ -300,7 +300,7 @@
(actions/do-dialogue entities
:bloodclot-head "'Fight he must for one more test,\nHe will die if not the best.'"
:bloodclot-head "Ring any bells?"
:bloodclot-head "Face it kiddo, you're no match for me, or my appetite."
:bloodclot-head "Face it, kiddo, you're no match for me, or my appetite."
:bloodclot-head "And Georgia McGorgeous would never go for such a cowardly knight anyhow."
:bloodclot-head "Let the feast begin."))
@@ -404,7 +404,7 @@
(actions/talk entities :ego "I already have the Sword of Blergh!")
(do (actions/talk entities :ego "That's the coolest sword I've ever seen!!")
(actions/walk-to entities :ego [45 97] :face :left)
(actions/talk entities :ego "If I pull it out I can become a great knight!")
(actions/talk entities :ego "If I pull it out, I can become a great knight!")
(let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))
obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))]
(if (= #{} missing-items)
@@ -548,7 +548,7 @@
(actions/do-dialogue entities
:ego "Wool is white as snow, but it keeps you warm."
:game-player "Good job, Tick! Now for your second riddle:"
:game-player "'Filled with air, light as a feather,\nIf you want to keep it, best have a tether.'"
:game-player "'Filled with air, light as a feather,\nWant to keep it? Best have a tether.'"
:ego "Okay. Be back soon.")
(brian-get-to-work entities))
(actions/do-dialogue entities :ego "What about this?" :game-player "No, that's not the solution. Keep looking.")))