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

working on new area.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-24 15:02:08 -08:00
parent adfb4d0a3d
commit 6986e982ac
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,13 +14,15 @@
(rooms/make :music :inside-antique (rooms/make :music :inside-antique
:interactions {} :interactions {}
:layers [(assoc (texture "inside-jail/background.png") :x 0 :y 0 :baseline 0) :layers [(assoc (texture "inside-jail/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165)] (assoc (texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165)
(assoc (texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240)]
:entities {:warden (assoc (texture "inside-jail/warden.png" ) :entities {:warden (assoc (texture "inside-jail/warden.png" )
:x 40 :y 60 :baseline 166 :x 40 :y 60 :baseline 166
:talk-color (color 0.9 0.3 0.9 1.0) :talk-color (color 0.9 0.3 0.9 1.0)
:script (actions/get-script entities :script (actions/get-script entities
(actions/do-dialogue entities :ego "Hey, who are you? Why am I in this cell?" (actions/do-dialogue entities :ego "Hey, who are you? Why am I in this cell?"
:warden "You're under arrest for theft of public property.")))} :warden "You're under arrest for theft of public property."
:ego "Under arrest? But I'm the good guy!\nThe game is named after me!")))}
:collision "inside-jail/collision.png" :collision "inside-jail/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 0 0.50 1.5) :scale-fn (utils/scaler-fn-with-baseline 0 0.50 1.5)
:start-pos [130 85])) :start-pos [130 85]))

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

@@ -53,7 +53,9 @@
(actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0) (actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0)
(actions/do-dialogue entities :ego "Ouch!" (actions/do-dialogue entities :ego "Ouch!"
:blergh "My turn.") :blergh "My turn.")
(actions/transition-background entities :inside-jail [100 100]))})) (actions/transition-background entities :inside-jail [130 85])
(actions/do-dialogue entities :ego "Hey!"
:ego "What's going on? I was just about to teach Blergh a lesson!"))}))
:entities {} :entities {}
:collision "space/collision.png" :collision "space/collision.png"
:scale-fn (constantly 1.5) :scale-fn (constantly 1.5)