From 5217685c159114a3cf49b48aed4f7f4d5a26b11a Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 30 Jul 2015 17:43:18 -0700 Subject: [PATCH] small refinements. --- desktop/gametodos.txt | 1 + desktop/resources/cursor.png | Bin 11348 -> 11382 bytes .../advent/screens/rooms/castle_gate.clj | 7 ++++--- desktop/src-common/advent/screens/scene.clj | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 49afeae4..6b0eb644 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -7,3 +7,4 @@ + closing should stop all scripts + dialogue for coin drop + night gandarf text is bad ++ descriptions for all items when used on self. diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 5a32af02353a13d29791e65a457d7ffa44d24bae..45ca19a1db9c217b15e1cbbc02c7a7c31458a4f8 100644 GIT binary patch literal 11382 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 D5E*3} literal 11348 zcmWk!WmwZ+8~$yK7)m3c#D=5+2q;KyD9VrqQIJ*v6$vRp7#kR%BHc9_064kszuiVnYrcU@= zX$Omb{MW5J0$7#;He{zXSZ!ufWH~2r4vG{3wK<-hSQ(Mtkv7ge_a(G&mcGfZ?skkh2Kr%5tUmzjN z=)+LuumRI>@tUz*Y)>DreCwH`{*8Ij4{SYKvD3pEqgoI3tQaOFC`V zJM30%z>jC8ke=4COz(*h|ENH~#o%Og25-RcP8ls@aRfAK@Z!dqQnp4G&Bk#Tg&HRZ zCZVqQc}oxB`tvTam8Ee`-UIUr(JyKg8C>$|e*2qtudOHIE`W$~2YL}9qr{6*lO!F@N6vO=B7vNUV6Q#7Si4g2V>3+@exZ3(a*&U*jP zXL|(hbo^eE#+16ea^;yEXKu(6oQ%QE3~lgq}u z3&=ejDZHbRYnr8$@U!W*il&rO*PFNPJx+?}O@?@%&jhMPFLb_%{4Ure_r>h1MrXMf z{?|7vgvA7i3VT?&c}3WjFSkN!TYPXJB;?Cp`OK&)NNyJ*bd^hrC6i^We{t{DKD%%F zV4qzG%N*wy{bK)7mF_e5C(4V;FF=F4YnALq^uo{dT|G0fB&+hWwyEu7j%4%e^HHlh zvy|pr{xhfDw{3L88EqOH_nz1k@S(T35Af$E-w}<2mzBSKWId>F`n!^YT4af}P_LMy zh^`s@o$;;t9e_Qu9FWn~fT^Bil&PN6a5&Ep`0c!hum)ZPJQu#i2LLh~`no!I13+7L z&N@kmosq@>74_}CY2Hg+~}7@Ye{Kqxhb@Iv*Pz`?D?*$Y!UAd@B-OqSH1V~_%zz9x#7DF~3IM9-d_%X^@$u?2i@Bd0Z$2O!kHzT0T|cYjMsd{V|&|fxUJc^*zzF~AsSINF6@9em=g0_xb$ftg9BIfY{YxH zH#H|K;4k!=|K@n)z*Hk8XqC}EtoL!BIJ&7`pwx7@xbm~A_mv8*Eq`w=*wvf%?mvY|h)J*YKLiKes;HdpcE%fp@6ob4X( zo=yl?SQ!+TNs5p6GRvC^-`naSaZqYm6cZkKWR)rW*`9u2nJIrz6!7==sX4BtbVt~` zd|$?Ai&DE=TdyBuR|aJXoq?TE?W`@4+kV&L6(2vOM6dmM$#G6I;55sN)xpoK&mWzN zn@@WfR9z-V-s=$_DO)AneiJ-%SRPl#(Vc35(3-mUlAK{7vmiV%w3XZQ7SW}>giV6gVPr-tO^{ zH-E29OT6NwY9l%(njW$G)ovSwEU;Z-T}_rmS~d6{0FoLGsv1di+G7{2YSoCC@s<03 zGCJAEikMA4S&Aw&NzKUPEB$90Ufzd;rWesKhs2paFkCbH_|&p#(HVMzA>0j1livMH zOcuCxNLBdbPuT z$P!m+lNEApXeAaW6|dCa>bAFB^yS`+Mg1=u6+OSTX`>D2bWQziR;h5YlMSFnZffp&Jdk$^P5?AOnfrAB=T{ocZ;#7@j$<$hj2%3XdTbjRe ze{gKDL)h&LI>$f+3n{S3kE(Q^sy4^dq4YjC!8gEU?@r#Ft86?>%N5B72pOyB10*Ky zxMKy3-~H87`-#QrfrvN6)~g=d#s`y0O(nOxk1mt%Z17Plv%2-w;pbFBLUOp-bwa3A z3r-u&yR}?`PveCEx|*8W*pTb62-jE{Ew{q|G3Bdv2sPFCNh0|(v+9?J=#@nlhoWfJ zdqb9H{&X^_!8dSt37~RN=;rPLhdZ<5L*gLG_eedb_Yf$tp|D;PH^~77lXXM(a2*9x zAzD@+hP#6DrH4IXXtx_P#q_AkF4 z)X&%1ReOtnym)!{G?Ut+i#^LX6IQ0>0Mi<^st*tT&D(Pn84hm8OL&X1wS)o2e!sNPXE+^)hfLlf4C|i#3079;>dS#`Y%r zFk5B%=BtDCs`IGM!v{dkY==>z9+|r{ZaqH&dgT zpZb8_ajrag%Cj6b*ynpXyj`pXZ;@|Yo;x)b`<<28nF6ANNIHOFLv5^j$dmAvXx`;> z>ZA!&arBThh}we40qh-q6h}fT=&n&7pY?#Nnza2$6ac1Qun;pHv-K&}wz}Ql1the` zfIg}Q$NMf{p_qWPuk*HidwbE~W-qBnz1yi3;roaA_kWSvwgFJYKc{$r=wzg+HF+au zo22C$UWg6Hy5=Qd(Ka+W@OddEm7z|=AF(hv`o2;j%D6!u7PS#$N;(OO8=4ZCIgoUZ^y$3QPY zZlf&3IGJl$QzusF%6sf7`3;;ehA5IN+elrE%ndI}^i0s)$O<$*mG}VyC%JN-2bOjj z9?MvW(9xZY)1rPMS8o873`=9r(!(-`qB}lk0g$#1Bf=!_;tql!(1GKZd52F5yIAEBKP)(9;cs4o zY?<3k@Gg@)P{M}273z^*Ig+IS4)`}p*yf#ij(cXqiGHPZuPxY3> z`n%i0EhbSx37*2o8u>mHm37jyktXSvNtZiVpR$=9ovXBsX>oYh-{V17ryBav>@Izk z^*u{~b@!UF@HoZ+3*q~wuUQuhuV;cwy)Lj(|GcJT&mJ>EY<#lJHO_niI^IRDF_9Qk zkpWh8PjaX0q9O&irTYa|Nj2kjq4O|fCH}}_o!Z|?p&8ec-t)<}5O``q{6lU%}r5$SsqxXe;#c2Sl-iQ;=z_`uZT&u4&1D>>B+uxB{ zDNtZ-uH^HRKXqMu!6C;&l(?Woc3JIpyt zVl|~Yb*&wIMK0(AqdCiCr|a*g1B=SvA~T$;C%k*<2E@7Q`6GT#Vf!A7hP_vE z1>~Eh9d@5&6enobSAB{;EeUYqUnuRv>H=HdZRODnKECX<4|tUBqB!Ay_@gqI@;ORw zAWwnpV7DE9Ij>hZN~2x)2%~~oTQjJW*}ni#kD9X+J#Iz4D!S_Y^S=*z-#yw&rR(af zz!d{b=M$W_1?dW{jMh$(w>e`6$CK66{(+H+nf@VXUQm79e~6T|WCEOOga!%_`I;(8(nGAshe*C-ayDYC%?12W zLfL(W0Qq_~zCmw3;NfrYYxu2!CiN+!h6+Cf(Ig0q!3K{yiwRH{oG|VCPGl_2B1b;i zBe(}(nDn9TYaT7bI!CYVX`ywQGbYyVcs@6~v8CU5*FvR*v_*8a1XLD|vzsu%oVfuzjail+(%M6iIwq0kAjyvwfi z_EpLnL0y`3lGQ?Y_2F(|)(D5xu6AxF2wf8V<&c#i3<;sN;3v2SIF>ZSODLJ;Sz19C z#ek82Sh@9T{;MwObTS95&vZ$p7Br( z;^N(vIjM5Z!eRh-aBR@eB#0^Cb?)X6%e!zon{0fBuk- z{~+}d?eD0l!^Zmb1Bc@<%(_Y1WlxmRs6~Ekc8TcnVc@Q#6@rHtTy%?+%&v8T2R;)AfJ& z>2VvUXh2dI>Xq8^;|ya&3BaUEM>pzn)NMT#g>tK~Bm3#?$!dFCL{Ec|?2wtX^CPRR zANkLNkl?Gq{)Ll+sywI5FAepacK49zd0?w{t>Y7~Th%OVB4lE-=|e2A({%jxAwPfu zbir@LnE-lUltbG1O%C^!>&oF)DlS(N|CBJTO7M_+l#rT}ohCvh)RStsFStcRRu%t~ z*y^D&nFCvciL{hg)vqoRJttG(&s%eZ4bQmIMs<>(9GCvdx|edS7xl)w(&De%w<;uc zzL)WJMt-=(;i^;&5c3*BxEz!s3t;Kds!^7=-oBcXHM(u-Mvgh6C8NbRVege0R$%y) zwTs3^m!fo}UX)2SYoa2>GfzzL@E#l>5;E35PyG1wV5J0ex1oRx2O)v+7DN*G=R)N( zbxBa0ylR9xUB=~M-Xul<*8;;0sBG-8KF-PFvcOd`Y$>og?kl???vvx|(}LM1HT}>& zSI)DEzBBpY-w?*>hGb4?@6vJ0%ZykApi7#SNLC-xD^j938q;vpMVZU%RQe0_Bc~)F z1%fOZzzx1H@X{OyOe630@Q}ZM4Cz4ZWLYSMP|k2)Mw}djz89700_n6 zG}g0wZjKsSzxJ*tb4o@t)>nBswJj2%gYc<-+jq1y_HsLArJ!CW*ukAfbsKTlyLEsv zqjCUFXjD@>=nD;K6bW}wOLR}zeZ+*E;5r0FeCNrYrm}`qaADm%UFD|z!$RUAF^`aH zBOSL=TDj7VDQ35HnIsF_SyhNPi`4xp!53n3`A;G*Bc4>K;LqoBILAU&qeN3#>vo&C z3GwxkU_;_S2#8FJbG4{@Q+O6}eCFE2uH$Faxs`QI1~spUkXZFXP`v-VE5#X?z(Wn6 zpq86eYBCcC_HX|VTF+?g&?n%wx?t1|(fU^h2dZ~o+)#@&K90{TI#+jJYW(xR-^<~5 zrv&cE$y4-F-IXe22qw9)&HKbMRke z?G|T!lAqN}TQp~Nju*<#bifU1vy=4rTjF|NsjE(#f;FWLt%_XS$=83LDbZ{hphLk{ zsy<!R7`h@r(FZ~R@3rqu@yU95uom=kC+1SB{p{tUSYb7yga9vus^YdHX=~& zR7gsV*Zc3WfDqRd5}d--_XLp?$3aS8h-Uh4RT7}S$)s^T03(Se1TH-Jvlz4LTjuY} zS`Z3QOZeHuBrQYTW_q6emH-=oOmlO4^Zt{a;!Orud?H}TaR<*F)BjvB?uI^&KW7VS zpMug~`#x0|ID-{7FY-}w=@m-bn9kV$W<+wlEDbev9=ZBf?t5p`^-G7}g9cpVoV!!P zj}3>bmh3|K8OibuC6D)P3dh!etqRXSWJ0VlQ2^ZuHlo*LbmP{xkUkc}xmDVFLJe+e z4w;9AOt+(0h*QUnlI=w@ZJtyj@%F z0AAOfR9Ga(TMZGe$4?cU0lH!S(xhv^U|IW>M6J{DTQqWq!gbYW1{=`_!!;S_rqU100{cs0-?k4!eHK(cFErBxo+e|F{WiMHs7UawteThA;A`g z0t@H9sc0z1inpcFg^g+v3#5#gR5imEe)Q3OsF00nJNjpdCD}j5%S!BU_Rny1g~*7Y z%9^t3js%G@Qg##!Vgs6>|IFqT{o-9M+`Q1VKq($zVmi6TyVjo5YX=l;vhF}yI9C66 z<28M&XS9e1znPR>q6$PV6_ESVG}1>)4m%_hD<}-Dct*mNje!Ut4hSK@Hpo28S4s~8 z-f96VS#`G)HI%;z#{j5hF(3vs&UcbgCsT55lO{ag-De_B#lfINFM9QOBC}t{J*^_y zIAEL!YX+z|m@l)^zjAgr$*{%)BzjW0sg8oY-2Jj?;U6Xkw6|Gvy_&7+=wBi&vxep_ zmkd&$x{c;wF_X_K5Ke{Cpf4v=zI};vSRTMi@U++4B@hQ|#~7alZl3O!o|%4i!Lz$! zbk=AzNRTG(3SkOGtQWc@Ko6nB`ISb{rx>YRD4#&#rLyPw`mYW30ZnAPn%Eb8uvZ7p z41i{am++rCqZSw#_+B+MrrK;|@l^<7>Iwl@of-q|#~NoD5fvm*Q0i+G0AQNIF?`^E z$}w=Z^Wa*3z+WCjxVq(6mo|85d+FWpMQgT}WCY-^#ir7#P|M0h{7neZim!tqZ^$IEXU+I;8(Phl!s7=#^CoWMVJTjSn1lOs z9~j%ID&M09aK=gqh8wKJO9nG%xn=zH3+lA)!6_oW!KuA*#RSZ#kVIB*x{VaykNB3u zh_b8aXE{*N2h=vWf@XUR2@3B)MqqwCJGTlzi2w-K_JKUQujUuVZ_`5F$Oz18w-c_*Zw4OXx?OT z)bb)ANAirkQ4-X@x0@gT;&t8w1zlFeqK73rZz{Dc-&~)VJc+m;5|Vo!WJvTJ=Q?2G z0qDS?4neGW+=G`niHIo(8soZn{%PQ#OQ`p<{rFeQ$n~DvU`Qy2lf5NNnI5B098d@F z!=ZgtQ7K8#KKCrc*Orb&VZd$mA|=Gbg!z;E(k zu#)P%3=4tl{rdv^?2Yl@#z>L`AKLjkY^1Cl(cXepC^u8^Fese%>l2{YsA|G6@t^a< z?`{A2Xc=$tL6ySIVjktaB|UOCg#+{l#Ml&&M5gPhUUzb(KMfaw6AI1RGYmSlKDVn* z2(U7l$V?|M_96}*%jbX=HxVyqlj~(4H6d=&p`_IGdKb}hiUf)EEU~NOI$PW;t|*UU zZqeO&j|)bZF#>aZaC6C)nAHb=T@N3yo%K z>DG{~<<4yPvsUe+-+|xqlkUQyDZ||Gicn0!YwnXC-w};BoYMZJ$M2_A{DRPd`LWil z)jY?wPA!p5_qJvb@}+uE>`DEDEie^S!Ai|Gto#ktE$rn}7PuIs?Q^;jCCPoD4F9M{ zz?0319Ilikw<~s=xTE&sR7~n)U^3s%7k_Sl+K(NM6K4E!i#TaIGs{Pxki*Mh6K#x{ z9RXFQyJq&M*oXrWya~eh18&Zbgfu#I?S^02oBi)AK&9XFs7C(RJf=vT73#pG8Xxu} zIqi7%;~_2W@G0}9^2YkhqfJNUKh7bwIfro}WmiJ^k)j05@rO9!%aIkIVfMS>UYK`O zhu^;>Ko)*GReV&O{Z;@6eHR(OF4~dx%?9u~(#UpY+8z=Egw=uL>P1$1p+V3vtz%wK zevs9B|22~n<8qI`jdd8t2MQeMgDd2HpmbW9s4f$ri_%B}t-rw1$}^HpzV+A9aq7@d zPw!PYVCC2WH#$NzqgW}G*6G*(MiyJpj08I_!}NrR1EwMSP=aR|ChAr-h-#p*4)1(` zDLYE`#{Ub|Zg0w)EKRFlB5Bc)xVa$jqcalqjk6qmM^k|~WxA=ZwU|`Yrd02y&nE;D z!PWKRTs2WY4tg%(>X_lbfyV!@J4!9wV?(<`us% z#+7y?-gttz` zGM-38yD?$sv*nHeq}Jx;YzSrlH5-ukcLHN4$1?GJs0Ei!(}}2H6hMQPBZD2A)vL%g z_lTZkWmkr?Mh9!#4G&w{DR<`>fbF=GNr`JU6p}6CcbOU456O;ZYJqiPb;bgPiRSq~ zy!$u#sNrj!(ZDtLT{s7Kix#NY-#T0#*_`n0ax3ET3Cp)oX~is@dRFc^+%&2_Z6YuB z8!g&>-L&J|Zp(+A*N_-mrD1l`3Byrz$y!%;~FXxE?lM|w``XE*q?@}1+( z;cRlRL6=F-HQyRJ8wfT;^NqPvE

