Connect all incoming tagMatches to monsters and trails

Author: omundy

Assets/_Project/Scenes/tally-viz-master.unity

@@ -20,7 +20,7 @@ protected DebugManager () { }
 
     public TMP_Text debugText;
     public ScrollRect debugScrollRect;
-
+    public bool DEBUG;
 
 
 
@@ -34,6 +34,9 @@ protected DebugManager () { }
 
     private void Awake ()
     {
+        DEBUG = false;
+
+
         AddSymbols ();
         // clear display
         ClearDisplay ();
@@ -129,6 +132,8 @@ public static string GetSymbol (string name)
     /// <param name="list"></param>
     public void PrintList (string str, List<int> list)
     {
+        if (!DEBUG) return;
+
         int i = 0;
         str += " [" + list.Count + "]: ";
         foreach (var item in list) {
@@ -139,8 +144,11 @@ public void PrintList (string str, List<int> list)
     }
 
 
+
     public void PrintDict (string str, Dictionary<int, TrailingMonster> dict)
     {
+        if (!DEBUG) return;
+
         int i = 0;
         str += " [" + dict.Count + "]: ";
         foreach (KeyValuePair<int, TrailingMonster> t in dict) {

Assets/_Project/Scripts/Core/DebugManager.cs

@@ -97,7 +97,7 @@ public void UpdatePositions ()
         //trailWidth = siblingCount * .1f;
 
         // set width based on the range + extra to cover the background
-        trailWidth = trailsRange + widthExtra;
+        trailWidth = Mathf.Min (trailsRange + widthExtra, 1.4f);
 
         // set start and end width 
         trailRenderer.startWidth = trailWidth; // 5 = 0.45f

Assets/_Project/Scripts/Effects/Trail.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -30,7 +31,7 @@ IEnumerator AddTestTrails (float wait)
         yield return new WaitForSeconds (wait);
 
         // random num
-        numberTrails = (int)Random.Range (minTrailCount, maxTrailCount);
+        numberTrails = (int)UnityEngine.Random.Range (minTrailCount, maxTrailCount);
         // add trail
         for (int i = 0; i < numberTrails; i++) {
             AddTrail (i);
@@ -47,7 +48,10 @@ IEnumerator AddTestTrails (float wait)
     public void AddTrail (int _mid = -1)
     {
         // if at max trails
-        if (trails.Count >= 8) return;
+        if (trails.Count >= 8) {
+            Debug.LogWarning ("trails.Count >= " + trails.Count);
+            return;
+        }
 
         if (_mid < 1) {
             // get a random mid from those in the game
@@ -60,7 +64,7 @@ public void AddTrail (int _mid = -1)
         // if already exists then exit
         var exists = trails.Find (item => item.name.Equals (name));
         if (exists != null) {
-            //Debug.Log ("TRAIL ALREADY EXISTS IN LIST");
+            Debug.LogWarning ("TRAIL ALREADY EXISTS IN LIST");
             return;
         }
 
@@ -88,6 +92,7 @@ public void RemoveTrail (int _mid = -1)
                 break;
             }
         }
+        //Debug.Log ("RemoveTrail(" + _mid + ") trails.Count = " + trails.Count + ", " + String.Join ("; ", trails));
     }
 
     public void RemoveAllTrails ()

Assets/_Project/Scripts/Effects/TrailManager.cs

@@ -48,7 +48,7 @@ public void Init (int _mid)
     // random
     void SetSpriteInParticleSystem (int _mid = -1, int _gameMidsIndex = -1)
     {
-        Debug.Log ("SetSpriteInParticleSystem() mid =" + mid + ", gameMidsIndex = " + gameMidsIndex);
+        //Debug.Log ("SetSpriteInParticleSystem() mid =" + mid + ", gameMidsIndex = " + gameMidsIndex);
 
         // choose random
         if (_mid < 1) {

Assets/_Project/Scripts/Players/Monster.cs

@@ -54,11 +54,11 @@ private void Awake ()
      */
     public int GetGameMidIndex (int _mid)
     {
-        Debug.Log ("GetMonsterSpriteIndex() [1] _mid = " + _mid);
+        //Debug.Log ("GetMonsterSpriteIndex() [1] _mid = " + _mid);
         int midSpriteIndex = -1;
         if (gameMids.Contains (_mid))
             midSpriteIndex = Array.IndexOf (gameMids, _mid);
-        Debug.Log ("GetMonsterSpriteIndex() [2] midSpriteIndex = " + midSpriteIndex);
+        //Debug.Log ("GetMonsterSpriteIndex() [2] midSpriteIndex = " + midSpriteIndex);
         return midSpriteIndex;
     }
 

Assets/_Project/Scripts/Players/MonsterIndex.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -78,6 +79,7 @@ public void RemoveMonster (int _mid = -1)
                 break;
             }
         }
+        //Debug.Log ("RemoveMonster(" + _mid + ") monsters.Count = " + monsters.Count + ", " + String.Join ("; ", monsters));
     }
 
     // test
@@ -94,11 +96,9 @@ public void RemoveAllMonsters ()
 
     public void UpdateMonsterPositions ()
     {
-
-
-        Debug.Log ("spawnPoints.Length = " + spawnPoints.Length);
-        Debug.Log ("monsters.Count = " + monsters.Count);
-        Debug.Log ("newTrailMids.Count = " + newTrailMids.Count);
+        //Debug.Log ("spawnPoints.Length = " + spawnPoints.Length);
+        //Debug.Log ("monsters.Count = " + monsters.Count);
+        //Debug.Log ("newTrailMids.Count = " + newTrailMids.Count);
 
         //for (int i = 0; i < monsters.Count; i++) {
         //    // get mid of monster at i of monsters

Assets/_Project/Scripts/Players/MonsterManager.cs

@@ -36,8 +36,7 @@ private void Awake ()
 
     public void Init (FeedData _feedData)
     {
-        //Debug.Log ("Player.Init() _username = " + _username);
-        Debug.Log ("Player.Init() _feedData.tagMatches = " + _feedData.tagMatches);
+        //Debug.Log ("Player.Init() _feedData.tagMatches = " + _feedData.tagMatches);
 
         // test
         //SaveTagMatchesFromStream (_feedData.tagMatches);
@@ -46,6 +45,8 @@ public void Init (FeedData _feedData)
         username = _feedData.username;
         avatarPath = _feedData.avatarPath;
         lastActive = DateTime.Now;
+
+        Debug.Log ("Player.Init() username = " + username);
     }
 
     /**
@@ -63,8 +64,11 @@ IEnumerator StartChecks ()
     /**
      *  Parse the tagMatches (monsters) string from the stream and update trails and monster sprites
      */
-    public void SaveTagMatchesFromStream (string tagMatchesStr)
+    public IEnumerator SaveTagMatchesFromStream (float wait, string tagMatchesStr)
     {
+        // wait a second 
+        yield return new WaitForSeconds (wait);
+
         // clear list
         tagMatchesMids.Clear ();
 
@@ -104,7 +108,7 @@ public void SaveTagMatchesFromStream (string tagMatchesStr)
                     }
                 }
                 // test
-                DebugManager.Instance.PrintList ("\n\ntagMatchesMids " + username + " ", tagMatchesMids);
+                DebugManager.Instance.PrintList ("tagMatchesMids " + username + " ", tagMatchesMids);
                 // update trailing monsters, with random set to false
                 StartCoroutine (trailingMonstersManager.UpdateTrailingMonsters (1f, false));
             }

Assets/_Project/Scripts/Players/Player.cs

@@ -270,7 +270,7 @@ public bool CreateNewPlayer (FeedData feedData)
             // store FeedData for zoom 
             currentPlayerScript.feedData = feedData;
             // add the current monsters / trails for the player
-            currentPlayerScript.SaveTagMatchesFromStream (feedData.tagMatches);
+            StartCoroutine (currentPlayerScript.SaveTagMatchesFromStream (2.0f, feedData.tagMatches));
         }
         return true;
     }
@@ -299,7 +299,7 @@ public void PlayEvent (FeedData feedData)
         currentPlayerScript.feedData = feedData;
 
         // update trailing monsters and trails
-        currentPlayerScript.SaveTagMatchesFromStream (feedData.tagMatches);
+        StartCoroutine (currentPlayerScript.SaveTagMatchesFromStream (.1f, feedData.tagMatches));
 
         // show event in public var
         currentEventType = feedData.eventType;