From a904cf25ab30bf44fbb50396100da54967e522eb Mon Sep 17 00:00:00 2001 From: jventalon Date: Thu, 19 Nov 2015 22:09:05 -0500 Subject: [PATCH] Pick up hearts --- Assets/Scenes/JustineScene.unity | Bin 27500 -> 26164 bytes Assets/Scenes/JustineScene.unity.meta | 4 ++-- Assets/Scripts/Health.cs | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/JustineScene.unity b/Assets/Scenes/JustineScene.unity index 37e89c4d14271550dcabe1e115fd41b5865f95a7..f2e6a24b84e0a6340064c6c1c7478536af3c0044 100644 GIT binary patch delta 4882 zcmbVO4RBOf6+Ulwvq?h=i3BI&}nG9Ic}i#y`|r>>vzdXJ{O26$fXqIwJ)np6}lGHg7k( z1idqN-`?|g&pG#;@7`;dv{P?ti-|UVK-67LM6-xm3i(SlF1O3wT}gK)CML9xGT}zT zQ9NYRK1{q&T5Z*Co?P5w)ovwrSufbM+llpgZ&)7s4~vdIe|6Wxqnl>FHUCga?KLXi z*We5McHyy(^Yaem{KC1%Udoo1C&mk(v}lirGDm~>yu&r8IoK2I+7{{>aj$%g26y;J z0%5w7_?=_9HO3|<;Es75|JMhvzTdfKq^Ri=kJR^%p37xs9ZyXc@({)6niMqVAf}5N z#S3&f&@{5p6_(}r$;Q(nd5Z3`Qv6{eJLNIaDt0d}egYzy)N)L8T}^7)b^5BVU^En7 zH5?5LM1r9K@pk@0iPH;yGb>@QKD=K=kv9#qAUwSv3UScwW=|((g6;)9H^ot|Y<=Tg+Q3f2Q8v68o@L^&@>*N-EnpGS#_fxIJ3IE2PC!bH&<1v1}6H#_vPBweHD*v_|k4Lb{x zbk#hDoxTT546`9;lCIHO-uQ?5dLh1EB40Sr?ccU8)D`RwcKV~-A=KZVwrmOe2O`~} zaKFzV4h%%a_3}9}vq*%kga!lQ=!lt0QGd865T!w#=krIm(~y71GXV;1>kV{9n*-ee zw$~Zp9h(FFp`k$6ictSxXn^;KFiq{I9OUKdi25tZ)+j9yuRIlref7e(P;xZP*~Mw$ z)HMD@vXAM!FY)42yat$}ela}1&S!uj`YU+c)&PR5R)uz!)6dp}=j9H2oxiXJo1j^B z9`_abh?)qn8eYMx&Q-Z=&aBTa7BLue;{d3Y0eykh~lq717sqW+MaE8eYFEr#h^oI`0tk_A-53 zPUcB8=LOay$K@B9G5#ZiSML3Cp;{oc{7l zBZ=?-O;O)j{i^@|gB@%4jjbAc{r2ydTExOFm7=iKE}FNDX*TiaEf;2ULDP|I$h#Ui zEpfK(<3&an8!Sz{(&H$CI4bRhj_*qOe4({E#F_237!vs2i})qtBCi^*t{itzZ}6jSy7Uq^SM^s!;(T_QvZ8P`Lh==yLMzbLcG@42Yz2M68X-sJBO zsH1y)M<`@~wXuzHbY2hu`}(TSD zEe4(fV=)ZuZB7Z zRk)q4V`SA=dR*0Y^*mCm9&y}Ff3j<;U3E3+8az$pP(V4Ifo#Q?MK4+WXmunhz1t@B zcz;vGNyThkGpU$a?|*hQruR4C8J?zhjd{aNU6WqNkS{4zU4w$h(`Z>|G&sbalgWO} zyup;N;WXfOs7k}hyXtVxv+3B%)qMu^jSL0?d_mVruhL-{8*FQ6<6i~0h@vGN?CH_5 zq5@#Q1X5^NDW?Bmas5a9nAL~8MNYOl#hEtSqw30@d}A1mX}m{_wefZ_)_CWLW5L!U z<28g#Vpv5{uO|a_Q}50U)Iat)(d``z&U18+ zovo_+=NtSS=hi*y#YDRbXUAN5y&=Nre1KI-38q|cXytNut;>^^*y(i5jautLqo&p) z>&Nc8dA9n`vT?HCvNh^dy?eagrYhds^){Ve*6Yozn5j|IA;>I0rSCW$XyM89!Z*6y)Wes`bc17U}Ut5I@Lfk5g#QC-ocDn4p9_pU{ delta 3681 zcmai03s98T6~6yIkO)jo1ary6c4~s!n8r?Moo!~UW2>~279&_`Op{3+L)A`_shzfCr(&pV&$<7-vc=By z&fLBCobTLo?>*<-@86#dNw@zXEhOYw3n6=agpipqx5G%57h8+1t;@(nB9V~tKyf$z z`)Mw{G!|c!_P#;77ayN_URU%5pe0h(8^)Z)M?XH*+#lH6*JIpL_mcA3a}!T*9r=p; zcHvoEY>975Tce|A%$A~YSn{J#(XV5r=YFiddE7I9|KO*+hfchnbvk}&YlCNK+|XJ( z2bOGrCF^w5oR?=@2BL#j=Gka(o~1V8^((de{2|iV7*Q(-&mC%HKJLw!B?QP`YS!~=bwp2Wh0G=m8t8BDD$K%k2+Fip|-aD67~?V3GC`3(?p z<1FYB09(9mUeB(er_)+ZyB;r!`rQq3I86NRdT&6H)oN941EDI=w$JxKTBpkG-bkmj zMfNEGZV18z2L!SN2(}S3{761k(*+m+Eb6gE#AUKNVIyj?S9aR>(#W6`NXH!%Bp7 zkWLVs-mfb0i$&ir&@Cjib5l6Fe8)c*Mn7B?LP zuaAT2^Q>#20f-fn`7M^yFmZZm=*nG*oV)7Sf*)~$%h%` z*ag7q!3GU0xtBk2ECZ_RhoHa8x^}V~96JNp)XU%GnE4S#8Bv04YUNJvR<5lBku(E% z8phgk6WAv|^^P_#h%~K;W{mIK;L%UQU zi>Y;<#<4!Y)`QJG<{z&NT*R@@0DA%CF@|BN;1j^H5D*QPo5>) z7HSwipGf~BtVy7|S2N4)FfgdG_i%%lm+whKdSd#Nl(hZy%9iZ%(axWsjupC?<5LiG zh(00i;BUV?SGl^Wd*yGg>5j+0t0#1>^U;by&&|l48{IW;?Yj1Af#bNMz1hnj%sOx- zd#>Z<-<_>Cdp^`_+LI?=xq9*JyqX{6_tqUg*p@+eI#E(FLxTr4;&(>wS8qX%3y^Nv{(mfW&}J z5C+R6$bwviEQkoNh~Me;@Ewb+kpt~=mRqQ~|>w6hiWf@E7^e~3R) zLIxeMc%Z3R4`y_vIg4Ibw!*Q^R-iH#Z5STVjX0j5CdBX=!0~*M-8A5-H3>!&JL%}i zQ&}c-hNa!z+z-Em7-`q`$IQZ(sUG~qY-ck^>@O;p?DX$$GwqY}Xof4DW;7e>wF(6{ z{P@T_*u-^^qp%6?LO#PLcy6;Mk^``w4sG)okSl4d$pSkV{-2P&y(}~2zUC08!(@mLJVyl^#h>X~`(+CDr{VuO$u<_JC(>A^9D4mUe# z&rSm^lq;%)1prAcX4_l&o^8vSvVq~DpfcmzjM+N1IyN`3$6L%NXDymMdselgoE|bUG81H=(&i(;N04M` zIxUd5P0KghGjF}Knmw-`Pazg!sbFsrOhNTR7M}$n<0pjHH|@w1-x+anc4nk)h)gDV Z2&IyHzv*G^A@@21YUz-&fd0!p??0ygMRWiF diff --git a/Assets/Scenes/JustineScene.unity.meta b/Assets/Scenes/JustineScene.unity.meta index 7a76a59..bbf4b97 100644 --- a/Assets/Scenes/JustineScene.unity.meta +++ b/Assets/Scenes/JustineScene.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 304af85f492026f499d09ceb6768bd22 -timeCreated: 1446164889 +guid: f0e4eaefb315ab44d801e3e38218f47c +timeCreated: 1447952927 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Scripts/Health.cs b/Assets/Scripts/Health.cs index 7a239fc..a0880ab 100644 --- a/Assets/Scripts/Health.cs +++ b/Assets/Scripts/Health.cs @@ -17,8 +17,8 @@ public class Health : MonoBehaviour void Start () { - spaceX = 2.3f; - spaceY = 2.3f; + spaceX = 1.2f; + spaceY = 1.2f; AddHearts (startingHealth); } @@ -69,4 +69,13 @@ public class Health : MonoBehaviour LoseHearts(1); } } + + void OnTriggerEnter2D(Collider2D other) + { + if( other.gameObject.tag == "HeartPickUp" ) + { + AddHearts(1); + Destroy (other.gameObject); + } + } }