returned getMinimalMoneyToBuild, added goto button in Diplomacy

Author: Nashet

Assets/ES-base.unity

@@ -92,8 +92,9 @@ void Update()
                 Game.setUnityAPI();
 
                 myCamera = this.GetComponent<Camera>();
-                gameObject.transform.position = new Vector3(Game.Player.getCapital().getPosition().x,
-                    Game.Player.getCapital().getPosition().y, gameObject.transform.position.z);
+                focusCamera(Game.Player.getCapital());
+                //gameObject.transform.position = new Vector3(Game.Player.getCapital().getPosition().x,
+                //    Game.Player.getCapital().getPosition().y, gameObject.transform.position.z);
                 loadingPanel.hide();
                 topPanel.show();
                 bottomPanel.show();
@@ -256,4 +257,10 @@ void showMessageBox()
         mesPanel.show(mes);
     }
     // This function is called every fixed framerate frame, if the MonoBehaviour is enabled.
+    public void focusCamera(Province province)
+    {
+        gameObject.transform.position = new Vector3(province.getPosition().x,
+                    province.getPosition().y, gameObject.transform.position.z);
+    }
+    
 }

Assets/code/Logic/EntryPoint/MainCamera.cs

@@ -166,6 +166,10 @@ internal Factory(Province province, Agent factoryOwner, FactoryType type) : base
         if (getCountry().economy.getValue() == Economy.PlannedEconomy)
             setPriorityAutoWithPlannedEconomy();
     }
+    //internal Value getMinimalMoneyForUpgrade()
+    //{
+    //    return Game.market.getCost(getUpgradeNeeds());
+    //}
     internal StorageSet getUpgradeNeeds()
     {
         if (getLevel() < Options.FactoryMediumTierLevels)
@@ -422,7 +426,7 @@ internal Procent getMargin()
     }
     internal Value getReopenCost()
     {
-        return new Value(Options.factoryMoneyReservPerLevel);
+        return new Value(Options.factoryMoneyReservePerLevel);
 
     }
     //internal Value getUpgradeCost()
@@ -628,7 +632,7 @@ internal bool isToRemove()
 
     float wantsMinMoneyReserv()
     {
-        return getExpences() * Factory.xMoneyReservForResources + Options.factoryMoneyReservPerLevel * level;
+        return getExpences() * Factory.xMoneyReservForResources + Options.factoryMoneyReservePerLevel * level;
     }
     public void simulateClosing()
     {

Assets/code/Logic/Factory.cs

@@ -154,16 +154,18 @@ internal FactoryType(string name, Storage basicProduction, bool shaft)
                 }
                 else
                 {
-                    Value cost = Game.market.getCost(this.getBuildNeeds());
-                    cost.add(Options.factoryMoneyReservPerLevel);
+                    //Value cost = Game.market.getCost(this.getBuildNeeds());
+                    //cost.add(Options.factoryMoneyReservPerLevel);
+                    Value cost = getMinimalMoneyToBuild();
                     return agent.canPay(cost);
                 }
             },
             delegate
             {
                 var sb = new StringBuilder();
-                Value cost = Game.market.getCost(this.getBuildNeeds());
-                cost.add(Options.factoryMoneyReservPerLevel);
+                //Value cost = Game.market.getCost(this.getBuildNeeds());
+                //cost.add(Options.factoryMoneyReservPerLevel);
+                Value cost = getMinimalMoneyToBuild();
                 sb.Append("Have ").Append(cost).Append(" coins");
                 sb.Append(" or (with ").Append(Economy.PlannedEconomy).Append(") have ").Append(this.getBuildNeeds());
                 return sb.ToString();
@@ -202,12 +204,12 @@ public static IEnumerable<FactoryType> getNonResourceTypes(Country country)
                 yield return next;
     }
 
-    //internal Value getBuildCost()
-    //{
-    //    Value result = Game.market.getCost(getBuildNeeds());
-    //    result.add(Options.factoryMoneyReservPerLevel);
-    //    return result;
-    //}
+    internal Value getMinimalMoneyToBuild()
+    {
+        Value result = Game.market.getCost(getBuildNeeds());
+        result.add(Options.factoryMoneyReservePerLevel);
+        return result;
+    }
     internal StorageSet getBuildNeeds()
     {
         //return new Storage(Product.Food, 40f);
@@ -299,7 +301,7 @@ internal Value getPossibleProfit(Province province)
     }
     internal Procent getPossibleMargin(Province province)
     {
-        return Procent.makeProcent(getPossibleProfit(province), Game.market.getCost(this.getBuildNeeds()));
+        return Procent.makeProcent(getPossibleProfit(province), getMinimalMoneyToBuild());
     }
     //internal bool canBuildNewFactory(FactoryType type)
     //{

Assets/code/Logic/FactoryType.cs

