Culture

readme.md → .github/readme.md

@@ -54,6 +54,7 @@ Note that the results from using a heightmap to generate a world might not perfe
 - O : Cycle between 'Population' map overlays
 - P : Cycle between 'Polity' map overlays
 - G : Enable 'General' map overlay
+- E : Enable 'Debug' map overlay (debug must not be set to 'none')
 - Tab : Cycle between overlay subtypes when available
 - 1: Set simulation speed to 'Max 1 Day/sec'
 - 2: Set simulation speed to 'Max 7 Days/sec'

.vscode/settings.json

@@ -0,0 +1,56 @@
+{
+    "files.exclude":
+    {
+        "**/.DS_Store":true,
+        "**/.git":true,
+        "**/.gitignore":true,
+        "**/.gitmodules":true,
+        "**/*.booproj":true,
+        "**/*.pidb":true,
+        "**/*.suo":true,
+        "**/*.user":true,
+        "**/*.userprefs":true,
+        "**/*.unityproj":true,
+        "**/*.dll":true,
+        "**/*.exe":true,
+        "**/*.pdf":true,
+        "**/*.mid":true,
+        "**/*.midi":true,
+        "**/*.wav":true,
+        "**/*.gif":true,
+        "**/*.ico":true,
+        "**/*.jpg":true,
+        "**/*.jpeg":true,
+        "**/*.png":true,
+        "**/*.psd":true,
+        "**/*.tga":true,
+        "**/*.tif":true,
+        "**/*.tiff":true,
+        "**/*.3ds":true,
+        "**/*.3DS":true,
+        "**/*.fbx":true,
+        "**/*.FBX":true,
+        "**/*.lxo":true,
+        "**/*.LXO":true,
+        "**/*.ma":true,
+        "**/*.MA":true,
+        "**/*.obj":true,
+        "**/*.OBJ":true,
+        "**/*.asset":true,
+        "**/*.cubemap":true,
+        "**/*.flare":true,
+        "**/*.mat":true,
+        "**/*.meta":true,
+        "**/*.prefab":true,
+        "**/*.unity":true,
+        "build/":true,
+        "Build/":true,
+        "Library/":true,
+        "library/":true,
+        "obj/":true,
+        "Obj/":true,
+        "ProjectSettings/":true,
+        "temp/":true,
+        "Temp/":true
+    }
+}

Assets/Resources/BillingMode.json

@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}

Assets/Scripts/2D/GuiManagerScript.cs

@@ -255,7 +255,8 @@ public void OnAutoSave()
         PlanetOverlay.PolityAdminCost,
         PlanetOverlay.FactionCoreDistance,
         PlanetOverlay.PolityCluster,
-        PlanetOverlay.ClusterAdminCost
+        PlanetOverlay.ClusterAdminCost,
+        PlanetOverlay.FormationDate
     };
     private int _currentPolityOverlay = 0;
 
@@ -280,7 +281,8 @@ public void OnAutoSave()
         PlanetOverlay.UpdateSpan,
         PlanetOverlay.Migration,
         PlanetOverlay.MigrationPressure,
-        PlanetOverlay.PolityMigrationPressure
+        PlanetOverlay.PolityMigrationPressure,
+        PlanetOverlay.HumanArrival
     };
     private int _currentDebugOverlay = 0;
 
@@ -1085,7 +1087,7 @@ private void ReadKeyboardInput_MapOverlays()
 
             if (Manager.CurrentDevMode != DevMode.None)
             {
-                Manager.HandleKeyUp(KeyCode.D, false, false, ActivateDebugOverlay);
+                Manager.HandleKeyUp(KeyCode.E, false, false, ActivateDebugOverlay);
             }
         }
 
@@ -1298,6 +1300,11 @@ public void SetCoastlineView()
         SetView(PlanetView.Coastlines);
     }
 
+    public void SetDebugView()
+    {
+        SetView(PlanetView.Debug);
+    }
+
     private void ReadKeyboardInput()
     {
         if (_backgroundProcessActive)
@@ -1690,6 +1697,19 @@ private void RegenerateWorld(GenerationType type)
         _regenMapOverlayTexture = true;
     }
 
