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

started making interaction.

Browse Source
This commit is contained in:
Bryce Covert
2015-03-24 16:22:54 -07:00
parent 8cd3a8535a
commit f528688f8c
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -89,7 +89,8 @@
:ego "And plus, it's the only way to get Georgia McGorgeous to love me!" :ego "And plus, it's the only way to get Georgia McGorgeous to love me!"
:ego "And this plaque here says that maidens love knights." :ego "And this plaque here says that maidens love knights."
:fairy-godfather "As long as you're under my watch, Tick, I forbid it!" :fairy-godfather "As long as you're under my watch, Tick, I forbid it!"
:fairy-godfather "And you're just not cut out for it!")) :fairy-godfather "And you're just not cut out for it!")
(actions/update-state entities #(update-in % [:plaques-read] conj :sword)))
(defn read-broom-plaque [entities] (defn read-broom-plaque [entities]
(actions/walk-to entities :ego [267 70] :face :right) (actions/walk-to entities :ego [267 70] :face :right)
@@ -106,7 +107,8 @@
:fairy-godfather "This weapon is used to fight a more persistent foe." :fairy-godfather "This weapon is used to fight a more persistent foe."
:fairy-godfather "Dust and grime!" :fairy-godfather "Dust and grime!"
:fairy-godfather "Take the broom, and cast it into the pit of fate." :fairy-godfather "Take the broom, and cast it into the pit of fate."
:fairy-godfather "Then you can fulfill your fate as a janitor.")) :fairy-godfather "Then you can fulfill your fate as a janitor.")
(actions/update-state entities #(update-in % [:plaques-read] conj :broom)))
(defn read-shovel-plaque [entities] (defn read-shovel-plaque [entities]
(actions/walk-to entities :ego [61 72] :face :left) (actions/walk-to entities :ego [61 72] :face :left)
@@ -120,7 +122,8 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:fairy-godfather "Don't be dismayed, young Tick." :fairy-godfather "Don't be dismayed, young Tick."
:fairy-godfather "Remember, these destinies can't be mistaken." :fairy-godfather "Remember, these destinies can't be mistaken."
:ego "But it sounds so dull!")) :ego "But it sounds so dull!")
(actions/update-state entities #(update-in % [:plaques-read] conj :shovel)))
(defn do-intro [entities] (defn do-intro [entities]
(Thread/sleep 2000) (Thread/sleep 2000)
@@ -214,14 +217,28 @@
:update-fn (partial utils/update-path-location 0.30) :update-fn (partial utils/update-path-location 0.30)
:baseline 240 :baseline 240
:script (actions/get-script entities :script (actions/get-script entities
(read-broom-plaque entities))) (if ((get-in @entities [:state :plaques-read]) :broom)
(do
(actions/walk-to entities :ego [267 70] :face :right)
(actions/play-animation entities :ego :sigh)
(actions/play-animation entities :ego :reach)
(actions/remove-entity entities :broom))
(read-broom-plaque entities))))
:shovel (assoc (texture "dream/shovel.png") :x 33 :y 122 :shovel (assoc (texture "dream/shovel.png") :x 33 :y 122
:path (catmull-rom-spline (map #(apply vector-2* %) [[22 122] [22 128]]) true) :path (catmull-rom-spline (map #(apply vector-2* %) [[22 122] [22 128]]) true)
:update-fn (partial utils/update-path-location 0.33) :update-fn (partial utils/update-path-location 0.33)
:baseline 240 :baseline 240
:script (actions/get-script entities :script (actions/get-script entities
(read-shovel-plaque entities))) (if ((get-in @entities [:state :plaques-read]) :shovel)
(do
(actions/walk-to entities :ego [61 72] :face :left)
(actions/play-animation entities :ego :sigh)
(actions/play-animation entities :ego :reach)
(actions/remove-entity entities :shovel))
(read-shovel-plaque entities))))
:sign (assoc (texture "dream/sign.png") :x 229 :y 33 :baseline 207) :sign (assoc (texture "dream/sign.png") :x 229 :y 33 :baseline 207)
:plaque-1 (assoc (texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :script (actions/get-script entities (read-shovel-plaque entities))) :plaque-1 (assoc (texture "dream/plaque1.png") :x 39 :y 99 :baseline 139 :script (actions/get-script entities (read-shovel-plaque entities)))
:plaque-2 (assoc (texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities))) :plaque-2 (assoc (texture "dream/plaque2.png") :x 147 :y 104 :baseline 139 :script (actions/get-script entities (read-sword-plaque entities)))

1
desktop/src-common/advent/screens/scene.clj
View File

@@ -415,6 +415,7 @@
:time :day :time :day
:obtained-items #{} :obtained-items #{}
:inventory [] :inventory []
:plaques-read #{}
:clues #{} :clues #{}
:mints-eaten 0 :mints-eaten 0
:seen-intro? false})) :seen-intro? false}))