@@ -488,8 +488,9 @@ internal override void invest()
                 if (proposition != null && proposition.canBuildNewFactory(getProvince()) &&
                     (getProvince().getUnemployedWorkers() > Options.minUnemploymentToBuldFactory || getProvince().getAverageFactoryWorkforceFullfilling() > Options.minFactoryWorkforceFullfillingToBuildNew))
                 {
-                    Value buildCost = Game.market.getCost(proposition.getBuildNeeds());
-                    buildCost.add(Options.factoryMoneyReservPerLevel);
+                    //Value buildCost = Game.market.getCost(proposition.getBuildNeeds());
+                    //buildCost.add(Options.factoryMoneyReservePerLevel);
+                    Value buildCost = proposition.getMinimalMoneyToBuild();
                     if (canPay(buildCost))
                     {
                         Factory found = new Factory(getProvince(), this, proposition);

Assets/code/Logic/NonAbstractPopUnit.cs

@@ -52,7 +52,7 @@ public static class Options
     internal static readonly int minDaysBeforeSalaryCut = 2;
     internal static readonly int howOftenCheckForFactoryReopenning = 30;
 
-    internal static readonly float factoryMoneyReservPerLevel = 20f;
+    internal static readonly float factoryMoneyReservePerLevel = 20f;
     internal static readonly float minMarginToRiseSalary = 0.01f;
     internal static readonly float factoryEachLevelEfficiencyBonus = 0.05f;
     //internal static float factoryHaveResourceInProvinceBonus = 0.2f;

Assets/code/Logic/Options.cs

@@ -46,7 +46,7 @@ override protected void AddButtons()
                 ////Adding cost
                 //if (Game.player.isInvented(InventionType.capitalism))
                 if (Economy.isMarket.checkIftrue(Game.Player))
-                    AddButton(Game.market.getCost(next.getBuildNeeds()).ToString(), next);
+                    AddButton(next.getMinimalMoneyToBuild().ToString(), next);
                 else
                     AddButton(next.getBuildNeeds().ToString(), next);
 

Assets/code/PanelTables/BuildPanelTable.cs

@@ -16,7 +16,7 @@ public class BuildPanel : DragPanel
     void Start()
     {
         MainCamera.buildPanel = this;
-        GetComponent<RectTransform>().anchoredPosition = new Vector2(0f, MainCamera.topPanel.GetComponent<RectTransform>().rect.height * -1f);
+        GetComponent<RectTransform>().anchoredPosition = new Vector2(50f, -100f);
         buildButton.interactable = false;
         hide();
     }
@@ -33,13 +33,14 @@ public void onBuildClick()
         //if (Game.player.economy.allowsFactoryBuildingByGovernment())
         {
             bool buildSomething = false;
-            var resourceToBuild = selectedFactoryType.getBuildNeeds();
+            
             if (Economy.isMarket.checkIftrue(Game.Player))
             //if (Game.player.economy.status == Economy.StateCapitalism)
             //have money /resource
             {
-                Value cost = Game.market.getCost(resourceToBuild);
-                cost.add(Options.factoryMoneyReservPerLevel);
+                //Value cost = Game.market.getCost(resourceToBuild);
+                //cost.add(Options.factoryMoneyReservePerLevel);
+                Value cost = selectedFactoryType.getMinimalMoneyToBuild();
                 if (Game.Player.canPay(cost))
                 {
                     var factory = new Factory(Game.selectedProvince, Game.Player, selectedFactoryType);
@@ -52,6 +53,7 @@ public void onBuildClick()
             else // non market
             {
                 //todo remove grain connection
+                var resourceToBuild = selectedFactoryType.getBuildNeeds();
                 Storage needFood = resourceToBuild.getFirstStorage(Product.Grain);
                 if (Game.Player.countryStorageSet.has(needFood))
                 {
@@ -82,7 +84,7 @@ public void refresh()
         {
             sb.Clear();
             sb.Append("Build ").Append(selectedFactoryType);
-            var cost = Game.market.getCost(selectedFactoryType.getBuildNeeds());
+            var cost =selectedFactoryType.getMinimalMoneyToBuild();
             sb.Append("\n\nResources to build: ").Append(selectedFactoryType.getBuildNeeds()).Append(" cost: ").Append(cost);
             sb.Append("\nEveryday resource input: ").Append(selectedFactoryType.resourceInput);
 

Assets/code/Panels/BuildPanel.cs

@@ -8,6 +8,7 @@ public class DiplomacyPanel : DragPanel
 {
     public Text captionText, generalText;
     public Button giveControlToAi, giveControlToPlayer;
+    public MainCamera mainCamera;
     Country selectedCountry;
     StringBuilder sb = new StringBuilder();
     // Use this for initialization
@@ -79,6 +80,11 @@ public void onSurrenderClick()
         Game.givePlayerControlToAI();
         setButtonsState();
     }
+    public void onGoToClick()
+    {
+        if (selectedCountry != Country.NullCountry)
+            mainCamera.focusCamera(selectedCountry.getCapital());
+    }
     public void onRegainControlClick()
     {
         Game.takePlayerControlOfThatCountry(selectedCountry);

Assets/code/Panels/DiplomacyPanel.cs

@@ -87,7 +87,9 @@ public bool isAllTrue(object forWhom)
 /// </summary> 
 public class Condition : Name
 {
-    internal static readonly Condition IsNotImplemented = new Condition(delegate { return 2 * 2 == 5 || Game.devMode; }, "Feature is implemented", true);
+    internal static readonly Condition IsNotImplemented
+        //= new Condition(delegate { return 2 * 2 == 5 || Game.devMode; }, "Feature is implemented", true);
+        = new Condition(delegate { return 2 * 2 == 5; }, "Feature is implemented", true);
     internal static readonly Condition AlwaysYes = new Condition(x => 2 * 2 == 4, "Always Yes condition", true);
 
     protected readonly Func<object, bool> checkingFunction;