+    public void ResetWorld()
+    {
+        ResetGuiManagerState();
+
+        Manager.ResetWorld();
+
+        MainMenuDialogPanelScript.SetVisible(false);
+
+        _hasToSetInitialPopulation = true;
+
+        OpenModeSelectionDialog();
+    }
+
     private void GenerateWorld(bool randomSeed = true, int seed = 0, bool useHeightmap = false)
     {
         if (randomSeed)
@@ -1985,15 +2005,22 @@ private bool TryCompleteGroupSelectionRequest(
     private void ClickOp_SelectPopulationPlacement(Vector2 mapPosition)
     {
         int population = AddPopulationDialogScript.Population;
+        int longitude = (int)mapPosition.x;
+        int latitude = (int)mapPosition.y;
 
-        if (AddPopulationGroupAtPosition(mapPosition, population))
+        if (Manager.CanAddPopulationGroupAtPosition(longitude, latitude))
         {
+            Manager.GenerateHumanGroup(longitude, latitude, population);
             UninterruptSimAndShowHiddenInterPanels();
-
             DisplayTip_MapScroll();
-
             _mapLeftClickOp -= ClickOp_SelectPopulationPlacement;
         }
+        // else {
+        //TODO: have some sort of visual feedback:
+        //        1. use the tooltip panel to display "Invalid cell for initial population."
+        //        2. highlight the cell with red (go back to normal color once pointer is not over the cell)
+        // }
+
     }
 
     public void SelectPopulationPlacement()
@@ -2004,39 +2031,19 @@ public void SelectPopulationPlacement()
 
         SetStartingSpeed(AddPopulationDialogScript.StartSpeedLevelIndex);
 
-        Debug.Log(string.Format("Player chose to select cell for population placement of {0}...", population));
+        Debug.LogFormat("Player chose to select cell for population placement of {0}...", population);
 
         if (population <= 0)
+        {
+            Debug.LogWarningFormat("Obtained a negative population value from AddPopulationDialogScript: {0}", population);
             return;
+        }
 
         DisplayTip_InitialPopulationPlacement();
 
         _mapLeftClickOp += ClickOp_SelectPopulationPlacement;
     }
 
-    private bool AddPopulationGroupAtPosition(Vector2 mapPosition, int population)
-    {
-        World world = Manager.CurrentWorld;
-
-        int longitude = (int)mapPosition.x;
-        int latitude = (int)mapPosition.y;
-
-        if ((longitude < 0) || (longitude >= world.Width))
-            return false;
-
-        if ((latitude < 0) || (latitude >= world.Height))
-            return false;
-
-        TerrainCell cell = world.GetCell(longitude, latitude);
-
-        if (cell.IsLiquidSea)
-            return false;
-
-        Manager.GenerateHumanGroup(longitude, latitude, population);
-
-        return true;
-    }
-
     private void DisplayTip_InitialPopulationPlacement()
     {
         if (_displayedTip_initialPopulation)
@@ -3022,6 +3029,10 @@ public void ChangePlanetOverlayToSelected()
         {
             ChangePlanetOverlay(PlanetOverlay.PolityAdminCost, false);
         }
+        else if (OverlayDialogPanelScript.FormationDateToggle.isOn)
+        {
+            ChangePlanetOverlay(PlanetOverlay.FormationDate, false);
+        }
         else if (OverlayDialogPanelScript.TemperatureToggle.isOn)
         {
             ChangePlanetOverlay(PlanetOverlay.Temperature, false);
@@ -3082,6 +3093,10 @@ public void ChangePlanetOverlayToSelected()
         {
             ChangePlanetOverlay(PlanetOverlay.PolityMigrationPressure, false);
         }
+        else if (OverlayDialogPanelScript.HumanArrivalToggle.isOn)
+        {
+            ChangePlanetOverlay(PlanetOverlay.HumanArrival, false);
+        }
         else
         {
             ChangePlanetOverlay(PlanetOverlay.None, false);