Add shot indicator

[gmtk-gamejam.git] / Assets / Scripts / Controllers / AIController.cs

diff --git a/Assets/Scripts/Controllers/AIController.cs b/Assets/Scripts/Controllers/AIController.cs
index 4879c4c25f9e77361def7daae13d81fb7b4da0d7..5a3761cddfe4a3aa3cb70b57dfb441f1840d0501 100644 (file)
--- a/Assets/Scripts/Controllers/AIController.cs
+++ b/Assets/Scripts/Controllers/AIController.cs
@@ -7,6 +7,7 @@ namespace Controllers
 {
   [RequireComponent(typeof(Rigidbody2D))]
   [RequireComponent(typeof(BoxCollider2D))]
+  [RequireComponent(typeof(Animator))]
   public class AIController : MonoBehaviour
   {
     [SerializeField] private float speed;
@@ -18,6 +19,10 @@ namespace Controllers
     [SerializeField] private Leg rightLeg;
     [SerializeField] private float maxLegAngle;
     [SerializeField] private float legSpeed;
+    
+    [Header("Arsm")]
+    [SerializeField] private GameObject leftArm;
+    [SerializeField] private GameObject rightArm;
 
     [Header("References")]
     [SerializeField] private GameController game;
@@ -26,10 +31,13 @@ namespace Controllers
     public Rigidbody2D Rigidbody => _rigidbody != null ? _rigidbody : _rigidbody = GetComponent<Rigidbody2D>();
     private Rigidbody2D _rigidbody;
 
-    private float animationStep;
+    private bool turn;
     
     public BoxCollider2D BoxCollider => _boxCollider != null ? _boxCollider : _boxCollider = GetComponent<BoxCollider2D>();
     private BoxCollider2D _boxCollider;
+    
+    public Animator Animator => _animator != null ? _animator : _animator = GetComponent<Animator>();
+    private Animator _animator;
 
     private void Start()
     {
@@ -53,14 +61,25 @@ namespace Controllers
       if (!game.enemy.HasBall) return;
       var hoopDistance = Mathf.Abs(transform.position.x - game.EnemyHoop.transform.position.x);
       var playerHoopDistance = Mathf.Abs(player.root.transform.position.x - game.EnemyHoop.transform.position.x);
-      if (hoopDistance < 6f && hoopDistance > 2.5f && (Random.Range(0, 100) > 30 || playerHoopDistance > hoopDistance)) // Take the shot when in range. 70% chance he decides to if the player is standing between him and the basket.
+      if (hoopDistance < 10.5f && hoopDistance > 2.5f && (Random.Range(0, 100) > 30 || playerHoopDistance > hoopDistance)) // Take the shot when in range. 70% chance he decides to if the player is standing between him and the basket.
       {
-        game.enemy.Shoot(transform);
+        game.enemy.Shoot(transform, Random.Range(0.5f, 1f));
       }
     }
 
+    private Vector3 lastPosition;
+    private static readonly int Running = Animator.StringToHash("Running");
+    private void FixedUpdate()
+    {
+      Animator.SetBool(Running, (lastPosition - transform.position).x > 0.015);
+      
+      lastPosition = transform.position;
+    }
+
     private void Update()
     {
+      if (game.freezeMotion) return;
+      
       var movement = transform.position;
       
       if (!game.enemy.HasBall) // Move towards the ball to grab it.
@@ -75,27 +94,30 @@ namespace Controllers
           // transform.position += new Vector3(game.ball.transform.position.x - transform.position.x, 0f, 0f).normalized * (Time.deltaTime * speed);
           var direction = Vector2.MoveTowards(transform.position, game.ball.transform.position, speed * Time.deltaTime);
           transform.position = new Vector2(direction.x, transform.position.y);
-          flipper.localScale = new Vector3((Vector2.Distance(transform.position, direction) > 0 ? -1f : 1f), 1, 1);
         }
       }
       else // Otherwise, move toward the basket, and then once we get within range, take the shot.
       {
         // How far the enemy tries to get from the hoop before shooting.
         // Currently, it will try to shoot a 3pt. shot if down, but a 2pt. shot if up or tied.
-        var targetDistance = game.enemy.score < game.player.score ? 5f : 3f;
+        var targetDistance = game.enemy.score < game.player.score ? 10f : 4f;
         transform.position = new Vector2(Vector2.MoveTowards(transform.position, game.EnemyHoop.transform.position + new Vector3(targetDistance, 0, 0), speed * Time.deltaTime).x, transform.position.y);
       }
 
       movement -= transform.position;
 
-      game.enemy.Move(transform.position + new Vector3(0f, BoxCollider.size.y * 3/4, 0f));
-      
-      leftLeg.top.transform.localRotation = Quaternion.Euler(0, 0, maxLegAngle * Mathf.Sin(animationStep * legSpeed));
-      leftLeg.bottom.transform.localRotation = Quaternion.Euler(0, 0, maxLegAngle + maxLegAngle * Mathf.Sin(animationStep * legSpeed));
-      rightLeg.top.transform.localRotation = Quaternion.Euler(0, 0, maxLegAngle * Mathf.Sin(animationStep * -legSpeed));
-      rightLeg.bottom.transform.localRotation = Quaternion.Euler(0, 0, maxLegAngle + maxLegAngle * Mathf.Sin(animationStep * -legSpeed));
+      bool currentTurn = movement.x > 0;
+      if (turn && currentTurn)
+        flipper.transform.localScale = new Vector3(1f, 1f, 1f);
+      else
+        flipper.transform.localScale = new Vector3(-1f, 1f, 1f);
 
-      animationStep += Time.deltaTime * Mathf.Abs(movement.x);
+      game.enemy.Move(transform.position + new Vector3(0f, BoxCollider.size.y * 3/4, 0f) + (transform.right * (0.5f * (turn && currentTurn ? -1 : 1))));
+      turn = currentTurn;
+      
+      // Point the arms at the ball.
+      leftArm.transform.up = -(game.ball.transform.position - leftArm.transform.position);
+      rightArm.transform.up = -(game.ball.transform.position - rightArm.transform.position);
     }
 
     [Serializable]