diff --git a/desktop/.nrepl-port b/desktop/.nrepl-port deleted file mode 100644 index 9463411b..00000000 --- a/desktop/.nrepl-port +++ /dev/null @@ -1 +0,0 @@ -2000 \ No newline at end of file diff --git a/desktop/resources/outside-jail/background.png b/desktop/resources/outside-jail/background.png index e8fc765a..cf02b893 100644 Binary files a/desktop/resources/outside-jail/background.png and b/desktop/resources/outside-jail/background.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index f4cb0966..45932026 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -11,17 +11,61 @@ (defn make [screen] - (rooms/make :music :town-2 - :interactions {:down-dir {:box [30 0 227 20] + (let [fountain (utils/make-anim "outside-jail/fountain.png" [42 50] 0.2 (range 3))] + (rooms/make :music :town-2 + :interactions {:down-dir {:box [30 0 227 20] + :script (actions/get-script entities + (actions/walk-to entities :ego [159 5]) + (actions/walk-straight-to entities :ego [159 -20]) + (actions/transition-background entities :inside-castle [79 145] + ) + (actions/walk-to entities :ego [159 74])) + :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/walk-to entities :ego [159 5]) - (actions/walk-straight-to entities :ego [159 -20]) - (actions/transition-background entities :inside-castle [79 145] - ) - (actions/walk-to entities :ego [159 74])) - :cursor :down}} - :layers [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)] - :entities {} - :collision "outside-jail/collision.png" - :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) - :start-pos [145 15])) + (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)] + :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" + :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) + :start-pos [145 15])))