From aee962d2c798c51d11152a98899d7b6ab4aaf20e Mon Sep 17 00:00:00 2001 From: Ian Brunjes Date: Wed, 13 Nov 2013 12:33:26 -0500 Subject: [PATCH] Prototype version updated 11/13 --IFB --- Assembly-CSharp-firstpass.pidb | Bin 7999 -> 8037 bytes Assembly-CSharp.pidb | Bin 19824 -> 22794 bytes Assembly-UnityScript-firstpass.pidb | Bin 28078 -> 28308 bytes Assets/Materials/bgTemp.mat | Bin 4216 -> 4216 bytes Assets/Prefabs/Background.prefab | Bin 8112 -> 8112 bytes Assets/Prefabs/FlyingEnemy.prefab | Bin 10528 -> 10736 bytes Assets/Prefabs/GroundEnemy.prefab | Bin 10528 -> 10736 bytes Assets/Prefabs/Player.prefab | Bin 13448 -> 13616 bytes Assets/Prefabs/PortalOut.prefab | Bin 57928 -> 53152 bytes Assets/Prefabs/Powerup.prefab | Bin 10248 -> 10992 bytes Assets/Scripts/EnemyPhysics.cs | 13 +++++- Assets/Scripts/OutPortal.cs | 8 ++-- Assets/Scripts/PlayerController.cs | 61 ++++++++++++++++++++++++---- Assets/Scripts/Powerups.cs | 2 +- Assets/Scripts/enemyCollide.cs | 2 +- Assets/TestLevel2.unity | Bin 86488 -> 88660 bytes ProjectSettings/TagManager.asset | Bin 5532 -> 5556 bytes 17 files changed, 70 insertions(+), 16 deletions(-) diff --git a/Assembly-CSharp-firstpass.pidb b/Assembly-CSharp-firstpass.pidb index 3945593581bf4037b52e0767a7b42cd8285e7dd9..f96e3376cb0f0f7a07c4097fbce60535b1f8a74f 100644 GIT binary patch delta 172 zcmdmQ_tb8}$;sLR+!L=9aN2V)fWhm@zKjQ$x)>+(F=>gpC+4QQq?Wm7mc#@XBqpbN zXO@(t=1qPmCb2n+Nr8)zXLB{rGbTpC$w~Yt8TmHr2)tz_taWk}lhNcEV!}+b@L96? Mp;#CPhc(ny0M*4d0{{R3 delta 128 zcmaEAx8H8UNk)!|r>Z!OI2gd--eh0K1B`W(`I)r10&)^d((;RPQ;RnHGg)vka&GS6 zdB()ZJ2{{KL6!{C&^ z;)MkO3;r2z;5KiwmOtv28(yuiufM-{b9M-S1 zjh}w~jB`cK59lZAXns(I_Z@U=b@jwwS#)bB5BjzGVsO%{)W&H?lS1K$e)D<#d~pAP zyXI#0?E1vw;pxMBc79@Z@6>JjJ923H@S&MKJBFXzB_yRmwMBZX%Ff|NeLe{5Zu$Qt z+yd3~;Q}tA1mJzj*D1qtO?hc{&(Z<6vNX3jF&&f|8(yVeTiWlI%M-hH?A*O{i@V`X zOnWtdtzxdHy;HaN^`(WXTk>x6>vgZPw6|9C)MlX+`c?hgeoU4m^JWM8-dNYw@R5pN z-<+we`4x|D`^uwpK_%Gdt-GiEpb-ktDIvf6l!wEh?$*79s^_iPyQFd~YBhFJS3^y- zdq6Q-hD_fbp_r}!E`xeh+7^VnqsrF*hW-cE{rbG+f(}|)_E%IIDg}*7-3u)jWNuNM zKqW`&S@%n2uV#@Pfj^*ZlI==W#S7+J$W0Awp+tXZ$^FWM3w5Dca;P6&vk3s57*(cC zIw9Z-4p$aKe{IbRXHwlqhAC12u28;EIVOeV7}vp|zV0;#%-%*_aLvlHl)P0XK$IZ& zp{UT%MgB;2MWbo&15mq!0 zj`eyTMBV7!G*EBNT{0EAjUuX^5+VRbv8Wsi5n(Y^I*lUpqU$I^&W@t4ZF(v(1S4L> z+t_R=0^{3#7%mb4=0r3MCwe^$$*!CyLxD8TM z%mip_%Hwx<_c#2|!wm)%`2gcQ7!-Vl?QBOgPWuiC(&TL#|2K*=r>mh?!)+TlN-S}yZ7l&7497B#i{;D$c=?U)Q-d?LmN<10;ps&ofEqN(SE^}(MgazbQ=j7?F z`ZFuvqim8jnM^k4AVUOlt2X+>4LOFI?CD+BP%>XIUnW^f_@v=|!RapccT&}s0>&Wg z5OG;u93l=XSF-IfoSoaNBAIYm1GSTW#WqDs7RzV zrGttJ@1SCvV|X24;@z`sdG56~oZH;>v|XUws`CfVMeRwGKmWlI`=SRV=E{C9R2PeFia^nC!o)+_u)i z7BGoy0)Vt9l&y)yxM(8Kd`>m+6QQ zYx%Baw{)^ODHpxd^+p&E0s6sGNCQ7beD zOF7a+oAvy)^;iKhmN6b(tSGms)`&nU)dGN}p=GQYDwu?!Y+t={S1A$zFjP$aEQzY1 zgNG}(964a`=t6-~6adhHUsKLf5YVRIOX$}yTedm3;%bF|b`@i8UaTCc*l+aOxh8tj zdo9aX&C15!BC3V`H7TW9Mf!1g`99hHsJ``&cIB(-T{A<_nNC|{bgsYTZrA}tB^fi5 z-r$!xkGh#2OsN;43pkM&SJbIZA#t!NT>yYWlC!#iHWjref1r}y9^wdTVG{s`9P5%L zbHAX&hD>u=WbX|7pP~Z*wZz(G=?G}kHzb3|^bKpr8E$SRN`Y#k`sYkF6FupjYSLQ_ z;Lj~ifnZU?c4LGlrql-j#t6H1_VN0Os-y8rsI8r59i0{GaD#F*T*uFaC27u|-i;QX zfziqlG4QwG#V{3H@nS(tZecxm zAYNRvuDA2FAFD7@YJ{Oyst3JOUK|<3nv5!&iad2130;YiLX`%*)6JzF>SXHT z4Gj?Vh824piv*fT*x&rxLVdFwFA13Dm?e{}-DVA5kask=t;*;R6=WIiDDJpu$IkQ# zrwc)w09>w|_QG_O^>wc45G+>~BJBwZmqx(Ty4b4QzFN51xyHJ@SktKOGm9E)Vm~T) zYRUqj*Via#$*@K*9#r_OEr|9p!Bb=aK<0YoEExf98j%E}nLjc^1m~R^H6W<;2g;Zu zU%BT&rKEH+1_>ErSGE*1V7-9W^)_fwTz6}&_@g!4%nv&?`Y|#;5ASO;b?uE%mXYOiIiVoSCY zOzs#7yHJS26BdW{Y}UqB1#L?Ys(e99bLK;D)m=VgrG~0P$Rukr%~rna0-J4oArqfr zxqx_?DQwd-@fkuD7%Tp<_9j`DH0hT5*|~R(&tMpmjLoAM7_r`blZ+mwNh&_W!kWc{ zNw&9-sMsMs^Qge-_zdgm&dm+M_~)@!(>OjupkPZ)9~WXOK0_?uI(ggYCj{*tpCK^& zq;lJyR{@{HhJpQ1nx$(!_f{kAXQ(T-FH05HpcUpel8 z3MPF)zatA?c~wtp>tUl5FJ`~2niL@b%;aa4vxEe+={0E-vR+lr@2&V7yG$(6th1Oa z46RK7Fb)h1Zg)-j?q2T#nw`iv+_x04;?Br;Y6rqovhMK%5@r+@6BPWjq#OErdVhuk z31;idTAL|5tZdR7SW51l-9SF^6n8`A3zO~l*6X3KXq9K$b@`zODC_0Q8VMs&{h1!o zE0YlWrOMVwPpE)LFlk#we?#RUsQQ&Pi*kv8cI^5Cl?txz|HND~N^iy&n%1c}IEogI zd)m^uOi*h&*i5AozL9xb)Ul3gb3W42^c;oEx}#9gE^7q5_;5^Um!(8!J5y3cGGX~` zD>`c>;4m4T+Pde}?+6}?L4C!FFIHhM0>n+?1$MHlRKkQu|;mCVopz( zp}-WxSh#-&eVJPKO6Jj(K_XgYd*6@8FVLk$eYbq9xSLL zMH>M6dXI8UTLqJz)bF^?c9rx1Ior|Ws!b6CaFH_2vcv?m>2kH>1{nMCX2^3YP>7O4 zXmRYE?@ag?S9)OlySsJi0QMXoiFwk&zjktG1IKI8N-OLZ1>mOg3Uki9XZMh(Tn2T|Q!Z7<~ ziv#f(2mQktwz&;9wke|pfL0i;tkJ?nwuK#88m1@!KqoF$&QidWcH8Y-rn(d<0PJ?s z4hZo*tlVk0^N8SGcRP@?yB$1WK}UhSlwfZZG}Q$F=*TCOvv>2DphZI@E&E>=JVgco zBmPO{EE(Kiv8kWYWHvf-v*0N*03b7^oF#*wYj^6?f~80RU=E#7&XT}abqeRYf~Uv; zpeLSkmdsOvUNEI7mCjZy26qNwIbP}EFE)yqEoJzlKfRaO>CZu3!v(F1NVe5ABVY{^{?Lw*Q&Fkob4n~0-pnL(v^~&eoBhIN zrj!W)_KTcVCLCt_4B-Y+Bmgi&E>_Nx5YVQh34I*Zu19CA^&Bi{9mY0(zoSB8A~E5S zLiYSLVX7~^(@3O&M&_3rTA3PmWNs3D%=%>XvAa)hswC1%FQ-t+c-T{l!zjgyLuXLS zHjO}SQo|XoywHs7aH4+g8Uc?K2>@sWIZFby9IkQbVV@O?nWp%S6deG_3B#GCBVal~ zM4<}%hRQeq6e@nv!!bqVKZ4+H;VlNe8sU|Ls@`D#R{C#D)@ zjzZm3@f!8eEpMNgZ!DMnlJ-aDMUa~+x`_ca^LKI`-a)xV=a@skG|7u2_wGD)EXhz? zBhI$eCZ~gq$veDNPY--co;l&LeIkkYHhOmaID*Tc@D+ur4W6j!<(k5YQ_UA~B#Wz) zY|hf3W5*F!q2Mq+=&%tjq#xaOmb;$z%`*=-+`M3e>s-< z$C3C}WWId;_3pK$Yp>gR<6+*lQ7^R9d{J-)^!mGmT1B z%&ScEt{>K<$o+*co=sI+Dl>C`LvhPGyKwWi6xwqRC3w8>U06%gz@tl8(zTYqR+?4!c==l?88_4rf&(FnB9y`u1*r@pxT;S~o@Qa<^ zvgAF=^Z1QUmItjjI*HOaEQf~7LIN*kCh(P8^mBMQhvkdIg4kgJGSmZh|a#)Z! z1Ph7-7>V=Il&f2PL)^D<(}<)0@pqcipBqR0pIRRNQWWL#@#Cym`%ikCgQs}QIybPh z>kR3(fMTxXjgPdi4m*Sfb3c@j5pOlsr%GTuJq-QT5eSCr%POAEEmDQT29}5=UsAYp8uC zs{NQssbhA|4(h)b)$dZN_1N9nP0e?snrl_cJg#uA1Lr#t4xzhLsKz0pmU}s>C$5&> zIy)wKhW$3P9plyi*gI{up9>c^@REe~OG$K?>pQkM*X^j7sZK2R+#L;Zh}Gs^)Q~Z3 z`MoOjJnq; zE#%w=#}^`wb1I$7SKypOu=}%!-MmWY^vf8|?eKd(;i4fgj3xCp^Cv@w{85o{wbf$Z8FC_rUI}5xXUodTsy|jI-Z2fF(x`a?eF9dBpSO zT+g1q*L8Nn4Ob>w-&u)16QVD!=!+>j6S1_g?&|&U+EP?AvA0}ZcPI9h^#Ehys@of0 z!<+c%&K*0ho~#*6=U%$|hf#NzRqDBf+8)g~C0ITivGi2xx!$!0- z+FMHA&hE);qZ=XoY*?}rHY|AhPGjvNcE55$hvotMnFEw9sU0F&FDtE*l z+mPSrA$h~s^q$?jAz#tOt?j*kb3+`(t_@)#0){Y8HvCo;eNRv92ugU(lng~!y=GO> z<9gMtVJxe9bdVzmVfa>caewdmn(=9V9xB1S!N;KBKgee9&2JltOBAX>%_kn8*QXuy zMXG^{&Q!je&x*(v>QYYxr}#=!vDR2FalY594X&2mwc4Qh_K33)toWT#$4`L;!JkP)*@*k@}T8qYKMnQw7W6vj)5CG=m%A1O8I|E{i*K^y7R9K0sV(xgvfWci#GB}oGa8Hr}Q70Ju>4%^Z zG5DIUT5&0W#oV1O(jR1Kk0wbUNs?Ynk|tOM>1RF+jfnK~y2=E$s4nJiZ!s~-IiF;5 zILYKtk_iznn7qJ1C^ZH2g051LF{+BW+ad&wqdQRMh8Jz(K8YY}O6Vf-e5H^wXtJM>yXH$3%SDTpJwr^8ftf z7mI%$@p=^;TtJQ;vB6>QefN#u{E6lD18_`0oh_`vVZ(g$KkWQ#E5p~ok=f|W-Afgv z6Z+}<``6vMg{BOPvS3ji+sT_2{^>7m`+pUn8GT-jaM=GH{LxkKeJHx0e+P%@G_bCp zPR|bQs;gfJozJ02?{%`|hpHb{zEX$-FY4la(&X-)AJFHXk`t!23~wIl(R8vWXMUtx zic;<+UA?I6{6_@Re-4d)QQ1l1qQeH7!bNMdQ1sM5Qxwq5EH1j3g`#~1nxcTdWpUB4 zEEK)TLeZ2AbeusSS2pw5OfaMQ#ypsLVieHKPBXQPJ{!YewBJl^qkp6QL#D&Bf+h`I Ve6~T!3unlPbL;rSU)j|p{r|Z7l=uJu delta 4141 zcmZuzdu)@}70>l6`M$)?!*(8aVkeLil7_%S%StmCX_6+8<^h2~fwnP;fvia!94Em^ zH+O~7HjEB99ncL;tEzP{5Gr-)*w7}jt(%}sK(S< zeQWZBNJc(QSG1VZ+4wvSyBxG=>2t;A;YPo&@5|ZQ*$mdFS-IP|3+@5hr#k3AOFeW~ zvC~zHVlWOEAz!Zn$B{GAWc>-79;d|rK=!^rxbFRZ5F>E36ZC&)Mnz*D0g#L z$QKM9U*R!lv*aYP%qhm`ro~Mzle6F<)-C03EGI2cIMYPipXL4hsTV-xh^k}NSvcg#e3zy-+i}ffsNfU%^IfC>2$#j>l^VsAt;g$N0$n> z^Okaow$KXY*VN`(#4a7?-w`5Lxd_o^9*@#pmzUl2KmHvjx7*9ksB@Q#FbBiKhz&78 z9jem`=V-AriP%x{Sp#S0lc;p^{q9@hHW*)^X|>o@qzCg@h7PcWbJ#-TH(6l{`oi4_ zKe}0CAyMwEGH&vPSn{CFu{hCWybyu{2Yv`%+;)&hroq6Nj5+z3mc;G+7i&-~=040FXN@() z=gZvFF}Z#)B(<}9`45&u{LtJs%*4@Udj&71dW6UGwgUy8&=~jm?61lv^ctQ}9Z-oU zG{r*lOTneihcflZuF0Yf}_22*LN&=A{0*UB%}OjZEp1K+Gdl% zsYE|p^*4jqMKi0fiEKLkc!>qqXsV!3*A!9DN*n$C@oL3tG2s@E3!1KT(>ER+r}K3- zkr};G*JD^_-yVOE>et#cRVW&` z2YuvQYmel_7#adYphx~)#1~&Ki`IU0m?`n20K}g)V>L^eO%Yx;9JeoneMYk{XUS4O)IV6;sH}kH zre>*SDWfwm?hlR*k0>i)yP?@0Whtu(+tu!56>HKn`A3FP7XKR$7`nnEA^%`aLx8T= zy+iMQb&L5LGaR6+b?>sYnQpDgp&Rw9%#SgAfs*5~uLj@mcn;=S>R3vyT68bl<50c^ z+;248T9y_nNM&=^U&C(vIwoD!Ce^c)TrMe+QR+~h0PdF>u92mb#MWc+I+Z5iexc!- zS$bV0Wl^eZ-eGS6?q?cq14|2J`eJ)4VDD?NHkMM(UeVySw*z)jgLSf$Tngy6D0V0t zfxDpLx>!n1@l;(}Y^Z@+|+f(5($?>EZR6D)NL> zKS%4+d^UlO(UGmEw-(L zJW3=_s8un^vl3^XU?Fklu#P+;_UqY^S;2k^A;K-jj;c17exX;zsGdHgrytSLi=dtz zc^T~A!w)xR=PwM)Q66SC&E;>HR1wfGFr;5#P`|){egUL+aIZ$i;uhQf2_D4@0Fs4d0)tzO`!tUdB?M|!^v2nxS9j^jeR}d9NnR9>W)v5& zA6f(wu+z?s-mgdpBFJ{?d3NY|wo9HEjd^u+d6z08k1@l8dxcM3Ie+U_$#w>mcrgNX z1T{xNsUiR5hooW7L5pu9fwCbnYk@iW+E3rpFc*Nq1qhT3iK*woUq8F5UeYiZ;ndg{ z1nPwZp`@fu6mHEu8{g3TEXO_oP%9(`?5IF!=QfDd_MX7@$-@RB3A%H&{B$c42S?vA8;ZH7Wpx*-oSDSWHS@$~I zH6G%N;)u$sGZg5aiCkwJo7u4dOQ?ao!KsjJY)Rb}hR|Q~U%i5EilXL$4{ZCKN`+xdge+wu3 zq2m!4k3Zg%v$rZE)~ck844_#MP4!lMP~nCn_|Z8^3=gU+z5_Y}hZaNXheV({g|c>>9ZyB^%rOP}XXlbW4ZtWh;&{6sKo;ZRnNQh{W@5 ztFxh^cc-@tAG1fw?tXjk+b9F82~mu2Ki|suSeEXn|;^&A2&aQO?t+ z0yhZ!98Cl+;cddtiXbNNAf?QVa!AiQ;}#2Af*yILGns0l+>K|LAPx}mQN)Sb&{-oQ zg!nSJc-$`$tc1RsX8-39=Qozgo%3Q$+`JFh1?{XYzP$l^8a?uz1@0cv5~iKn+o>XLKbBbtDjh9 f#cFP-LeHbWIUk=k9ny^1C)zsddr60Lh% delta 1556 zcmZ`(T})F+6z1F(>@6;rQjk(u5fP+Rt8PVi7YZAR2vMX-l@$MIBmL9T)@x0O##Q2G z*N~0DJ;ta+#egqjd>IpoCjLZU{E5MY#0SL}BN{cvsPV-IJX3mWmzGIp?mcI|Z)VOp z-^_^#xbh78?}O&}gZ;X<>oa0)NS%=Z^ykIF4kNx^XMrPFw!^Ho2i;L`Snl@7Xs>tS z3$upZY93Vy-vDo{ZA%Aou=7n7AY4@8Ky4A0uBk}}ahU@eIC-F;lbIKb0wCsiXhJ^h!YJ64I0{_g2heb?BKs=m?yVqI# zpK0MwYbgm+Q&We0^!;}R1tX?Dgu0mpJPF;}lT?e7tR2fP0+!)dh`y zx9r{-^~kN^Xjpax16_fTPh8016AFA0Svmg$;vHvxd0vy<(GrU6i#CQsQ8^q8dStPR z6Q3%?YV38Ew41qaT=6X>OSj1%kh|<2d2cw>=qBB{MGFT#Q9#Sd`mv)U>W+HE6&&$c zL0D1eH0oD!-$TW>imU?E2?gwWN4JnpE^RovO`oC?D!Bt)+x3u63;22a(%D3?c-E?7 zk9sb4cIsyMS%<6%j`<3wC$HIO|=Kg*aHCBIv6Mb delta 65 zcmeyN@I!%xfq^S(Ba0CiBjaRqF7wUJToYL*Pv8=rEFz%6%>V}ulidXr1t!Z+uXX7y-s@44MD{ delta 29 ecmdmBzrlXP965n6ET;Pzpa96W-@HbSg%JRctq3y! diff --git a/Assets/Prefabs/FlyingEnemy.prefab b/Assets/Prefabs/FlyingEnemy.prefab index b1a64763116420826a4322c2700fcea6b977fe9c..35189b1f832f6ffca822d8831a86cf7696e31820 100644 GIT binary patch delta 297 zcmZ1w^dVS)fkC~JfkE>F0|NsmkUe3dfIXwY=0H|o#>oq~+cqmRB{Hdmdghf_Fk~ba z2jrKh7L^t-FalLe0Wk=G*bJTwlj~We7^NrYNlCh;7bTWumQ*sZ03~EVvOoY<#Q|Xl z1e6rnsJJKQrurvkr6!lyF+j}?C`wIBOsZl4sgs?&T2`G=ZZe~UI-@+06rOyUMVL`x z@^cnlM#asdtXhhSAwXsSfuIOTFG&B+YQe<7paEpRWQJgt$q8zyg1Jmd9=ofXJofQb zI8Wl5{)K7sK{biV57bgPS%GR@^HOswfg-}26V$sHg@7Uq4fY@sMlrD delta 168 zcmewmydX$`fkAB}1B0dl0|NsmkbPmIfITDM=7nOH88<64B{GSn<>V)pFu3NW=2iw5 zq^71YumDv`O;(VWoP39cXYwHyk;$#B!i+MLXR_)t%5FZ+s->vt0aWrI2#SF8g7ojK z8cYlf8bJ0-W(a1UETo<~`I@HCE) HpeXF0|NsmkUe3dfIXwY=0H|o#>oq~+cqmRB{Hdmdghf_Fk~ba z2jrKh7L^t-FalLe0Wk=G*bJTwlj~We7^NrYNlCh;7bTWumQ*sZ03~EVvOoY<#Q|Xl z1e6rnsJJKQrurvkr6!lyF+j}?C`wIBOsZl4sgs?&T2`G=ZZe~UI-@+06rOyUMVL`x z@^cnlM#asdtXhhSAwXsSfuIOTFG&B+YQe<7paEpRWQJgt$q8zyg1Jmd9=ofXJofQb zI8Wl5{)K7sK{biV57bgPS%GR@^HOswfg-}26V$sH#egCV4fY@ma{Pieu(KH^f6y=h E01?|s82|tP delta 167 zcmewmydX$`fkAB}1B0dl0|NsmkbPmIfITDM=7nOH88<64B{GSn<>V)pFu3NW=2iw5 zq^71YumDv`O;(VWoP39cXYwHyk;$#B!i+MLXR_)t%5FZ+s->vt0aWrI2#SF8g7ojK z8cYlf8bJ0-W(a1UETo<~`I@HCj-}z+fcFz+h^?z`(!>WE*T05aMR!+Zgbac`^t8bd`XBk|G-w_r%;(|D>$c zWs3Jy)@MMWKY;AAjG}V{~7aS4*uzz)da*9JzaoO|AC+gNIQLA z%V5F8z~BI6|AUIT0L3bRVi7>GzfiFS>EBr|0L3(bVlSB?n00cSVd`W?Bb&_*Mk-8` aRg4uU+nTU5vP_<8Vn2C`iQwd?Cf)#)wk%Bm diff --git a/Assets/Prefabs/PortalOut.prefab b/Assets/Prefabs/PortalOut.prefab index ee92d0a57362ac39abfeb356ffecf0c1489f76e4..02e276d4200ddb9a363a3dfcf97199b2b990965f 100644 GIT binary patch delta 170 zcmX?cgn7YyW&s9<1NICI=NB+AFmM9d2@?hE8M!wGaI(mTdghf_Fl1zw1TZiHWhH?a z1VC&C&&}^dU+nU;0W$vsK@pI4(AdS`!NkCz0c2M}@d0@~#sZ)i4-W&wF`yU-CoI!v uY~W*Hm;q!ThvEh4-&rO2C#ziCGg;vZ$L0qY^_dtCOulegV{^gP8$1AY+AOpH delta 3751 zcma)7%Q6vxL&5kZYY2%@diwAu2N@RdOLD238|wTVNV*tOG!?|5sk?WOjvyP3F2 zTX4%~3#V!>NC?pr;=s*^q6moq1$v4=;>ZDU;?x`BSmwR4o44+cY)fnV&Hw-2zWwdY zdVJ-}_UqT$yBYiaDr0{~7-M(I@4sE{9<5&8`A0~s8-vx^wyw6Q?QrH;t2}CztpeL7 zjbVAfD+F&H@W$Bmv6&=aD_E?!rao`VSFh5P@gifrB6jC}UAyV%b#ZERM^~R5f@*j~ z#N`7!Dtm}4R69vJZ+a|aaubbv103}>lHBC7m!)~vE1CtiOIrJh9lCClaXikwgA4NF zRy=Fu@FAHnVWv;!Ja?tT$>60K;%47KXrCC^GcbHVsZeie(k-}NVtQg+=0YKinZ(K- z5T9=kS3D&4pfA(FC|ht%&T^E!`NFqu|jHkI>wh+Zr#NRTC5k&Dc zqIiZBXpZ7pg5o(}rhySfv0tkz6whmQh2lVfjwt2`iYYg}vTS9L#S0{%Wfm_Yi-XAG zB~qX{i$jFPs4vsNh_V>d>Wam-%#S;Ps8qrOZ7Bg!J7 z)fJ1RR#z+*0`!21L7o`LNJh&rjw6gkgz*X~&>Y6A1jcK=Oamhd<8`gBV7#H#6^u6n zbc7M}trGgoc#EX8Ok)XYq>zS53N)v2g3w6&G7XF@b>|9=XY^`U(En$_n8LOZP_DXOj zc&RcIF6V9$T_@Ez?vv^!?7iOloayCk2U{;RcmrB5`Yh`FxApG$Oe#=~)q8if4$^ul zz~pN^UNJKn+sR?`ryAS=&3g?N2phRCYd!Ve`IbXozmEILmg|=8jm?)E z+yTv>Zm>XDY3zPAz~m>trgaeVX97&PL!NRS4x3~6l$YMl*jZe`=U@d_-XUrA6|Bw< z{-k}z!YTPKvHAI-4gWjL7d^9tSr^2O zaBn4Hr}MBQ$D#LXW?VE871Rj9roCX7N-(3K?)%j0yU#O4GiSx!Wt-csgWeAUyvOAu z!u3Y>XC<&n2|)H6Q>zY&edx1GKM4d)o|$ByBYgTe*d+0T*>`+N4#5n^Zj?#(#CLG tXiOa4*eh=Q+#}*Y?b05p%^{K6+$sLr>=vnw?eeoj7(et?ul@LE=l@<2f2;ri diff --git a/Assets/Prefabs/Powerup.prefab b/Assets/Prefabs/Powerup.prefab index 25772b796d4cb7989a60865c4df203f99141c3d6..7c8a0961cd73cbdb5734ebfea893549d92a67c44 100644 GIT binary patch delta 411 zcmeAO_z64#f+ij2JwC8dQLMMJPUy8pKcl6f*(x&7gRJ zUNXZ9pqK-Y?+C?CpVw+JynreMhR6RRpoD|QE(QglZ!~~xP|$$zg7ojK9+SgWJ12io z=brpPm4%Ug@>5lBZjc-Z0QF4PS2LWPqOLKyMePbJ&`5^5$+7B_Cm&Gb MZ(VIa`GL9y004(nnE(I) delta 245 zcmewm+7Y10z@WN=fkA_Vfq{V&$i4ui8BFwy^bFEW82(); } - + void OnGUI(){ + if (gotHit){ + GUI.TextField (new Rect (0, 0, 90, 20), "Hit by enemy!", 25); + } + if (gotPower){ + GUI.TextField (new Rect (0, 0, 60, 20), "Powerup!", 25); + } + } void OnTriggerEnter(Collider other) { string derp = other.tag; if (derp == "Powerup"){ + gotPower=true; + Invoke ("resetPower", 1f); playerHP++; - Debug.Log ("Powered up!"); + //Debug.Log ("Powered up!"); } else if (derp == "EndPortal"){ DestroyObject (this.gameObject); - Debug.Log ("hit portal"); + //Debug.Log ("hit portal"); } else if (derp == "Backboard"){} else{ + gotHit=true; + Invoke ("resetHit", 1f); playerHP--; - Debug.Log ("phit"); + //Debug.Log ("phit"); } } + void resetHit(){ + gotHit=false; + } + void resetPower(){ + gotPower=false; + } void playerDead() { DestroyObject(this.gameObject); pDead = true; - print (pDead); + } void Update () { + + if (playerHP <= 0) { + playerDead (); + } + float amtToMove = Input.GetAxisRaw ("Horizontal") * PlayerSpeed * Time.deltaTime; if(playerPhysics.grounded) { @@ -59,9 +86,25 @@ public class PlayerController : MonoBehaviour { playerPhysics.move (movement); - if (playerHP == 0) { - playerDead (); - } + + CastRayToWorld (); + + if(Input.GetMouseButtonDown(0)){ + if (portalExist) {DestroyObject(currentPortal.gameObject);} + //Vector3 position = new Vector3(transform.position.x, transform.position.y + (transform.localScale.y / 2), 0); + currentPortal = (Instantiate (WeaponPortal, mousePos, Quaternion.identity) as GameObject); + + portalExist = true; + //Debug.Log (mousePos); + } + } + + + void CastRayToWorld() { + Ray ray= Camera.main.ScreenPointToRay(Input.mousePosition); + Vector3 point= ray.origin + (ray.direction); + mousePos = new Vector3(point.x, point.y, 0.0f); + //Debug.Log( "World point " + pointZero); } } diff --git a/Assets/Scripts/Powerups.cs b/Assets/Scripts/Powerups.cs index aed2728..434b00f 100644 --- a/Assets/Scripts/Powerups.cs +++ b/Assets/Scripts/Powerups.cs @@ -4,7 +4,7 @@ using System.Collections; public class Powerups : MonoBehaviour { void OnTriggerEnter(Collider other) { - if (other.tag=="Player"){ + if (other.tag=="Player" || other.tag=="Enemy"){ DestroyObject (this.gameObject); } } diff --git a/Assets/Scripts/enemyCollide.cs b/Assets/Scripts/enemyCollide.cs index fbfccdd..be83bd3 100644 --- a/Assets/Scripts/enemyCollide.cs +++ b/Assets/Scripts/enemyCollide.cs @@ -4,6 +4,6 @@ using System.Collections; public class enemyCollide : MonoBehaviour { void OnTriggerEnter(Collider other) { - Debug.Log ("hit"); + //Debug.Log ("hit"); } } diff --git a/Assets/TestLevel2.unity b/Assets/TestLevel2.unity index fe3c631812012eef6c62327f27954488b2e2cea5..92ce832594ca365a1e5c822bee250abdb2b612fb 100644 GIT binary patch delta 4880 zcmb`L4^Y&{7036P!|>;TgFDXS{~?EfddD5yabO@E(Nxr+XN}R=nh_0(4JsO}XmlW* zXsu3K%-Jq&W2@72!c42dF&0fUp{ccYswsBtl%z4mX-qL{)HbH3M(Owc?)T$<*TkgF zbcg-z?q~nMef#zu13!s5^I}Yapp5SbTJWF{A`bZ;q{8beb-9;%#qHtY;S7{-hBg_- z@1Nx~>~Kst@Vp_<8ro=>uz%LzT_JmROz7dvKk@Jl?cwRqLFV#>Piy3Im4C4DA?W4*fBA0+|kw-D_~nowl;ILNqlz9$dAqan0Hm zL1@Jb;J|q?O@!Qz3<~#r#F0u_${5KuUPhut?H63rxU^yM1`&%M*`aH(g`out5<`hI zGATDy8)ptZy)a7te-htze*Ur<|k{i7hs)W5&5(WaR_h-P(SfuFq0{I z;)8$d8M_EfFNLb}+Y9WeLafCiwB1#Mb%8}D5#nC3t6;q7S~b>yx!cXr69)k2gXwoX zv{@E)gYD5xase!85n>UTc69H7^?*$QyQNCzBG?VEjac2sD!T;MW);GYcI~tA;dmLa zONARz=J-C?A(edqRgUQ*ScNT0 zW!uFiz!pHgxGsa801KdVts374i%pM~))g=}m|j|k`#tzWckz~=`q2kbmT>!dmE|-!1P0` z2Q!V0mdpmQCNTZ5Pk?oU=>@Y9tRGCjgTM3?2krSn^pHpzF!G4?(Wm;`)!&`hBlA+Qt(GDos?hYNs?NXTDlq(s4Qf0IHUQ9t z@^9353aq7A2%}Mm<6s1A@y znv?TRfa$GM6UKDQ}J<6v#5+VpD#TB{ndSwltUXiGvg0FT-^dO>mQNi!J*b0rfMO6jv2I9DP8VO zrDG{8MlG&;`H64Ty^_>6`I&h6!6?~mriEYr>-I-KoL&2;dO7Laqt4BHY~3g z#TCzaeRaF`+kK8(Nis|=&dI5RU2?{Ohvx1+u%YfXJbMU%ZI4aea^`1W+829v`<~<{ zr^;WM>AJi(jZD4AEws-NheuW1zp`<~db!6!X4#oe0Sik&h>jZm-i^3>3ki89o!Tf? z)@RT~IhaKSa$zRg+p@_acV?1>b6N6OCfPY>mL*vf_q{A2t&}YXvneQ_W!9EMMtKZ5 zikIiI$S+TfMZeBWGRUfIjJ36%uA-_o2UQzqqU}>TSnv@$ogqq)JI0b9$?SSeeR(XI zIiF1>NS+KQ`@_k(aPrH1Dr?7sE_N^bC+}A9C09-vd1$k;J?4CK3`jY0;DQVkF!I46ZVlGFv43-)iuh2q zIMRwUJYL`*dvQS!^aF;qLBJwm0qb8->iGk2LlxcCS}rRKho*4gr$sMHc11K%va6zr zl6@IXlEFO6(5tRYbIap4DF%{!lHQUM9TTx8Sl%9f-^@o*;GGAk}JUSlzExnh=Q$A5zZ^}eU z;7gV5q*ecE3<7CnMAbnjl@)}g%r>E;MzaYc`&2Ut@|IJ%nm!liP;5mZ`akWW8YHJ& z#HH&ln)R?=SJ+nSb%k9OO;^~J(R77<9ZgphUkJ1Q7plU;^ZMAO`XZ{L?|(;C(Kq@m zRnfOog{CGQHE(U3Tzh9#VVN7{o|)vZxIE=$mE{PL5sZp8w0K<}zrWH~Ss6ATT#p(y zgT}CJG)l!b8l_?zjgoC+x^ft*ZR883*~WNz)~%@ATu(&h4tc^Vmnc8-P^O}C(q2ka zOjb|a{z;)rS50p_+P#I9Yiu$fB-*Y-c z$n7*ksBgE_aCy>6gYVT-24Bs)!w-9^wScO&!$ssQan}~`Q6>SuY#T-oXoW}%1?7uc)UKp&r=CM zNelnCQ{_iSJJmRO^d5SZ;^d|(%FW})OK&G|hJD)foT7CVb`vMhSCOQ+-c8k%Y((+t zY1nF9$qQdODkv9NwJUt*c^m%* DIU(iE delta 3939 zcmbW4ZA@F&8OP6~m|(z3>|lr?yx7kK!$As;a93kJN}SmX?GQGEmT%;ay&g^D^{gLk z5=`~%$6$+Kt*Em>x1WH;v&?Qj4K@GLG32|O=P!`?enqDJB zzrsE^Ip%3yXLkCpVDn(A(;tFG?5fkfLRYR-<5DU~0#6Pe}h1 z*b7Q0*TFh-gxC*e%>Kt<(_qbDy}aOgrQHB@gl1bh`i+ z02speo4Q@(x?ncMsW-sb-T|9|I8mfyy8Q{v6;d@r?3o6P1FE9E3pN6#&ivcb0=6pzOaF^6Rlx$v%mP@#zP}uyy1;zp9d3> zRI?UvwwJFQ*w+fCPS)l(wjG|83ux9cyxpATlnpLAFE`{-t9&z$Zpr9IS}T9JldR+K z}QlLJ9fg5f5b}{kVt1c(oN!v7GTx z0n&qBq@5+?Li!J0+KSgg>gDkv=fx7O)LSJ~CO<p_KGUUKrM zTlRU$F8861w3m=YjxK+G$VHG5mr-A;h*h@wC?Kaw$R?iw>%|EuhM#2Zgy1EJ!&g&` zzxkB&Z~_k>gRxXn@G*&KsXcs*a@6C8k68}S{O~c%Zyb_hr*@mT>*&EF-NK6RmZQhp z4jsbnLJ0XCKjpBJE_NjP&vW=qIl^x~-{r1)Dw4;VX}wlt^57oM(R}5%R>bBex0bu# zBld(8fdL0$R1RZt}~05we-_?Mf=}sRg;h%G1|qmBX_lY9`A{DPJ~jb^M>(Iu6(-{8{@8WV`J3EC`vo(BIr2e6(8yXeG4r)lz8Jv#T!Q|-k`v8ym83b zgOrU+I{wp;yTjVpUk|U0-4oHq{%}MeyBvs6vmJNG<@mw36nQm5oi3)vUS!IR^1VXZ zcu}n9C|Rae6(en&C$y@s){#H1HTYolGUWtUukE=5n7|La%X} zAEX<{Ywn;9UGtIcX3azO6w*Qq#6DB6Y5scsist?XL-URXL-Tn z?!yv3ozN!uUx}3oPVCVp_{<(-f+zRTZLGh-a`I<{s=~E(wKd!7e#>fn(^&N|&%ptGdpE|n={{?5F!8o delta 31 ncmdm@Jx7~^fkDKTfkAZ6Mh*uNMw`i=BJPt@L|rDo5jg<>c`OL!