Merge pull request #384 from Nashet/dev

Dev

Author: Nashet

Assets/EconomicSimulation/Scripts/Logic/Factory.cs

@@ -348,14 +348,14 @@ internal void setPriority(Priority priority)
         }
         public Procent getMargin()
         {
-            if (getCountry().economy.getValue() == Economy.PlannedEconomy)
+            if (getCountry().economy.getValue() == Economy.PlannedEconomy || !isWorking())
                 return Procent.ZeroProcent;
             else
             {
                 var divider = Game.market.getCost(getUpgradeNeeds()).get() * level;
                 if (divider == 0f)
-                    Debug.Log("Division by zero in getMargin()");                 
-                return new Procent(getProfit() / (divider), false);
+                    Debug.Log("Division by zero in getMargin()");
+                return Procent.makeProcent(getProfit(), divider, false);                
             }
         }
         internal Value getReopenCost()
@@ -509,9 +509,9 @@ public void ChangeSalary()
                         salaryRaise = 0.003f;
                     else if (margin.get() > 0.1f) //10%
                         salaryRaise = 0.002f;
-                    
-                    
-                    
+
+
+
                     salary.add(salaryRaise);
                 }
 
@@ -525,7 +525,7 @@ public void ChangeSalary()
                 if (unemployment.isBiggerThan(Options.ProvinceExcessWorkforce))
                     salary.subtract(0.001f, false);
 
-                if ( getWorkForce() == 0)// && getInputFactor() == 1)
+                if (getWorkForce() == 0)// && getInputFactor() == 1)
                     salary.set(getProvince().getLocalMinSalary());
                 // to help factories catch up other factories salaries
                 //    salary.set(province.getLocalMinSalary());
@@ -752,7 +752,7 @@ internal void payDividend()
 
 
             }
-        }        
+        }
 
         internal void close()
         {
@@ -926,9 +926,9 @@ override public void consumeNeeds()
 
                 if (getCountry().economy.getValue() == Economy.PlannedEconomy)
                 {
-                    if (daysInConstruction >= Options.fabricConstructionTimeWithoutCapitalism)                                                  
+                    if (daysInConstruction >= Options.fabricConstructionTimeWithoutCapitalism)
                         if (getCountry().countryStorageSet.has(constructionNeeds))
-                            isBuyingComplete = getCountry().countryStorageSet.send(this.getInputProductsReserve(), constructionNeeds);                    
+                            isBuyingComplete = getCountry().countryStorageSet.send(this.getInputProductsReserve(), constructionNeeds);
                 }
                 else
                 {
@@ -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/Game.cs

@@ -321,14 +321,25 @@ internal static bool isPlayerSurrended()
 
         static void generateMapImage()
         {
+            int mapSize;
+            int width;
             //#if UNITY_WEBGL
-            int mapSize = 20000;//30000;
-            int width = 150 + Random.Next(60);   // 140 is sqrt of 20000
-                                                 //int width = 30 + Random.Next(12);   // 140 is sqrt of 20000
-                                                 //#else
-                                                 //        int mapSize = 40000;
-                                                 //        int width = 200 + Random.Next(80);
-                                                 //#endif          
+            if (devMode)
+            {
+                mapSize = 20000;
+                width = 150 + Random.Next(60);
+            }
+            else
+            {
+                mapSize = 25000;
+                width = 170 + Random.Next(65);
+            }
+            // 140 is sqrt of 20000
+            //int width = 30 + Random.Next(12);   // 140 is sqrt of 20000
+            //#else
+            //        int mapSize = 40000;
+            //        int width = 200 + Random.Next(80);
+            //#endif          
             Texture2D mapImage = new Texture2D(width, mapSize / width);        // standard for webGL
 
 
@@ -474,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");
         }
 
@@ -533,10 +545,10 @@ internal static void simulate()
                         factory.produce();
                         factory.payTaxes(); // empty for now                        
                     }
-                    foreach (PopUnit pop in province.allPopUnits)                    
+                    foreach (PopUnit pop in province.allPopUnits)
                         pop.produce();
                 }
-            
+
             // big CONCUME circle   
             foreach (Country country in Country.getAllExisting())
             {
@@ -576,7 +588,7 @@ internal static void simulate()
                                     pop.payTaxToAllAristocrats();
                         }
                         foreach (PopUnit pop in province.allPopUnits)
-                        {                            
+                        {
                             pop.consumeNeeds();
                         }
                     }
@@ -615,7 +627,7 @@ internal static void simulate()
                                 soldier.takePayCheck();
                         }
                         //because income come only after consuming, and only after FULL consumption
-                        if ( pop.canTrade() && pop.hasToPayGovernmentTaxes())
+                        if (pop.canTrade() && pop.hasToPayGovernmentTaxes())
                             // POps who can't trade will pay tax BEFORE consumption, not after
                             // Otherwise pops who can't trade avoid tax
                             pop.payTaxes();

Assets/EconomicSimulation/Scripts/Logic/Interfaces.cs

@@ -1,5 +1,5 @@
 using UnityEngine;
-using UnityEditor;
+
 
 namespace Nashet.EconomicSimulation
 {

Assets/EconomicSimulation/Scripts/Logic/Market.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/PopTypes/Aristocrats.cs

@@ -1,5 +1,5 @@
 using UnityEngine;
-using UnityEditor;
+
 using Nashet.ValueSpace;
 using Nashet.Utils;
 

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

@@ -1,5 +1,5 @@
 using UnityEngine;
-using UnityEditor;
+
 using Nashet.ValueSpace;
 using System.Collections.Generic;
 

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

@@ -1,5 +1,5 @@
 using UnityEngine;
-using UnityEditor;
+
 using Nashet.ValueSpace;
 using System.Linq;
 using Nashet.Utils;

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

@@ -1,5 +1,5 @@
 using UnityEngine;
-using UnityEditor;
+
 using Nashet.ValueSpace;
 
 namespace Nashet.EconomicSimulation

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

@@ -1,5 +1,5 @@
 //using UnityEngine;
-//using UnityEditor;
+//
 //using System;
 //using Nashet.Utils;
 //using Nashet.ValueSpace;

Assets/EconomicSimulation/Scripts/Logic/PopTypes/PopUnit.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);