experiments

This commit is contained in:
2015-05-03 16:09:27 -07:00
parent a0a7257bd0
commit b8c47d674d
41 changed files with 170 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
<dict>
<key>duration</key>
<real>0.20000000298023224</real>
</dict>
</array>
</plist>

View File

@@ -28,10 +28,14 @@
(actions/start-animation screen (merge (assoc (animation->texture screen wizard-stand)
:left {:talk (utils/flip wizard-talk)
:stand (utils/flip wizard-stand)
:disappear (utils/flip wizard-disappear)}
:disappear (utils/flip wizard-disappear)
}
:right {:talk wizard-talk
:stand wizard-stand
:disappear wizard-disappear}
:disappear wizard-disappear
}
:origin-x 0
:origin-y 0
:talk-color (color 0.95 0.3 1.0 1.0)
:facing :left) wizard-spec)
:stand)))

View File

@@ -37,6 +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?"
@@ -106,7 +107,8 @@
safe-lock (animation 0.1 (for [i (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])]
(aget safelock-sheet 0 i)))
candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2])
candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] )]
candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] )
experiment-left (utils/flip (utils/make-anim (texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))]
(rooms/make :music :inside-fangald
:interactions {:down-dir {:box [151 0 320 20]
:script (actions/get-script entities
@@ -134,7 +136,13 @@
(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 {: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
: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)
: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 = %
:kiss (actions/get-script entities