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

closer to having gandarf be right.

Browse Source
This commit is contained in:
Bryce Covert
2015-05-05 22:23:27 -07:00
parent ae50600203
commit 4f67c1006d
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/src-common/advent/screens/rooms/inside_house.clj
View File

@@ -37,7 +37,7 @@
(actions/update-state entities #(assoc % :active? false)))
(defn do-wizard-dialogue [entities]
(actions/play-animation entities :wizard :experiment)
(actions/do-dialogue entities :wizard "What can I do for you boy?")
(actions/present-choices entities
{:choices ["What's with the safe?"
@@ -136,12 +136,7 @@
(assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200)
(assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0)
(assoc (texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)]
:entities {:experiment (assoc (animation->texture screen experiment-left)
:x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 7.43 :origin-y 0
:anim experiment-left
:stand experiment-left
:anim-start 0
:baseline 225)
:entities {
:wizard (common/make-wizard screen {:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0
:script (actions/get-script entities (do-wizard-dialogue entities))
:scripts #(condp = %
@@ -202,6 +197,10 @@
(do (actions/give entities :frog-legs)
(actions/remove-entity entities :frog-legs)
(actions/do-dialogue entities :ego "Eww. Frog legs.")))))}
:experiment (rooms/make-entity :experiment (assoc (animation->texture screen experiment-left)
:x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 7.43 :origin-y 0
:experiment experiment-left
:baseline 225))
:collision "inside-house/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75)
:apply-state (fn [entities]