filled out new room.

This commit is contained in:
2014-12-27 11:25:48 -08:00
parent a8b7cb87c5
commit f383c53b15
3 changed files with 57 additions and 14 deletions

View File

@@ -1 +0,0 @@
2000

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

@@ -11,6 +11,7 @@
(defn make [screen] (defn make [screen]
(let [fountain (utils/make-anim "outside-jail/fountain.png" [42 50] 0.2 (range 3))]
(rooms/make :music :town-2 (rooms/make :music :town-2
:interactions {:down-dir {:box [30 0 227 20] :interactions {:down-dir {:box [30 0 227 20]
:script (actions/get-script entities :script (actions/get-script entities
@@ -19,9 +20,52 @@
(actions/transition-background entities :inside-castle [79 145] (actions/transition-background entities :inside-castle [79 145]
) )
(actions/walk-to entities :ego [159 74])) (actions/walk-to entities :ego [159 74]))
:cursor :down}} :cursor :down}
:door {:box [22 42 46 124]
:script (actions/get-script entities
(actions/walk-to entities :ego [50 46])
(actions/talk entities :warden "NO VISITORS!"))}
:window {:box [62 175 80 212]
:script (actions/get-script entities
(actions/talk entities :ego "I wonder if anyone is prisoner up there?"))}
:sign {:box [5 173 61 199]
:script (actions/get-script entities
(actions/talk entities :ego "J.A.I.L. Jail. Can't you read?"))}
:my-house {:box [89 128 118 179]
:script (actions/get-script entities
(actions/talk entities :ego "That's my house. I'd rather play outside."))}
:sherrif-house {:box [138 143 160 168]
:script (actions/get-script entities
(actions/do-dialogue entities
:ego "That's the Sherrif's house."
:ego "He hates me."
:ego "All because I threw a rock through his window."
:ego "Or windows."
:ego "What's the big deal?"))}
:mchulk-house {:box [223 137 282 172]
:script (actions/get-script entities
(actions/do-dialogue entities
:ego "That's Captain McHulk's house!"
:ego "He's the mightiest knight in all of Remington."
:ego "If only I could be as strong as him one day."
))}}
:layers [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)] :layers [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)]
:entities {} :entities {:fountain (assoc (animation->texture screen fountain)
:x 150 :y 126 :baseline 114
:anim fountain
:anim-start 0
:script (actions/get-script entities
(actions/walk-to entities :ego [151 119] :face :right)
(actions/play-animation entities :ego :reach)
(actions/do-dialogue entities :ego "Ahh, life-giving water."
:ego "I feel strength."
:ego "And renewal!")))
:warden {:object nil
:x 36
:y 86
:width 10
:height 10
:talk-color (color 0.9 0.3 0.9 1.0)}}
:collision "outside-jail/collision.png" :collision "outside-jail/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3)
:start-pos [145 15])) :start-pos [145 15])))