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

minor tweaks to dialogue

Browse Source
This commit is contained in:
Bryce Covert
2016-03-14 20:05:57 -05:00
parent 9130d98bb2
commit 632bd539b6
9 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -61,11 +61,11 @@
{:run #(do (actions/respond entities % {:run #(do (actions/respond entities %
:grandma "It's my Smuffle Wuffles!" :grandma "It's my Smuffle Wuffles!"
:grandma "We were on a pleasant walk through the woods." :grandma "We were on a pleasant walk through the woods."
:grandma "Then we got in argument, and so he ran up into that tree!") :grandma "Then we got in an argument, and so he ran up into that tree!")
(actions/play-animation entities :grandma :cry) (actions/play-animation entities :grandma :cry)
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "An argument? With a cat?" :ego "An argument? With a cat?"
:grandma "Yes of course! We were arguing about politics!")) :grandma "Yes, of course! We were arguing about politics!"))
:choices ["So you want me to get your cat down?" :choices ["So you want me to get your cat down?"
{:run #(actions/respond entities % {:run #(actions/respond entities %
:grandma "Yes! I need a courageous hero to rescue Smuffle Wuffles for me." :grandma "Yes! I need a courageous hero to rescue Smuffle Wuffles for me."
@@ -104,7 +104,7 @@
:grandma "Young man, I was here when that sword was put in the stone 100 years ago!" :grandma "Young man, I was here when that sword was put in the stone 100 years ago!"
:grandma "Of course I know how it can be pulled!" :grandma "Of course I know how it can be pulled!"
:grandma "One must prove themselves worthy in wisdom, courage, and might." :grandma "One must prove themselves worthy in wisdom, courage, and might."
:grandma "How about proving your courage by helping rescue Smuffle Wuffles?") :grandma "How about proving your courage by helping me rescue Smuffle Wuffles?")
:choices actions/previous-choices} :choices actions/previous-choices}
"Later." "Later."
{:run #(do (actions/respond entities % {:run #(do (actions/respond entities %
@@ -154,9 +154,10 @@
{:run #(do (actions/respond entities % {:run #(do (actions/respond entities %
:owl "Yes, in fact there is." :owl "Yes, in fact there is."
:owl "You see, we owls have very strong vision." :owl "You see, we owls have very strong vision."
:owl "I was born with a birth defect, and only one of my eyes is good." :owl "I was born with a birth defect, and only one of my eyes is sharp enough for hunting."
:owl "I dropped my monocle somewhere around here!" :owl "As for the other, alas, I need a monocle, or it's useless."
:owl "Without it, I have severe nausea.") :owl "And now I've dropped that very monocle somewhere in this valley!"
:owl "What's worse, without it, I have severe nausea.")
(do-puke entities) (do-puke entities)
(actions/do-dialogue entities (actions/do-dialogue entities
:owl "Excuse me." :owl "Excuse me."
@@ -200,7 +201,8 @@
:owl "Have you ever thought that maybe you're not that enjoyable to talk to?" :owl "Have you ever thought that maybe you're not that enjoyable to talk to?"
:ego "I guess not." :ego "I guess not."
:owl "Naw, I'm just pulling your leg." :owl "Naw, I'm just pulling your leg."
:owl "I'm an owl, and owls are wise.") :owl "I'm an owl, and owls are wise."
:owl "Therefore we express our wisdom by way of speech.")
(present-owl-choices entities))) (present-owl-choices entities)))
(actions/update-state entities #(assoc % :talked-to-owl? true))) (actions/update-state entities #(assoc % :talked-to-owl? true)))

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

@@ -228,14 +228,14 @@
} }
{:run #(do (talk %) {:run #(do (talk %)
(respond "Bubba's standing right next to me!") (respond "Bubba's standing right next to me!")
(respond "You're an imposter!") (respond "You're an impostor!")
(respond "Leave us alone."))}) (respond "Leave us alone."))})
"It's me, Frankie!" "It's me, Frankie!"
{:run #(do {:run #(do
(talk %) (talk %)
(respond "Frankie?") (respond "Frankie?")
(respond "But, I'm Frankie!") (respond "But, I'm Frankie!")
(respond "Imposter!") (respond "Impostor!")
(respond "Leave us alone!"))}]})) (respond "Leave us alone!"))}]}))
) )
@@ -252,7 +252,7 @@
(actions/georgia-say entities "I'm counting on you, Tick!") (actions/georgia-say entities "I'm counting on you, Tick!")
(actions/do-dialogue entities (actions/do-dialogue entities
:frankie "Georgia's going steady with me now, Dipstick." :frankie "Georgia's going steady with me now, Dipstick."
:frankie "No day-dreaming about my girlfriend!") :frankie "No daydreaming about my girlfriend!")
(actions/play-animation entities :frankie :laugh) (actions/play-animation entities :frankie :laugh)
(actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town." (actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town."
:frankie "Ain't that right, boys?") :frankie "Ain't that right, boys?")

