diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 71510dcf..81d4eaa7 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -204,7 +204,7 @@ (terminate [this screen entities] entities) (can-skip? [this screen entities] false))) -(defn walk-to [entities target-id [final-x final-y] & {:keys [can-skip? face]}] +(defn walk-to [entities target-id [final-x final-y] & {:keys [can-skip? face force-dir]}] (let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id]) final-x (int final-x) final-y (int final-y) @@ -242,9 +242,10 @@ (update-in entities [:room :entities target-id] #(start-animation screen (assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)] true) - :facing (cond (< delta-x 0) :left - (> delta-x 0) :right - :else (:facing %))) + :facing (cond force-dir force-dir + (< delta-x 0) :left + (> delta-x 0) :right + :else (:facing %))) :walk )))))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 0772ae69..2a334aaf 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -98,7 +98,7 @@ (defn walk-to-blergh [entities] (actions/walk-to entities :ego [85 145] :face :right) (actions/transition-background entities :space [0 65]) - (actions/walk-straight-to entities :ego [140 55] :face :right) + (actions/walk-straight-to entities :ego [160 45] :face :right) (actions/play-animation entities :blergh :appear :stop? false) (actions/transition-music entities :fight)) @@ -121,14 +121,15 @@ (actions/add-entity entities :blergh (get-in @entities [:room :blergh])) - (actions/do-dialogue entities :ego "Who are YOU?!?!?!" - :blergh "I'm your worst nightmare." - :blergh "I am Blergh, and this is now my dimension." + (actions/do-dialogue entities :ego "Who are you?!" + :blergh "I am Bloodclot, the goblin king!" :blergh "The last 100 years I have waited for someone to pull my old sword,\n and let me return me to my rightful throne!" - :ego "Wait a second. I'm just a kid." - :ego "I'm just trying to impress Georgia McGorgeous." - :ego "I just... accidentally pulled the sword!" - :ego "I didn't know that it would release a new evil on the world!" + :ego "Wait a second. I'm just a kid.") + (actions/walk-straight-to entities :ego [150 45] :override-dir :right) + (actions/do-dialogue entities :ego "I'm just trying to impress Georgia McGorgeous.") + (actions/walk-straight-to entities :ego [100 45] :override-dir :right) + (actions/do-dialogue entities :ego "I just... accidentally pulled the sword!") + (actions/do-dialogue entities :blergh "'Fight he must for one more test,\nHe will die if not the best.'" :blergh "Ring any bells?" :blergh "It's time to die kiddo."