Morale Part 2

Assets/GWConquest/Scripts/ServerCallbacks.cs

@@ -19,8 +19,18 @@ namespace GWConquest
 
             GameManager.Instance.SceneLoadLocalDone();
 
-            foreach(GameObject go in FindObjectsOfType<GameObject>()) {
-                go.SendMessage("OnSceneLoadLocalDone", SendMessageOptions.DontRequireReceiver);
+            //foreach(GameObject go in FindObjectsOfType<GameObject>()) {
+            //    go.SendMessage("OnSceneLoadLocalDone", SendMessageOptions.DontRequireReceiver);
+            //}
+
+            foreach(var spawner in FindObjectsOfType<SpawnAIUnits>())
+            {
+                spawner.SpawnUnits();
+            }
+
+            foreach(Zone z in Zone.AllZones)
+            {
+                z.CheckBattleStart();
             }
             
             var ecount = BoltNetwork.Entities.Count();

Assets/GWConquest/Scripts/SpawnAIUnits.cs

@@ -12,7 +12,7 @@ namespace GWConquest {
         public Zone zone;
         public bool assignAsLeader;
 
-        public void OnSceneLoadLocalDone()
+        public void SpawnUnits()
         {
             BoltLog.Info("Spawning AI units");
 

Assets/GWConquest/Scripts/UI/IngameUI.cs

@@ -52,7 +52,6 @@ namespace GWConquest
                 if(currentTime - lastClickTime <= doubleClickInterval)
                 {
                     doubleClick = true;
-                    BoltLog.Info("Doubleclicked");
                 }
                 lastClickTime = currentTime;
 
@@ -121,7 +120,7 @@ namespace GWConquest
         {
 
             Vector3 camPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
-            BoltLog.Info("Raycasting with origin {0}; direction {1}", camPos, Camera.main.transform.forward);
+            //BoltLog.Info("Raycasting with origin {0}; direction {1}", camPos, Camera.main.transform.forward);
 
             Debug.DrawRay(camPos, Camera.main.transform.forward, Color.green, 5);
 

Assets/GWConquest/Scripts/UI/UnitInfoPanel.cs

@@ -154,7 +154,7 @@ namespace GWConquest
 
                 float moralePct = (float) CurrentUnit.Morale / CurrentUnit.Class.Morale;
                 MoraleBar.fillAmount = moralePct;
-                MoraleBarText.text = (moralePct*100).ToString() + "%";
+                MoraleBarText.text = Mathf.RoundToInt(moralePct*100).ToString() + "%";
                 MoraleBar.color = Util.UpdateColorRGB(MoraleBar.color, CurrentUnit.Player.Color);
 
                 if(CurrentUnit.Class.IsHero)

Assets/GWConquest/Scripts/Unit.cs

@@ -191,6 +191,8 @@ namespace GWConquest
             unit.Formation = playerFormation;
             playerFormation.UnitEntities.Add(unitEntity);
 
+            BoltLog.Info("Spawned unit {0} for player {1} in formation {2}", unit, player, playerFormation);
+
             return unit;
         }
 

Assets/GWConquest/Scripts/Zone.cs

@@ -97,19 +97,14 @@ namespace GWConquest
                 {
                     if(GameManager.Instance.IsLoaded)
                     {
-                        CheckBattleStart(true);
+                        CheckBattleStart();
                     }
                 }
             }
             
         }
 
-        public void OnSceneLoadLocalDone()
-        {
-            CheckBattleStart(false);
-        }
-
-        public void CheckBattleStart(bool ingame)
+        public void CheckBattleStart()
         {
             if (ShouldStartBattle())
             {
@@ -122,7 +117,7 @@ namespace GWConquest
                 }
                 CurrentBattle.Init();
 
-                BoltLog.Info("Starting battle, ingame: {0}", ingame);
+                BoltLog.Info("Starting battle at zone {0}", this);
             }
         }