From 36b6abdd126d3f25aab5c40817d2859530b3caf6 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 22 May 2015 18:23:31 -0700 Subject: [PATCH] it's about the ladder. --- .../src-common/advent/screens/rooms/common.clj | 2 +- .../src-common/advent/screens/rooms/dream.clj | 7 ++++--- .../advent/screens/rooms/inside_jail.clj | 18 +++++++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 7d1dd609..aa46ec3d 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -15,7 +15,7 @@ (defn go-to-jail [entities] (actions/update-state entities #(assoc % :time :night)) - (actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key} (:inventory %)) (:chest-contents %)))) + (actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key :ladder} (:inventory %)) (:chest-contents %)))) (actions/update-state entities #(assoc % :inventory [])) (actions/update-state entities #(assoc % :opened-bars? false)) (actions/transition-background entities :inside-jail [130 85])) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 77312490..1b052a94 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -89,7 +89,8 @@ :ego "'Because maidens love guys with might.'" :ego "Awesome!" :ego "If I become a knight, maybe Georgia McGorgeous will love me!") - (actions/in-love entities) + (when-not (get-in @entities [:state :plaques-read :sword]) + (actions/in-love entities)) (actions/stop-walking entities :ego :face :right) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) (face-fairy entities) @@ -318,7 +319,7 @@ (actions/play-animation entities :ego :reach-stop :stop? true) (actions/do-dialogue entities :ego "I can't bring myself to do it." - :ego "That sounds horrible!" + :ego "It seems like misery!" :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?")) :broom (actions/get-script entities (actions/walk-to entities :ego [154 41]) @@ -329,7 +330,7 @@ (actions/play-animation entities :ego :reach-stop :stop? true) (actions/do-dialogue entities :ego "I can't bring myself to do it." - :ego "That sounds horrible!" + :ego "It seems like misery!" :ego "Plus, how can I ever win the heart of my true love, Georgia McGorgeous?"))}}} :timers {:return [15.0 15.0 return-from-island]} :layers [(assoc (texture "dream/clouds1.png") :x -10 :y 0 :baseline -1 :parallax 0.2 :scale-x 1.1 :scale-y 1.1) diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 9018203f..1a0889c8 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -60,15 +60,27 @@ (defn do-warden-dialogue [entities] (actions/do-dialogue entities :ego "Hey, who are you? Why am I in this cell?" - :warden "You're under arrest for theft of public property." - :ego "Under arrest? But I'm the good guy!\nThe game is named after me!" - :warden "Sorry chap. The law's the law.") + :warden "You're under arrest for theft of property." + :ego "Under arrest? Theft of property?" + :ego "I didn't steal the Sword of Blergh, I fulfilled the prophecy." + :warden "Slow down there, chap." + :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." + ) (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 "He doesn't bend the rules, even for young thieves.") :choices actions/previous-choices} + "Took, son of Luke, son of Puke gave me that ladder!" + {:run #(actions/respond entities % + :warden "It wasn't his to give." + :warden "In fact, he's off to the gallows come dawn." + :ego "Oh, no.") + :choices actions/previous-choices} "But I was going to teach Bloodclot a lesson!" {:run #(actions/respond entities % :warden "Sure you were. If he even exists."