From 18bfc55f04f87968e665e846cac0bac6535a9cce Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sun, 14 Dec 2014 21:12:33 -0800 Subject: [PATCH] More entertaining dialogue and no re-open. --- .../advent/screens/rooms/inside_cafeteria.clj | 13 ++++++---- .../advent/screens/rooms/inside_castle.clj | 4 +-- .../advent/screens/rooms/inside_house.clj | 26 +++++++++++++------ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 52462d35..274427cb 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -46,12 +46,14 @@ "Can I be a knight like you guys?") {:run #(actions/respond entities % :warriors "We thinketh not, young esquire." - :warriors "You lacketh the strength and vigor required for such a task.") + :warriors "Thou lacketh the strength and vigor required for such a task." + :warriors "To becometh a knight, thou wouldst have to best Captain McHulk in battle." + :warriors "And no one durst challeng him!") :choices ["But I'm on a quest to become a knight!" {:run #(actions/respond entities % :warriors "Young esquire, thou art valiant in heart. " :warriors "Departeth henceforth and go hitherto, unto the gym.")} - "I challenge you to a arm wrestling match to prove my strength." + "I challenge Captain McHulk to an arm wrestling match to prove my strength." {:run (fn [msg] (actions/respond entities msg :warriors "Prepare thyself, thy task is not for the faint of heart.") (if (actions/has-item? @entities :flask-1-strength) @@ -67,7 +69,9 @@ (do (play-battle entities :lose) (actions/do-dialogue entities - :warriors "You lost, young master. Go hitherto, unto thy gym."))))} + :warriors "You lost, young master. Go hitherto, unto thy gym.") + (actions/walk-to entities :ego [160 45]) + (actions/do-dialogue entities :ego "Dang! If I only I had some kind of potion to make me strong..."))))} "Something else." {:choices actions/something-else}] } @@ -127,8 +131,7 @@ {:run #(actions/respond entities % :ladder-guard "I am Took, son of Luke, son of Puke.") :choices actions/previous-choices} "Goodbye." - {:run #(actions/respond entities % "Goodbye.")}]}) - ) + {:run #(actions/respond entities % "Goodbye.")}]})) (defn make [screen] (let [warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 9f85884b..ed9e66e6 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -16,11 +16,11 @@ {:run #(actions/respond entities % :game-player "Thanks. I'm the reigning champ in the annual Town of Remington Junior Smarty Pants Derby." :game-player "I earned it with my wisdom and sharp intellect." - :game-player "Oh, I'm guessing you want it? Perhaps to prove your wisdom and pull the Sword of Blergh?" + :game-player "Oh, I'm guessing you want it? Maybe to prove your wisdom and pull the Sword of Blergh?" :game-player "Perhaps to become a knight and impress a young lady?") :choices ["Yes." {:run #(actions/respond entities % - :game-player "My trophy is hard-won. You want pry it from my fingers easily." + :game-player "My trophy is hard-won. You won't pry it from my fingers easily." :game-player "But I'm preparing for next year's Junior Smarty Pants Derby, and I need some help." :game-player "If you can help me, it will secure my success for next year, and so you can have this trophy." :game-player "Deal?") diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 698a251b..e7ceb623 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -13,14 +13,24 @@ (defn open-safe [entities] (screen! safe/safe-screen :show-screen :success (actions/get-script entities - (actions/talk entities :ego "Yes! That worked.") - (actions/play-animation entities :ego :squat) - (actions/give entities :recipe) - (actions/talk entities :ego "I found a recipe for a strength potion!") - (actions/talk entities :ego "Looks like there's something else in here too...") - (actions/play-animation entities :ego :squat) - (actions/give entities :frog-legs) - (actions/talk entities :ego "Eww. Frog legs.")) + (if (actions/has-item? entities :recipe) + (do + (actions/play-animation entities :ego :squat) + (actions/talk entities :ego "It's empty now.")) + (do + (actions/talk entities :ego "Yes! That worked.") + (actions/talk entities :ego "Let's see here...") + (actions/play-animation entities :ego :squat) + (actions/talk entities :ego "No, that's a recipe to turn someone into a professional dancer...") + (actions/play-animation entities :ego :squat) + (actions/talk entities :ego "Here's a recipe to make everything taste like cotton candy. I'll just put that back.") + (actions/play-animation entities :ego :squat) + (actions/give entities :recipe) + (actions/talk entities :ego "Aha! Here it is! I found a recipe for a strength potion!") + (actions/talk entities :ego "Looks like there's something else in here too...") + (actions/play-animation entities :ego :squat) + (actions/give entities :frog-legs) + (actions/talk entities :ego "Eww. Frog legs.")))) :failure (actions/get-script entities (actions/talk entities :ego "I don't think that worked..."))) (actions/update-state entities #(assoc % :active? false)))