Merge pull request #475 from Nashet/ver.0.20

Ver 0 20

Assets/DebugWindow.cs

@@ -28,6 +28,7 @@ private void Start()
         {
             Exist = true;
             devModeToggle.isOn = Game.devMode;
+            logInvestmentsToggle.isOn = Game.logInvestments;
         }
 
         public override void Hide()
@@ -42,7 +43,9 @@ public void OnDevModeChange(bool value)
         }
 
         public void OnLogInvestmentsChange(bool value)
-        { }
+        {
+            Game.logInvestments = value;
+        }
 
         public void OnLogMarketFailsChange(bool value)
         { }

Assets/EconomicSimulation/Scripts/Logic/Country.cs

@@ -34,7 +34,7 @@ public class Country : MultiSeller, IClickable, IShareOwner, ISortableName, INam
         public readonly List<AbstractReform> reforms = new List<AbstractReform>();
         public readonly List<Movement> movements = new List<Movement>();
 
-        private readonly string name;
+        private string name;
         private readonly Culture culture;
         private readonly Color nationalColor;
         private Province capital;
@@ -205,6 +205,11 @@ public Country(string name, Culture culture, Color color, Province capital, floa
             }
         }
 
+        internal void SetName(string v)
+        {
+            name = v;
+        }
+
         private void ressurect(Province province, Government.ReformValue newGovernment)
         {
             alive = true;
@@ -983,17 +988,17 @@ public void AIThink()
                             {
                                 var isFactory = x.Key as Factory;
                                 if (isFactory != null)
-                                    return Country.InventedFactory(isFactory.Type);
+                                    return InventedFactory(isFactory.Type);
                                 else
                                 {
                                     var newFactory = x.Key as NewFactoryProject;
                                     if (newFactory != null)
-                                        return Country.InventedFactory(newFactory.Type);
+                                        return InventedFactory(newFactory.Type);
                                 }
                                 return true;
                             }
                             ).MaxByRandom(x => x.Value.get());
-                        if (!project.Equals(default(KeyValuePair<IInvestable, Procent>)) && project.Value.isBiggerThan(Options.minMarginToInvest))
+                        if (!project.Equals(default(KeyValuePair<IInvestable, Procent>)) && project.Value.isBiggerThan(Options.minMarginToInvest.Copy().Multiply(Options.InvestorEmploymentSafety)))
                         {
                             MoneyView investmentCost = project.Key.GetInvestmentCost();
                             if (!CanPay(investmentCost))

Assets/EconomicSimulation/Scripts/Logic/Game.cs

@@ -10,7 +10,8 @@ namespace Nashet.EconomicSimulation
 {
     public class Game : ThreadedJob
     {
-        internal static bool devMode = false;
+        public static bool devMode = false;
+        public static bool logInvestments = false;
 
         private static readonly bool readMapFormFile = false;
         private static MyTexture mapTexture;

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

@@ -35,11 +35,11 @@ public Procent getBusinessSecurity(IInvestable business)
         {
             var res = business.Country.OwnershipSecurity;
 
-            if (business.Country != Country)
-                res.Multiply(Options.InvestingForeignCountrySecurity);
+            //if (business.Country != Country)
+            //    res.Multiply(Options.InvestingForeignCountrySecurity);
 
-            if (business.Province != Province)
-                res.Multiply(Options.InvestingAnotherProvinceSecurity);
+            //if (business.Province != Province)
+            //    res.Multiply(Options.InvestingAnotherProvinceSecurity);
 
             if (business is NewFactoryProject) // building, upgrading and opening requires hiring people which can be impossible
                 res.Multiply(Options.InvestorEmploymentSafety);

Assets/EconomicSimulation/Scripts/Logic/Production/Factory.cs

@@ -163,7 +163,7 @@ internal static readonly DoubleConditionsList
             conditionsDestroy = new DoubleConditionsList(new List<Condition> {
             //new Condition(Economy.isNotLF, x=>(x as Producer).Country),
              conPlacedInOurCountry,  Economy.isNotLF }),//}).addForSecondObject(new List<Condition> {
-            // (status == Economy.PlannedEconomy || status == Economy.NaturalEconomy || status == Economy.StateCapitalism)
+                                                        // (status == Economy.PlannedEconomy || status == Economy.NaturalEconomy || status == Economy.StateCapitalism)
             conditionsNatinalize = new DoubleConditionsList(new List<Condition> { conNotFullyBelongsToCountry, conPlacedInOurCountry,
                 Economy.isNotLF, Economy.isNotInterventionism }),//}) .addForSecondObject(new List<Condition> {
             conditionsSubsidize = new DoubleConditionsList(new List<Condition> { conPlacedInOurCountry ,Economy.isNotLF, Economy.isNotNatural,
@@ -239,8 +239,8 @@ public Factory(Province province, IShareOwner investor, ProductionType type, Mon
                 salary.Set(province.getLocalMinSalary());
                 if (Country.economy.getValue() == Economy.PlannedEconomy)
                     setPriorityAutoWithPlannedEconomy();
-                //else
-                //    Debug.Log(investor + " invested " + cost + " in building new " + this);
+                if (Game.logInvestments)
+                    Debug.Log(investor + " invested " + cost + " in building new " + this +" awaiting " + type.GetPossibleMargin(province)+ " margin");
             }
         }
 
@@ -908,7 +908,8 @@ internal void open(IShareOwner byWhom, bool payMoney)
             {
                 agent.PayWithoutRecord(this, getReopenCost());
                 ownership.Add(byWhom, getReopenCost());
-                //Debug.Log(byWhom + " invested " + getReopenCost() + " in reopening " + this);
+                if (Game.logInvestments)
+                    Debug.Log(byWhom + " invested " + getReopenCost() + " in reopening " + this + " awaiting " + this.Type.GetPossibleMargin(Province) + " margin");
             }
             _isOpen = true;
             daysUnprofitable = 0;
@@ -956,10 +957,12 @@ internal void upgrade(IShareOwner byWhom)
                 var cost = Game.market.getCost(getUpgradeNeeds());
                 (byWhom as Agent).PayWithoutRecord(this, cost);
                 ownership.Add(byWhom, cost);
-                //Debug.Log(byWhom + " invested " + cost + " in upgrading " + this);
+                if (Game.logInvestments)
+                    Debug.Log(byWhom + " invested " + cost + " in upgrading " + this + " awaiting " + GetMargin() + " margin");
             }
-            //else
-            //    Debug.Log(byWhom + " invested in upgrading " + this);
+            else
+                if (Game.logInvestments)
+                Debug.Log(byWhom + " invested in upgrading " + this);
         }
 
         internal int getDaysInConstruction()

Assets/EconomicSimulation/Scripts/Logic/Production/Ownership.cs

@@ -349,7 +349,8 @@ internal void BuyStandardShare(IShareOwner buyer)
                         shareToBuy.Value.ReduceSale(cost);
 
                         var boughtProcent = new Procent(cost, parent.ownership.totallyInvested);
-                        //Debug.Log(buyer + " bough " + boughtProcent + " shares (" + cost + ") of " + parent + " from " + shareToBuy.Key);
+                        if (Game.logInvestments)
+                            Debug.Log(buyer + " bough " + boughtProcent + " shares (" + cost + ") of " + parent + " from " + shareToBuy.Key + " awaiting " + GetMargin() + " margin");
                     }
                 }
             }

