GameStructure: Level CoinTarget property and LevelManager GameWonWhen…

…TargetCoinsReached auto win option
takaaptech · Jan 14, 2017 · 0b0331a · 0b0331a
1 parent 5974699
commit 0b0331a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/Scripts/GameStructure/Levels/Editor/LevelEditor.cs b/Scripts/GameStructure/Levels/Editor/LevelEditor.cs
@@ -36,6 +36,7 @@ public class LevelEditor : GameItemEditor
         SerializedProperty _star4TargetProperty;
         SerializedProperty _timeTargetProperty;
         SerializedProperty _scoreTargetProperty;
+        SerializedProperty _coinTargetProperty;
 
         protected override void OnEnable()
         {
@@ -49,6 +50,7 @@ protected override void OnEnable()
             _star4TargetProperty = serializedObject.FindProperty("_star4Target");
             _timeTargetProperty = serializedObject.FindProperty("_timeTarget");
             _scoreTargetProperty = serializedObject.FindProperty("_scoreTarget");
+            _coinTargetProperty = serializedObject.FindProperty("_coinTarget");
         }
 
 
@@ -67,12 +69,19 @@ protected void DrawLevelProperties()
             EditorGUILayout.LabelField("Level Properties", EditorStyles.boldLabel);
             EditorGUI.indentLevel += 1;
             EditorGUILayout.PropertyField(_starTotalCountProperty);
-            EditorGUILayout.PropertyField(_star1TargetProperty);
-            EditorGUILayout.PropertyField(_star2TargetProperty);
-            EditorGUILayout.PropertyField(_star3TargetProperty);
-            EditorGUILayout.PropertyField(_star4TargetProperty);
+            EditorGUI.indentLevel += 1;
+            if (_starTotalCountProperty.intValue >= 1)
+                EditorGUILayout.PropertyField(_star1TargetProperty);
+            if (_starTotalCountProperty.intValue >= 2)
+                EditorGUILayout.PropertyField(_star2TargetProperty);
+            if (_starTotalCountProperty.intValue >= 3)
+                EditorGUILayout.PropertyField(_star3TargetProperty);
+            if (_starTotalCountProperty.intValue >= 4)
+                EditorGUILayout.PropertyField(_star4TargetProperty);
+            EditorGUI.indentLevel -= 1;
             EditorGUILayout.PropertyField(_timeTargetProperty);
             EditorGUILayout.PropertyField(_scoreTargetProperty);
+            EditorGUILayout.PropertyField(_coinTargetProperty);
             EditorGUI.indentLevel -= 1;
             EditorGUILayout.EndVertical();
         }

diff --git a/Scripts/GameStructure/Levels/LevelManager.cs b/Scripts/GameStructure/Levels/LevelManager.cs
@@ -80,6 +80,12 @@ public class LevelManager : Singleton<LevelManager>
         [Tooltip("Whether the user should automatically win the game once the levels target score is reached")]
         public bool GameWonWhenTargetScoreReached;
 
+        /// <summary>
+        /// Whether the user should automatically win the game once the levels target coins is reached
+        /// </summary>
+        [Tooltip("Whether the user should automatically win the game once the levels target coins is reached")]
+        public bool GameWonWhenTargetCoinsReached;
+
         /// <summary>
         /// Time when the level was started.
         /// </summary>
@@ -141,6 +147,8 @@ void Start()
                 MyDebug.LogWarningF("You have enabled the option 'GameOverWhenTargetTimeReached' in LevelManager however the current level has a configured TimeTarget of 0 and so will end immediately. Consider using Level resource configuration files and setting this value.");
             if (GameWonWhenTargetScoreReached && Mathf.Approximately(Level.ScoreTarget, 0))
                 MyDebug.LogWarningF("You have enabled the option 'GameWonWhenTargetScoreReached' in LevelManager however the current level has a configured ScoreTarget of 0 and so will end immediately. Consider using Level resource configuration files and setting this value.");
+            if (GameWonWhenTargetCoinsReached && Mathf.Approximately(Level.CoinTarget, 0))
+                MyDebug.LogWarningF("You have enabled the option 'GameWonWhenTargetCoinsReached' in LevelManager however the current level has a configured CoinTarget of 0 and so will end immediately. Consider using Level resource configuration files and setting this value.");
 #endif
 
             if (AutoStart)
@@ -236,7 +244,8 @@ void Update()
 
                 // check for gameover (win) conditions.
                 if ((GameWonWhenAllStarsGot && Level.StarTotalCount == Level.StarsWonCount && StartStarsWon != Level.StarsWon) ||
-                    GameWonWhenTargetScoreReached && Level.Score >= Level.ScoreTarget)
+                    GameWonWhenTargetScoreReached && Level.Score >= Level.ScoreTarget ||
+                    GameWonWhenTargetCoinsReached && Level.Coins >= Level.CoinTarget)
                     GameOver(true, ShowGameOverDialogDelay);
             }
 

diff --git a/Scripts/GameStructure/Levels/ObjectModel/Level.cs b/Scripts/GameStructure/Levels/ObjectModel/Level.cs
@@ -168,6 +168,24 @@ public int ScoreTarget
         [SerializeField]
         int _scoreTarget;
 
+        /// <summary>
+        /// A field that you can set from json, extensions or code that represents a target coins for completing the level
+        /// </summary>
+        /// You can also use StarxTarget if you want individual scores for winning different stars.
+        public int CoinTarget
+        {
+            get
+            {
+                return _coinTarget;
+            }
+            set
+            {
+                _coinTarget = value;
+            }
+        }
+        [Tooltip("The coins target for completing the level.")]
+        [SerializeField]
+        int _coinTarget;
         #endregion Editor Parameters
 
         /// <summary>