including dialogue tweaks.
This commit is contained in:
Bryce Covert
@@ -19,7 +19,7 @@
|
||||
(defn do-initial-peddler-conversation [entities]
|
||||
(actions/do-dialogue entities
|
||||
:ego "Hello there, peddler."
|
||||
:peddler "Good day sir! Care to see any of my wares?"
|
||||
:peddler "Good day, sir! Care to see any of my wares?"
|
||||
:peddler "I have only the choicest of wares."
|
||||
:ego "What 'wares' are you selling?"
|
||||
:peddler "I have the choicest of all types of wares..."
|
||||
@@ -27,17 +27,17 @@
|
||||
:peddler "...glass eyes..."
|
||||
:peddler "... and motivational tapes."
|
||||
:peddler "And today, I have a one day special!"
|
||||
:peddler "Every purchase comes with a free balloon!")
|
||||
:peddler "Every purchase comes with the choicest of balloons!")
|
||||
(actions/present-choices entities {:choices ["I'm interested in your earplugs."
|
||||
{:run #(do (actions/update-state entities (fn [state] (assoc state :wants-toy true)))
|
||||
(actions/respond entities %
|
||||
:peddler "A choice choice sir!"
|
||||
:peddler "These earplugs have been used by the the choicest of wearers."
|
||||
:peddler "These earplugs have been used by the choicest of wearers."
|
||||
:peddler "I can see a young man like yourself enjoying these choice earplugs for ages to come!"
|
||||
:peddler "And remember, every purchase comes with the choicest of balloons!"
|
||||
:peddler "That'll just be 10 sheckels."
|
||||
:ego "But I haven't got any money!"
|
||||
:peddler "Well I'm afraid you won't have the choicest of earplugs."
|
||||
:peddler "Well, I'm afraid you won't have the choicest of earplugs."
|
||||
:ego "Can't I give you something else for them?"
|
||||
:peddler "I'll tell you what, I don't have any thing for the kids that come to my stand."
|
||||
:peddler "If you can bring me the choicest of toys..."
|
||||
@@ -47,13 +47,13 @@
|
||||
{:run #(do (actions/update-state entities (fn [state] (assoc state :wants-toy true)))
|
||||
(actions/respond entities %
|
||||
:peddler "The choicest choice, young man!"
|
||||
:peddler "This glass eye is made out of the choicest glass, from across the sea."
|
||||
:peddler "This glass eye is made out of the choicest glass from across the sea."
|
||||
:peddler "And remember, every purchase comes with the choicest of balloons!"
|
||||
:peddler "That'll just be 95 sheckels."
|
||||
:ego "But I haven't got any money!"
|
||||
:peddler "Well I'm afraid you won't have the choicest of glass eyes."
|
||||
:peddler "Well, I'm afraid you won't have the choicest of glass eyes."
|
||||
:ego "Can't I give you something else for them?"
|
||||
:peddler "I'll tell you what, I don't have any thing for the kids that come to my stand."
|
||||
:peddler "I'll tell you what, I don't have anything for the kids that come to my stand."
|
||||
:peddler "If you can bring me the choicest of toys..."
|
||||
:peddler "... and I mean the choicest of toys... "
|
||||
:peddler "Then I'll give you the glass eye."
|
||||
@@ -66,9 +66,9 @@
|
||||
:peddler "These choicest of motivation tapes will convince you that life isn't so bad."
|
||||
:peddler "For only 3 easy payments of 29.99 scheckles, they're yours!"
|
||||
:ego "But I'm broke!"
|
||||
:peddler "Well I'm afraid you won't have the choicest of motivational tapes."
|
||||
:peddler "Well, I'm afraid you won't have the choicest of motivational tapes."
|
||||
:ego "Is there anything else you'd take instead?"
|
||||
:peddler "I'll tell you what, I don't have any thing for the kids that come to my stand."
|
||||
:peddler "I'll tell you what, I don't have anything for the kids that come to my stand."
|
||||
:peddler "If you can bring me the choicest of toys..."
|
||||
:peddler "... and I mean the choicest of toys... "
|
||||
:peddler "Then I'll give you the motivational tapes."
|
||||
@@ -83,13 +83,13 @@
|
||||
:peddler "What would you like?")
|
||||
(actions/present-choices entities
|
||||
{:choices ["The glass eye."
|
||||
{:run #(do (actions/respond entities % :peddler "Of course sir. Here you go.")
|
||||
{:run #(do (actions/respond entities % :peddler "Of course, sir. Here you go.")
|
||||
(actions/give entities :glass-eye))}
|
||||
"The motivational tapes."
|
||||
{:run #(do (actions/respond entities % :peddler "Of course sir. Here you go.")
|
||||
{:run #(do (actions/respond entities % :peddler "Of course, sir. Here you go.")
|
||||
(actions/give entities :motivational-tapes))}
|
||||
"The used earplugs."
|
||||
{:run #(do (actions/respond entities % :peddler "Of course sir. Here you go.")
|
||||
{:run #(do (actions/respond entities % :peddler "Of course, sir. Here you go.")
|
||||
(actions/give entities :used-earplugs))}]})
|
||||
(actions/talk entities :peddler "And, of course, here is your balloon.")
|
||||
(actions/give entities :balloon)
|
||||
@@ -116,8 +116,8 @@
|
||||
(give-teddy entities))
|
||||
|
||||
(actions/do-dialogue entities :ego "No, no, and no."
|
||||
:peddler "Well come back when you have something I'm interested in."
|
||||
:peddler "Remember - I have a one-day special going."
|
||||
:peddler "Well, come back when you have something I'm interested in."
|
||||
:peddler "Remember, I have a one-day special going."
|
||||
:peddler "Every purchase comes with a free balloon!")))
|
||||
|
||||
(defn walk-to-peddler [entities]
|
||||
@@ -145,10 +145,10 @@
|
||||
(actions/do-dialogue entities
|
||||
:frankie "And how about that? A glass eye."
|
||||
:frankie "And not only that, it's the choicest of glass eyes!"
|
||||
:frankie "It must be made of the choicest glass, from across the sea!"
|
||||
:frankie "It must be made of the choicest glass from across the sea!"
|
||||
:frankie "This'll be perfect for when I punch your eye out, Dipstick."
|
||||
:frankie "Or, I could fetch some real good dough for this."
|
||||
:frankie "What would you say boys?")
|
||||
:frankie "What would you say, boys?")
|
||||
(actions/play-animation entities :frankie :glance)
|
||||
(actions/do-dialogue entities :frankie "95 sheckles?"))
|
||||
(actions/has-item? entities :used-earplugs) (do
|
||||
@@ -158,16 +158,16 @@
|
||||
:frankie "Wow! These are the choicest of earplugs!"
|
||||
:frankie "They're great for tuning out your voice, Dipstick!"
|
||||
:frankie "But, I could fetch some real good dough for them."
|
||||
:frankie "What would you say boys? ")
|
||||
:frankie "What would you say, boys?")
|
||||
(actions/play-animation entities :frankie :glance)
|
||||
(actions/do-dialogue entities :frankie "10 sheckels?"))
|
||||
(actions/has-item? entities :motivational-tapes) (do
|
||||
(actions/remove-item entities :motivational-tapes)
|
||||
(actions/do-dialogue entities
|
||||
:frankie "And how about that? Some motivational tapes"
|
||||
:frankie "And how about that? Some motivational tapes."
|
||||
:frankie "Wow! These are the choicest of motivational tapes!"
|
||||
:frankie "But, I could fetch some real good dough for them."
|
||||
:frankie "What would you say boys? ")
|
||||
:frankie "What would you say, boys?")
|
||||
(actions/play-animation entities :frankie :glance)
|
||||
(actions/do-dialogue entities :frankie "3 easy payments of 29.99 sheckles?"))))
|
||||
|
||||
@@ -178,28 +178,28 @@
|
||||
(if (get-in @entities [:state :seen-frankie?])
|
||||
((rand-nth [#(do
|
||||
(actions/do-dialogue entities
|
||||
:frankie "Well, well, well. What have we here boys?"
|
||||
:frankie "Well, well, well. What have we here, boys?"
|
||||
:frankie "It's good ol' Dipstick again.")
|
||||
(actions/play-animation entities :frankie :laugh))
|
||||
#(do
|
||||
(actions/do-dialogue entities
|
||||
:frankie "Quiet boys."
|
||||
:frankie "Quiet, boys."
|
||||
:frankie "Dipstick's here.")
|
||||
)]))
|
||||
(do
|
||||
(actions/do-dialogue entities :frankie "Well, well, well. What have we here boys?")
|
||||
(actions/do-dialogue entities :frankie "Well, well, well. What have we here, boys?")
|
||||
(actions/play-animation entities :frankie :glance)
|
||||
(actions/do-dialogue entities :frankie "It's good ol' Dipstick.")
|
||||
(actions/play-animation entities :frankie :laugh)
|
||||
(actions/do-dialogue entities
|
||||
:ego "Uh, oh. Frankie Rockfist!"
|
||||
:ego "Oh no! Frankie Rockfist!"
|
||||
:ego "Listen, I don't want any trouble."
|
||||
:frankie "Well you found it tonight, Dipstick."
|
||||
)
|
||||
(actions/play-animation entities :frankie :flex)
|
||||
(actions/talk entities :frankie "Am I right boys?")
|
||||
(actions/talk entities :frankie "Am I right, boys?")
|
||||
(actions/play-animation entities :frankie :glance)
|
||||
(actions/do-dialogue entities :frankie "You looking for another beat down Dipstick?")
|
||||
(actions/do-dialogue entities :frankie "You looking for another beat down, Dipstick?")
|
||||
(actions/play-animation entities :frankie :laugh)
|
||||
(actions/do-dialogue entities
|
||||
:ego "The name's \"Tick\"..."
|
||||
@@ -227,7 +227,7 @@
|
||||
(actions/update-state entities #(assoc % :bubba-gone? true))
|
||||
(actions/do-dialogue entities
|
||||
:frankie "Bubba, put this stuff in the secret stash."
|
||||
:goon-2 "You got it boss.")
|
||||
:goon-2 "You got it, boss.")
|
||||
(actions/remove-entity entities :coin-flip)
|
||||
(actions/walk-straight-to entities :goon-2 [0 100])
|
||||
(actions/do-dialogue entities
|
||||
@@ -378,7 +378,7 @@
|
||||
(actions/do-dialogue entities
|
||||
:ego "It's Angus, Remington's buff bull."
|
||||
:ego "He's used in all of the town's rodeos."
|
||||
:ego "Farmer Doug feeds him an exclusive wild high-protein grass diet to keep him in tip top shape."
|
||||
:ego "Farmer Doug feeds him wild high-protein grass diet to keep him in tiptop shape."
|
||||
:ego "He looks mean, I'd rather not pet him."))
|
||||
:scripts #(condp = %
|
||||
:grass (actions/get-script entities
|
||||
@@ -429,7 +429,7 @@
|
||||
(actions/talk entities :ego "I think it's working!")
|
||||
(actions/play-animation entities :ego :squat)
|
||||
(actions/give entities :flies)
|
||||
(actions/talk entities :ego "Hopefully they won't fly out of my backpack."))}
|
||||
(actions/talk entities :ego "Hopefully, they won't fly out of my backpack."))}
|
||||
)}
|
||||
:note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png")
|
||||
:x 198 :y 66 :baseline 174
|
||||
|
||||
Reference in New Issue
Block a user