notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

step back.

Browse Source
This commit is contained in:
Remington Covert
2015-02-12 21:16:21 -08:00
parent d576e377ed
commit e0a35216f0
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/src-common/advent/actions.clj
View File

@@ -204,7 +204,7 @@
(terminate [this screen entities] entities) (terminate [this screen entities] entities)
(can-skip? [this screen entities] false))) (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]) (let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id])
final-x (int final-x) final-x (int final-x)
final-y (int final-y) final-y (int final-y)
@@ -242,7 +242,8 @@
(update-in entities [:room :entities target-id] (update-in entities [:room :entities target-id]
#(start-animation screen #(start-animation screen
(assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)] true) (assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)] true)
:facing (cond (< delta-x 0) :left :facing (cond force-dir force-dir
(< delta-x 0) :left
(> delta-x 0) :right (> delta-x 0) :right
:else (:facing %))) :else (:facing %)))
:walk :walk

17
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -98,7 +98,7 @@
(defn walk-to-blergh [entities] (defn walk-to-blergh [entities]
(actions/walk-to entities :ego [85 145] :face :right) (actions/walk-to entities :ego [85 145] :face :right)
(actions/transition-background entities :space [0 65]) (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/play-animation entities :blergh :appear :stop? false)
(actions/transition-music entities :fight)) (actions/transition-music entities :fight))
@@ -121,14 +121,15 @@
(actions/add-entity entities :blergh (get-in @entities [:room :blergh])) (actions/add-entity entities :blergh (get-in @entities [:room :blergh]))
(actions/do-dialogue entities :ego "Who are YOU?!?!?!" (actions/do-dialogue entities :ego "Who are you?!"
:blergh "I'm your worst nightmare." :blergh "I am Bloodclot, the goblin king!"
:blergh "I am Blergh, and this is now my dimension."
: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!" :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 "Wait a second. I'm just a kid.")
:ego "I'm just trying to impress Georgia McGorgeous." (actions/walk-straight-to entities :ego [150 45] :override-dir :right)
:ego "I just... accidentally pulled the sword!" (actions/do-dialogue entities :ego "I'm just trying to impress Georgia McGorgeous.")
:ego "I didn't know that it would release a new evil on the world!" (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 "'Fight he must for one more test,\nHe will die if not the best.'"
:blergh "Ring any bells?" :blergh "Ring any bells?"
:blergh "It's time to die kiddo." :blergh "It's time to die kiddo."