From 6f8c37ea94a25ea8e59d91089b043409baee8f8a Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Fri, 1 May 2020 22:38:09 -0400 Subject: [PATCH] Fixed a few minor bugs --- Assets/Scenes/Test Scene.unity | 2 +- Assets/Scripts/GMScript.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/Test Scene.unity b/Assets/Scenes/Test Scene.unity index 86ccba7..152514e 100644 --- a/Assets/Scenes/Test Scene.unity +++ b/Assets/Scenes/Test Scene.unity @@ -4512,7 +4512,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1928466015} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalPosition: {x: -5, y: 2, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index 7c1d479..e25eaf6 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -90,6 +90,7 @@ public class GMScript : MonoBehaviour robotColour = Colours.Red; + // GENERATES PARTY MEMBER COLOURS do{ partyRedo = false; @@ -100,6 +101,8 @@ public class GMScript : MonoBehaviour PartyColours[2] = Random.Range(0, 15); PartyColours[3] = Random.Range(0, 15); + // CHECKS THAT NO ROBOTS SHARE A COLOUR AND THERE ARE NO MORE THAN 1 BUFF ABILITY ROBOT + // IF EITHER OCCUR THE PARTY GETS RANDOMIZED AND CHECKED UNTIL THAT IS NO LONGER THE CASE for(int i = 0; i < partySize; i++) { for(int j = 0; j < partySize; j++) @@ -199,6 +202,7 @@ public class GMScript : MonoBehaviour gameover = true; GameOver.SetActive(true); + cursorLock = false; } @@ -215,6 +219,7 @@ public class GMScript : MonoBehaviour gameover = true; Victory.SetActive(true); + cursorLock = false; }