From 8e8713e278b73b27f87d9839ad171292a5003a3e Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 20 Nov 2014 16:42:51 -0800 Subject: [PATCH] all three quests are now completeable. --- desktop/resources/cursor.png | Bin 5562 -> 5691 bytes desktop/src-common/advent/screens/items.clj | 1 + .../advent/screens/rooms/cat_tree.clj | 18 ++++++++++++++++-- desktop/src-common/advent/screens/scene.clj | 2 +- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 20ebbf60397d2b1f53e6ad5e49c14e701ccbc451..ded4268659e705fafa36cffc7e31b234b34a0849 100644 GIT binary patch delta 4627 zcmWO6hd-2$1Hkd;o;y1Zg=E}igedEm>~knPqfm)ckz^$<#Ca}}tWHUiP4*0_h&yE@ zGP1X*WXrm9Zv4J~!{_yRH!3%&)LcS9KP*hKmqKA{u6)6c?IKxXrMNa#(L|z1^B%lU*vwQeCVWEpkE&5Vj-8#22x5L9ORp=@hen#)Lt{HD7npYxM-P&Y`?npRh-*lG@EsgYFei|sn zu4%9dUd+*6tdhO=)c&+ZB?b+9PQ$BP*DEFT_w4_i&*=ExhfK6-s@Nfe zyJL}+&oy!yr;r5XLg)cCnYK;B^X1(O=(BV zC_cqSEdO+IaLC`<-X1&wsROLc%uMe@ac7X`$L_LcRs`_gx%Qs<`&`w5#aik=>DLhf zTq`?4$P(LzA?Fu&x5_o$i`@IP-zmXZr|2_PT7A$rem>W0!nrBjh=gNspznvtnQewm za1_vFj}$G7T|Z_mW@e~15I)HWT-CNE;~t?mMo~pLr>%IemU?L8H$6Xw=->9)&VrE5D^Hz)E@%moMji;CyUZz&Pv^fi~rUqOHVCe-?{LB;r#8T!0VN zNjNUTK+ZaYc>{IYfC9}7vTlobYuIx~C&KQQzxU`JyHvau_|70RU zkfDS{*r~G2eE8(t8S}qx+_vtcMFXbji^6j(4MP!79}Ddi5571Mt5I$*=D)9R!D%gL z#QF{q9(R=?2Sx7k0P|j!;NwHba*HlNSRtCwVZ2h-c?zi!J$t7qKVRmQU<}IA%`N-Jbe5fY3~&K6IK|N5`H^-LwIoMWW=ERv zPAS*1@T%gse<+S~2osOR0l+8El*5v)+fdze7d?N$oNptf=i|9aO#+QnO1UyM-`~Qa z-=J3R(UeS@petKFr_XO4q=|pQ4sy9vMGWnX0YqgYhmLnHtWqoZ6Xi32L6k zm0d76ZC`FVd;baX0@$M&SKMxi@{)Ta_SMKgc4Mdo>5t!0ZPvbczx?>kOHs-Yh>>$c z18SU`DTvTa!m*%RZ4mW1@rp z^%{+5L>^LeGFs=+^yb?D;}Qj4NHyfmEJ?+Cvq|IMjx-322AdO`=~{rQ*WR3)9jS3QR5Xt}iU>){5h)i4$uH(? z^?>)yAvx+ilmpn6s^A-4LzqPoGt14h`~OAcqVEhDQlK_jzAV9H(sW4D)enjmV6yz2 zR_o5YS#2$0M&7F}Bk0Ud-p30k(04?Q*mk4NEC9Or43IfETczrJ%In&q2WSLd?ZH)Q zQP-++9Pg-N znG1;nt8W%0>!ec^6f5YvsgT{FaWla)l^unyC-4{mA_;5uob6=<0(MWusggu}qiF5x zivTwr4db79Qw!V^D1kHZQj@y5vG10OyE(d3xW4CN@Kb-l*a8zbUyY=wLtSXy^x1Y&{C8fix zvWqX|V7GjrQ&d)AjD^C1&F+T{TnBot&St6Di~QocGUT06=@rRw#{=;As>lVO9>(mk z%AMJXKRsY&cp&oSpD?etS54+Upu9Wlkd)r0ibdF@;v|s+nLI?EuxB+uh zx|Q8)AQ91p1YC>g>X>@vV!t55JuU?v_4jahxa(5BRLO&Qo+$&)s|!d27oFDwCgEkS zo~V+6_teeH+FZb4o#o6Cze>NA(T_pT&ucT;zg}<|958#hlM%Fs7zg@S(0aqJ;x4Cq z_qml}d$F+C<2-7GY}hJ%18V6@e_GMKZ_!*a_}DwL0Y)nVg=;kM)|4}0Mebh43NURr zMTO{dwBUKK7BEA09>s*6n=IdQtX_~%S-dNcLvcs2KMN=m4v(4iY1w3*8QX#ne=im1IGxyx7N9(s^m||WR7&sIP2kmR z*rJqYJPgVli-o3S7ELtVUSI|Xe?o-#1(T%Qg&_S+H{h4Jm@oU@XksZ?4&LyR47W-rdSlr$Nq|_>21MOG0+fzlf`fu0| zJRdj&QxPhW%_`5J?^z@5YrS~vjK7{Hd@SWq4U)#V`_NlSa6*8ua~a)(JV;&X zhK`kvTa}%SG#Fv=N3p~BN%o{q-lh2>B5!9lBPmHjOrlFKC*bp_X}ilSUPSZ}3o8dM zJTyXxBz}=u8A^YHfUcx9VC9UW$Q3@UhjKsz?xo0;G0wRLAb5&xD@GHNz0=xC?(<#X zxKGDSM;&CwaDn4bWw79hGrF@MN%;^FBe18=tcH^%Ndz_8F^$FpMx!1k;*R4sqsY`?=omB!}P5i}@crICWz2 zY$Xkkt6;q?GrN8QEhRxiJY?tDW_i3O&;qW`EjsMG931v*)Vj-JZ5ic4hQ*3&C0Bqb z423le#|2|Wfqw%m+ChM0I! zj*QDVp4AWBj|yk6oDMRc`y%K8h=b-kkJP@>7_~xSwdB5yKk}mb<9#3x(bR?h7as-P z8%CiRLVdv>o+{rPgvwlV;1h_z|4e==Y(hoC!*zO*uCulDE7TS&Gl9u9+{M4DpjtNL zz#r78TWeKZdNJxxdJpH3D+s~_=Nel!ie7bwmXy(_;$9m$qBl>p}w;fZA>SB zZ04V{cRKsJ!FNT6-ydXr?E7BNXn+ZJT=~g0<687AMHe%dCXLmyC+57(mKg19^qvA2 z7RBp;@km^M`5c&z& zn|}GfAl%xC-g~V%4cBiLpeQ*UY(?jj1c|foAm#P2Nl+FXn%W>`>`@b}2$FL}NRKm5T*i3K6*!rmJtg?($Zv{~+O*CgvOYqQ z@TeE~kX~@c($7`Xh2RX$R+Ur<2;Ck-E9tp~nY~`o)Zq)rDu=4IhCjO*)&WX>^;f4- zn_9Ng{zH-jC+V92#!D(3q79HVf#l~1wcjMO1MaOCiKpb(O7$A%VZ$E?&ar@<^Tuae z$L6)0L!(}#;&0Df;I)7nr698Wo9KgxSNz0mJPFI0q=>VXgwA}r0M5ml!EM|((qMC! zRo=U&^rSOZ0$<1jW{ms})V313htKWHeIDGxWS!Ws=aIi&{ z-qcTtCR}n!ArH03$>#(hWkCc4=-bk*l99`cAu#uBATsQ$ZEw~jf*}Az$f8+dln=9a z`aVgpkVZdo(3^bXDJLqHi$!wB#G?E*CS!)RS^46{+NAA$BCl9wUuiEYWNlf^j9u4QkW6|B=XWV zik6s7>rEbX+yuvPATezY3C$r-E-_SzxuN4Nq0Z=$G8MPK75F{gHZll=uQLZTxIm^k zuokR@+UL`g$US&HVgGRQSNY0(+jB~v?))?EO>xL@*^EcxqU&huX_u!AWugK+ndj?H z4##kNfNn^BS{s$z&2Y3cUnthgSzX3VE2nK8pyIYeXWBFJ)c`&K04&a3Fs(9nkNQ7( C;OQ6u delta 4497 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 h^2yemmpD*&ibcMi7U-7%0Du>;GQVL~e#ImH{{T=p-|+wd diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 04fbf841..7dbdc055 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -72,3 +72,4 @@ (def medal {:name "Medal of strength" :value :medal :cursor :medal}) +(def certificate {:name "Certificate of courage" :value :certificate :cursor :certificate}) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index 8a51548b..432f5539 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -8,6 +8,13 @@ [play-clj.ui :refer :all] [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(defn get-down [entities] + (actions/talk entities :ego "I'll get down.") + (actions/walk-straight-to entities :ego [151 50] :update-baseline? false :face :left) + (actions/play-animation entities :ego :reach) + (actions/remove-entity entities :blank) + (actions/remove-entity entities :ladder) + (actions/give entities items/ladder)) (defn make [screen] (let [cat-stand-sheet (texture! (texture "cat-tree/cat-stand.png") :split 22 10) @@ -34,7 +41,7 @@ {:object nil :x 0 :y 0 :width 320 :height 240 :baseline 240 :script (actions/get-script entities (when (get-in @entities [:room :entities :ladder]) - (actions/talk entities :ego "I'll get down."))) })) + (get-down entities)))})) )}}} :layers [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) @@ -47,7 +54,14 @@ (actions/talk entities :ego "Kitty's not so interested in me.")) :scripts {:cat-toy (actions/get-script entities (actions/play-animation entities :ego :cat-toy) - (actions/talk entities :ego "I guess I'm too far away."))}) + (if (get-in @entities [:room :entities :ladder]) + (do (actions/talk entities :ego "I think he's going for it!") + (actions/play-animation entities :ego :cat-toy) + (actions/remove-entity entities :cat) + (get-down entities) + (actions/talk entities :ego "TODO: get award from little old lady in this room") + (actions/give entities items/certificate)) + (actions/talk entities :ego "I guess I'm too far away.")))}) cat-stand)} :collision "cat-tree/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20)))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index e668591d..42a65329 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -226,7 +226,7 @@ :inside-fangald (make-music "inside-fangald.ogg")} :state {:object nil :active? true - :inventory [items/grass items/ladder] + :inventory [items/grass ] :clues #{} :mints-eaten 0} :actions {:object nil diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 32a47d84..7b4488e1 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -11,7 +11,7 @@ (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :certificate]) (defn cursor [filename which] (let [scale 2