Assets/EconomicSimulation/Scripts/Logic/World.cs

@@ -186,6 +186,7 @@ internal static void CreateCountries()
             }
             Game.Player = allCountries[1]; // not wild Tribes, DONT touch that
 
+            allCountries.Random().SetName("Zacharia");
             //foreach (var pro in allProvinces)
             //    if (pro.Country == null)
             //        pro.InitialOwner(World.UncolonizedLand);

Assets/EconomicSimulation/Scripts/Panels/BottomPanel.cs

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

Assets/EconomicSimulation/Scripts/Panels/PoliticsPanel.cs

@@ -43,7 +43,7 @@ private void Start()
             voteButton.interactable = false;
             dropDown.interactable = false;
             forceDecisionButton.interactable = false;
-            GetComponent<RectTransform>().anchoredPosition = new Vector2(15f, 15f);
+            GetComponent<RectTransform>().anchoredPosition = new Vector2(15f, 45f);
             Hide();
         }
 

Assets/UnityUIUtils/Scripts/TooltipBase.cs

@@ -75,6 +75,12 @@ public class TooltipBase : MonoBehaviour
         [SerializeField]
         private RectTransform bgImage;
 
+        private void Start()
+        {
+            var image =transform.parent.GetComponent<Image>();
+            image.color = GUIChanger.DarkestColor;
+        }
+
         // Use this for initialization
         private void Awake()
         {

WEBGL/TemplateData/style.css

@@ -48,7 +48,7 @@
 /* Container holding the image and the text */
 .container {
     position: relative;
-    text-align: center;
+    text-align: left;
     color: black;
 font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
 	font-size: 22px;
@@ -68,7 +68,7 @@ font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
 /* Top left text */
 .top-left {
     position: absolute;
-    top: 210px;
+    top: 160px;
     left: 120px;
 }
 

WEBGL/credits.html

@@ -23,7 +23,25 @@
 <body>
   <div class="container">
   <img src="credits_background.png" alt="Background" style="width:100%;">  
-  <div class="top-left">Nashetovich - coding in general<br/><br/>more soming soon</div>  
+  <div class="top-left">Credits:
+  <br/>
+  <br/>Nashetovich - coding in general
+  <br/>dillyo09 - bug fixing
+  <br/>Zachary Pruckowski - sponsorship
+  <br/>Jakob Stenberg - sponsorship
+  <br/>el lyss - sponsorship
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>
+  <br/>Support that game on <a href="https://www.patreon.com/economicsimulation" target="_blank">Patreon</a>!
+  </div>  
 </div>
 </body>
 </html>