Merge pull request #382 from Nashet/dev

Dev

Author: Nashet

Assets/EconomicSimulation/ES-base.unity

@@ -260,7 +260,6 @@ public void ConvertFromGoldAndAdd(Value gold)
             this.cash.add(coins);
             this.moneyIncomethisTurn.add(coins);
             gold.set(0);
-
         }
 
         override public string ToString()

Assets/EconomicSimulation/Scripts/Logic/Agent.cs

@@ -10,7 +10,11 @@
 using Nashet.Utils;
 namespace Nashet.EconomicSimulation
 {
-    public class Country : MultiSeller, ICanBeCellInTable
+    public interface ISortable
+    {
+        float getSortRank();
+    }
+    public class Country : MultiSeller, IClickable, ISortable
     {
         public readonly static List<Country> allCountries = new List<Country>();
         internal static readonly Country NullCountry;
@@ -343,7 +347,7 @@ internal Procent getAverageNeedsFulfilling()
             foreach (var province in ownedProvinces)
                 foreach (var pop in province.allPopUnits)
                 {
-                    result.addPoportionally(calculatedPopulation, pop.getPopulation(), pop.needsFullfilled);
+                    result.addPoportionally(calculatedPopulation, pop.getPopulation(), pop.needsFulfilled);
                     calculatedPopulation += pop.getPopulation();
                 }
             return result;
@@ -712,7 +716,7 @@ private Product getMostDeficitProductAllowedHere(IEnumerable<Product> selector,
 
                     var proposition = FactoryType.whoCanProduce(item);
                     if (proposition != null)
-                        if (proposition.canBuildNewFactory(province) || proposition.canUpgradeFactory(province))
+                        if (proposition.canBuildNewFactory(province) || province.canUpgradeFactory(proposition))
                         {
                             var found = countryStorageSet.getFirstStorage(item);
                             if (minFound == null || found.isSmallerThan(minFound))
@@ -1069,7 +1073,7 @@ public Procent getUnemployment()
             foreach (var item in ownedProvinces)
             {
                 int population = item.getMenPopulationEmployable();
-                result.addPoportionally(calculatedBase, population, item.getUnemployment());
+                result.addPoportionally(calculatedBase, population, item.getUnemployment(PopType.All));
                 calculatedBase += population;
             }
             return result;
@@ -1371,8 +1375,8 @@ internal AbstractReform getReform(AbstractReformValue abstractReformValue)
             }
             return null;
         }
-        public void OnClickedCell()
-        {            
+        public void OnClicked()
+        {
             if (MainCamera.diplomacyPanel.isActiveAndEnabled)
             {
                 if (MainCamera.diplomacyPanel.getSelectedCountry() == this)
@@ -1383,5 +1387,10 @@ public void OnClickedCell()
             else
                 MainCamera.diplomacyPanel.show(this);
         }
+
+        public float getSortRank()
+        {
+            return GetHashCode();
+        }
     }
 }

Assets/EconomicSimulation/Scripts/Logic/Country.cs

@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 namespace Nashet.EconomicSimulation
 {
-    public class Culture
+    public class Culture: ISortable
     {
         private readonly string name;
         private readonly List<Culture> allCultures = new List<Culture>();
@@ -12,6 +12,12 @@ public Culture(string iname)
             name = iname;
             allCultures.Add(this);
         }
+
+        public float getSortRank()
+        {
+            return GetHashCode();
+        }
+
         public override string ToString()
         {
             return name;

Assets/EconomicSimulation/Scripts/Logic/Culture.cs

@@ -228,7 +228,7 @@ private void closeToppestPanel()
             var lastChild = canvas.transform.GetChild(canvas.transform.childCount - 1);
             var panel = lastChild.GetComponent<DragPanel>();
             if (panel != null)
-                panel.onCloseClick();
+                panel.Hide();
             else
             {
                 lastChild.SetAsFirstSibling();