From 9e5d3feec0a6d84f7f53ab44b79ba647854ad7fb Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Tue, 24 Apr 2018 13:49:36 -0500 Subject: [PATCH] Merged alex + darrel --- MoCha/Assets/Scenes/MonsterCreator.unity | Bin 96444 -> 96508 bytes MoCha/Assets/Scripts/MonsterManager.cs | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 3ba305fb1b41da86af7871cfd15a0b3fb0d90693..5f1c5044b0836fe58428d9f84db5c6a02f61b9b9 100644 GIT binary patch delta 1987 zcmZXSe{54#6vyvb+pYU0o&B-OHfdpV6<0RdPi37OgF!RRIs&?=xIqT4HFkwGFqp>b z#6Z;8aT8ww(TawRz?Q*Vc>4oz8e%4n3?pVBM!IN7F^Jn=8(|Bc_j;SRw>3Gv_kGT} z-+RxG3saieDUFVh-c$k|vxJZg+*{7-{@Q8Wf8GD^obSL7>p$yqu2FsPkrllje&VIt z1X}M7W&i=Q1<_8lG_)saV|gas@V1Wn%CumiIj%yg^4JY7mw$I4nL%LUYVZFn>jZS{%FJX}a*Jt4WcCZetIR7p%rzy3n+2-XpD4XGI|k9k@) z5aPq{C1_7Eb`9A&{C)y0pD{C?LWSOqgzQ3^gf{)ciq*Ifi<6KLu3EGi#)gm;03lh( z9xxWAHOKW1T|FUT4IygueDd8UNnyYhdlO>vDPtqZ;#oYl%3FdiGD*8p!Q4p5Jv=Td zbOzom6+POQWrc#)m1QEcAUlAo_*Oe(y>tQxKG%H6aq9g{pkzg!zDW4*}YwK>%A5T^*= zM88J`-+npzW9B)CEFOI{w*x1JkO5@zN*-e@Of$lI$IyFnwCl&;8pP-bvUnXD8EXp= z@-6zrIo-sVj&4H*a~IYgE180x&CFx_kPsVwr=pcCe;}#4kj1CJl(7+dHmujQ;AJ-c zr*N$XGHCkAi!`mLm_|;T3~$`cGn)Fl)}BbdeW!hTuq*-PsH5i_{!Y*KL@1#XH;Tpo zK0P1oe_fM&WF`9X2h={chA$dyQ!8R3Lm`a<3}0FR!j~6-z?Cpy>#DeCnxT{q{H*0$ zMlUDG7xDHnK6$<-jSN|N=gqx}i)i4Ag}2?FQ9OqR`>p(;zZXP`(EU$?N`1QSTnioi zHws#M{C+c}@^km=wexS{gVV!{ZlObSv(kw!zT#0>Q6j;T2+Hivr$IKv^r_)dt`JTK zzY4TmPC9f6p$sSiSi)U>9Li(MGJ5a28Mh9-MEdlwj8@(f32wz0iJXy0jzJ<@3{Z%U ziw0QE^%%ey+l#SJ8zGC+89_Xb`(j+W5z*>#k>HjQGfnTyiV-utIiAX8n?Q%(c9W#M z)g%TA-6r4^#T9&63z8LF)`g@fAI_-dUW!8_SPGybAqiVfwzam>sU9mgTmU*Dvp=*beuqxyjc+D-3T1|Gbn1 e$970fnlCK`-QZK^Bwf}HC|U+CfDA=t11DqhLnVM?lPx%zVXUyoYGkov;!4y^ z6qC8T(8|VEjN`{p0(-`W3}Un4!aze8w^;TgtJ#mR#X0$B)QxUC_i>x|sxLXY?|jaA z-*eBow_TW1jn1hwg!En^U>zldMB}?}So2ez?$_Is<@A@&^nGg&oONl>MLmSkXM~%j z1!2_Kp`>N??bKABN)I0mr)TP-=OTom~ah8 zTivi(WTcRgR`i#knK(O6qr0?uRYinYkUog^Fpo?idkXzHv=q)X#e}q@ACLCe6RWdu zAx`=tD(FiHaiFJ0^Yh3MvNRyXfb1@3zHNl0q92KN^72kmK~0BIp|6|}JyI3gDIRen z3wH59M&o)6ky#mQw!NIqn1;d!+C1{Cq>xto$OabCBRhsG>p7h>Co&Ij!$s?&%I2-ID0kcQ_noYP6$8*>>Zd8fyW1MZG-KbE$N7}Jf84$Cr$ZlaO%YL0R zbFH-3=Kf2MF;yF#Lk0Cq((VrNh!>d!GuZjGa8_I=?e#EcZ`1q_wRu*v)bn>s3v-z^ zsh3p0=gfmFsQLqETj*(2INm_W4*X~(+AGQNPci{7vRTDq7xTI|MCNXkx=oCq7TGMl z$rPHT{*rjaiOhsb>`u0o{eyRjkO^eLNuJ=$OdoY>^K8vhcBjd@on`kS3r_Mq&Kz$_ zmEPxUh_<4F7bC&5ulVAdGNw>tBjg;e?4IuAOpQMZbr>NL$e!j*L%(ur^NmNP+q!<$ zT~VPJ*?!DqH!7PmH!=tMOmzciRaiPrNbW9B!E##PGnRY0D{!(%4JB{oUYQ@h-ZP1_ z#HVxl%0^E|;flt;*slR#Hzx|^9)5@N|Z5C?m&7sG7y9HyPIh+~? zW8Rt3(;b5ef@iQ=6=76t#S4lL-8cQXV7X{k%2SLZ4wcORW^Xhn*R72P|EkwxlsBt7oXq!1GuR-0DM#21}U%n6O8B7ws{5dp_vHsu7 z6jVK>p_L>r@VyV3nYM;zQ;bk3`~OUKc{>$temSY975}% zklh>w3lM4F9SuiZv&*1K!Bs3eP`cdFPzj*1muexAR)4HteBBr%S4A?W1x9d5r0EF29PH@52X8o(+a8apf3NYed7aXC_;T`3*1 zD?JSkgxT-ZLZ;oB4r-St18VM*cdWZdp4GJGz(hzUtJ%L92EuUYfnprGHy>t0GT2eA zDT3?4^VDeZBx*{)w^V)!SXO`KJ$n~V`FYr=h$7?~{{M6obk3Y9pqay|)HtNHXI6vy l(hJZeZ>?o7L@tpDyFB$^37L{u=~cKP&l2y`ZwEmO{{yStEA;>X diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index bc5d34f..b19f367 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -9,17 +9,12 @@ public class MonsterManager : MonoBehaviour { public GameObject inventory; public Item item; - private Inventory inv; + public Inventory inv; void Start() { - inv = FindObjectOfType (); - giveItem (item); - } - - public void giveItem(Item itm) - { - inv.AddItem (itm); + //inv = FindObjectOfType (); + inv.AddItem (item); } public void showItems()