From e0a997dee76a45a39bea664ec370c09d741d62b1 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 20 Dec 2015 19:31:52 -0500 Subject: [PATCH] minor feedback. --- desktop/src-common/advent/screens/rooms/cat_tree.clj | 7 +------ desktop/src-common/advent/screens/rooms/inside_jail.clj | 8 ++++++-- desktop/src-common/advent/screens/rooms/outside_house.clj | 2 +- desktop/src-common/advent/screens/rooms/outside_jail.clj | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index bd28dc98..3cfefad1 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -161,7 +161,7 @@ {:run #(actions/respond entities % :owl "Of course I can help you in your quest." :owl "I know just what you need." - :owl "But I'm also in trouble of my own.") + :owl "But I'm also in some trouble of my own.") :choices ["What kind of trouble?" {:run #(do (actions/respond entities % :owl "You see, we owls have very strong vision." @@ -186,11 +186,6 @@ :owl "Could you help me find it?" :ego "I'll let you know if I see anything." :owl "Oh, thank you."))} - "Have you seen Gandarf tonight?" - {:run #(actions/respond entities % - :owl "I don't know him." - :owl "I'm actually just travelling through this land.") - :choices actions/previous-choices} "Nevermind." {:run #(do (actions/respond entities % :owl "Oh, do tell me if you see a glass monocle around." diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index ebc63297..3fc586bf 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -271,6 +271,7 @@ "inside-jail/guard-crash.ogg" 0.6 false) + (actions/do-dialogue entities :guard "*oof*!") (actions/camera-shake entities 6) (actions/begin-animation entities :warden :stand) @@ -333,7 +334,9 @@ (actions/talk entities :ego "Not while I'm in this cell.")))}} :door {:box [257 62 301 152] :cursor :down - :script (actions/get-script entities (leave entities))}} + :script (actions/get-script entities (leave entities))} + + } :layers [(assoc (utils/get-texture "inside-jail/background.png") :x 0 :y 0 :baseline 0 :night-profile :none) (assoc (utils/get-texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165 :night-profile :none) (assoc (utils/get-texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35 :night-profile :none) @@ -435,7 +438,8 @@ (actions/talk entities :ego "I can't reach it.")))) :closed-window (assoc (utils/get-texture "inside-jail/window.png") :night-profile :none - :x 99 :y 111 :baseline 128)} + :x 99 :y 111 :baseline 128) + :guard { :object nil :width 100 :height 100 :x 70 :y 55 :talk-color (color 0.2 0.6 1.0 1.0)}} :collision "inside-jail/collision-locked.png" :collision-free (advent.pathfind/map-from-resource "inside-jail/collision-free.png") :scale-fn (utils/scaler-fn-with-baseline 0 0.50 1.5) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 300f1842..7e960580 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -487,7 +487,7 @@ "Bloodclot is on the loose!" {:run #(do (actions/respond entities % :wizard "Bloodclot?" - :wizard "You can't mean the goblin, Bloodclot?" + :wizard "You can't mean the goblin Bloodclot?" :wizard "If you did, you'd be burned to a crisp from his lightning gem!" :ego "Yes, that Bloodclot!" :wizard "I knew that there would be a \"final test\" for the hero who pulled the blade..." diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index cf8acf49..aaecf0bd 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -130,7 +130,7 @@ :sherrif-house {:box [138 143 160 168] :script (actions/get-script entities (actions/do-dialogue entities - :ego "That's the Sherrif's house." + :ego "That's the Sheriff's house." :ego "He hates me." :ego "All because I threw a rock through his window." :ego "Or windows."