From af9f8fbd1e612837e5df2b9f3502aaa78ef2d8cb Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Mon, 27 Oct 2014 07:24:33 -0700 Subject: [PATCH] added cards. --- desktop/resources/cursor.png | Bin 2642 -> 3042 bytes desktop/src-common/advent/screens/items.clj | 3 +++ desktop/src-common/advent/screens/scene.clj | 3 ++- desktop/src-common/advent/utils.clj | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 9e0ef7d3014a787d7e0654f31ed54fe7173dde0f..4a9a86775ae4d2328ca872c717826706530e17b5 100644 GIT binary patch delta 1958 zcmV;X2U+;i6yg`KQv`npc}YY;RCodHT777hRTw`TVTEOuj4fBLr4z!kPweATnWYPo zs4R@67MA%1LKqln$WkMMk|fi$l$L3YvLXzeD>GviqV}Z}ZZcb46T}kBzW(s`{?7J$ z_uO;OdB5&v=Di2D=Q-y*&vVXu?)&?l=RNPMRDqOB>MJt%8pE-@rttV zR^Swd>Pr$p%$I+c&(${o!8=*a{! zpQL{Yyg@2z&&&a1RPbX0NkIfZvv^=Mo1Aq4V5g0%gTClbI)7K}{%j{`F~;PsCe=Kw z&L;vnu8S0;fBV8VRa2je@fkpSroV z@~9L1^jo>oo~46HnzPa;<#bG}|WZR8tldp6EI7-|w-#GKf0iYZ+ z?m2)w07RUm=KyjJQg2^&zrX9tc7VTi^9J1nnMDS|Fx9r->Mu+RM$O3pxdSB<|1n?RF{yhi(R(D*i)O))I zXp=R&f=~Qmgp@g~xYFsU#31ct8czU6orjz!WAcn4ENg(h99zZ$_{WSHb3WUenwlPl z4iccwKASY}nYC-z>U0GpK;87iZjN0UJ3i8X^D)4*N1Y@9U;1}_^t~ECZlX4a9JYV; zkWx3>ypK)_!0RC5S0WreYm5fcH->J<(G}{LGIP{S^?}N zgSX$^qG0poR~=dFhy%UN`;?OJ`0pEAq1J8je!Uol;2&9bs(SY0j9T2*8F+t2V1{-9 z7j`b-$`}Bc2X0MVwpd{?=pRHP7!L#zR4@*U)Y)c}o}It*OI_Lqk$?oh)TMtM5~y6V zQM*o_?-8?i@MoR_$hg!2_`zP~o83Fr=uuaw4>qn>sm?*F%sU4t7W)eL1VFGu;s>;w z2e$&)1oz!{j@8BhJ;(qV0wjO>K^QU;UghB*yk!`!SIS14UV%bL!Mu}nihk;#=^Iz*7+h6zZ8|a6R994q{d2e2heX7bz zuh;U$7k+ODnkRt&lOgr=e;B)8Qq|UwiA|>DJ1N6uQ!b&#y zRqUM~@c}&ZkK;xGE^Qgh1a6!dJtW|VH0Oo7-+7#suyX)_9fjbR(*p^(&H-o#&=dH~ z0@xQtA`9To4?-X*MDc$uM4NuOk#Hv9T1=Aw0DjnFr*}Qu2W0@;r+0sK$LIaHX}@cp zXy@~EQoz9<&;7_OlEg?dK7DN06*dP~>d#nF&H(oAT&K;s>yro|m#*5{5JUhx2;_Jm zfae?D$V&h59RLmhZ5aUk`8tp>@G+2l{>OO$4giZ8K=%su3ju#{@l8o$FiF6)i&MwD ze%SXV@Hsxf6b2gFx@5jF^7VJk%heu60xmzctNv0m3uYZy;Ph_8e0hvmqwKANUasU7T07*qoM6N<$g6>$*c>n+a delta 1555 zcmV+u2JHFb7t$24Qv`nn=}AOERCodHS!-xqMHHS5QkD9u5R9y%YubRQpePXyVlCSJ zBjOXqUlLt6QV^s<{ShdE3L=Og6tk`dK`92Gh<~<~8j&c3#)?*iJlKjZ1_~;b;NwTG z_nY>+Jv+H`@7&!ywqyqGo-=38IWza{{mz^_SE&usZW!qaaPfb3%|7Lx`Uq^K2;^|H z!O~KY>*~^cyEh;FH>W|C+q5+Y9<*Jbw7)ZdX|Ut!E$phjlk-l#CGbyty{Nix->iN7 zuy-NRKA+DAjYcC;CtA!ZG3~6O9ot{Rwk2%1tqa1I_4e>g(PpKdE&B6xC=C^UU3G}!6&YZ9v-d_^uA!VryRDmT1^#;#g>y8fM2av-=xp16u_@kDx+ELy#Crnpo>#&>+92%0Q*@ffR3wL zeO;TDO3x_pplGNDa4{ihVZzThv;QdblDj{6R0Ihw^iY3K@xo;~uHc6QfT$H9!p^+X z)+)ydU@3FurERP0cb&`Yo!t?L5&&+a-6T+Y@(~>kCINKFgOb-umLKf?06yDo+s;$C z%$B7RAmFk4lV7O))l`uHH0Fgl>-Bm|NdR`Z=!3i#r2G)Tv@zF(zRiVc3m-lS*rMg- z(JKH$!6bi><-Lu&diAaMl}rMx0^mE6hdN13f}eU)hMoVX%X;+Cdml|UftdQF!vlrj z=f>ZkN5r4 zuK@IclAkgFpRKoW1=(d3C;KC+*P0+O{@8$8(lVh8-$~(uB zPyBzOR45d*Zqg6R>9|V3H8Ds%c_2styRJj7kv_w9X>nTB0DU>P^ab!=88*sFrP5R2 zkp#$dERLGbOu1aviPn`?i% zdmQK;KCYBJ<$rv8k2)~1(4?2vA^7{c&s8sf5vYBW^~5s*)1M8v(6a$o`T)Q}aO=bs z=PS(z?URxS=0gHWYM6&j@|49<34X~--J~QS!7q7f?~{OxMrZI*0wCBy@dviDJOG>E ze)xgy+66$5WPl0*6yr!3(*Ku@-*bQXq$f}I?|b&c+^4TS6d(zJqAzVsp5Q;V>t_c) z{KXxvaYv5Zwaqo4PY}y7g3!f>X`cpmInR3Yb4T8do*VFgo?KLyToitJS^7$Kcio}s z_eWJ_z1QjIKNA6c2uSc#jJ_%3n2nmC2Jo@_W5-8hMPTY-3;^G~=Pq^mt=E4lBm>CM z0D4pcX{{OjD)Y_{{{WtOab6eTQkT9=;AZi0ItfHB&2^z44X!bhb`AirqY?aac}N2O z96&~7{rOdSkZ>koyEQWb0Q}I!PH%g+PpSZpluvyV=lg!vvfs8&$oW3qD&Sy`_kL6s zt@vnVe%i#{SK1nEr9XYSoB@B#e|tcybJu4g0G*yy6`ueY&CZ~!k^pSC#>8MI0h_*y z9N+q(x01l;yZ}=gXsBzW?fPif-nK5AJS_>>>?p_UGGpaUZCKl-+;DGfX*fdC5t002ovPDHLk FV1oVb3TFTS diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index c03b600e..d03df304 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -24,3 +24,6 @@ (actions/remove-item entities flask-1) (actions/give entities flask-1-with-mushrooms) (actions/talk entities :ego "I'll just put a few of these in here."))}}) + +(def cards {:name "Warlock's Tower cards" :value :cards :cursor :cards}) +(def cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck}) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 0473c9ee..bcf22505 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -11,6 +11,7 @@ [advent.zone :as zone] [advent.utils :as utils] [advent.screens.rooms :as rooms] + [advent.screens.items :as items] [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] @@ -163,7 +164,7 @@ {:rooms rooms :state {:object nil :active? true - :inventory []} + :inventory [items/cheat-deck items/cards]} :actions {:object nil :channel (chan) :current nil diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 11e8f3e9..b13f9cd0 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]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck]) (defn cursor [filename which] (let [scale 2