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

improvements on borders.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-27 21:36:09 -07:00
parent 813715069a
commit 38610968c7
24 changed files with 1517 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src-common/advent/screens/rooms/castle_gate.clj
View File

@@ -139,7 +139,7 @@
:coinflip coin-flip)))
(defn make-goon-1 [screen]
(let [stand (utils/make-anim "castle-gate/goon-1.png" [12 33] 0.21 [0 0 0 0 0 0 0 0 0 1])]
(let [stand (utils/make-anim "castle-gate/goon-1.png" [13 33] 0.21 [0 0 0 0 0 0 0 0 0 1])]
(assoc (animation->texture screen stand)
:x 244 :y 102 :baseline 138
:scale-x 1.4

15
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -225,9 +225,9 @@
grandma-talk (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 2 0 2 0 2 0 2 0 2 0 1 0 2 0 0])
grandma-kiss (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 8 9 10 9 10 9 10 9 8 0])
grandma-cry (utils/make-anim-seq "cat-tree/grandma-cry" [58 40] 0.15 (flatten [(range 20) 0 0 0 0 0 0 0 0 0]))
owl-stand (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [0 0 0 0 0 0 0 2])
owl-talk (utils/make-anim "cat-tree/owl.png" [19 28] 0.2 [1 0 1 0 1 0 0 0 2 0])
owl-puke (utils/make-anim "cat-tree/owl.png" [19 28] 0.10 [0 0 2 2 3 2 2 3 3 2 3 3 3 4 5 6 7 4 4 3 3 2 2 2 2 2])
owl-stand (utils/make-anim "cat-tree/owl.png" [21 30] 0.2 [0 0 0 0 0 0 0 2])
owl-talk (utils/make-anim "cat-tree/owl.png" [21 30] 0.2 [1 0 1 0 1 0 0 0 2 0])
owl-puke (utils/make-anim "cat-tree/owl.png" [21 30] 0.10 [0 0 2 2 3 2 2 3 3 2 3 3 3 4 5 6 7 4 4 3 3 2 2 2 2 2])
puke (particle-effect "particles/puke")]
(rooms/make :music {:day :town-2 :night :night}
:ladder ladder-entity
@@ -379,7 +379,14 @@
:script (actions/get-script entities (talk-to-owl entities))
:scripts #(condp = %
:monocle (actions/get-script entities (give-monocle entities))
(actions/get-script entities (actions/talk entities :owl "No thank you.")))))
(actions/get-script entities
(if (get-in @entities [:state :talked-to-owl?])
(do (actions/do-dialogue entities :ego "Is this your monacle?")
(if (actions/has-obtained? entities :feather)
(actions/talk entities :owl "You already gave me my monacle, silly boy!")
(actions/talk entities :owl "No, it's round and made of glass."))
(do-puke entities))
(actions/talk entities :ego "Why would an owl want that?"))))))
:collision "cat-tree/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20)
:apply-state (fn [_ entities]