From 9f153ce98153666e59d06adefb78d95abc4181ff Mon Sep 17 00:00:00 2001
From: Joshua Reason <s3544917@student.rmit.edu.au>
Date: Sat, 10 Oct 2015 21:49:57 +1100
Subject: [PATCH] +pointing rod when picking up object

---
 .../Character/Character_Animation.controller  | Bin 17556 -> 17280 bytes
 unity_Project/Assets/Scripts/magnetGun.cs     |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/unity_Project/Assets/Character/Character_Animation.controller b/unity_Project/Assets/Character/Character_Animation.controller
index 0db0ede8e62ab7e382685339dffcd97ce262040e..ac4b8e548f10752ada05cea278096387d1b445d6 100644
GIT binary patch
delta 1217
zcmZuwZAepL6h7~D*33CqGe34)`LR#u*tD;ebIla{GN~*GikKl~L2DI#5Cw~*?2EET
zg33ar!1`6~PeB+#KY}Ps`VoR+zp@B2h)@XZ+<O<rtqb?O=bYy`=REg)-`jOgB+m*9
zk++?wE=feW?Dssh<U4!;j)=yF&#S9q5`t(OuiI#PT8T&REawd8vC$!mAoj5>#5sq&
zoD4+cjJ#1_jeTaQT4j&_2Q!(k%uqTFW@6M~6Cq4FWP1;%;+$O11?vr3lRlS5w4l-{
zizHhsVosx&P&}9IkcP&L|5oN5NslmMz-g1VW?|TA6ED&0v}RqqpkX1*cF86Evxs)-
z=9YG+=VlY_MWw5NXRmR|_6d&l8n-`6tH3FjEIl^iw#z0wc*686Ib5!5ofy{Wgl{fc
zB#`5lr7<(g-L@?uJ`H_$v$Ip(s(!}wtyZV8LOxOb7v!(g>XJC=mU+LfyJdT9_P_nN
z4`{qWymiZ&TjvmUA;(i-pI|S+(wq1+n$oASv;C^7C5Bp$EKOLk!(%IH%Okp|Bd)!v
z5hodI$4PFNoJ-W9W0?mvmJzQ#vgp7kkK9yTKy*UK8~u7+9oxg$Q@&HpEU7sysj=*a
zCaH)h$#s8Yl!10{8$Nr7V5%v^yYhKR1P%CJUXKy45f5rhaL<=JQ@N#UKPT|kYsGzk
zz7Y82yDTJB28wW;V+o!9fMPiw_Q%<4(PGs;_n%cWMM^EkeP+Z1rJQ;0=S(1ipg+h_
zWgzeeOLYc5O4tx|z_jp8Ml>q$dTAND7nxEo7ETIg->ND@#WIsQb1GKN;<QKLc&H&Y
zxVX@Oo~mNo?=4oqwoA`cp7q$KFbT{GErBIyNPSrrl|%;o;RP9di|{OBSCod`_*v~h
zag7JDut99Vhe#O`HDgMI&5;h~j6{6AJH_)?9ga8bKX|m|V5>4Exk9n(Kh0}tHwGf}
z@jmQ<VMV`XCZ`%(;;nn)yA@Ux_0b9;r4B@`B2(f-1CMcY(+ZJ|k=nbW8>d%p%>DBb
eeRV`X@M>jqQ6qcGW8rm3^OG0qxjUBD_5K16q9ly~

delta 1392
zcmZXUZ)jUp6u{4Yd#f=`+hA&&yw_;DzL&fvF--%*Y)#TM4O^_WtSd-a%SeawAGSms
zbI6==jIH$##GD~)A9NcPD#F+nk*Y(s;fEnOS`jAwP_r>uCy4Wtib6g2-9*RhgLm$|
z=lsr}ckW4wC)mk3<^<^e0w8-509t6jbkW(Sg`#u<sII(Yu3RiKfC*YBV11pRSLe5r
zhV(e9sq7F=lg#5B$sAtQT>j%f^qKbPW`H%~ZkVs|bu^b6xUahbS2cwd@h?sFu90en
zl+Vcg72r9)0LQUcSJ`!vF3jt;&bVzOJ3J}a1+u-2(|Y@M_rn{h)`NnYCEHO;wrAfI
zHm4oG(G{s^#}!@ayl<y?7P9)jAoGm?&ttE@ooai^uX^K-jTt8|)#}2x{i*~__>o^>
z1^klmpPDv?F02SVhrjz(wunsuRWe#I7*HN7(*0OFl+!;jTY0|)j|3Dpj;8{u_c~pw
z75sdk0OPnEP}u_h8c;i<j{wZlr;Sj{M`|s<b60SSWIKdSM!Pra0w`FheaFgX+A}y{
zs8X~Q_Zo_Kp%vgg3pn(#0ONSkaOnrX5~nMV0vxlD%}c_T!|x4#*Y^zdt$aJcVGFnV
z+bJ`3m2C4gVq;YNSgrWsuG6M%)&o!^zXxr%W5Q-r04`f>KrsNE6F2t+{}|8AEsy^F
zUE95Y!~l19zlfK+m(U$_;;x{KXM#Q~#bo?8n0>nb^PmZb+|<l-ukj%C)HCt<uYTHK
zR%9ATaNRmRR9}BxM{%$*w3SIX5b7yMn(;{JDBFZA+(WY0lvCjov|oP0gG#vVKW%Ts
zgKvaqObcgO#Po=8mW4gIC&XEyouczlBvmQ&lq9?m)$o;Vno_@PQAsgXuZTYUmskw7
z*m1n}q`$Hhlch>_Ygn#Sw`C=&Q%^jOi+!zFP0DN-UrlvkDd}q*+5ft4?7-B4{k|xE
zoz%-|8UIXa<z$E1xeEznGjH=Q&X<!_CgZK-yF3IIQU?0^=dokZrkDW;v)}AW@N&#Q
z5n6{Q@qFJF{H)u7YY8_xLO$n1Tups{Y32pm75nkW{xFYMk<(6Q*0zIk?Zo_mgV}L<
z;1gCtS7sCsXNElKL2{wzJgxuK_ItB5==gKyEILCSi3e|05-`-~m!_9|u3W9D;r~8<
UNcwc99CFKi3NSvHw$+{f1x-*!2><{9

diff --git a/unity_Project/Assets/Scripts/magnetGun.cs b/unity_Project/Assets/Scripts/magnetGun.cs
index 89bd9b2..451a008 100644
--- a/unity_Project/Assets/Scripts/magnetGun.cs
+++ b/unity_Project/Assets/Scripts/magnetGun.cs
@@ -156,6 +156,10 @@ public class magnetGun : MonoBehaviour {
 
 
 			if (item.tag == "moveable"){
+
+				playerController.animator.SetBool("Holding",true);
+				//playerController.animator.SetTrigger("startHolding");
+
 				originalConstrants = item.attachedRigidbody.constraints;
 				originalGravity = item.attachedRigidbody.useGravity;
 
@@ -212,6 +216,8 @@ public class magnetGun : MonoBehaviour {
 
 	private void dropItem(Collider item){
 		if (item != null) {
+			playerController.animator.SetBool("Holding",false);
+
 			item.attachedRigidbody.useGravity = originalGravity;
 			item.attachedRigidbody.drag = 0.0f;
 			item.attachedRigidbody.constraints = originalConstrants;