Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/Scipts/Recipe.cs

@@ -27,10 +27,14 @@ public class Recipe : MonoBehaviour {
         PlayerCount = PlayersManager.Instance.RemotePlayers.Count + 1;
 
         localPlayer.GetComponent<LocalPlayer>().recipe = this;
+        int count = 0;
         for (int i = 0; i < PlayerCount; i++)
         {
-            int rand = UnityEngine.Random.Range(0, Qtys.Length - 1);
-            Qtys[rand] += 1;
+            Qtys[count] += 1;
+            if (count > 3)
+            {
+                count = 0;
+            }
         }
         for (int i = 0; i < 4; i++) //Set the recipe UI
         {

Assets/VeggieSpots/Mushroom spot.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 23066903033166784}
   - component: {fileID: 65576532979852656}
   - component: {fileID: 114486742490627892}
-  - component: {fileID: 54565867815028620}
+  - component: {fileID: 54268202253157094}
   m_Layer: 0
   m_Name: Mushroom spot
   m_TagString: Untagged
@@ -37,13 +37,13 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1920492649654550}
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 336.3763, y: 397.99, z: -16.19441}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -50.12228, y: 1658.2845, z: -2998.564}
   m_LocalScale: {x: 2.9190772, y: 2.9190772, z: 2.9190772}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!23 &23066903033166784
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -87,7 +87,7 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1920492649654550}
   m_Mesh: {fileID: 4300000, guid: 79212885923a8b04fbe9237207a285f6, type: 3}
---- !u!54 &54565867815028620
+--- !u!54 &54268202253157094
 Rigidbody:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -100,7 +100,7 @@ Rigidbody:
   m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
-  m_Constraints: 0
+  m_Constraints: 122
   m_CollisionDetection: 0
 --- !u!65 &65576532979852656
 BoxCollider:

Assets/VeggieSpots/carrot_02.prefab

@@ -38,7 +38,7 @@ GameObject:
   - component: {fileID: 4365294101830012}
   - component: {fileID: 65285727482329386}
   - component: {fileID: 114730137093934732}
-  - component: {fileID: 54899189070266880}
+  - component: {fileID: 54734235210677366}
   m_Layer: 0
   m_Name: carrot_02
   m_TagString: Untagged
@@ -96,7 +96,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1507904707863932}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.84856, y: -0.63446, z: -0.70239}
+  m_LocalPosition: {x: -3.8306704, y: 1647.9479, z: -2985.4912}
   m_LocalScale: {x: 134.83574, y: 134.83574, z: 134.83574}
   m_Children:
   - {fileID: 4224880173686552}
@@ -189,7 +189,7 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1299243923031594}
   m_Mesh: {fileID: 4300002, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3}
---- !u!54 &54899189070266880
+--- !u!54 &54734235210677366
 Rigidbody:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -202,7 +202,7 @@ Rigidbody:
   m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
-  m_Constraints: 0
+  m_Constraints: 122
   m_CollisionDetection: 0
 --- !u!65 &65285727482329386
 BoxCollider:
@@ -214,7 +214,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 0.07, y: 0.02, z: 0.1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &114730137093934732
 MonoBehaviour:

Assets/VeggieSpots/potato_01.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 23385680880581990}
   - component: {fileID: 65470407959044724}
   - component: {fileID: 114909207236204264}
-  - component: {fileID: 54606795516042544}
+  - component: {fileID: 54371359018975834}
   m_Layer: 0
   m_Name: potato_01
   m_TagString: Untagged
@@ -86,7 +86,7 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1116618855275128}
   m_Mesh: {fileID: 4300000, guid: 63cf58fd2474f0e498c599433ea47a80, type: 3}
---- !u!54 &54606795516042544
+--- !u!54 &54371359018975834
 Rigidbody:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -99,7 +99,7 @@ Rigidbody:
   m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
-  m_Constraints: 0
+  m_Constraints: 122
   m_CollisionDetection: 0
 --- !u!65 &65470407959044724
 BoxCollider:

Assets/VeggieSpots/pumpkin.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 23233777779250244}
   - component: {fileID: 65564087199631914}
   - component: {fileID: 114991623911943832}
-  - component: {fileID: 54061168205415448}
+  - component: {fileID: 54050288613722914}
   m_Layer: 0
   m_Name: pumpkin
   m_TagString: Untagged
@@ -38,8 +38,8 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1420467368236124}
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 255.76149, y: 560.73267, z: -552.0315}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: -59.754265, y: 1659.6, z: -2987.1729}
+  m_LocalScale: {x: 0.60498, y: 0.60498, z: 0.60498}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -88,7 +88,7 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1420467368236124}
   m_Mesh: {fileID: 4300000, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3}
---- !u!54 &54061168205415448
+--- !u!54 &54050288613722914
 Rigidbody:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -101,7 +101,7 @@ Rigidbody:
   m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
-  m_Constraints: 0
+  m_Constraints: 122
   m_CollisionDetection: 0
 --- !u!65 &65564087199631914
 BoxCollider: