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

progress on interactions with cursors

Browse Source
This commit is contained in:
Bryce Covert
2016-08-11 21:22:56 -07:00
parent a3536d7b0d
commit 626eb12f98
7 changed files with 133 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@
disappear-left {1 [:disappear 0.7]}
}
:night-profile :sprite
:cursor :talk
:origin-x 0
:origin-y 0
:talk-color (color 0.95 0.3 1.0 1.0)

41
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -629,7 +629,7 @@
:cauldron-sound {:object nil :sound (utils/load-sound "outsidehouse/cauldron.ogg")}
:interactions
{:door {:box [250 100 281 160]
:script
:only-script
(actions/get-script
entities
(actions/walk-to entities :ego [257 90] :face :right :skip-type :end)
@@ -660,21 +660,21 @@
:cursor :right}
:right-dir {:box [220 141 320 204]
:script (actions/get-script
:only-script (actions/get-script
entities
(actions/walk-to entities :ego [244 150] :skip-type :end)
(actions/transition-background entities :behind-house [122 140])
(actions/walk-to entities :ego [172 122]))
:cursor :right}
:up-dir {:box [105 180 203 240]
:script (actions/get-script
:only-script (actions/get-script
entities
(actions/walk-to entities :ego [137 204] :skip-type :end)
(actions/transition-background entities :cat-tree [223 -51])
(actions/walk-straight-to entities :ego [200 10]))
:cursor :up}
:left-dir {:box [0 40 40 140]
:script (actions/get-script
:only-script (actions/get-script
entities
(walk-to-castle entities))
:cursor :left}}
@@ -697,6 +697,7 @@
[:stand 1] sheep-1
[:stand 2] sheep-2
[:stand 3] sheep-3
:cursor :hand
:origin-y 3
:origin-x 6
:scale-x (scaler [38 160])
@@ -785,7 +786,7 @@
:outside-particles (common/make-outside-particles)
:magic (assoc (doto (particle-effect "particles/magic") )
:magic (assoc (particle-effect "particles/magic")
:x 153
:y 105
:baseline 238)
@@ -796,19 +797,20 @@
:anim-sound-frames {door {1 [:door-sound 0.1]}}
)
:lamb (assoc (utils/get-texture "outsidehouse/lamb.png")
:x 10 :y 163 :baseline 77
:right {:stand (animation 0.1 [lamb-stand])
:walk lamb-walk}
:left {:stand (utils/flip (animation 0.1 [lamb-stand]))
:walk (utils/flip lamb-walk)}
:scale-x (scaler [10 163])
:scale-y (scaler [10 163])
:script (actions/get-script entities
(actions/talk entities :ego "Aww, it's a newborn lamb!"))
:scripts {:carrot (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))
:grass (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))
:sword (actions/get-script entities (actions/talk entities :ego "I prefer to let the butcher make lamb chops."))})
:cursor :look
:x 10 :y 163 :baseline 77
:right {:stand (animation 0.1 [lamb-stand])
:walk lamb-walk}
:left {:stand (utils/flip (animation 0.1 [lamb-stand]))
:walk (utils/flip lamb-walk)}
:scale-x (scaler [10 163])
:scale-y (scaler [10 163])
:script (actions/get-script entities
(actions/talk entities :ego "Aww, it's a newborn lamb!"))
:scripts {:carrot (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))
:grass (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))
:sword (actions/get-script entities (actions/talk entities :ego "I prefer to let the butcher make lamb chops."))})
:butterfly (assoc (animation->texture screen butterfly-stand)
:x 161
:y 218
@@ -823,6 +825,7 @@
a (catmull-rom-spline! ^CatmullRomSpline (:path entity) :value-at v pos-f)]
(assoc entity :x (vector-2! v :x) :y (vector-2! v :y)))))}
:cauldron (rooms/make-entity :cauldron (assoc (animation->texture screen cauldron)
:cursor :look
:x 139 :y 73 :baseline 167
:anim cauldron
:anim-start 0
@@ -832,6 +835,7 @@
:scripts put-something-in-cauldron))
:charcoal (rooms/make-entity :charcoal
(assoc (animation->texture screen charcoal)
:cursor :hand
:anim charcoal
:anim-start 0
:night-profile :none
@@ -854,6 +858,7 @@
:wizard "Good job, Tick."))}}))
:note (rooms/make-entity :note (assoc (utils/get-texture "outsidehouse/note.png")
:x 277 :y 74 :baseline 160
:cursor :hand
:night-profile :none
:script (actions/get-script entities
(actions/walk-to entities :ego [280 80] :face :right)