diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj index cc17f80c..b666a4a8 100644 --- a/desktop/src-common/advent/screens/rooms/behind_house.clj +++ b/desktop/src-common/advent/screens/rooms/behind_house.clj @@ -73,7 +73,7 @@ (get-in @entities [:state :opened-crack?]) (do (actions/walk-to entities :ego [70 80]) (actions/play-animation entities :ego :start-squat :stop? false) - (actions/talk entities :ego "I can see Gandarf, the wizard inside." :animate? false :stop? false) + (actions/talk entities :ego "I can see Gandarf the wizard inside." :animate? false :stop? false) (actions/talk entities :ego "It looks like he's opening his Magi-safe." :animate? false :stop? false) (actions/play-sound entities "safe-sound.ogg" 0.1) (actions/talk entities :ego "So that's the code to his safe..." :animate? false :stop? false) @@ -88,7 +88,7 @@ (actions/update-state entities (fn [state] (assoc state :opened-crack? true)))))) :scripts {:stick (actions/get-script entities (if (get-in @entities [:state :opened-crack?]) - (actions/talk entities :ego "I could shove the stick in that, hole, but why?") + (actions/talk entities :ego "I could shove the stick in that hole, but why?") (actions/do-dialogue entities :ego "It looks like that wall is crumbling." :ego "I can probably scratch it off with my hand."))) diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index a1c200b0..fd187d35 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -47,7 +47,7 @@ :frankie "No day-dreaming about my girlfriend!") (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." - :frankie "Ain't that right boys?") + :frankie "Ain't that right, boys?") (actions/play-animation entities :frankie :glance)) :choices actions/previous-choices} @@ -55,7 +55,7 @@ {:run #(do (actions/respond entities % :frankie "Oh please." :frankie "Like you're so different." - :frankie "Am I right boys?") + :frankie "Am I right, boys?") (actions/play-animation entities :frankie :glance) (actions/do-dialogue entities :frankie "We steal gold, diamonds, and relic slingshots." @@ -77,7 +77,7 @@ (actions/play-animation entities :frankie :laugh) (actions/update-state entities (fn [s] (assoc s :bubba-gone? true))) (actions/do-dialogue entities :frankie "Bubba, go check to make sure our stuff is safe." - :goon-2 "You got it boss.") + :goon-2 "You got it, boss.") (actions/walk-straight-to entities :goon-2 [0 100]))} "Nevermind." @@ -180,7 +180,7 @@ :script (actions/get-script entities (if (get-in @entities [:tweens :coin-y]) (do - (actions/talk entities :ego "Hey Bubba!" :wait false) + (actions/talk entities :ego "Hey, Bubba!" :wait false) (actions/update-entities entities (fn [entities] (update-in entities [:tweens] dissoc :coin-y))) @@ -203,7 +203,7 @@ (actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search) (actions/talk entities :ego "Umm, sorry!")) (do - (actions/do-dialogue entities :ego "Hi Bubba." + (actions/do-dialogue entities :ego "Hey, Bubba!" :goon-2 "Beat it, Dipstick.")))) :scripts {:money (actions/get-script entities (actions/do-dialogue entities :ego "I don't want to give it back!")) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index 2ea3f70c..05410846 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -27,7 +27,7 @@ (defn do-saved-grandma-dialogue [entities] (actions/walk-to entities :ego [165 45] :face :left) (actions/do-dialogue entities - :grandma "Oh it's my handsome hero again!" + :grandma "Oh, it's my handsome hero again!" :grandma "Back for another kiss?" :ego "Umm, erm...") (actions/play-animation entities :ego :get-sick :stop? false) @@ -134,7 +134,7 @@ (actions/walk-to entities :ego [141 54] :face :right) (cond (actions/has-obtained? entities :feather) (do (actions/do-dialogue entities :ego "Hello again." - :owl "Oh! Hello again! Thanks you again for all your help." + :owl "Oh! Hello again! Thank you again for all your help." :owl "My nausea has nearly worn off.") (do-puke entities)) @@ -145,12 +145,12 @@ (do-puke entities)) :else - (do (actions/do-dialogue entities :ego "Hello there little owl." + (do (actions/do-dialogue entities :ego "Hello there, little owl." :owl "Who you calling little?" :ego "Wow! You can talk?" :owl "Of course I can!" :ego "But none of the other animals so far in this game have talked!" - :owl "Have you ever thought that maybe you're not that enjoyable to talk with?" + :owl "Have you ever thought that maybe you're not that enjoyable to talk to?" :ego "I guess not." :owl "Naw, I'm just pulling your leg." :owl "I'm an owl, and owls are wise.") @@ -330,7 +330,7 @@ (actions/do-dialogue entities :ego "It's no big deal." :grandma "You won't go unrewarded!" - :grandma "Come here young man.") + :grandma "Come here, young man.") (actions/walk-straight-to entities :ego [133 35]) (actions/talk entities :grandma "For your impressive display of courage and bravery, I give you this. ") (actions/play-sound entities :kiss 0.7) @@ -383,9 +383,9 @@ :monocle (actions/get-script entities (give-monocle entities)) (actions/get-script entities (if (get-in @entities [:state :talked-to-owl?]) - (do (actions/do-dialogue entities :ego "Is this your monacle?") + (do (actions/do-dialogue entities :ego "Is this your monocle?") (if (actions/has-obtained? entities :feather) - (actions/talk entities :owl "You already gave me my monacle, silly boy!") + (actions/talk entities :owl "You already gave me my monocle, silly boy!") (actions/talk entities :owl "No, it's round and made of glass.")) (do-puke entities)) (actions/talk entities :ego "Why would an owl want that?")))))) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index b788fa63..32e2a4bb 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -81,7 +81,7 @@ :ego "'You must cast the spell to restore magic to the Slinger's Shot yourself.'" :ego "'You still do have The Slinger's Shot, don't you?'" :ego "'I will do my best to help you along the way.'" - :ego "'You will need to add to your flask the ashes of magic, and the sound of buzzing.'" + :ego "'You will need to add to your flask: the ashes of magic and the sound of buzzing.'" :ego "'Then stir with the gift of flight.'" :ego "'Then pour the contents in the cauldron.'" :ego "'I will give you more instructions when I can.'" @@ -132,14 +132,14 @@ (respond "Wait a second...") (respond "You're not Bubba!") (respond "Bubba has a deep voice!") - (respond "Imposter!") + (respond "Impostor!") (respond "Leave us alone."))} "(Same pitch) I think I'm getting a cold." {:run (fn [m] (talk "I think I'm getting a cold.") (respond "Wait a second...") (respond "I recognize that voice!") - (respond "I don't know what you're up trying to pull, Dipstick.") + (respond "I don't know what you're trying to pull, Dipstick.") (respond "Leave us alone."))} "(Lower pitch) I think I'm getting a cold." {:run (fn [m] @@ -158,7 +158,7 @@ {:run (fn [m] (talk m) (respond "Bubba, we've talked about this.") - (respond "Our club charter, Chapter 17, Section 23 cleary states...") + (respond "Our club charter, Chapter 17, Section 23 clearly states...") (respond "... that we are not to discuss stash locations unless in person!")) :choices ["Can't you make an exception?" {:run (fn [m] @@ -181,7 +181,7 @@ (respond "Ahh yes, here it is.") (respond "'If visual confirmation cannot be made...'") (respond "'The 'The super cool secret club' member can validate his allegiance... ") - (respond "'By giving a nice complement to the gang leader.'") + (respond "'By giving a nice compliment to the gang leader.'") (respond "... Well?")) :choices ["Umm, you've got a killer smile." {:run (fn [m] @@ -337,7 +337,7 @@ (defn do-win [entities] (actions/do-dialogue entities - :ego "Hey Bloodclot!" + :ego "Hey, Bloodclot!" :ego "I have this potion which will make me as strong as you!" :bloodclot-head "What?!" :bloodclot-head "Give it here!") diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 9a244abb..16b01d84 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -88,9 +88,9 @@ (actions/talk entities :ego "There's a plaque here.") (actions/play-animation entities :ego :squat) (actions/do-dialogue entities - :ego "'A noble choice to be a knight,\nBe a hero, do what's right.'" - :ego "'There's no need to shove,\nTo find your true love,'" - :ego "'Because maidens love guys with might.'" + :ego "'A noble choice to be a knight.\nStrength and valor guard thee from fright.'" + :ego "There’s no need to shove\nTo find thy true love,'" + :ego "''Cause maidens swoon for guys with might.'" ; TODO - QUOTES :ego "Awesome!" :ego "If I become a knight, maybe Georgia McGorgeous will love me!") (actions/in-love entities)) @@ -113,9 +113,9 @@ (actions/talk entities :ego "There's a plaque here.") (actions/play-animation entities :ego :squat) (actions/do-dialogue entities - :ego "'Grab the broom, and sweep that dirt!\nSweep, and mop till your arms hurt.'" - :ego "'You'll smell like a hog,\nwith stench like a fog,'" - :ego "'So with you, no girl will flirt.'") + :ego "'Grab thy broom, son, and sweep that dirt!\nSweep and mop till thy armpits hurt.'" + :ego "'Thou smell like a hog,\nWith stench like a fog,'" + :ego "'So with thou no cute babes wouldst flirt.'") (actions/play-animation entities :ego :sigh) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) @@ -134,9 +134,9 @@ (actions/talk entities :ego "There's a plaque here.") (actions/play-animation entities :ego :squat) (actions/do-dialogue entities - :ego "'Choose the shovel, dig some holes,\ntis the boringest of roles,'" - :ego "'You can work by night,\nBut suffer a plight:'" - :ego "'Gals dislike guys who bury souls.'") + :ego "'With thy shovel thou will enroll\nFor the dead man a resting hole.'" + :ego "'Thou doth own the night\nBut beware the plight:'" + :ego "'Thou will not wed, if twas thy goal.'") (actions/play-animation entities :ego :sigh) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) (face-fairy entities) @@ -218,7 +218,7 @@ (actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path)) (actions/walk-straight-to entities :fairy-godfather [87 120] :speed 1.75 :update-baseline? false) (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :path (catmull-rom-spline (map #(apply vector-2* %) [[87 120] [87 124]]) true)))) - (actions/do-dialogue entities :fairy-godfather "This shovel represents the job of grave-digger." + (actions/do-dialogue entities :fairy-godfather "This shovel represents the job of gravedigger." :fairy-godfather "A simple job, for a simple fellow." :ego "Hey! " :ego "I'm not simple.") @@ -236,8 +236,8 @@ :fairy-godfather "Sword...?" :fairy-godfather "Uh, oh. There must be some mistake." :fairy-godfather "Ahem." - :fairy-godfather "You must choose between being a janitor and grave-digger." - :ego "But I want that sword, and be a knight!" + :fairy-godfather "You must choose between being a janitor and a gravedigger." + :ego "But I want that sword so that I can be a knight!" :ego "And you said that these destinies are never mistaken!" :fairy-godfather "Nevermind that." :fairy-godfather "Choose the broom or shovel, and cast it into the pit of fate." @@ -312,7 +312,7 @@ (actions/do-dialogue entities :fairy-godfather "Young Tick, you must choose your destiny!") (actions/present-choices entities {:choices ["What if I don't like any of these choices?" {:run #(do (actions/respond entities % - :fairy-godfather "Who wouldn't want to be a grave digger or janitor?" + :fairy-godfather "Who wouldn't want to be a gravedigger or janitor?" :fairy-godfather "That's the problem with kids these days." :fairy-godfather "Always complaining about what they can't have." :fairy-godfather "You need an attitude adjustment, mister.")) @@ -334,10 +334,10 @@ {:run #(actions/respond entities % :fairy-godfather "Don't worry, Tick.")}]}))) (defn describe-shovel [entities] - (actions/do-dialogue entities :fairy-godfather "Grave-digging is just the thing for you, Tick." + (actions/do-dialogue entities :fairy-godfather "Gravedigging is just the thing for you, Tick." :fairy-godfather "Just think about it." :fairy-godfather "You'll have your own little shack at the cemetery..." - :fairy-godfather "... where you can stay at 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.")) (defn describe-broom [entities] @@ -357,7 +357,7 @@ (actions/talk entities :ego "Wow! That's a long way down.")) :scripts {:shovel (actions/get-script entities (actions/walk-to entities :ego [154 41]) - (actions/talk entities :ego "I guess I'm doomed to be a grave-digger.") + (actions/talk entities :ego "I guess I'm doomed to be a gravedigger.") (actions/play-animation entities :ego :sigh) (actions/play-animation entities :ego :reach-start :stop? false) (describe-shovel entities) diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index fe139020..25286118 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -47,7 +47,7 @@ (update-in entities [:room :bloodclot-timer] (fnil inc 0))))) (defn bloodclot-talk-script [entities] - (actions/talk entities :ego "Let me down Bloodclot!" :anim :suspended-talk) + (actions/talk entities :ego "Let me down, Bloodclot!" :anim :suspended-talk) (actions/do-dialogue entities :bloodclot-head "You've been a nuisance since I first met you!" :bloodclot-head "Why shouldn't I gobble you up?") (bloodclot-choices entities)) @@ -75,7 +75,7 @@ :note-2 (fail-item :bloodclot-head "I'm afraid Gandarf will be of no use to you now.") :flask-1-strength (common/win) (actions/get-script entities - (actions/talk entities :bloodclot-head "Don't make me laugh kid!"))) + (actions/talk entities :bloodclot-head "Don't make me laugh, kid!"))) }} :timers {:taunt [5.0 1.0 add-second]} :layers [(assoc (utils/get-texture "held/background.png") :x 0 :y 0 :baseline 0) diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 5356b9fe..bc9a3094 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -34,7 +34,7 @@ "So you're just waiting in the dark?" {:run #(do (actions/respond entities % :shopkeep "Somebody's got to guard all of this stuff." - :shopkeep "Plus my son will be back any minute now with those candles.") + :shopkeep "Plus, my son will be back any minute now with those candles.") (actions/play-animation entities :shopkeep :sigh)) :choices actions/previous-choices} "Something else." @@ -101,7 +101,7 @@ {:run #(do (actions/respond entities % :shopkeep "REALLY? You've met him?" :ego "... erm. Yes!" - :shopkeep "If you really met him, you'll have to prove it." + :shopkeep "If you really did meet him, you'll have to prove it." :shopkeep "What is my son's name?")) :choice-fn (fn make-choices [] (let [names (shuffle boy-names)] @@ -198,7 +198,7 @@ (when (or (actions/has-item? entities :portrait) (has-to-return-teddy? entities)) (actions/walk-to entities :ego [235 15]) - (actions/talk entities :shopkeep "Excuse me sonny. Please return my belongings before you leave.") + (actions/talk entities :shopkeep "Excuse me, sonny. Please return my belongings before you leave.") (when (actions/has-item? entities :portrait) (return-portrait entities)) (when (has-to-return-teddy? entities) @@ -256,7 +256,7 @@ :grandfather-clock {:box [55 70 103 185] :script (actions/get-script entities (actions/do-dialogue entities :ego "Cool grandfather clock!" - :shopkeep "It's quite the exquisit piece, isn't it?"))} + :shopkeep "It's quite the exquisite piece, isn't it?"))} :shelf {:box [0 60 52 199] :script (actions/get-script entities (actions/walk-to entities :ego [48 58]) @@ -334,7 +334,7 @@ #_(actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) (actions/do-dialogue entities :ego "She's all out." - :shopkeep "That's right I'm all out." + :shopkeep "That's right, I'm all out." :shopkeep "Go tell Gandarf that I need some more brewed up." :shopkeep "Pronto!")) (do (actions/walk-to entities :ego [159 62] :face :right) diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 6963c380..0c057854 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -29,7 +29,7 @@ (defn do-warrior-dialogue [entities] (actions/walk-to entities :ego [150 45] :face :left) - (actions/talk entities :ego "Hey guys!") + (actions/talk entities :ego "Hey, guys!") (actions/talk entities :warriors "Hark! Good day, young esquire.") (actions/present-choices entities {:choices ["Can I have some of your food?" @@ -51,7 +51,7 @@ :warriors "As my father instructedeth unto me as a mere lad: " :warriors "'Son, thou must speaketh in this manner.'" :warriors "And I asketh unto him:" - :warriors "'But father, why musteth I speaketh in this manner?'" + :warriors "'But, Father, why musteth I speaketh in this manner?'" :warriors "'Yea, my son, for thou art a knight. And thou musteth speaketh in this manner.'" :warriors "And I toldeth unto him:" :warriors "'Thou art my father, and I am thy son. Therefore I will speaketh in this manner.'" @@ -77,7 +77,7 @@ (actions/play-animation entities :ego :grow :stop? false) (play-battle entities :win) (actions/do-dialogue entities - :warriors "Congratulations young master. Thou art worthy in might." + :warriors "Congratulations, young master. Thou art worthy in might." :warriors "Take thy servant's medal of strength.") (actions/give entities :medal) (actions/glad entities) @@ -102,7 +102,7 @@ (actions/present-choices entities {:choices [(when (not (actions/has-obtained? entities :ladder)) "Nice ladder.") {:run #(actions/respond entities % - :ladder-guard "Tis nice, indeed!" + :ladder-guard "'Tis nice, indeed!" :ladder-guard "Belongeth to the Duke of Remington, it doth.") :choices ["Can I have it?" {:run #(actions/respond entities % :ladder-guard "No.") @@ -118,7 +118,7 @@ :choices ["Pretty pretty pretty please?" {:run #(do (actions/respond entities % :ladder-guard "Well, okay." - :ladder-guard "Do not darest telleth a soul, or thou wilst bring my family dishonor!" + :ladder-guard "Do not durst telleth a soul, or thou wilst bring my family dishonor!" :ladder-guard "I will shame the name of my father, Luke, and his father, Puke." :ladder-guard "Not to mention, the duke will have my head!") (actions/walk-to entities :ego [211 63] :face :right) @@ -142,7 +142,7 @@ :ladder-guard "I trusteth it is safe in thy possession?" :ego "Yes, it sure is!" :ego "Can I borrow it a while longer?" - :ladder-guard "Yes, but do not durst tell a soul!") + :ladder-guard "Yes, but do not durst telleth a soul!") (actions/respond entities % :ladder-guard "I trusteth it is safe in thy possession?" :ego "Ahem..." @@ -156,7 +156,7 @@ (when (not (actions/has-obtained? entities :ladder)) (actions/do-dialogue entities :ladder-guard "Dost thou seeth this ladder?" - :ladder-guard "Tis my duty to guardeth it." + :ladder-guard "'Tis my duty to guardeth it." :ladder-guard "Why, if I didst sit and dineth with my friends, a hoodlum wouldst steal it."))) :choices actions/previous-choices} "What's your name?" diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 46a3418d..8daf0826 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -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."))) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index b804e8f2..e80b3e17 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -56,7 +56,7 @@ "What's with the safe?" {:run #(actions/respond entities % :wizard "That's my MagiSafe 5000." - :wizard "It's used to keep whipper-snappers like you out of my precious belongings." + :wizard "It's used to keep whippersnappers like you out of my precious belongings." :wizard "It's a magical safe only opened when the correct musical password is entered." :ego "What's the password?" :wizard "That's for me to know, and you not to find out.") @@ -70,7 +70,7 @@ "How can I prove that I'm worthy in wisdom?") {:run #(actions/respond entities % :wizard "Every year we have the annual Town of Remington Junior Smarty Pants Derby." - :wizard "The whole town gets together to vote on who is the wisest in town, by a game of riddles." + :wizard "The whole town gets together to vote on who is the wisest in town, by means of a game of riddles." :wizard "Last year's winner was a young man named Brian O'Brainy, in town." :wizard "Maybe you can ask him.") :choices actions/previous-choices} @@ -80,7 +80,7 @@ :wizard "Of course I could." :wizard "I keep all sorts of potion recipes in my MagiSafe 5000.") - (actions/talk entities :wizard "I can turn a weakling into an olympic lifter." :anim :talk-angry :stop? false) + (actions/talk entities :wizard "I can turn a weakling into an Olympic lifter." :anim :talk-angry :stop? false) (actions/talk entities :wizard "A flea into a lion!" :anim :talk-angry :stop? false) (actions/talk entities :wizard "A klutz into a ballet dancer!" :anim :talk-angry :stop? true) (actions/do-dialogue entities @@ -95,7 +95,7 @@ :wizard "Fought a firebreathing dragon?" :ego "Umm..." :wizard "Saved an old lady from a burning building?" - :wizard "Stave off zombies from the eternal graveyard?" + :wizard "Staved off zombies from the eternal graveyard?" :wizard "Rescued a stranded cat?" :ego "I haven't done any of those things!" :wizard "Seems to me you have to go do some heroic deeds!") @@ -168,7 +168,7 @@ :scripts #(condp = % :kiss (actions/get-script entities (actions/do-dialogue entities - :wizard "Good job boy! You saved a damsel in distress." + :wizard "Good job, boy! You saved a damsel in distress." :wizard "You have proven yourself worthy in courage.")) :medal (actions/get-script entities (actions/do-dialogue entities @@ -177,16 +177,16 @@ :trophy (actions/get-script entities (actions/do-dialogue entities :wizard "My, my, you have proven your worth in wisdom!" - :wizard "One day you'll be as wise as me!")) + :wizard "One day, you'll be as wise as I am!")) :recipe (actions/get-script entities (actions/do-dialogue entities - :ego "I probably shouldn't show him that I have his stolen posessions.")) + :ego "I probably shouldn't show him that I have his stolen possessions.")) :frog-legs (actions/get-script entities (actions/do-dialogue entities - :ego "I probably shouldn't show him that I have his stolen posessions.")) + :ego "I probably shouldn't show him that I have his stolen possessions.")) :mandrake (actions/get-script entities (actions/do-dialogue entities - :ego "I probably shouldn't show him that I have his stolen posessions.")) + :ego "I probably shouldn't show him that I have his stolen possessions.")) :flask-1 (actions/get-script entities (actions/do-dialogue entities :wizard "You can keep the flask.")) @@ -216,7 +216,7 @@ (actions/remove-entity entities :flask) (actions/give entities :flask-1) (when (get-in @entities [:room :entities :wizard]) - (actions/do-dialogue entities :ego "Hey you think I could have this flask?" + (actions/do-dialogue entities :ego "Hey, you think I could have this flask?" :wizard "Sure.")))) :frog-legs (assoc (utils/get-texture "inside-house/frog-legs.png") :x 180 :y 77 :baseline 240 diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index f57474db..eece3e26 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -80,12 +80,12 @@ :warden "You're not under arrest for theft of the sword." :warden "You're under arrest for stealing the Duke of Remington's ladder." :ego "But I'm the good guy!\nThe game is named after me!" - :warden "Sorry chap. The law's the law." + :warden "Sorry, chap. The law's the law." ) (actions/present-choices entities {:choices ["But I'm just a kid." {:run #(actions/respond entities % - :warden "The Duke of Remington is a very stern chap." + :warden "The Duke of Remington is a very stern fellow." :warden "He doesn't bend the rules, even for young thieves.") :choices actions/previous-choices} "Took, son of Luke, son of Puke lended me that ladder!" @@ -194,13 +194,13 @@ (do (actions/transition-background entities :outside-jail [50 46] :face :right) (if (get-in @entities [:state :dropped-ball?]) (do - (actions/do-dialogue entities :ego "Yes I made it!" + (actions/do-dialogue entities :ego "Yes! I made it!" :ego "But what now?" :ego "I have till sunrise before Bloodclot comes and destroys the town." :ego "Maybe Gandarf can help me!") (utils/snapshot-state @entities :after-jail)) (do - (actions/do-dialogue entities :ego "Yes I made it!" + (actions/do-dialogue entities :ego "Yes! I made it!" :guard "Hmm?" :guard "Halt! Thou art under arrest!" :guard "Thou wilst be putteth back into thy cell.") @@ -341,7 +341,7 @@ (actions/do-dialogue entities :ego "Oops!" :warden "Hey! What are you doing?" - :warden "Trying to escape, are ye chap?") + :warden "Trying to escape, are ye, chap?") (common/go-to-jail entities)) entities) entities) entities)))}]