minor cleanup, add attribute Value to IGem

EGaDSAustin · Nov 4, 2019 · 15db8a2 · 15db8a2
1 parent 1d8931c
commit 15db8a2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 23 deletions.
diff --git a/.idea/.idea.unity c# workshop/.idea/contentModel.xml b/.idea/.idea.unity c# workshop/.idea/contentModel.xml
diff --git a/.idea/.idea.unity c# workshop/.idea/workspace.xml b/.idea/.idea.unity c# workshop/.idea/workspace.xml
diff --git a/Assets/Init/Scripts/Gem.cs b/Assets/Init/Scripts/Gem.cs
@@ -6,16 +6,17 @@ namespace EGaDSTutorial
 {
     public interface IGem
     {
+        float Value { get; }
         void OnPickup();
-
     }
 
 
     [RequireComponent(typeof(Collider2D))]
-    [AddComponentMenu("Gem/Gem")]
+    [AddComponentMenu("Gem/BaseGem")]
     public class Gem : MonoBehaviour, IGem
     {
         [SerializeField] private float _value;
+        public float Value => _value;
 
         public void OnPickup()
         {

diff --git a/Assets/Init/Scripts/Player.cs b/Assets/Init/Scripts/Player.cs
@@ -13,18 +13,17 @@ class Player : MonoBehaviour
         #region Singleton
 
         private static Player _instance;
-        public static Player Instance
-        {
-            get { return _instance ? _instance : (_instance = FindObjectOfType<Player>()); }
-        }
+        public static Player Instance => _instance ? _instance : (_instance = FindObjectOfType<Player>());
 
         #endregion
 
         #region Movement
 
         public void Update()
         {
-            transform.position = transform.position + new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0) * Time.deltaTime * _speed;
+            transform.position = 
+                transform.position + _speed * Time.deltaTime * 
+                new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0);
         }
 
         #endregion
@@ -37,9 +36,5 @@ private void OnCollisionEnter2D(Collision2D other)
         }
 
         #endregion
-
-
-
-
     }
 }