From dc82cde883e6bd23f6d0d2946506a2506efdc018 Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Tue, 5 May 2020 18:46:28 -0400 Subject: [PATCH] Reworked generated kill sequence so the same colour isn't picked twice or more in a row --- Assets/Scripts/GMScript.cs | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index 33bbc85..d308dd9 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -148,14 +148,26 @@ public class GMScript : MonoBehaviour // COLOURS FOR KILL SEQUENCE ARE GENERATED HERE for(int i = 0; i < EnemyKillSequence.Length; i++) { + + if(i == 0) + { + do{ + EnemyKillSequence[i] = Random.Range(0, 12); + }while(EnemyKillSequence[i] != PartyColours[0] && + EnemyKillSequence[i] != PartyColours[1] && + EnemyKillSequence[i] != PartyColours[2] && + EnemyKillSequence[i] != PartyColours[3]); + } else { + do{ + EnemyKillSequence[i] = Random.Range(0, 12); + }while(EnemyKillSequence[i] != PartyColours[0] && + EnemyKillSequence[i] != PartyColours[1] && + EnemyKillSequence[i] != PartyColours[2] && + EnemyKillSequence[i] != PartyColours[3] || + (EnemyKillSequence[i] == ((EnemyKillSequence[i-1]+6)%12))); + } - do{ - EnemyKillSequence[i] = Random.Range(0, 12); - }while(EnemyKillSequence[i] != PartyColours[0] && - EnemyKillSequence[i] != PartyColours[1] && - EnemyKillSequence[i] != PartyColours[2] && - EnemyKillSequence[i] != PartyColours[3]); - + print((Colours)EnemyKillSequence[i]); EnemyKillSequence[i] = (EnemyKillSequence[i]+6)%12; }