4
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -350,13 +350,13 @@
:fairy-godfather "Just think about it." :fairy-godfather "Just think about it."
:fairy-godfather "You'll have your own little shack at the cemetery..." :fairy-godfather "You'll have your own little shack at the cemetery..."
:fairy-godfather "... where you can stay and not see another person for months on end ..." :fairy-godfather "... where you can stay and not see another person for months on end ..."
:fairy-godfather "well, another alive person anyways.")) :fairy-godfather "... well, another alive person anyways."))
(defn describe-broom [entities] (defn describe-broom [entities]
(actions/do-dialogue entities :fairy-godfather "Janitoring is just the thing for you, Tick." (actions/do-dialogue entities :fairy-godfather "Janitoring is just the thing for you, Tick."
:fairy-godfather "Just think about it." :fairy-godfather "Just think about it."
:fairy-godfather "Imagine the sweet smell of victory once you've mopped up some spilled milk." :fairy-godfather "Imagine the sweet smell of victory once you've mopped up some spilled milk."
:fairy-godfather "Or the smell of soap in the bathroom, where you'll spend a lot of your time.")) :fairy-godfather "Or the smell of soap in the bathroom, where you'll spend your time making the tile and porcelain shine."))
(defn make [screen] (defn make [screen]
(let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) (let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1])

4
desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
View File

@@ -39,12 +39,12 @@
{:run #(actions/respond entities % {:run #(actions/respond entities %
:warriors "Verily I say unto you: no." :warriors "Verily I say unto you: no."
:warriors "We art filled with hunger." :warriors "We art filled with hunger."
:warriors "And we musteth replentish our strength." :warriors "And we musteth replenish our strength."
:warriors "Get ye your own food!") :warriors "Get ye your own food!")
:choices actions/previous-choices} :choices actions/previous-choices}
"Shouldn't you be guarding something?" "Shouldn't you be guarding something?"
{:run #(actions/respond entities % {:run #(actions/respond entities %
:warriors "Even the mightiest of knights musteth replentish their strength." :warriors "Even the mightiest of knights musteth replenish their strength."
:warriors "And geteth some R and R.") :warriors "And geteth some R and R.")
:choices actions/previous-choices} :choices actions/previous-choices}
"Why dost thou speaketh in this manner?" "Why dost thou speaketh in this manner?"

2
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -152,7 +152,7 @@
{:run #(actions/respond entities % {:run #(actions/respond entities %
:game-player "The study of knights?" :game-player "The study of knights?"
:game-player "That area of research hasn't been founded yet." :game-player "That area of research hasn't been founded yet."
:ego "Well I can be your first subject!" :ego "Well, I can be your first subject!"
:game-player "I'm far too busy." :game-player "I'm far too busy."
:game-player "Plus, you're not even a knight!") :game-player "Plus, you're not even a knight!")
:choices actions/previous-choices} :choices actions/previous-choices}

2
desktop/src-common/advent/screens/rooms/inside_house.clj
View File

