From 05f5300a4e9880993c8155f816a004361eed3e48 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 9 Nov 2015 09:42:51 -0800 Subject: [PATCH] single to double quotes --- .../advent/screens/rooms/common.clj | 52 +++++++++---------- .../src-common/advent/screens/rooms/dream.clj | 18 +++---- .../src-common/advent/screens/rooms/held.clj | 2 +- .../advent/screens/rooms/inside_cafeteria.clj | 8 +-- .../advent/screens/rooms/inside_castle.clj | 27 +++++----- .../advent/screens/rooms/outside_house.clj | 12 ++--- desktop/src-common/advent/screens/scene.clj | 12 ++--- 7 files changed, 66 insertions(+), 65 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 89ebd595..b6a6ee12 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -75,34 +75,34 @@ (defn read-note-1 [entities] (actions/do-dialogue entities :ego "It's a note from Gandarf! It says:" - :ego "'Tick, I have been kidnapped by Bloodclot.'" - :ego "'He's got me locked up in his fortress of doom.'" - :ego "'It's actually pretty comfortable, despite the name.'" - :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 "'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.'" - :ego "'And please hurry, because we're being forced into a karaoke competition.'" - :ego "'I'm about at my wits' end.'" - :ego "'P.S., Guard that slingshot with your life!'" - :ego "'P.P.S., You can look for my secret stash of helpful stuff behind a nearby r...'" + :ego "\"Tick, I have been kidnapped by Bloodclot." + :ego "He's got me locked up in his fortress of doom." + :ego "It's actually pretty comfortable, despite the name." + :ego "You must cast the spell to restore magic to the Slinger's Shot yourself." + :ego "You do still 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 "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." + :ego "And please hurry, because we're being forced into a karaoke competition." + :ego "I'm about at my wits' end." + :ego "P.S., Guard that slingshot with your life!" + :ego "P.P.S., You can look for my secret stash of helpful stuff behind a nearby r...\"" :ego "It just cuts off there.")) (defn read-note-2 [entities] (actions/do-dialogue entities :ego "It's a Bingo card." :ego "Look's like there's a note on the back." - :ego "'Tick, the situation is dire. I don't have much time. Please hurry.'" - :ego "'We've been forced into playing bingo for the last 3 hours.'" - :ego "'You are almost done with the spell to restore magic to The Slinger's Shot.'" - :ego "'You haven't lost it, right?'" - :ego "'You need to add the root of all evil to the cauldron.'" - :ego "'Also, you'll need to add a split second.'" - :ego "'Then, dip the Slinger's Shot in to complete the spell.'" - :ego "'Don't forget about my secret stash of helpful stuff.'")) + :ego "\"Tick, the situation is dire. I don't have much time. Please hurry." + :ego "We've been forced into playing bingo for the last 3 hours." + :ego "You are almost done with the spell to restore magic to The Slinger's Shot." + :ego "You haven't lost it, right?" + :ego "You need to add the root of all evil to the cauldron." + :ego "Also, you'll need to add a split second." + :ego "Then, dip the Slinger's Shot in to complete the spell." + :ego "Don't forget about my secret stash of helpful stuff.\"")) (def frankie-color (Color/valueOf "9907CFFF")) (defn listen-to-frankie [entities] @@ -170,7 +170,7 @@ (talk m) (respond "Let's see, Chapter 24...") (respond "Ahh, yes, here it is.") - (respond "'There is to be no robbery of the elderly...'") + (respond "\"There is to be no robbery of the elderly...\"") (respond "Bubba, Chapter 24 doesn't say anything about our stash!")) :choices actions/previous-choices} @@ -179,9 +179,9 @@ (talk m) (respond "Let's see, Chapter 19A...") (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 compliment to the gang leader.'") + (respond "\"If visual confirmation cannot be made...") + (respond "The 'The super cool secret club' member can validate his allegiance... ") + (respond "By giving a nice compliment to the gang leader.\"") (respond "... Well?")) :choices ["Umm, you've got a killer smile." {:run (fn [m] diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 5d702b2d..08c8e822 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.\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 "\"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.\"" :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 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.'") + :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 "'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.'") + :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) diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index ef6f9508..fa18ba6e 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -22,7 +22,7 @@ {:run #(actions/respond entities % :bloodclot-head "But I love eating young, tender children!" :bloodclot-head "My mother would sing while making children stew." - :bloodclot-head "'Eat the humans while they're young,'\n'Eat the liver, spleen, and lung!'" + :bloodclot-head "\"Eat the humans while they're young,\nEat the liver, spleen, and lung!\"" :bloodclot-head "Just singing that makes my mouth water.") :choices actions/previous-choices} "I'm covered in poison!" diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 8456c32f..fa47b8b3 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -49,12 +49,12 @@ :warriors "`Tis a tradition!" :warriors "All knights speaketh in such a manner." :warriors "As my father instructedeth unto me as a mere lad: " - :warriors "'Son, thou must speaketh in this manner.'" + :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 "'Yea, my son, for thou art a knight. And thou musteth 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.'" + :warriors "\"Thou art my father, and I am thy son. Therefore I will speaketh in this manner.\"" :ego "... I think I've got the idea.") :choices actions/previous-choices} (when (not (actions/has-obtained? entities :medal)) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 098ab351..4b9289a1 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -106,7 +106,7 @@ :game-player "... and there are a few puzzles that have ME stumped." :game-player "If you can bring me the answers to three riddles, I'll give you my trophy." :game-player "Here's the first riddle:" - :game-player "'White as snow, but not as cold,\nKeeps you warm, or so I'm told.'" + :game-player "\"White as snow, but not as cold,\nKeeps you warm, or so I'm told.\"" :ego "Okay. So I'll be back soon."))} "No thanks." {:run #(actions/respond entities % :game-player "Fine by me.")}]} @@ -200,8 +200,8 @@ {:run #(actions/respond entities % :game-player "It's the Sword of Blergh. " :game-player "There's a prophecy that says that whoever pulls it will be a great knight!" - :game-player "'The Sword of Blergh, with magic sting,\nshall yield to no earthly king.'" - :game-player "'Worthy in wisdom, courage, and might,\nonly then with sword he'll fight.'" + :game-player "\"The Sword of Blergh, with magic sting,\nshall yield to no earthly king." + :game-player "Worthy in wisdom, courage, and might,\nonly then with sword he'll fight.\"" :game-player "I've often dreamed of pulling the sword myself.") :choices ["Why don't you?" {:run #(do (actions/respond entities % @@ -221,19 +221,19 @@ (when (= :wool (get-in @entities [:state :current-riddle])) "What was that riddle again?") {:run #(actions/respond entities % - :game-player "'White as snow, but not as cold,\nKeeps you warm, or so I'm told.'") + :game-player "\"White as snow, but not as cold,\nKeeps you warm, or so I'm told.\"") :choices actions/previous-choices} (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,\nWant 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])) "What was that riddle again?") {:run #(actions/respond entities % - :game-player "'Hippity-hop, I'd jump so high,\nWithout these springs, can't harm a fly.'") + :game-player "\"Hippity-hop, I'd jump so high,\nWithout these springs, can't harm a fly.\"") :choices actions/previous-choices} "Nevermind." {:run #(actions/respond entities % :game-player "See you around.")}]}) @@ -298,9 +298,10 @@ (actions/talk entities :ego "I wouldn't taste very good anyhow!" :anim :scared-talk) (actions/begin-animation entities :ego :scared) (actions/do-dialogue entities - :bloodclot-head "'Fight he must for one more test,\nHe will die if not the best.'" + :bloodclot-head "\"A final test remains, behold!\"" :bloodclot-head "Ring any bells?" - :bloodclot-head "Face it, kiddo, you're no match for me, or my appetite." + :bloodclot-head "The final test of my appetite." + :bloodclot-head "Face it, kiddo, you're no match for me." :bloodclot-head "And Georgia McGorgeous would never go for such a cowardly knight anyhow." :bloodclot-head "Let the feast begin.")) @@ -312,9 +313,9 @@ :ego "It looks like there's an inscription here.") (actions/play-animation entities :ego :squat) (actions/do-dialogue entities - :ego "'In the day when I shall be pulled,\nWith much strength a knight will take hold.'" - :ego "'Courage will he need,\nWisdom he shall heed.'" - :ego "'A final test remains, behold!'") + :ego "\"In the day when I shall be pulled,\nWith much strength a knight will take hold." + :ego "Courage will he need,\nWisdom he shall heed." + :ego "A final test remains, behold!\"") (if (= 3 (count missing-items)) (do (actions/walk-to entities :ego [115 54]) @@ -549,7 +550,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,\nWant 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."))) @@ -563,7 +564,7 @@ (actions/do-dialogue entities :ego "A balloon is light as a feather." :game-player "That's right, Tick! Now for your third riddle:" - :game-player "'Hippity-hop, I'd jump so high,\nWithout these springs, can't harm a fly.'" + :game-player "\"Hippity-hop, I'd jump so high,\nWithout these springs, can't harm a fly.\"" :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/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index cfdcfb40..a098f7ca 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -191,14 +191,14 @@ (defn do-prophecy [entities] {:run #(do (actions/respond entities % :wizard "Well, let me remind you." - :wizard "'On the day when it shall be pulled,\nWith much strength a knight will take hold.'")) + :wizard "\"On the day when it shall be pulled,\nWith much strength a knight will take hold.\"")) :choices ["Is this almost over?" {:run #(do (actions/update-state entities (fn [state] (assoc state :convinced-wizard? true))) (actions/respond entities % :wizard "Patience, boy." - :wizard "'Courage will he need,\nWisdom he shall heed.'" - :wizard "'A final test remains, behold!'" + :wizard "\"Courage will he need,\nWisdom he shall heed." + :wizard "A final test remains, behold!\"" :wizard "If this is truly your quest, then I will help you. " :ego "So you're my friend now, Gandarf?" :wizard "No."))} @@ -206,8 +206,8 @@ {:run #(do (actions/update-state entities (fn [state] (assoc state :convinced-wizard? true))) (actions/respond entities % :wizard "Excuse you. Moving on..." - :wizard "'Courage will he need,\nWisdom he shall heed.'" - :wizard "'A final test remains, behold!'" + :wizard "\"Courage will he need,\nWisdom he shall heed." + :wizard "A final test remains, behold!\"" :wizard "If this is truly your quest, then I will help you. " :ego "So you're my friend now, Gandarf?" :wizard "No.") @@ -354,7 +354,7 @@ (do-prophecy entities)]} "I want to have the name 'Sir Tick.'" {:run #(actions/respond entities % - :wizard "'Sir Tick.'" + :wizard "\"Sir Tick.\"" :ego "It does have a nice ring to it." :ego "Wouldn't you say?" :wizard "It does indeed!" diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 17310c66..d8ead728 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -282,12 +282,12 @@ void main () (actions/get-script entities (actions/do-dialogue entities :ego "The recipe says:" - :ego "'For strength beyond measure,\nyou must mix, at your leisure:'" - :ego "'- A bowl of soup, shroom cream will do'" - :ego "'- Spit of beast whose strength will imbue'" - :ego "'- Mandrake root completes the brew'" - :ego "'A word of warning, before you go.\nA sip is all it takes to grow.'" - :ego "'Not more than that do drink,\nOr risk your body pushed to brink.'" + :ego "\"For strength beyond measure,\nyou must mix, at your leisure:" + :ego "- A bowl of soup, shroom cream will do" + :ego "- Spit of beast whose strength will imbue" + :ego "- Mandrake root completes the brew" + :ego "A word of warning, before you go.\nA sip is all it takes to grow." + :ego "Not more than that do drink,\nOr risk your body pushed to brink.\"" :ego "Hmm. I wonder what that last part means?")) :portrait