including dialogue tweaks.

This commit is contained in:
Bryce Covert
2015-11-06 09:55:03 -08:00
parent 6457aff70d
commit e45771a678
6 changed files with 63 additions and 64 deletions

View File

@@ -190,7 +190,7 @@
(defn do-prophecy [entities]
{:run #(do (actions/respond entities %
:wizard "Well let me remind you."
:wizard "Well, let me remind you."
:wizard "'On the day when it shall be pulled,\nWith much strength a knight will take hold.'"))
:choices
["Is this almost over?"
@@ -199,7 +199,7 @@
:wizard "Patience, boy."
:wizard "'Courage will he need,\nWisdom he shall heed.'"
:wizard "'A final test remains, behold!'"
:wizard "If this is truely your quest, then I will help you. "
:wizard "If this is truly your quest, then I will help you. "
:ego "So you're my friend now, Gandarf?"
:wizard "No."))}
"*cough* *cough* *ahem*"
@@ -208,20 +208,20 @@
:wizard "Excuse you. Moving on..."
:wizard "'Courage will he need,\nWisdom he shall heed.'"
:wizard "'A final test remains, behold!'"
:wizard "If this is truely your quest, then I will help you. "
:wizard "If this is truly your quest, then I will help you. "
:ego "So you're my friend now, Gandarf?"
:wizard "No.")
(utils/save @entities :autosave "Autosave"))}]})
(defn wizard-dialogue [entities]
(if (get-in @entities [:state :has-met-gandarf?])
(do (actions/do-dialogue entities :ego "Hello again Gandarf!"
(do (actions/do-dialogue entities :ego "Hello again, Gandarf!"
:wizard "Not you again!")
(actions/talk entities :wizard "I command you, leave at once!" :anim :talk-angry :stop? false)
(actions/talk entities :wizard "Don't make me use my powers against you!" :anim :talk-angry :stop? false)
(actions/talk entities :wizard "Leave now, or else!" :anim :talk-angry :stop? false)
(actions/begin-animation entities :wizard :magic-hands))
(do (actions/do-dialogue entities :ego "Hello there Gandarf!"
(do (actions/do-dialogue entities :ego "Hello there, Gandarf!"
:wizard "Oh no, not you!"
:ego "What do you mean, 'not you!'?"
:wizard "I mean, you've wrecked my life!"
@@ -239,7 +239,7 @@
:choices ["You mean the time I set your house on fire with a lava mint?"
{:run #(do
(actions/respond entities %
:wizard "No, of course n...")
:wizard "No, of course n-")
(Thread/sleep 500)
(actions/do-dialogue entities :wizard "Wait... that was you!?" :wizard "My house was completely destroyed!")
(Thread/sleep 500)
@@ -258,9 +258,8 @@
:wizard "Of course I'm cross! It's irreplaceable!"
:wizard "That cowboy hat accented my facial physique."
:wizard "And complemented my skin color."
:wizard "And you little pipsqueak stole it from me!"
:wizard "That's why I bought my Magi-Safe 5000, to keep out intruders like you."
)
:wizard "And you, little pipsqueak, stole it from me!"
:wizard "That's why I bought my Magi-Safe 5000: To keep out intruders like you.")
(actions/talk entities :wizard "Now leave, before I force you out!" :anim :talk-angry :stop? false)
(actions/begin-animation entities :wizard :magic-hands)
(actions/transition-background entities :outside-house [257 90] :face :left)
@@ -299,7 +298,7 @@
(actions/talk entities :ego "Gandarf is such a stingy old toad."))}
"To find you a brand new dragon."
{:run #(do (actions/respond entities %
:wizard "Great idea Tick!"
:wizard "Great idea, Tick!"
:wizard "You'd make the perfect base for a dragon-bait stew!"
:wizard "Let me just summon my boy-sized cooking pot.")
(actions/talk entities :wizard "Boildrum Ka...." :anim :talk-angry :stop? false)
@@ -321,9 +320,9 @@
:wizard "I dreamed I was an earthworm."
:wizard "And you'd never guess what happened when I woke up."
:ego "What?"
:wizard "I had indigestion."
:wizard "Nothing. I had some indigestion."
:wizard "Dreams aren't all they're chocked up to be."
:wizard "Face it boy, it was just a dream. "
:wizard "Face it, boy, it was just a dream. "
:wizard "You'll never be a knight."
:wizard "Now go.")
(actions/transition-background entities :outside-house [257 90] :face :left)
@@ -348,7 +347,7 @@
:wizard "Your cause is noble, and your heart is just."
:wizard "Just don't let me catch you stealing my belongings.")
(Thread/sleep 1000)
(actions/do-dialogue entities :wizard "Now Tick, do you know the prophecy of the Sword of Blergh?"))
(actions/do-dialogue entities :wizard "Now, Tick, do you know the prophecy of the Sword of Blergh?"))
:choices ["Yes."
(do-prophecy entities)
"No."
@@ -382,13 +381,13 @@
:wizard "Surely thou doth know that thou can speaketh in this manner."
:wizard "Thy tongue requireth neither sword nor title.")
:choices actions/previous-choices}]}
"By besting trap, beast, and long, boring, conversation with old gheezers."
"By besting trap, beast, and long, boring, conversation with old geezers."
{:run #(do (actions/respond entities %
:wizard "Quite right, quite right.")
(Thread/sleep 1000)
(actions/do-dialogue entities
:wizard "Wait."
:wizard "What 'old gheezer' are you referring to?"
:wizard "What 'old geezer' are you referring to?"
:ego "Umm...")
(actions/talk entities :wizard "You don't happen to be referring to me, do you?" :anim :talk-angry :stop? false)
(actions/begin-animation entities :wizard :magic-hands)
@@ -402,11 +401,11 @@
:wizard "Ha! Good standing?"
:wizard "You're the neighborhood cheat and everyone knows it."
:wizard "I'm afraid your standing is irreparable."
:wizard "Now leave me to mourn ol' Snaggletooh.")
:wizard "Now leave me to mourn ol' Snaggletooth.")
(actions/transition-background entities :outside-house [257 90] :face :left)
(actions/play-animation entities :ego :sigh))}
]}
"Snaggletooth deserved a free life, you old gheezer!"
"Snaggletooth deserved a free life, you old geezer!"
{:run #(do (actions/respond entities % :wizard "Why, you..."
:wizard "Snaggletooth was my friend!")
(Thread/sleep 1000)
@@ -457,7 +456,7 @@
:wizard "Hurry, boy! Time's-a-wastin'!")
(do
(actions/do-dialogue entities :ego "Gandarf! Boy am I glad to see you."
:wizard "I'm busy. What is it Tick?")
:wizard "I'm busy. What is it, Tick?")
(actions/present-choices entities
{:choices ["I got put in jail!"
{:run #(actions/respond entities %
@@ -472,7 +471,7 @@
:wizard "You did?"
:wizard "Congratulations, Tick!"
:wizard "Meanwhile, my life hasn't been going so great."
:wizard "Someone broken into my MagiSafe 5000 and stole some things from my hut."
:wizard "Someone broke into my MagiSafe 5000 and stole some things from my hut."
:ego "Oh."
:ego "How awful!")
:choices actions/previous-choices}
@@ -484,7 +483,7 @@
:ego "Yes, that Bloodclot!"
:wizard "I knew that there would be a 'final test' for the hero who pulled the blade..."
:wizard "But I never imagined this."
:wizard "There's only one way to neutralize his lighting magic:"
:wizard "There's only one way to neutralize his lightning magic:"
:wizard "The Slinger's Shot."
:wizard "It's a magical slingshot that has long lost its power."
:wizard "Here, take it.")
@@ -624,7 +623,7 @@
(actions/remove-entity entities :experiment))
(if (get-in @entities [:state :convinced-wizard?])
(do (actions/talk entities :wizard (str "Oh, hello there boy."))
(do (actions/talk entities :wizard "Oh, hello there, boy.")
(utils/save @entities :autosave "Autosave"))
(wizard-dialogue entities)))))
:cursor :right}
@@ -680,7 +679,7 @@
(leave-sheep entities))
(do
(walk-to-sheep entities)
(actions/talk entities :ego "Come here mama sheep!")
(actions/talk entities :ego "Come here, mama sheep!")
(actions/play-animation entities :ego :sigh)
(actions/talk entities :ego "She's too far away for me to pet her.")
(leave-sheep entities)))))
@@ -689,13 +688,13 @@
(actions/talk entities :ego "She doesn't need it back."))
:grass (actions/get-script entities
(walk-to-sheep entities)
(actions/talk entities :ego "Come on girl, get the grass!")
(actions/talk entities :ego "Come on, girl, get the grass!")
(actions/play-animation entities :ego :reach)
(actions/talk entities :ego "I think she's not interested.")
(leave-sheep entities))
:carrot (actions/get-script entities
(walk-to-sheep entities)
(actions/talk entities :ego "Come on girl, get the carrot!")
(actions/talk entities :ego "Come on, girl, get the carrot!")
(actions/walk-straight-to entities :sheep [90 138] :update-baseline? false)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :carrot)