Custom game boundaries, HUD adjustments,

Fixes #28 Fixes #27
vilbeyli · Apr 19, 2015 · ae8a049 · ae8a049
1 parent 590d65e
commit ae8a049
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/Assets/Scenes/game.unity b/Assets/Scenes/game.unity
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
@@ -114,7 +114,7 @@ public void GameOver(bool win)
 
     public void UpdateFlagCounter(bool condition)
     {
-        _flagCount += condition ? 1 : -1;
+        _flagCount += condition ? -1 : 1;
     }   // true: increment | false: decrement
 
     private void ResetGameState()
@@ -172,6 +172,7 @@ void CreateDummyScores()
 
     void LoadScoresToUI()
     {
+        // TODO: IF condition would be useful not to make too many attempts on db
         // get UI Text objects
         Text beginnerScores, intermediateScores, expertScores;
 
@@ -205,7 +206,7 @@ void LoadScoresToUI()
 
     string HighScoreFormat(int i, Score score)
     {
-        return "\t" + (i + 1) + "\t\t" + score.Name + "\t\t" + score.TimePassed + "\n\n";
+        return "\t" + (i + 1) + "\t\t" + score.Name + "\t\t\t" + score.TimePassed + "\n\n";
     }
 
     public void Detonate(Tile tile)
@@ -216,19 +217,6 @@ public void Detonate(Tile tile)
     }
 }
 
-// SERIALIZE FIELD ???? DOESNT WORK???
-[System.Serializable]
-public class TileOptions
-{
-    [SerializeField]
-    public int a;
-    [SerializeField]
-    public float b = 0.5f;
-    [SerializeField]
-    public bool c = false;
-};
-// ????????????????????????????????????
-
 [System.Serializable]
 public class GameSettings
 {
@@ -286,7 +274,7 @@ public bool isValid()
             (
             (   _width <= 0 || _height <= 0 || _mines <= 0 ) ||
             (   _mines >= _width*_height                   ) ||
-            (   false                                      )
+            (   _height > 24 || _width > 35                )
             )
 
             return false;

diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs
@@ -165,12 +165,14 @@ public void UpdateFlagText(int flagCount)
         flagCount = Mathf.Abs(flagCount);   // ignore sign
         if (Mathf.Abs(flagCount) < 10)
         {
-            flagCountText += "00" + flagCount;
+            flagCountText += "00";
         }
         else if (Mathf.Abs(flagCount) < 100)
         {
-            flagCountText += "0" + flagCount;
+            flagCountText += "0";
         }
+        flagCountText += flagCount;
+
 
         // add the constructed flag count text to the UI Text
         _elements.FlagText.text += flagCountText;