{bt9X2THXA0awxrV$RG?t{R%5&Rdb=oKCt|# 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 diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index f4fbf986..d1e992fc 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -193,13 +193,14 @@ (actions/walk-to entities :ego [245 90])) (defn flip-coin [screen entities] - (if (not (get-in entities [:state :has-dropped-coin?])) + (if (and (= 0 (rand-int 2)) + (not (get-in entities [:state :has-dropped-coin?]))) (-> entities (update-in [:room :entities :coin-flip] (fn [cf] (-> (actions/start-animation screen cf :coinflip) (assoc :opacity 1.0)))) (assoc-in [:tweens :coin-y] (tween/tween :coin-y screen [:room :entities :coin-flip :y] 112 175 0.5 :ease tween/ease-out-cubic :finish (fn [e] - (assoc-in e [:tweens :coin-y] (tween/tween :coin-y (assoc screen :total-time (+ 0.5 (:total-time screen))) [:room :entities :coin-flip :y] 174 116 0.5 :ease tween/ease-in-cubic + (assoc-in e [:tweens :coin-y] (tween/tween :coin-y (assoc screen :total-time (+ 0.5 (:total-time screen))) [:room :entities :coin-flip :y] 174 118 0.5 :ease tween/ease-in-cubic :finish (fn [e] (assoc-in e [:room :entities :coin-flip :opacity] 0.0))))))) (update-in [:room :entities :goon-2] (fn [g] (-> (actions/start-animation screen g :flip))))) @@ -211,7 +212,7 @@ walkie-visible (animation 1.0 [(last (utils/split-texture "castle-gate/throw-walkie.png" [205 136] (range 9)))]) walkie-invisible (animation 1.0 [(first (utils/split-texture "castle-gate/throw-walkie.png" [205 136] (range 9)))])] (rooms/make :music {:day :town-2 :night :night} - :timers {:taunt [4.0 11.0 flip-coin]} + :timers {:taunt [1.0 6.0 flip-coin]} :interactions {:right-dir {:box [300 40 320 83] :script (actions/get-script entities (actions/walk-to entities :ego [301 46] :face :right) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 3ae72383..38bcbc3a 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -750,7 +750,6 @@ void main() :on-timer (fn [screen [entities]] (when-let [timer-fn (get-in entities [:room :timers (:id screen) 2])] - (println "here") (timer-fn screen entities))) :on-show