From 0aca7474e6b670cf0ae9aed81ddeb438079c904f Mon Sep 17 00:00:00 2001 From: "LEM-II\\Ilja" <> Date: Sun, 22 Jan 2017 14:05:12 +0100 Subject: [PATCH] buildings --- GGJ17/Assets/LairCannon.cs | 2 - .../BuildingBlocks/Building_Barracks.prefab | Bin 9044 -> 13361 bytes .../BuildingBlocks/Building_EnemyLair.prefab | Bin 83064 -> 83064 bytes .../BuildingBlocks/Building_Extractor.prefab | Bin 11936 -> 11936 bytes .../BuildingBlocks/Building_Flag.prefab | Bin 9044 -> 9044 bytes .../BuildingBlocks/Building_Wall.prefab | Bin 9044 -> 9044 bytes GGJ17/Assets/Scene/BlockTest.unity | Bin 780096 -> 775808 bytes .../Blocks/Building/Building_Barracks.cs | 48 ++++++++++++------ GGJ17/ProjectSettings/TagManager.asset | Bin 4348 -> 4356 bytes 9 files changed, 32 insertions(+), 18 deletions(-) diff --git a/GGJ17/Assets/LairCannon.cs b/GGJ17/Assets/LairCannon.cs index df3e4f3..a60c8c6 100644 --- a/GGJ17/Assets/LairCannon.cs +++ b/GGJ17/Assets/LairCannon.cs @@ -6,10 +6,8 @@ public class LairCannon : MonoBehaviour { void OnParticleCollision(GameObject go) { - Debug.Log("Blubl"); if (go.tag.Equals("Ground")) { - Debug.Log("Blubl" + go.transform.position); Building_EnemyLair lair = GetComponentInParent(); GameObject obj = Instantiate(lair.spawnPrefab); obj.transform.position = go.transform.position + Vector3.up * 1.2f; diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Barracks.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Barracks.prefab index e49401a05633ec774821f4cfd92f859338f9749d..d869d7fa3f6bc4fdff782d1fce113bf5d1274815 100644 GIT binary patch delta 2759 zcmZ{leM}rh6u{peM=iA|Cr~LCIH=UpMmRnW+S#XyBusAR z&HKIgX6DVz?cCfqJy-@%`8+^fH2`?9KZz3jmHtX!xEB6PCX-UublLpI{D}ptbMc!j zF#BHLHSyw>;C6KTVWy<8BO@V!1b<|JIfiIG*3DP}yhvT}Hh?*fnj7oGgqQJ)s1YwG zyo|qu8u2ZJZ7$j4yn-6>M+jq~dFKEE<~yj6VJlHAWT1(!VV`&fK`cxBI`)ZgBM4x< zyrIInRCGAO!eJINlo8e~s{;&1VGN#yn5N2lFdm7qcGY0|h#ZN4p@fEFN3>2RkFe$l z(+!ZR?Pf78u7}uOT~<_(4LLNFjv1w?lF94&XU~@u%(Lvb+>O_&Zr{?7ewIONgPEcA z&$&Ic$nSACB^S9TlRnFH--8J{9x4)KP|oH<=s_ve*wo>42G5|4&Y;%jUi5d{Tak^U zk$;`Q@8{eva1ZD84o~1wN|1}N3@a_Gfea>1>>P3x57=P`08$s^qDK?=-^n>8KI2Gw$IFY83c!&YJ{& zlJkJT!^9H^o0l2r2s9q>c#1nmbC&ZKfnVT!ufX5nyfwvL@PHf4_mS^IMiuj?EzN*l zocJRius;>xhWBtwKjFNM^CkaT&f8bWitn?FZ?Is-oCwP|w8r+g#4Mg$;KgXuVpTTZC5}W|7{5)z=ifJk>TO^O>5~YpFTb|83t&dB$NiM6j pWMd7DVKzB7vXh=Jn6JGxlrTN@R4}ZtA(>1&QBTw{jADf%{SWnQ<#hl6 delta 262 zcmdm(am7uEfkB>=fk8Qhfq_8~$W{Q-45oUfdIo964FCTB|If&=QR#)Gs7;}@oV8`+ zeM4E3v{{ob*((E;Rc@A-@@AggC#EquNG_0(YqE!~gO9S3J4GP-OB3J(0;L^p-HPOm;L7 hp4^}>!3k5#FnO)M{p1h&tGF2Kfm*;|^AZCGCIAtKMOpv= diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_EnemyLair.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_EnemyLair.prefab index ccd750ee3929f248bc6c067d090f779a321467b8..06e936ec82adb7a31c29730f981df874c41ff86d 100644 GIT binary patch delta 19 acmey-!TO_vwP6dR1S2Eoc1cFYcxM1gC^UJ diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Extractor.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Extractor.prefab index 62a53f18b7796ad44f38377837985c664df4d516..3c4f94ce7fe55ecafc3d2707c00b906c025d2a2f 100644 GIT binary patch delta 14 VcmZ1wyC8N$gcc*`=147f762-K1h@bI delta 14 VcmZ1wyC8N$gcc*i=147f762+p1g`)9 diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Flag.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Flag.prefab index 875c758b3c431c283ef67825accd5f419f7d575e..b012ebeb2d38121135d7b9d25cca0724c5d148f3 100644 GIT binary patch delta 14 WcmccOcExSO3VBA(%`4?sGXnrI`~}|t delta 14 WcmccOcExSO3VB9`%`4?sGXnrI#s$^@ diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Wall.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Wall.prefab index f8817dd9dc5a72703c1e1b745bd8738b9e5c447e..0d6765683f17abf8d6dc8321c2af7b37021fdfe0 100644 GIT binary patch delta 14 WcmccOcExSO3VBA(%`4?sGXnrI`~}|t delta 14 WcmccOcExSO3VB9`%`4?sGXnrI#s$^@ diff --git a/GGJ17/Assets/Scene/BlockTest.unity b/GGJ17/Assets/Scene/BlockTest.unity index 5e1465d233af14738794bafe3b8d8cb43608e96d..2c8600df10a51ac46e57dcbcdfe8953ee735e50c 100644 GIT binary patch delta 23003 zcmYk^34Bv!)&}rf+G-J(s4P(sDvHJtFe>v+XK^O#s1>)k$8D?|hD8XjWsw_X3$9^p zRFKOa_bLKWwtx#!MB|K06p@H5QADe#(-}d&=Y8{>o|)gTAN0@d^PGF`o3w6U_PtZ$ z&!5uMsrdOkr^Cl_$8iqF?;G%|^ZUNP?;9L&y7Sxq{rf8pd#UHhlb1|B)nBz_*2%l8 zm(2bBE!FL6Ixo4n|9}7LzMDDgaPt+>TPmDlh2wOp4y6SLR5;V|`2qMijFyA-!{-O$@F=CL-XCOB`z%tlU47&G;B*e zm~7@dn*Sc%%=eeNw2&YEndJtUk}jX)&0bk0)p~59nqtKjiEq zu}CKble{Zv8JL`pD`|mo%)|SSa}_ZQlvSVl(m6J;6()hF(PHB@@N`-cCIj}PHBQjH zxsTjt^O|9jHxFj|oxns5oX-nWFbP~h3r^C&OR5Iiz$i=t!?YqSjogFraVag4(2nO8 z-&MZ3M1|Y-cKbXrFF*r?&>uJp}4_|2B=g+5wr)zP4S`sG3PhPU#mK0&~y<`?GHbXmR z8#DWF0ZPeJyf8UaOXkq>Fe%wPt6Wmsq$T@k%`kbD{6-6=v|~Rl4|78pz^u@jT@Lg; zt|c39{K(!(15BRrd$a;fPWAh=`X}_v9A zRDL8dxshRIbDa`UN@Bb)x>!qw(`wRMawn}GCU??&$&B(Nfl0|rw7}Ea@iHw9^UUkd ztZNCe{uwQKg_eLx$%qRVlphI9UJ)Z{;b-*~F^ZOjO-H`@$#^s^@|?aR{O-2ZHZTd4 zz@un2&uie(v__Z&cBT1V(7+zY|6ud#VUkx%%fez9q#7T`(%j&S8rYMVgZ0Bj=4ba` z@7`kron{T(OKXHl;67RjCIkLPi@&6Ky_UA`gjgp7!+_vu2pK1dGOZ6a4r)6MrSZC1cmg!-g zNh`oYxJ&bjXrlR->p42#dBt`_U7(!S{=`<8lw3e-%xKAlH28lf%07)wgU( z8YUgfXmziZJM7PY%ZVAFhl$NAB14O;(2`eaDVUV3ymhlJDZ!*<6|Hfl-pFcND@;1p z+`8GdUz}Q{C0SlrfJw>Vn|9ml0;{!T2rUDXZQVhuTcagIX$4paH)bBmFq%K>YDwLS z?`%mlt0jM=wZf$2PqfChTJmR_f1Q^6g%*LyjdVZf(9Y<0(lEO%^Zwt1SogY?)Y39A z57(GSax5+KhL-fCrC?I>Zsd4dQi91N*+^@AQ#;;+nSQ4g=;2pW@;)z2y`?32S^*{{ z9oP4T=rAg;vPn=f4n2%`@>6{cmf@!>j&bOQNuQaE2Flc(Xu)@N>dv%0EQC@sbQhX$ zqYnMIKMc1e4KP`Mh}Hs=jx&v!{m0(ZlCyZB?|m&fn-+%2`lt9N+7b^YB~xj^yp~L( zHN!k~nMXXG7XILWe*T+5Oai6k#@vUtqzIGsH_#&g)b-y)%faNW`es_gzjXbxgIjD~ z3dW&b=P6>~L!EjKEe(^YJzD)ox|zAO1Wbnh^!uH*qyUr6d`63YtR0)IVgDtdlzh$$ z6Q5|wW?Bv=CDAkf*ae$(`~}_2Kw1(O!=IUhIf&+bs+$>1OTqe?=Wo8v{;e)*1M@(c zIz(&uOs77RR)l%@I`cfwqQy7q&}Y-KFd6#F4kg>+`&>KRtB4*@PUh9L+Ra)Lp=Dtq zl$z6j4bAyNOJ+`Pu_a-c+(;9x2$POf*<7b#i^!=$8z*6@{<{6H(hq~u3h ze4F0L9$FSA9WS_--DXRC+qL9Hng^40HPdQ$Xvs^oEG&eZFgNlt&Dp6XcfOvs9buTf zjPIhkIbaN5Xin?h#JZB6)_Z7qn7oZ%e)h{Yu;yzW`U+YKCPQCI^M9j5Uq#EnLgwc` zGxgQPR-mlr)vMmLCH1>>>epylm<+vw7W`I+UP;TrWaw1qPi&sETk{_8?3S?+D1lG# z!V*m0&7P#izth0Nl)W}E1CzCWN(+9kd7sfdnB;Au)wwMic+8(Fj>0mW7)%aacbfBq zuC)g(4)bumIn}ka+8^~S97}6}$yS%l?qoZfVPu%fV!=Ls#^+L;L@$Ll2`RVKQ`# z=KRW`&HMjwVhSizPx<0z8<>a5TBp+L_iErYS_USMX*w;uPxFFX#@oCEO!7{JnSRIl zO#@Hkg)x`}o=&UTuYrT(lWbrJCV@j}8JOJh9khVct}SmUE$g&%+wQn>;|3epiVNjA zRnZa^?b;qwHLa#yySCGR04)s*;eO0}%7L^JOdiv^v%j?+b(QTnH17X(Vlz;teuGw9 zrBlC2%fRF@jl2FQ8`uJqp~utW)jIS9nsa~-J<*uizXz15C-K4}Os1Z{r2Wyj%n2SS zQ#;NAS{f!pFQoZvbm&F2W|$0}efUJ1SAw}R^;%+Md!2e6trg~B0P{xkIxTgO4*dqL z0F$A|bUV|Q1Ul%@F3p2+XxE7oeFy8*V`*uaOnuP-=h?s_Ob*<|w8$ZCfzBng983;y znAUKp=FR^5MaaYcQ$PuP%A(`=4%5Inv^Y!xJ(}OAfk*yhxE(MIldX276=Cu|(}~t_ zIJRn@zgcT%qH~00VY%bM2mFNv+y&m6&Auxn3vrzw7SkZ^wyI$*p38DI=(8K>-f89$u?e?f_Vrt zo7qmQ^J~ctS|dz0Gd8%zmgHbk@&GMzly;1x6=0ru{-$I+vGHgvnLx|Hq~x-u!@A;f zr>3i}|8iO!##8NFL2H4@`mdxVy6O5~a6j&91G7Mx`bAp!7@fMAmWO#}0DQbei*?tb zU#2y~Wa#XU-nPT(p+m2wxs5=XdL6L@lc`^)#cOryC-$FV12Zrg`bk>-u{!iDS`H>d z&!$Ct+M&xo|2;)a17+$deJ{2ptuQ(1Q)#i|bm(ccB20#!PHQ|~hn~M^kj-m`$~lc8UlJ=&JEz@+45TKq)qSVD8$fR?;M^k5-8 zU-NQWN-M&o|1ZYHVTuxOK3${48v99BTNeiT@AdHSPE+3-aVh%z}izaa33uNlfd6-HK%Fb zewqjChf?#G`6nN>)#epoc0lv~-Wn%+2&#BXMbU7_q zhoArCv|d5<{ZS9nm9%D92t%2}dKIk&CI{((2hO!6p+9NKI9eVi9ph=?KT8Mhe*&=u zC?ykV!M|w9KTaHGOX4uu%#E~Gm~5tj7Cl2Za}&+^t8S*tj%T~spa1HB@)GkK#Q$o7V`FjvTG#O#J*OC2tcGKo0|$*YP{Fz*$QIU9`U&?sXI@f@dLDGm^|ZgwAy-o#^Y%jn4JD| z0=sQq3rx<;xwPo{$TP1$^Nw^Lu>h3UXFV;}Ujqkzc;GR(+)2YEa1gEb0v&KLEeVsn zA+*4Sn&+;6>^$3J2c`*3_Xt)y;O&uPpi4i42}Jp!?1u@50t5I zzUWz7l7dOeEwsSpT5>Bb4fBv?UOBhX>aWnv44@@o(s8~!`2|~20Lp6m)52HkW-g#* zVX~PEX_2dRGuyZ3ZC(;4L+_x~Uadp#q`4kYrY;df5uN&LS{x=*pVZ~h?zl-O50jyP zN2|X^hd!B>fyvOlY2j<_(60Tqc+%lV+rR{{Es*A1_dkKO7_2RjR&%{>;n&mtV)H^U z$=gfIz+xEQyz2Iy=9VuE+@OKK@xm;uA1*TAxBK)u#|E~-B(N_n_74p_g;s>gfI(X0 zjhZ*`v`cJWvkR2xG>8~#(C0LmmW6p3#2l_6w1%7XG2KD)VDgx5|NCfL(gKsAqqOMF z<)Q6A{~bsy0A=bywAd{=b<6MWw}EMx1pYv)y;ZmHBP|J&ygjtQZJKxf`pK>hYyip@ z`mdi{o*E{v;|pl90lI|?X};Ta3m4JCFxkQ}U8mVR4<;SmX~C$gB|V7EQ7x&Zg$HWM zv9u&iN{T0xONuZl`H~hJq#avnEin5y&HMjX#N=Qt*+$F5q~xh*mfAb19ir=>LrcM8 z$TFweqt)D@>z_;WU~;GjAM$Z`)9)03GW8IkvFK2p`VLwN=HbuGAsk9e4AY^9(Q+^u zx@FdZJ#e|>kLl1q(2_Cy{3lcYNOXql)O%Dhdz;3gn1ai z3>~1w?~lPN!vM_o7SV#+v(Jd^p<~mLhC|g*}3v2PdAX}Ke;C)*XgUJ?V z&`K~FdL}Ir*P)weEif5+(t^Cr3yj6k=(qn?LxPwA%G8r-br0y&57G)S8Tuibf1D0| z-{cls5{1e6Xr#5mq{AISY#gs8BWeB#S~7|jfyrimJnN8J%{F62BJ6aMJGp|4M zmiax=c~ApeXepQkUUTMUHZTv9wO&hWcu3cJ9jyrSkZ<06uBXKx)~(*)60<;A>!cg6 zv?abrbm{~x0h29ErnSOktq; zxDAZMWDB>@d{cA_x6+a@&na)=Hd=71-9q{A{|z95H>a)9&7KO>s&#u{JOENGS z`Z-##Nr!%(=D9$b`UPTLN~bPfvd;#_U=sKxtpt;^u$2~hT=Tx7wZQs0u%A}e$ zzsuIzk_Jypex9N&4O-BwUFT1B{k@Wxk{l903g|x2qSz6=My4L4t8JMhf&%e6alA339 z=$~kDm<;_htp!#d8u$MTG4ZTUJ#U3T8GiEe(?`45x*j*Sz>6f3IjF zwj>Rck{z_VjF#-AWni-D5-sv7I?VGoZ=+umQ$Q)%^!`FyQi925KBqOjrkmMJ%fni)E5m`r^EExbxMb0IAWlcB#jcY`e{!erz>X$pK~RFL`0Z8lC#k)JHZj1(U$TXuhll`e<>OIdGe4{x@{1U%12! zFoZC37Pin@VY1epL(Z@z^>1oPiB^C~$=9^VTUzoBtraF6yJ&9RdM$D1{oR%%U~)j> zG=EM@#?n$S4+EPwsRw9vZ)?doS|dzuq<692cI04qoaO)iqYp9kj;_Bitr;fI^AuYB z23`N=0XN#fI84sR7qnKGJkBk&=)0O%9N?C}*x9Io1IFHC1M6TCcss2bCV^2}?Ry$H zkd}eT`3Q~NX7gHLl6NL8>b|dmXAui9x#P2GvAhP}z4Zqhn1)HI%mnBUNfFb_9m4(2Xe{1ZKx-_o+5T&*Xw zW3K_W#8=R%JJAv_nYuHr6((!#LQ8(ip_d%<&ZeU(IxP9mSNk_rbXfkMH5K3YcKh6X z^$1Mllx}U`w&%XIhTGb=HJn1r!=xcdiwd;TqaxfYC8Ct_2Gc?|7 z&1su(!BiWV0?O1AX@S8y^(0yv=Hcti&RFqt}e&cAI*9wsGI zXbr=)WGbx)lagt)_?_A@otA~6!?n-zn}hyiOMG|fYIe~Quo%`{jgN0>tuWclZd&qg z-OS;G4jYNfog7StK7tmxM~6OgkXyd60QB$$=6QDHg^l;>)SYMbuA+)gXOWYs%p@zEMsx#D^on1RWuuA&9+*Su<)2a~)5 zR$TAeFRmM-fy;}lt;Jvxn4y(mGT^JU2>x{;34D##0+TylS@Vv~3&iy?t)gY(xKN(c zYGU13eNJm=1y~5{Gmj}t^FN@EY0i6{M&XZ~C`=BVM{9*i$6Q+DIChwywdWE2Rck^-%6f|h(r%fLM3n?wB>EizF%Ho;84lLAV~tc!cvk`hcxX44uc zX~|QxR+xtjQ!8XFR9f8U1-L_}EjOb0)XS|%|dr+TohL(oOGwyov znKrNplQYwe7I{eXj-lmXlmW9bl-$RQeb?6S!srGA=Fd6z_TJ01a z`Vg82b7ks7iJ_@F^xYZX zTjm3kedgusw8A8C94(g8!11&qOa`1lYkXYuvcbMKuNl_%&sx?JLr>^)T1U&mJPcr7 zVz1L0p47+m2F-)XV>+UHoh@mB$VzYJX?Wdh#1Jf`G+(D~- zN&|P&k}%0D(E@WcZ`=`oH+lGP?SOJx$CuG*ftf!w&uIcJ=IItD(tLAu3zKMJm~5fP zFH7yv9!xrFX~B7>1JB=-97}8ldidO|x+g6>UrUaoC1FysW9>3qQiRE7cG4mXbTcJd z4knxV+9ftD)YYswd94jh!6a}c&9_JcSJC1y30zI{FV?)dmu|LsVVLC2qq#Ytyd>rm z>(UyyfR=~#!&b~IBAu(fAHO&?Pix@Qv^Y%io}snCWWZ->iDztH`QNo!y(MS^vp{)H zYiQwT^(^Xf*>uAj|c})MPKFfAE&uhnx)ovM+K(ixr78-b=?*%Qn ziPj7Y;TrREz|FK4n3TMK!f;y>dQmr%r)6NWnGa|Iw^>*7Phu7(t8R>VHn0^Y&u#=Q z_L2sUq!nSZ>QS`Dmo=~djAb^j8D=(ZfBw6G7+RuRxR92GdAQK5`XXAxE4qb?X&y|r zu(b1Awxk6nLocI6m+H{VJHO@H3kyJ*I>QTN%XI4FGoRV((l9w6y=ZmIb?6gl8JG-x zA}x~9p#!v320#DF)DNBhtt~0xLMeHe*7&NHJVI-QNy($M)N5Mu7_9)4j)Rx9*p9#o zc9`$~hY&MBIfRGO>Q-vWVYC7)gs(G)&`0yH(vovttQ>+8gm;g}|^MxA;GEe8vs)C|3oR`Z??-M`1Pwj=_Rp)a82 zVKVfE*0BH3`#SYSys!Y1sVm!Uuz|k323FA$FbS-twZi1h>;PKw1I>HqiC=794t9@u z{#E$cKn(p;1K*`J!z6Gct^QvcxUKVVHZTs81Gk;#`%t&KgO-GO=ro7g-AN37q-!nF zVlX*y_f5RU%<5!eQqo8Zf2<`VXnB~2>rKf>TI>_;7*#g>{Xd|T9QDBkFwong^4>T{Pbp8u%?O4U@pg@3z{! zB1|6BHMH0keN5NVe%Au@Fo}6i*AbINeNNZY^2OzcR<=8?qUpScpmwRR{QHPN}SF%70$ft*K$qL4NyLXmeFB-|6W1pZ~RQ zdVX_NkEXm_)4aK=pS>8r>DCk)%rC9|qRcf5p6U2ypYsoQn(~iTc5KQFul6)$(yrp5rZXO`{6qPd9%hu9rdf|x`T)@eUglWul=z|w8#u8;`$nu1rf>$rU77gc+wHvRN@m2XmR zcr`u_Se_ex;I;>64(@QgS)OlFaqofns99dz+de#8?>)Ff$I<@}uk|dM delta 25312 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 E0Gp+-O#lD@ diff --git a/GGJ17/Assets/Script/Blocks/Building/Building_Barracks.cs b/GGJ17/Assets/Script/Blocks/Building/Building_Barracks.cs index 76f21a8..711227b 100644 --- a/GGJ17/Assets/Script/Blocks/Building/Building_Barracks.cs +++ b/GGJ17/Assets/Script/Blocks/Building/Building_Barracks.cs @@ -8,7 +8,7 @@ public class Building_Barracks : AbstractBaseBuilding { public float sonarPulseIntervall = 2f; public int ticksToLeaveAlert = 10; public float alertResourceDrain = -0.1f; - public float atackIntervall = 0.5f; + public float attackAimDuration = 1f, attackFlareDuration = 0.1f; private LineRenderer ousiaRay; private Collider[] enemiesSpotted = new Collider[0]; @@ -19,13 +19,14 @@ public bool IsAlerted set { isAlerted = value; + ResourceManager m = FindObjectOfType(); if (value) { - FindObjectOfType().RegisterResources(alertResourceDrain); + if(m)m.RegisterResources(alertResourceDrain); } else { - FindObjectOfType().DeregisterResources(alertResourceDrain); + if(m)m.DeregisterResources(alertResourceDrain); } } } @@ -58,32 +59,36 @@ public Collider AquireTarget() { foreach(Collider enemy in enemiesSpotted) { - Vector3 dir = enemy.transform.position - transform.position; - float distance = dir.magnitude; - dir.Normalize(); - if (Physics.Raycast(transform.position, dir, distance)) - { continue; } - else + if (EvaluateTarget(enemy)) { - ousiaRay.SetPosition(1, enemy.transform.position); return enemy; } - } return null; } + public bool EvaluateTarget(Collider enemy) + { + Vector3 dir = enemy.transform.position - transform.position; + float distance = dir.magnitude; + dir.Normalize(); + return !Physics.Raycast(transform.position, dir, distance, LayerMask.NameToLayer("Building")); + } + + public int clearTicks = 0; public IEnumerator Sonar() { - int clearTicks = 0; while(true) { Collider[] cc; if(AlertCheck(out cc)) { - if(!isAlerted) StartCoroutine(Engaging()); + if (!isAlerted) + { + StartCoroutine(Engaging()); + IsAlerted = true; + } clearTicks = 0; - IsAlerted = true; } else if(++clearTicks == ticksToLeaveAlert) { @@ -95,10 +100,21 @@ public IEnumerator Sonar() public IEnumerator Engaging() { + Debug.Log("Engaged!"); for(Collider target = AquireTarget(); target; target = AquireTarget()) { - - yield return null; + Debug.Log("Aiming!"); + Debug.DrawLine(transform.position, target.transform.position, Color.cyan); + yield return new WaitForSeconds(attackAimDuration); + if (EvaluateTarget(target)) + { + ousiaRay.SetPosition(1, target.transform.position); + ousiaRay.enabled = true; + Destroy(target.gameObject); + yield return new WaitForSeconds(attackFlareDuration); + ousiaRay.enabled = false; + } } + Debug.Log("No Targets!"); } } diff --git a/GGJ17/ProjectSettings/TagManager.asset b/GGJ17/ProjectSettings/TagManager.asset index d44109a8c7269a9d7bf04c63eb750ed4088f611e..18dbcdfd92bf12c2d4f3eaf7c4c79cc635aca4ff 100644 GIT binary patch delta 50 zcmeyP*rLS2z`*pAfkBXEBgYpeCKkrcjLiReCjaH{<^jquIF)ARq-5r$PiAC}nEXUQ F0svb(4o(07 delta 39 vcmZos`lHCfz`*pAfkEKUMvgB`jDI#WGXLk9EWpe%NuXmgKXc6FHv$p>{$UKg