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

minor improvements.

Browse Source
This commit is contained in:
Bryce Covert
2015-08-05 08:30:42 -07:00
parent 3ccd78544e
commit ff8149fabb
8 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/inside-jail/warden.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
desktop/resources/inside-jail/warden.pxa/0.pxi
View File

Binary file not shown.

BIN
desktop/resources/inside-jail/warden.pxa/1.pxi
View File

Binary file not shown.

BIN
desktop/resources/inside-jail/warden.pxa/2.pxi
View File

Binary file not shown.

BIN
desktop/resources/inside-jail/warden.pxa/3.pxi
View File

Binary file not shown.

8
desktop/resources/inside-jail/warden.pxa/CelData.plist
View File

@@ -18,5 +18,13 @@
<key>duration</key> <key>duration</key>
<real>1</real> <real>1</real>
</dict> </dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
</array> </array>
</plist> </plist>

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

@@ -764,6 +764,10 @@
(defn in-love [entities] (defn in-love [entities]
(transition-music entities :love :duration 1.0) (let [seen-love (get-in @entities [:state :has-seen-love?])]
(play-animation entities :ego :love) (when (or (not seen-love)
(transition-music entities nil :duration 1.0)) (< (rand-int 10) 3))
(transition-music entities :love :duration 1.0)
(play-animation entities :ego :love)
(actions/update-state entities (fn [s] (assoc s :has-seen-love? true)))
(transition-music entities nil :duration 1.0))))

16
desktop/src-common/advent/screens/rooms/inside_jail.clj
View File

@@ -201,13 +201,12 @@
(aget warden-sheet 0 i))) (aget warden-sheet 0 i)))
warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])] warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])]
(aget warden-sheet 0 i))) (aget warden-sheet 0 i)))
warden-fall-asleep (animation 0.1 (for [i (flatten [(repeat 5 0) 2 2 (repeat 10 0) 2 2 2 2 2 2 2 (repeat 10 0) 2 2 2])] warden-fall-asleep (animation 0.1 (for [i (flatten [(repeat 5 0) 2 2 (repeat 10 0) 2 2 2 (repeat 10 0) 2 2 2])]
(aget warden-sheet 0 i))) (aget warden-sheet 0 i)))
warden-sleep (animation 0.5 (for [i (flatten [ 3 3 2 2 2])] warden-sleep (animation 0.25 (for [i (flatten [ 3 4 3 4 3 4 3 4 3 4 5 5 2 2 2 2 2 2])]
(aget warden-sheet 0 i))) (aget warden-sheet 0 i)))
candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4))
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])]
]
(rooms/make :music :inside-antique (rooms/make :music :inside-antique
:interactions { :interactions {
:lock {:box [172 102 190 124] :lock {:box [172 102 190 124]
@@ -239,6 +238,15 @@
(actions/update-state entities #(assoc % :dropped-ball? true)) (actions/update-state entities #(assoc % :dropped-ball? true))
(actions/do-dialogue entities :ego "Geronimo!!" (actions/do-dialogue entities :ego "Geronimo!!"
:ego "*crash*!") :ego "*crash*!")
(Thread/sleep 200)
(actions/begin-animation entities :warden :stand)
(Thread/sleep 300)
(actions/do-dialogue entities
:warden "Charlie, is that you chap?"
:warden "What're you doing digging through my trash can?")
(Thread/sleep 300)
(actions/play-animation entities :warden :fall-asleep :stop? false)
(actions/begin-animation entities :warden :sleep)
(actions/remove-item entities :ball-n-chain)) (actions/remove-item entities :ball-n-chain))
(actions/do-dialogue entities :ego "I don't know what to do with that."))) (actions/do-dialogue entities :ego "I don't know what to do with that.")))
:sword (actions/get-script entities (actions/talk entities :ego "I wouldn't want to accidentally break the Sword of Blergh.")) :sword (actions/get-script entities (actions/talk entities :ego "I wouldn't want to accidentally break the Sword of Blergh."))