Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop

Assets/Baby Parts/baby base1.png (Stored with Git LFS)

-size 26338

Assets/Baby Parts/baby base2.png (Stored with Git LFS)

-size 28143

Assets/Baby Parts/baby base3.png (Stored with Git LFS)

-size 25588

Assets/Baby Parts/baby eye 1 blue.png (Stored with Git LFS)

-size 7428

Assets/Baby Parts/baby eye 1 brown.png (Stored with Git LFS)

-size 7840

Assets/Baby Parts/baby eye 1 green.png (Stored with Git LFS)

-size 8465

Assets/Baby Parts/baby hat1.png (Stored with Git LFS)

-size 16511

Assets/Baby Parts/baby hat2.png (Stored with Git LFS)

-size 12946

Assets/Baby Parts/baby hat3.png (Stored with Git LFS)

-size 17938

Assets/Baby Parts/baby pant 1.png (Stored with Git LFS)

-size 30189

Assets/Baby Parts/baby pant 2.1.png (Stored with Git LFS)

-size 29336

Assets/Baby Parts/baby smile 1.png (Stored with Git LFS)

-size 7830

Assets/Baby Parts/baby smile 2.png (Stored with Git LFS)

-size 13321

Assets/Baby Parts/baby smile 3.png (Stored with Git LFS)

-size 9695

Assets/Baby Parts/baby top1.png (Stored with Git LFS)

-size 22865

Assets/Baby Parts/baby top2.png (Stored with Git LFS)

-size 16031

Assets/Baby Parts/baby top3.png (Stored with Git LFS)

-size 20523

Assets/ParentBehaviour.cs

@@ -16,16 +16,35 @@ public class ParentBehaviour : MonoBehaviour
 
     public List<string> order = new List<string>();
 
+    public ParentBehaviour otherParent;
+
+    public Texture2D[] parentBases;
+    public Texture2D parentFaceNeutral;
+    public Texture2D parentFaceHappy1;
+    public Texture2D parentFaceHappy2;
+    public Texture2D parentFaceAngry;
+    public Texture2D parentFaceTalk;
+
 
     [ContextMenu("Get Random Child")]
     public void GetRandomChild()
     {
-        int _childIndex = Random.Range(0, babySpawner.transform.childCount);
-
-        child = babySpawner.transform.GetChild(_childIndex).gameObject;
-
-        //CHECK IF OTHER PARENT WANTS THIS CHILD (if otherParent.child == child)
-
+        bool _validChild = false;
+        while (!_validChild)
+        {
+            int _childIndex = Random.Range(0, babySpawner.transform.childCount);
+
+            child = babySpawner.transform.GetChild(_childIndex).gameObject;
+
+            if (otherParent.child != null)
+            {
+                if (child != otherParent.child)
+                {
+                    //this prevents both parents asking for the same child
+                    _validChild = true;
+                }
+            }
+        }
         Randomizer _childRandomizer = child.GetComponent<Randomizer>();
 
         baseVis = _childRandomizer.baseObj.GetComponent<MeshRenderer>().material.mainTexture;
@@ -39,19 +58,76 @@ public class ParentBehaviour : MonoBehaviour
         order.Insert(Random.Range(0, order.Count), "eye");
         order.Insert(Random.Range(0, order.Count), "top");
         order.Insert(Random.Range(0, order.Count), "bottom");
+    }
 
-        foreach (string item in order)
+    public bool CheckChild(GameObject _child)
+    {
+        if (_child == child)
         {
-            print(item);
+            return true;
+        }
+        else
+        {
+            return false;
         }
-
-
-
     }
 
+    public Texture GiveDetails(GameObject _child)
+    {
+        for (int i = 0; i < order.Count; i++)
+        {
+            switch (order[i]){
+                case "base":
+                    if (child.GetComponent<Randomizer>().baseObj.GetComponent<MeshRenderer>().material.mainTexture != baseVis)
+                    {
+                        return baseVis;
+                    }
+                    break;
+                case "hat":
+                    if (child.GetComponent<Randomizer>().hatObj.GetComponent<MeshRenderer>().material.mainTexture != hatVis)
+                    {
+                        return hatVis;
+                    }
+                    break;
+                case "eye":
+                    if (child.GetComponent<Randomizer>().eyeObj.GetComponent<MeshRenderer>().material.mainTexture != eyeVis)
+                    {
+                        return eyeVis;
+                    }
+                    break;
+                case "top":
+                    if (child.GetComponent<Randomizer>().topObj.GetComponent<MeshRenderer>().material.mainTexture != topVis)
+                    {
+                        return topVis;
+                    }
+                    break;
+                case "bottom":
+                    if (child.GetComponent<Randomizer>().bottomObj.GetComponent<MeshRenderer>().material.mainTexture != bottomVis)
+                    {
+                        return bottomVis;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return null;
+    }
 
-
-
-
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.gameObject.tag == "child")
+        {
+            if (CheckChild(other.gameObject))
+            {
+                //this is the correct child
+            }
+            else
+            {
+                Texture _displayGraphic = GiveDetails(other.gameObject);
+                //display the display graphic 
+            }
+        }
+    }
 
 }

ProjectSettings/PackageManagerSettings.asset (Stored with Git LFS)

+size 1445