diff --git a/Assets/base.unity b/Assets/base.unity index 177cb56a..b74ffb42 100644 Binary files a/Assets/base.unity and b/Assets/base.unity differ diff --git a/Assets/code/Logic/Army.cs b/Assets/code/Logic/Army.cs index a3244860..59d69cd0 100644 --- a/Assets/code/Logic/Army.cs +++ b/Assets/code/Logic/Army.cs @@ -137,9 +137,9 @@ public class Army static Modifier modifierFirearms = new Modifier(x => (x as Army).getEquippedFirearmsSupply(), "Equipped Firearms", 2f, false); static Modifier modifierArtillery = new Modifier(x => (x as Army).getEquippedArtillerySupply(), "Equipped Artillery", 1f, false); - static Modifier modifierCars = new Modifier(x => (x as Army).getEquippedCarsSupply(), "Equipped cars", 2f, false); - static Modifier modifierTanks = new Modifier(x => (x as Army).getEquippedTanksSupply(), "Equipped tanks", 1f, false); - static Modifier modifierAirplanes = new Modifier(x => (x as Army).getEquippedAirplanesSupply(), "Equipped airplanes", 1f, false); + static Modifier modifierCars = new Modifier(x => (x as Army).getEquippedCarsSupply(), "Equipped Cars", 2f, false); + static Modifier modifierTanks = new Modifier(x => (x as Army).getEquippedTanksSupply(), "Equipped Tanks", 1f, false); + static Modifier modifierAirplanes = new Modifier(x => (x as Army).getEquippedAirplanesSupply(), "Equipped Airplanes", 1f, false); static Modifier modifierLuck = new Modifier(x => (float)Math.Round(UnityEngine.Random.Range(-0.5f, 0.5f), 2), "Luck", 1f, false); private float getColdArmsSupply() diff --git a/Assets/code/Logic/Game.cs b/Assets/code/Logic/Game.cs index 4d842cc8..4e78aaec 100644 --- a/Assets/code/Logic/Game.cs +++ b/Assets/code/Logic/Game.cs @@ -403,8 +403,8 @@ void findNeighborprovinces() } void generateMapImage() { - //mapImage = new Texture2D(200, 100); - mapImage = new Texture2D(100, 50); + mapImage = new Texture2D(200, 100); + //mapImage = new Texture2D(100, 50); Color emptySpaceColor = Color.black;//.setAlphaToZero(); mapImage.setColor(emptySpaceColor); int amountOfProvince; @@ -412,8 +412,8 @@ void generateMapImage() amountOfProvince = 10; else amountOfProvince = 12 + Game.Random.Next(8); - amountOfProvince = 60 + Game.Random.Next(20); - //amountOfProvince = 160 + Game.random.Next(20); + //amountOfProvince = 60 + Game.Random.Next(20); + amountOfProvince = 160 + Game.Random.Next(20); for (int i = 0; i < amountOfProvince; i++) mapImage.SetPixel(mapImage.getRandomX(), mapImage.getRandomY(), UtilsMy.getRandomColor()); @@ -775,10 +775,10 @@ void makeHelloMessage() { new Message("Tutorial", "Hi, this is VERY early demo of game-like economy simulator" + "\n\nCurrently there is: " - + "\n\npopulation agents \nbasic trade & production \nbasic warfare \nbasic inventions \nbasic reforms (voting is not implemented)" - + " \npopulation demotion\\promotion to other classes \nmigration (inside country) \nassimilation" + + "\n\npopulation agents \nbasic trade & production \nbasic warfare \nbasic inventions \nbasic reforms (population can vote for reforms)" + + " \npopulation demotion\\promotion to other classes \nmigration\\immigration\nassimilation" + "\n\nYou play as " + Game.Player.getName() + " country yet there is no much gameplay for now. You can try to growth economy or conquer the world." - + "\nTry arrows or WASD for scrolling map and mouse wheel for scale" + + "\n\nTry arrows or WASD for scrolling map and mouse wheel for scale" + "\nEnter key to close top window, space - to pause\\unpause" , "Ok"); ; diff --git a/Assets/code/Logic/Invention.cs b/Assets/code/Logic/Invention.cs index 2454caf9..8570df88 100644 --- a/Assets/code/Logic/Invention.cs +++ b/Assets/code/Logic/Invention.cs @@ -62,10 +62,10 @@ public class Invention : AbstractCondition steamPower = new Invention("Steam Power", "Increases efficiency of all enterprises by 25%", new Value(100f)), Welfare = new Invention("Welfare", "Allows min wage and.. other", new Value(100f)), Gunpowder = new Invention("Gunpowder", "Allows Artillery & Ammunition", new Value(100f)), - Firearms = new Invention("Hand-held cannons", "Allows Firearms, very efficient in battles", new Value(100f)), - CombustionEngine = new Invention("Combustion engine", "", new Value(200f)), - Tanks = new Invention("Tanks", "", new Value(400f)), - Airplanes = new Invention("Airplanes", "", new Value(800f)) + Firearms = new Invention("Hand-held cannons", "Allows Firearms, very efficient in battles", new Value(200f)), + CombustionEngine = new Invention("Combustion engine", "Allows Oil, Fuel, Cars, Rubber and Machinery", new Value(400f)), + Tanks = new Invention("Tanks", "Allows Tanks", new Value(800f)), + Airplanes = new Invention("Airplanes", "Allows Airplanes", new Value(1200f)) ; readonly public static Condition SteamPowerInvented = new Condition(x => (x as Country).isInvented(Invention.steamPower), "Steam Power is invented", true); readonly public static Condition IndividualRightsInvented = new Condition(x => (x as Country).isInvented(Invention.individualRights), "Individual Rights are invented", true); diff --git a/Assets/code/Panels/InventionsPanel.cs b/Assets/code/Panels/InventionsPanel.cs index 85293fd1..0109a891 100644 --- a/Assets/code/Panels/InventionsPanel.cs +++ b/Assets/code/Panels/InventionsPanel.cs @@ -48,7 +48,7 @@ public void refresh() if (selectedInvention != null) { descriptionText.text = "Science points: " + Game.Player.sciencePoints - + "\n\n" + selectedInvention.ToString() + " description: " + selectedInvention.getDescription(); + + "\n\n" + selectedInvention + " : " + selectedInvention.getDescription(); // invention available if (!Game.Player.inventions.isInvented(selectedInvention) && Game.Player.sciencePoints.get() >= selectedInvention.cost.get()) diff --git a/Assets/code/Panels/TopPanel.cs b/Assets/code/Panels/TopPanel.cs index 3d66927a..6dd689a8 100644 --- a/Assets/code/Panels/TopPanel.cs +++ b/Assets/code/Panels/TopPanel.cs @@ -24,7 +24,7 @@ void Update() public void refresh() { - generalText.text = "Economic Simulation v11 Date: " + Game.date + " Country: " + Game.Player.getName() + generalText.text = "Economic Simulation v0.11.0 Date: " + Game.date + " Country: " + Game.Player.getName() + "\nMoney: " + Game.Player.cash + " Science points: " + Game.Player.sciencePoints + " Men: " + Game.Player.getMenPopulation(); @@ -37,6 +37,10 @@ public void onTradeClick() else MainCamera.tradeWindow.show(true); } + public void onExitClick() + { + Application.Quit(); + } public void onMilitaryClick() { if (MainCamera.militaryPanel.isActiveAndEnabled) diff --git a/Assets/code/Utils/Procent.cs b/Assets/code/Utils/Procent.cs index 1a2c3ea5..3988165c 100644 --- a/Assets/code/Utils/Procent.cs +++ b/Assets/code/Utils/Procent.cs @@ -104,7 +104,7 @@ public void addPoportionally(int baseValue, int secondValue, Procent secondProce public override string ToString() { if (get() > 0) - return System.Convert.ToString(get() * 100f) + "%"; + return (get() * 100f).ToString("0.00") + "%"; else return "0%"; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a19714e4..f68fe117 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