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

minor tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-12-02 20:54:23 -08:00
parent 033acad52c
commit 22a650549e
12 changed files with 130 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,7 @@
:game-player "Brian, you're a genius!")
#(actions/do-dialogue entities :game-player "Considering the inverse square law..."
:game-player "I estimate our planet's escape velocity to be..."
:game-player "No, that can't be right.")]))
)
:game-player "No, that can't be right.")])))
entities))
nil)
@@ -347,7 +346,8 @@
add-monocle-if-necessary))
(defn make [screen]
(let [game-player-talk-sheet (texture! (utils/get-texture "inside-castle/game-player-talk.png") :split 40 44)
(let [sign (utils/make-anim-seq "inside-castle/sign" [44 20] 0.3 (flatten [(repeat 20 0) 1 0 2 0 1 0 2 0 1 0 2 0 1]))
game-player-talk-sheet (texture! (utils/get-texture "inside-castle/game-player-talk.png") :split 40 44)
game-player-talk-up (animation 0.15 (for [i [0 2 0 2 0 2 0 3 0 2 0 1 0 0 0 0 2 0 2 0 3 0 1 0 1 0 0 1 0 2 0 3 0]]
(aget game-player-talk-sheet 0 i)))
@@ -491,6 +491,10 @@
:entities {:bird-1 (utils/make-bird screen (as-> [[185 235]
[220 225] [210 230] [250 235]] p
(concat p (reverse p))))
:sign (assoc (animation->texture screen sign )
:anim sign
:anim-start 0
:x 125 :y 138 :baseline 239)
:bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p
(concat p (reverse p))))

3
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -169,8 +169,7 @@
(actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 1.0))
(actions/give entities :broken-clock)
(actions/walk-straight-to entities :ego [170 71]))
(actions/talk entities :ego "No reason to chop that!"))
)
(actions/talk entities :ego "No reason to chop that!")))
:sword (actions/get-script entities (actions/talk entities :ego "I can just use the axe."))
:default (actions/get-script entities (actions/talk entities :ego "No reason to chop that!"))
:frog-legs (actions/get-script entities (actions/talk entities :ego "They're already chopped up!"))