Some optimization & closes #374

Author: Nashet

Assets/EconomicSimulation/ES-base.unity

@@ -973,10 +973,7 @@ override internal float getExpences()
         {
             return base.getExpences() + getSalaryCost();
         }
-        /// <summary>
-        /// Should optimize? Seek for changes..
-        /// </summary>
-        /// <returns></returns>
+        //Not necessary ti optimize -  cost 0.1% of tick
         public int getWorkForce()
         {
             int result = 0;

Assets/EconomicSimulation/Scripts/Logic/Factory.cs

@@ -485,7 +485,8 @@ static void makeHelloMessage()
                 + "\n\nOr, You can give control to AI and watch it"
                 + "\n\nTry arrows or WASD for scrolling map and mouse wheel for scale"
                 + "\n'Enter' key to close top window, space - to pause \\ unpause"
-                + "\n\n\nAlso I have now Patreon page where I post about that game development. Try red button below!"
+                + "\n\n\nI have now Patreon page where I post about that game development. Try red button below!"
+                + "\nAlso I would be thankful if you will share info about this project"
                 , "Ok");
         }
 

Assets/EconomicSimulation/Scripts/Logic/Game.cs

@@ -101,8 +101,8 @@ private Storage recalculateProductForConsumers(Product product, Func<Consumer, S
                 foreach (Province province in country.ownedProvinces)
                     foreach (Consumer consumer in province.getAllAgents())
                     {
-                        Storage re = selector(consumer).getFirstStorage(product);
-                        result.add(re);
+                        Storage found = selector(consumer).getFirstStorage(product);
+                        result.add(found);
                     }
                 Storage countryStor = selector(country).getFirstStorage(product);
                 result.add(countryStor);

Assets/EconomicSimulation/Scripts/Logic/Market.cs

@@ -445,7 +445,7 @@ private List<Storage> getNeedsInCommon(List<Storage> needs)
             Value multiplier = new Value(this.getPopulation() / 1000f);
             List<Storage> result = new List<Storage>();
             foreach (Storage next in needs)
-                if (next.getProduct().isInventedByAnyOne())
+                if (next.getProduct().IsInventedByAnyOne())
                 {
                     Storage nStor = new Storage(next.getProduct(), next.get());
                     nStor.multiply(multiplier);

Assets/EconomicSimulation/Scripts/Logic/PopTypes/PopUnit.cs

@@ -243,7 +243,7 @@ static public int CostOrder(Product x, Product y)
 
         public bool isTradable()
         {
-            return this != Product.Gold && isInventedByAnyOne();
+            return this != Product.Gold && IsInventedByAnyOne();
         }
 
         public bool isAbstract()
@@ -287,7 +287,7 @@ internal bool isResource()
         }
 
 
-        public bool isInventedByAnyOne()
+        public bool IsInventedByAnyOne()
         {
             // including dead countries. Because dead country could organize production
             //of some freshly invented product
@@ -361,7 +361,7 @@ public override string ToString()
                 sb.Append(" (");
                 bool firstLine = true;
                 foreach (var item in getSubstitutes())
-                    if (item.isInventedByAnyOne())
+                    if (item.IsInventedByAnyOne())
                     {
                         if (!firstLine)
                             sb.Append(" or ");

Assets/EconomicSimulation/Scripts/Logic/Product.cs

@@ -704,7 +704,7 @@ internal void setResource(Product inres)
         internal Product getResource()
         {
             //if (getOwner().isInvented(resource))
-            if (resource.isInventedByAnyOne())
+            if (resource.IsInventedByAnyOne())
                 return resource;
             else
                 return null;

Assets/EconomicSimulation/Scripts/Logic/Province.cs

@@ -4,16 +4,21 @@
 using System.Collections.Generic;
 using System;
 using Nashet.UnityUIUtils;
+using System.Linq;
 
 namespace Nashet.EconomicSimulation
 {
 
     public class BuildPanelTable : UITableNew<FactoryType>
     {
         protected override IEnumerable<FactoryType> ContentSelector()
-        {            
-            return FactoryType.getAllInventedTypes(Game.Player, x => x.canBuildNewFactory(Game.selectedProvince));
-        }      
+        {
+            
+            if (Game.selectedProvince == null)
+                return Enumerable.Empty<FactoryType>();
+            else
+                return FactoryType.getAllInventedTypes(Game.Player, x => x.canBuildNewFactory(Game.selectedProvince));
+        }
         protected override void AddRow(FactoryType factoryType, int number)
         {
             // Adding shownFactory type

Assets/EconomicSimulation/Scripts/PanelTables/BuildPanelTable.cs

@@ -6,9 +6,10 @@
 using Nashet.UnityUIUtils;
 using Nashet.ValueSpace;
 using Nashet.Utils;
+using System.Linq;
+
 namespace Nashet.EconomicSimulation
 {
-
     public class BuildPanel : DragPanel
     {
         [SerializeField]
@@ -35,7 +36,7 @@ void Start()
         public override void Show()
         {
             selectedFactoryType = null; // changed province           
-            base.Show();                       
+            base.Show();
         }
         public void onBuildClick()
         {
@@ -106,7 +107,7 @@ public override void Refresh()
 
                 descriptionText.text = sb.ToString();
 
-                
+
                 buildButton.interactable = selectedFactoryType.conditionsBuild.isAllTrue(Game.Player, Game.selectedProvince, out buildButton.GetComponent<ToolTipHandler>().text);
                 if (!selectedFactoryType.canBuildNewFactory(Game.selectedProvince))
                     buildButton.interactable = false;
@@ -116,11 +117,13 @@ public override void Refresh()
             else
             {
                 buildButton.interactable = false;
-                {
-                    buildButton.GetComponentInChildren<Text>().text = "Select building";
+                buildButton.GetComponentInChildren<Text>().text = "Select building";
+                if (Game.selectedProvince == null)
+                    descriptionText.text = "Select province where to build";
+                else if (FactoryType.getAllInventedTypes(Game.Player, x => x.canBuildNewFactory(Game.selectedProvince)).Count() == 0)
+                    descriptionText.text = "Nothing to build now";
+                else
                     descriptionText.text = "Select building from left";
-                }
-
             }
         }
     }

Assets/EconomicSimulation/Scripts/Panels/BuildPanel.cs

@@ -315,7 +315,7 @@ public string getSymbol()
                         return " ";
                     case State.descending:
 #if UNITY_WEBGL
-                        return " ˅";
+                        return " v";
 #else
                         return " \u25BC";
 #endif