From 96c82393fe748538074f9c7d7091da2e9aff5884 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 6 Nov 2014 17:33:53 -0800 Subject: [PATCH] adding new screen. --- .../resources/inside-antique/background.psd | Bin 860553 -> 871369 bytes .../advent/screens/rooms/inside_antique.clj | 26 ++++++++++++++++++ .../advent/screens/rooms/inside_castle.clj | 6 ++++ desktop/src-common/advent/screens/scene.clj | 2 ++ 4 files changed, 34 insertions(+) create mode 100644 desktop/src-common/advent/screens/rooms/inside_antique.clj diff --git a/desktop/resources/inside-antique/background.psd b/desktop/resources/inside-antique/background.psd index 2a10f1519072679194db3c5c538feb02fadb19c1..5c43582155192e5a3da3cee7c3bf85ed068267fe 100644 GIT binary patch delta 9076 zcmeH~4Nz276oAjdB2OT-Nu$(^oMv*GAi)*Mzu~7eN-PbXnsTNE9!Bl%lVwShrq`xs z7L@vu6|)pf%N$L3<@O`Wia!yh;@FVCWtM+gq9$tooX&mkE(;%&{yF2%t@0@eb zz3<+4-#zcnsy5ZQ2F{KOk{ZkVJ`x-peF$Z`S0M)EKURmKGA6mZ%z!zK zUT90QO04GfE%Nnlu!HSU|JQj$9cxd%zSG&U&Z%$NucJrm-@i8yc>e!p0kXY-{|uuD zeA`-=bhCY;=y*bOIC5+g^T@}xJxFsnQXb2AK9f-2k-|os9XT(GW8{2u78%*T1<97E zD2rs9NXTvqM%ryH^s!kj{pogFUWO!DSc_dnYlfJWnv(LkUCPd}h|JE~2xH0!$!;|} zL|eX)@tArNiN6WOlr zn_eT&8f?g+<3)R3j%4!&>XBtE5Cm(UX)?(m2s<~0%20^Z?E0mFoX@L+d7+Tey6aRO`=f27BXGwD?zAWnb<~)3?WQ;+BwWHK&dO} zOV=prPD5`cQ7U7jkCCa3KCXxF68gBSZWsC)rWF*e#+gWq6f?IEbPHuco?clTZ7-hNjQN&!6wqy;YRopYKW?E z1AGqO6K%jM_zboZRpWZ7fbB#ZaUGOH9nmJNgw?Qv(<<0Wv>DgJO6t*rTkvaGAwxaK z<*xF(^A;SsSJK@MWt|n+pZ+moo;JR^4G8!exVR%)QR2UA~;C4 zmh=Jq%56S+AAaLDA1#DK-1Z(E=ClBga4LbL%}Lfeo)5>!$Zo+$#c-T#HTWgy^euh? z^WYD%)uJ2Tg+E)+_xL#|^r$?z4ON&64Mf|q0_MO;qB<;xci=S94qVM?C$56GLH>)3 zKj2D2M)kM?ir@^VLTDt~h0EbBI7_q_m%%JJPqYu0!c4fp>2MZl8FaTpaM?tU<1z8pMveGXYNpg%wD@LO)sDKCA?wM6_+dYaNWCGxJ72S>7nAMtL(3i zdA~G%KaL)pvVXe=*{`Dq4}1Rpd<6f$^o*Is6%ZM-SP*pgn0VZsz31 zTB1tY=&qzH+A39)w~<@N*0dUTkhdDvqmNeMPHtO)^(|- zHxjY;pJOXh@C3K%R0ria8&8q#+EfoKcs)jM(YKlhu15ReLzHLWC361)i?MAw1Pi(M zYVW1Y0;>UlSiZ7Z?8Io4M%kZl9m_Qsrd17}+&-(&-4 zTbc+z9xelC+m24YH^&CDZ6*3nzP>ElUJ7K}|3bEXrrD{MK0)cw+t!)ZYj4k)mbF9m PX7(H&?(R7}LOS>lgY%u- delta 727 zcmX>(-L&(t$pi(aEUt}8Ud*h9rdEcglM9(0p{(u9)w-6ci3XMi$w|7&CMJfuCZ>kw zx)vsuDY}+P=7x!;$w`(*#>O`K6}bhzzE+--71%^3pJQR)T*b1FMTHoxlNYdCbD4!0 zngeYHqRk6Ar&#ccS~z+7vM@1#fX?KJ9@>-hop?0G7_kDdT3xVOHU>r@EjW3ZlbIZ| zDUitq7KRWX7#J8GpnS&3flk6oAjL2N2OtBe0u_Lj2@3!Pp-S^gb8>(@rp;o``+$awg@&Vbdu=#isM6r)Lm}}bt zahs0=n7g{w6{0w9^Vhag2(x^1en%#RIRUKbZ>KGUyK=LAcOis%2rP58CltcHy;;8x z;u4>)n|u2qihTKiisYuR)8LTXZlK7a!MHhpb`DFk?~Hce8H_;81jNih%mT!$K+Fcj b>_E%`#GKoGXK)#>ZI8;}-X4{~lm8e1nBLN^ diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj new file mode 100644 index 00000000..dc23081a --- /dev/null +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -0,0 +1,26 @@ +(ns advent.screens.rooms.inside-antique + (:require [advent.screens.rooms :as rooms] + [advent.actions :as actions] + [advent.screens.items :as items] + [advent.utils :as utils] + [clojure.zip :as zip] + [play-clj.core :refer :all] + [play-clj.ui :refer :all] + [play-clj.utils :refer :all] + [play-clj.g2d :refer :all])) + + + + +(defn make [screen] + (rooms/make :music :town-1 + :interactions + {:down {:box [60 0 290 25] + :cursor :down + :script (actions/get-script entities + (actions/walk-to entities :ego [222 3]) + (actions/transition-background entities :inside-castle [182 90]))}} + :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)] + :entities {} + :collision "inside-antique/collision.png" + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 04ce1a76..fe5ca411 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -100,6 +100,12 @@ (actions/walk-to entities :ego [284 145]) (actions/transition-background entities :outside-castle [82 180]) (actions/walk-to entities :ego [129 148]))} + :antique-door {:box [154 90 189 150] + :cursor :up + :script (actions/get-script entities + (actions/walk-to entities :ego [182 90] :face :left) + (actions/play-animation entities :ego :reach) + (actions/transition-background entities :inside-antique [222 15]))} :sword {:box [0 130 39 165] :script (actions/get-script entities (actions/talk entities :ego "That's the coolest sword I've ever seen!!") diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 9f2ee1ff..b8ed97e0 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -15,6 +15,7 @@ [advent.screens.rooms.outside-house :as rooms.outside-house] [advent.screens.rooms.inside-house :as rooms.inside-house] [advent.screens.rooms.inside-castle :as rooms.inside-castle] + [advent.screens.rooms.inside-antique :as rooms.inside-antique] [advent.screens.rooms.behind-house :as rooms.behind-house] [advent.screens.rooms.outside-castle :as rooms.outside-castle] [advent.screens.rooms.cat-tree :as rooms.cat-tree] @@ -171,6 +172,7 @@ :behind-house (rooms.behind-house/make screen) :cat-tree (rooms.cat-tree/make screen) :inside-castle (rooms.inside-castle/make screen) + :inside-antique (rooms.inside-antique/make screen) :outside-castle (rooms.outside-castle/make screen)}] {:rooms rooms :musics {:object nil