@@ -67,7 +67,7 @@
(when (not (actions/has-obtained-all-of? entities [:trophy :medal :kiss])) (when (not (actions/has-obtained-all-of? entities [:trophy :medal :kiss]))
"About that prophecy...") "About that prophecy...")
{:run #(actions/respond entities % {:run #(actions/respond entities %
:wizard "To become a knight you will need to be worthy in courage, wisdom, and might." :wizard "To become a knight, you will need to be worthy in courage, wisdom, and might."
:wizard "Only then can you become worthy to pull the Sword of Blergh.") :wizard "Only then can you become worthy to pull the Sword of Blergh.")
:choices [(when (not (actions/has-obtained? entities :trophy)) :choices [(when (not (actions/has-obtained? entities :trophy))
"How can I prove that I'm worthy in wisdom?") "How can I prove that I'm worthy in wisdom?")

10
desktop/src-common/advent/screens/rooms/outside_castle.clj
View File

@@ -39,7 +39,7 @@
(if (get-in @entities [:state :wants-toy]) (if (get-in @entities [:state :wants-toy])
(actions/do-dialogue entities :peddler "I will give them to you if you bring me the choicest of toys.") (actions/do-dialogue entities :peddler "I will give them to you if you bring me the choicest of toys.")
(actions/do-dialogue entities (actions/do-dialogue entities
:peddler "That'll just be 10 sheckels." :peddler "That'll just be 10 sheckles."
:ego "But I haven't got any money!" :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?" :ego "Can't I give you something else for them?"
@@ -61,7 +61,7 @@
(if (get-in @entities [:state :wants-toy]) (if (get-in @entities [:state :wants-toy])
(actions/do-dialogue entities :peddler "I will give it to you if you bring me the choicest of toys.") (actions/do-dialogue entities :peddler "I will give it to you if you bring me the choicest of toys.")
(actions/do-dialogue entities (actions/do-dialogue entities
:peddler "That'll just be 95 sheckels." :peddler "That'll just be 95 sheckles."
:ego "But I haven't got any money!" :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?" :ego "Can't I give you something else for them?"
@@ -203,7 +203,7 @@
:frankie "But, I could fetch some real good dough for them." :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/play-animation entities :frankie :glance)
(actions/do-dialogue entities :frankie "10 sheckels?")) (actions/do-dialogue entities :frankie "10 sheckles?"))
(actions/has-item? entities :motivational-tapes) (do (actions/has-item? entities :motivational-tapes) (do
(actions/remove-item entities :motivational-tapes) (actions/remove-item entities :motivational-tapes)
(actions/do-dialogue entities (actions/do-dialogue entities
@@ -265,7 +265,7 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:frankie "The Slinger's Shot?" :frankie "The Slinger's Shot?"
:ego "No, not the Slinger's Shot!" :ego "No, not the Slinger's Shot!"
:frankie "Look like we hit the jackpot tonight boys!") :frankie "Looks like we hit the jackpot tonight, boys!")
(frankie-comment-on-item entities) (frankie-comment-on-item entities)
(actions/update-state entities #(assoc % :bubba-gone? true)) (actions/update-state entities #(assoc % :bubba-gone? true))
(actions/do-dialogue entities (actions/do-dialogue entities
@@ -433,7 +433,7 @@
:carrot (actions/get-script entities :carrot (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right) (actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "I don't thing Angus is interested." :ego "I don't think Angus is interested."
:ego "Farmer Doug only feeds him a wild high-protein grass.")) :ego "Farmer Doug only feeds him a wild high-protein grass."))
:sack-lunch (actions/get-script entities :sack-lunch (actions/get-script entities

8
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -467,7 +467,7 @@
:ego "No, not yet." :ego "No, not yet."
:wizard "Hurry, boy! Time's-a-wastin'!") :wizard "Hurry, boy! Time's-a-wastin'!")
(do (do
(actions/do-dialogue entities :ego "Gandarf! Boy am I glad to see you." (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 (actions/present-choices entities
{:choices ["I got put in jail!" {:choices ["I got put in jail!"
@@ -494,7 +494,7 @@
:wizard "If you did, you'd be burned to a crisp from his lightning gem!" :wizard "If you did, you'd be burned to a crisp from his lightning gem!"
:ego "Yes, that Bloodclot!" :ego "Yes, that Bloodclot!"
:wizard "I knew that there would be a \"final test\" for the hero who pulled the blade..." :wizard "I knew that there would be a \"final test\" for the hero who pulled the blade..."
:wizard "But I never imagined this." :wizard "But I had never imagined this."
:wizard "There's only one way to neutralize his lightning magic:" :wizard "There's only one way to neutralize his lightning magic:"
:wizard "The Slinger's Shot." :wizard "The Slinger's Shot."
:wizard "It's a magical slingshot that has long lost its power." :wizard "It's a magical slingshot that has long lost its power."
@@ -751,10 +751,10 @@
(actions/play-animation entities :ego :milk) (actions/play-animation entities :ego :milk)
(actions/remove-item entities :flask-1) (actions/remove-item entities :flask-1)
(actions/give entities :flask-1-with-milk) (actions/give entities :flask-1-with-milk)
(actions/talk entities :ego "Sheeps milk.") (actions/talk entities :ego "Sheep's milk.")
) )
(actions/talk entities :ego "She's too far away.")) (actions/talk entities :ego "She's too far away."))
(actions/do-dialogue entities :ego "I like a nice glass of milk." (actions/do-dialogue entities :ego "I'd like a nice glass of milk."
:ego "But sheep's milk is too creamy for me."))) :ego "But sheep's milk is too creamy for me.")))
:flask-1-with-mushrooms :flask-1-with-mushrooms
(actions/get-script entities (actions/get-script entities

2
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -143,7 +143,7 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "That's Captain McHulk's house!" :ego "That's Captain McHulk's house!"
:ego "He's the mightiest knight in all of Remington." :ego "He's the mightiest knight in all of Remington."
:ego "If only I could be as strong as him one day." :ego "If only I could be as strong as he is one day."
))} ))}
:stump {:box [205 68 251 100] :stump {:box [205 68 251 100]
:script (actions/get-script entities :script (actions/get-script entities