Merge pull request #497 from Nashet/Map-options

Map options

Assets/EconomicSimulation/Scripts/Logic/Diplomacy.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Nashet.EconomicSimulation
 {

Assets/EconomicSimulation/Scripts/Logic/EntryPoint/MainCamera.cs

@@ -14,6 +14,8 @@ public class MainCamera : MonoBehaviour
         [SerializeField]
         private float xzCameraSpeed = 2f;
 
+
+
         [SerializeField]
         private float yCameraSpeed = -55f;
 
@@ -54,6 +56,9 @@ private void Start()
         {
             Get = this;
             focusHeight = transform.position.z;
+            //
+            //var window = Instantiate(LinksManager.Get.MapOptionsPrefab, LinksManager.Get.CameraLayerCanvas.transform);
+            //window.GetComponent<RectTransform>().anchoredPosition = new Vector2(150f, 150f);
         }
 
         public void Move(float xMove, float zMove, float yMove)
@@ -88,7 +93,7 @@ private void FixedUpdate()
         private void LoadGame()
         {
             Application.runInBackground = true;
-            game = new Game();
+            game = new Game(MapOptions.MapImage);
 #if UNITY_WEBGL
             game.InitializeNonUnityData(); // non multi-threading
 #else
@@ -109,6 +114,8 @@ private void OnGameLoaded()
         // Update is called once per frame
         private void Update()
         {
+            if (!MapOptions.MadeChoise)
+                return;
             //starts loading thread
             if (game == null)// && Input.GetKeyUp(KeyCode.Backspace))
             {
@@ -180,6 +187,7 @@ private void Update()
                     MessagePanel.showMessageBox(LinksManager.Get.CameraLayerCanvas, this);
 
             }
+
         }
 
         private void RefreshMap()

Assets/EconomicSimulation/Scripts/Logic/Game.cs

@@ -17,7 +17,7 @@ public class Game : ThreadedJob
         public static bool logInvestments = false;
         public static bool logMarket = false;
 
-        private static readonly bool readMapFormFile = false;
+        public static  bool readMapFormFile = false;
         private static MyTexture mapTexture;
 
 
@@ -39,23 +39,24 @@ public class Game : ThreadedJob
         private static VoxelGrid grid;
         private readonly Rect mapBorders;
 
-        public Game()
+        public Game(Texture2D mapImage)
         {
-            if (readMapFormFile)
+            if (mapImage==null)
+                generateMapImage();            
+            else
             {
-                Texture2D mapImage = Resources.Load("provinces", typeof(Texture2D)) as Texture2D; ///texture;
+                //Texture2D mapImage = Resources.Load("provinces", typeof(Texture2D)) as Texture2D; ///texture;
                 mapTexture = new MyTexture(mapImage);
             }
-            else
-                generateMapImage();
+
             mapBorders = new Rect(0f, 0f, mapTexture.getWidth() * Options.cellMultiplier, mapTexture.getHeight() * Options.cellMultiplier);
         }
 
         public void InitializeNonUnityData()
         {
             World.market.initialize();
 
-            World.Create(mapTexture, !readMapFormFile);
+            World.Create(mapTexture);
             //Game.updateStatus("Making grid..");
             grid = new VoxelGrid(mapTexture.getWidth(), mapTexture.getHeight(), Options.cellMultiplier * mapTexture.getWidth(), mapTexture, World.GetAllProvinces());
 

Assets/EconomicSimulation/Scripts/Logic/Mono/World.cs

@@ -221,7 +221,8 @@ internal static void CreateCountries()
             howMuchCountries += Rand.Get.Next(6);
             if (howMuchCountries < 8)
                 howMuchCountries = 8;
-
+            if (howMuchCountries > World.allProvinces.Count)
+                howMuchCountries = World.allProvinces.Count;
             for (int i = 0; i < howMuchCountries; i++)
             {
                 //Game.updateStatus("Making countries.." + i);
@@ -351,15 +352,16 @@ public static List<Province> getSeaProvinces(MyTexture mapTexture, bool useProvi
         /// <summary>
         /// Could run in threads
         /// </summary>
-        public static void Create(MyTexture map, bool isMapGenerated)
+        public static void Create(MyTexture map)
         {
+            bool isMapRandom = MapOptions.MapImage == null;
             //FactoryType.getResourceTypes(); // FORCING FactoryType to initialize?
 
             // remake it on messages?
             //Game.updateStatus("Reading provinces..");
             preReadProvinces(map);
-            var seaProvinces = getSeaProvinces(map, !isMapGenerated);
-            deleteSomeProvinces(seaProvinces, isMapGenerated);
+            var seaProvinces = getSeaProvinces(map, !isMapRandom);
+            deleteSomeProvinces(seaProvinces, isMapRandom);
 
             // Game.updateStatus("Making countries..");
             CreateCountries();
@@ -377,16 +379,15 @@ public static void Create(MyTexture map, bool isMapGenerated)
         private static void setStartResources()
         {
             //Country.allCountries[0] is null country
-            //Country.allCountries[1].Capital.setResource(Product.Wood);// player
-
             //Country.allCountries[0].Capital.setResource(Product.Wood;
+            //Country.allCountries[1].Capital.setResource(Product.Wood);// player
 
-            allCountries[2].Capital.setResource(Product.Fruit);
-            allCountries[3].Capital.setResource(Product.Gold);
-            allCountries[4].Capital.setResource(Product.Cotton);
-            allCountries[5].Capital.setResource(Product.Stone);
-            allCountries[6].Capital.setResource(Product.MetalOre);
-            allCountries[7].Capital.setResource(Product.Wood);
+            if (allCountries.Count > 2) allCountries[2].Capital.setResource(Product.Fruit);
+            if (allCountries.Count > 3) allCountries[3].Capital.setResource(Product.Gold);
+            if (allCountries.Count > 4) allCountries[4].Capital.setResource(Product.Cotton);
+            if (allCountries.Count > 5) allCountries[5].Capital.setResource(Product.Stone);
+            if (allCountries.Count > 6) allCountries[6].Capital.setResource(Product.MetalOre);
+            if (allCountries.Count > 7) allCountries[7].Capital.setResource(Product.Wood);
         }
 
         // temporally

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

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Nashet.EconomicSimulation
 {

Assets/EconomicSimulation/Scripts/Panels/BottomPanel.cs

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

Assets/EconomicSimulation/Scripts/Panels/MapOptions.cs

@@ -0,0 +1,89 @@
+using Nashet.UnityUIUtils;
+
+using SFB;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Nashet.EconomicSimulation
+{
+    /// <summary>
+    /// Warning! This mono object will not work in webGL if instantiated (will not load image file)    
+    /// </summary>
+    class MapOptions : Hideable
+    {
+        static public bool MadeChoise;
+        [SerializeField]
+        private Toggle randomMap;
+
+        [SerializeField]
+        private CanvasSampleOpenFileImage imageOpener;
+
+        [SerializeField]
+        private RawImage loadedImage;
+
+        [SerializeField]
+        private Button generate, loadImage;
+
+        internal static Texture2D MapImage;
+
+        private void Start()
+        {
+            //GetComponent<RectTransform>().anchoredPosition = new Vector2(800f, 200f);
+            GUIChanger.Apply(gameObject);
+        }
+        //public override void Refresh()
+        //{
+
+        //}
+        public void OnMapFromFileToggled(bool value)
+        {
+            if (value == true)
+            {
+                generate.interactable = false;
+                loadImage.interactable = true;
+            }
+            else
+            {
+                generate.interactable = true;
+                loadImage.interactable = false;
+            }
+        }
+        public void OnLoadImageClicked()
+        {
+
+        }
+        public void OnGenerate()
+        {
+            if (randomMap.isOn)
+            {
+                Game.readMapFormFile = false;
+                MadeChoise = true;
+                Hide();
+            }
+            else //take picture
+            { 
+                if (loadedImage.texture == null) //todo thats never true
+                    Message.NewMessage("", "Wasn't able to load that image", "Ok", false);
+                else
+                {
+                    Game.readMapFormFile = true;
+                    MapImage = loadedImage.texture as Texture2D;
+                    MadeChoise = true;
+                    Hide();
+                }
+            }
+
+        }
+        private void Update()
+        {
+            if (!randomMap.isOn)
+                generate.interactable = loadedImage.texture!=null;
+            generate.interactable = true;
+        }
+    }
+}

Assets/EconomicSimulation/Scripts/Utils/ExtendedList.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+
 
 namespace Nashet.Utils
 {

Assets/EconomicSimulation/Scripts/Utils/Extensions/Extensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using Nashet.EconomicSimulation;
@@ -74,9 +75,28 @@ public static bool HasComponentInParentParent<T>(this MonoBehaviour that)
                 return true;
         }
     }
-
+    //public static class TextureExtensions
+    //{
+    //    public static bool IsEmpty(Texture2D original)
+    //    {
+    //    }
+    //}
     public static class Texture2DExtensions
     {
+        public static Texture2D LoadPNG(string filePath)
+        {
+
+            Texture2D tex = null;
+            byte[] fileData;
+
+            if (File.Exists(filePath))
+            {
+                fileData = File.ReadAllBytes(filePath);
+                tex = new Texture2D(2, 2, TextureFormat.RGBAFloat, false);
+                tex.LoadImage(fileData); //..this will auto-resize the texture dimensions.
+            }
+            return tex;
+        }
         public static Texture2D FlipTexture(Texture2D original)
         {
             Texture2D flipped = new Texture2D(original.width, original.height);
@@ -605,7 +625,7 @@ public static int FindIndex<T>(this IEnumerable<T> items, Func<T, bool> predicat
 
         //}
 
-        
+
         public static IEnumerable<T> FirstSameElements<T>(this IEnumerable<T> collection, Func<T, float> selector)
         {
             T previousElement = collection.FirstOrDefault();