From ebd77a2547fdeec236adcfce316d2667b3e9a1be Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 31 Oct 2014 12:45:18 -0700 Subject: [PATCH] added frog legs. --- desktop/resources/cursor.png | Bin 3380 -> 3511 bytes desktop/src-common/advent/screens/items.clj | 1 + .../advent/screens/rooms/inside_house.clj | 8 +++++++- desktop/src-common/advent/utils.clj | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 72af70e0c8443ba31820ddc59c7acc16ab702f08..09fdd7a9b26b817ddf6a80e5e76ae993c3675eb2 100644 GIT binary patch delta 2430 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 delta 2298 zcmVQCi3hr)6fXnfOzwAZ{{Q%|=5L%jgIEdY|j} zyq)iU@8A7?=Ad18zjN-n=bU@L_j{jn&b{xa)c>RnsmhDt;@5vQ`;>Rn?mN&G?!cbh z{1~omucZejh+Vjlv58`TH^*>kzj2zWFL8ftfX}4o@2gYgR6ZrRz%q zU-H?wXP46{eyo3-9z6m9LER`6Hv)R3v*s<2?0d)4gFSzUWjlXXyH5TZW%?wYj&IIu zS?)bOHDy0Z(GUPcZEbCl*ADX_;Mw>J@?$JBsSDfs`g&DXR%X3^Ix8$J>{U`yvX*^Y zisxy>h!NGccF=D=`n`Sz1`fW%>fUp%bnWSyJY|2DYTB~Kof@*y9d^&4YaGJ3 z0ibx$AYBQh8UzURnwnK==FB}Xb zOBz&hRjGfKy`1Ax@Lu5OI*W4*~=( zK)<^GlWO+q_uRX*xAhg52Q#YRwS+!8v*83d#(jCZrY1AYVn9SGu;0BtE} z-;bI=hn|!n^It#mHhqO<|HY++v2krZ6)rSC@asY6qq@2}>B1O;fEN&Hn<***44-~$ z@|u6ow53jGuAg(-Qh?uVkOcu=>J$8}qx&mfka+=~0Yln@j{{f9vj7AEQ!lI!Jf!MN zmi}S$WMVui0KjP~K>%exnyvtxK)`0oPqh4`7QRpscvG46;X{I-KBLfci*M0$+;q*= zS{*?ES>Me3QG7wCGeG1A;3#Vhv$a`24gi1UoVMox=Am+`=KyjIl5bk^gq!uH9KheX zt4@nR(f4Yl4W~Tqp}Y0#R@bE8+7@M70m$uby1uxOY-NA=PuK!*LeeM)gKqXm#&@#6 zY6mwK{{CxD?7WgXCCqfeeOplUE%Wo4x+g1(&F9dHr+8=nD>AV8jDUetVM_U+rJCq@t;Z`xr`kF1Q0kMiH#2AKNjGYG(z_N|{EQ{%># zYjx0qJ*Sm=(92pW1_ARt0hxR9y#;@IDv?Il=h>k9{c*y~HL1pmDDW7b;{>Bo;x z2mnpTkL&CY8uc&`5pVoMcgO1MR;rg4zwOTR#?t3q9)SU41ilOgP{OM{nf1rNd(;7W zse2j<;}i3k;4%DklBDA`n9#SAc1ZD`t`~SJdgoc)2B~Y&cp8M1HgZDK%l&Q zz#b>|u(xe;Jq!k3KBS)4xCwr#1Mr6h0TcYv9^elO0#Y|s9)OowzwexJs-s=$ZGd?e z5HtsX?*xG$mB?eZzPy4!w!n`s;RXPL9zPsd5{e^Bm~>dh}=YH34DLf{B< z%isZE6fM&gMtX=LjVbCn1@aBlzCAJe#uMSpdcW@FL`P2tR->~ z$X~Wyn^r7x0<&}QXC4MhzvKbJ9KVZ-T{l)-ng8R`&#%ML%3q$0n1?_4$dmoa^Ec;gT`@I=AOMQKv@v;t|6q;8}Mh(omYMPIB#Aqe5G=G+^6Yt&mLMGv`zs3Rdo^k zZHp%Osus`RsLb;H?5dqwf2b1(0RBl6rpE36Nb=KAIv~lOO5FG34?UDcp?uX{HnAc> z9YMgx7r_rF;IkP7^dTU@&sC#u$~fjnO;7{)$o|OqXsifKJ&b<=;0qQ$kaV&S(4!Iv zYl+}j)|nsv0X*~KyitHlUHUSCYvUsx1YDQqy3ltAJDCYP2LRa72!6Rd1OZe5QfBf1 zJ%P_Ez|;xqqY7Z=M?hdu2(po51V3dqz=aK8d(&RhsJ;OBAsdz}&}@PqYx8^yAQx@J z1KbkevLf*F1Mq)i44K|*Zy%QV_s`DP2Y%e|+m`))>!RESxU>P4AWp@Hw3mLP@R$!5 zDjM=(b~yM$=?^`52q^7>-Uc9H6b+lEGyRE!o76wO4r)^b0stR$+T0bs*&o>)fBa!% z5P&R7`44;i@dtoM+0O=<&HkTupz-ouiUN6Lep&uYWm|t=u-#L?&8h;C^F`%5HIv}5 z5DSw*BI-i@^zg19W0?j%d0000007*qoM6N<$f)fOBqyPW_ diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 649cdbd8..69e93026 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -42,5 +42,6 @@ (def cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy}) (def stick {:name "Stick" :value :stick :cursor :stick :scripts {:wool make-cat-toy}}) (def balloon {:name "Choicest of balloons" :value :balloon :cursor :balloon}) +(def frog-legs {:name "Frog legs" :value :frog-legs :cursor :frog-legs}) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 312ab594..a4a43849 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -20,7 +20,13 @@ (actions/walk-to entities :ego [237 1]) (actions/transition-background entities :outside-house [262 88])) :cursor :down} - :wizard {:box [228 80 248 126]}} + :safe {:box [34 70 70 115] + :script (actions/get-script entities + (actions/walk-to entities :ego [59 65]) + (actions/play-animation entities :ego :squat) + (actions/give entities items/frog-legs) + (actions/talk entities :ego "I found some frog legs inside."))} + } :layers [(assoc (texture "inside-house/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240)] diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index a2f2da21..2610246a 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 :cards :cheat-deck :stick :cat-toy :balloon]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck :stick :cat-toy :balloon :frog-legs]) (defn cursor [filename which] (let [scale 2