diff --git a/desktop/resources/outside-castle/steer.png b/desktop/resources/outside-castle/steer.png new file mode 100644 index 00000000..2888b8fb Binary files /dev/null and b/desktop/resources/outside-castle/steer.png differ diff --git a/desktop/resources/outside-castle/steer.pxi b/desktop/resources/outside-castle/steer.pxi new file mode 100644 index 00000000..7730acb9 Binary files /dev/null and b/desktop/resources/outside-castle/steer.pxi differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 34ac8a9e..f6900c91 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -62,8 +62,8 @@ :ego "Okay."))} "No." {:run #(actions/respond entities % - :game-player "That's exactly what I'd expect a dummy like you to say." - :choices actions/previous-choices)}]} + :game-player "That's exactly what I'd expect a dummy like you to say.") + :choices actions/something-else}]} (when (= :wool (get-in @entities [:state :current-riddle])) "What was that riddle again?") diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index dc01c9af..7616bdbb 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -63,6 +63,9 @@ :entities {:peddler (actions/start-animation screen (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil :talk peddler-talk :stand peddler-stand) - :stand)} + :stand) + :steer (assoc (texture "outside-castle/steer.png" ) :x 203 :y 155 :baseline 80 + :script (actions/get-script entities + (actions/talk entities :ego "That is one buff bull!")))} :collision "outside-castle/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00))))