Merge pull request #495 from Nashet/ver.0.20

better unit selection & upload

Assets/EconomicSimulation/Scripts/Logic/Agent.cs

@@ -359,5 +359,5 @@ public override string ToString()
         {
             return "Agent "+ cash.Get();
         }
-    }
+    }    
 }

Assets/EconomicSimulation/Scripts/Logic/Mono/Unit.cs

@@ -26,15 +26,7 @@ public class Unit : Hideable, IHasProvince//, IHasCountry//MonoBehaviour,
         Animator m_Animator;
 
 
-        private readonly static List<Unit> allUnits = new List<Unit>();
-
-        public Army NextArmy
-        {
-            get
-            {
-                return Game.Player.AllArmies().Where(x => x.Province == Province).Random();
-            }
-        }
+        private readonly static List<Unit> allUnits = new List<Unit>();       
 
         public Province Province { get; private set; }
 

Assets/EconomicSimulation/Scripts/Panels/BottomPanel.cs

@@ -17,7 +17,7 @@ public class BottomPanel : Window
         private void Awake() // used to position other windows
         {
             MainCamera.bottomPanel = this;
-            generalText.text = "Prosperity Wars v0.20.4";
+            generalText.text = "Prosperity Wars v0.20.5";
             Hide();
         }
 

Assets/EconomicSimulation/Scripts/Utils/ExtendedList.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nashet.Utils
+{
+    /// <summary>
+    /// Remembers and gives next element. Not used now
+    /// </summary>    
+    public class ExtendedList<T> : List<T>
+    {
+        private int nextElement = -1;
+        public T Next
+        {
+            get
+            {
+                nextElement++;
+                if (nextElement == this.Count)
+                    nextElement = 0;
+                return this[nextElement];
+            }
+        }
+    }
+}

Assets/EconomicSimulation/Scripts/Utils/Extensions/Extensions.cs

@@ -298,6 +298,19 @@ public static IEnumerable<T> Yield<T>(this T item)
         {
             yield return item;
         }
+        public static T Next<T>(this IEnumerable<T> collection, ref int number)
+        {
+            if (collection.IsEmpty())
+                return default(T);
+            var res = collection.ElementAtOrDefault(number);
+            if (res == null)
+            {
+                number = 0;
+                res = collection.ElementAtOrDefault(number);
+            }
+            number++;
+            return res;
+        }
         //public static void ForEach<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, Action<TKey, TValue> invokeMe)
         //{
         //    foreach (var keyValue in dictionary)

Assets/RTSStyleUnitSelection/Script/SelectionComponent.cs

@@ -20,6 +20,7 @@ public class SelectionComponent : MonoBehaviour
     private static Camera camera; // it's OK
     [SerializeField]
     private KeyCode AdditionKey;
+    private int nextArmyToSelect;
 
     private void Start()
     {
@@ -155,7 +156,7 @@ private void SelectUnitOrProvince()
             {
                 var unit = collider.transform.GetComponent<Unit>();
 
-                var army = unit.NextArmy;
+                var army = unit.Province.AllStandingArmies().Where(x => x.getOwner() == Game.Player).Next(ref nextArmyToSelect);
                 if (army != null)
                 {
                     if (Input.GetKey(AdditionKey))