itai.sharim/TagFight - Change NQXDEYOPZBO7AZJHBEBNMBR3QFE4OAQFK4FHOIGKD7TXE256X23AC

Simplify FollowAction to use MoveAction

Created by itai.sharim on September 11, 2022

NQXDEYOPZBO7AZJHBEBNMBR3QFE4OAQFK4FHOIGKD7TXE256X23AC

Dependencies

In channels

main

Change contents

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 60 [3.535]

B:BD[3.2101] → [3.2101:2202]

                _animator.Play(_run);
                break;
            case FollowAction.State:

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 74 [3.535]
B:BD[3.2604] → [3.2604:2666]
```
                break;
            case FollowAction.State:
```
Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 87 [3.535]
B:BD[3.3031] → [3.3031:3093]
```
                break;
            case FollowAction.State:
```

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 104 [3.535]

B:BD[3.3534] → [3.3534:3572]

B:BD[3.3572] → [4.9459:9629]

∅:D[4.9629] → [3.3623:3647]

B:BD[3.3623] → [3.3623:3647]

            case FollowAction.State:
                _animator.Update(-Mathf.Floor(_animator.GetCurrentAnimatorStateInfo(_layer).normalizedTime));
                _animator.CrossFade(_run, 0.25f, _layer);
                break;

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 120 [3.535]
B:BD[3.4019] → [3.4019:4057]
B:BD[3.4057] → [4.9879:9917]
∅:D[4.9917] → [3.4090:4114]
B:BD[3.4090] → [3.4090:4114]
```
            case FollowAction.State:
                HandleFollowState();
                break;
```
Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 135 [3.535]
B:BD[5.513] → [5.513:558]
```
        print($"Searching for {moveName}");
```
Deletion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 5 [6.9309]
B:BD[6.9407] → [6.9407:9430]
```
using UnityEngine.AI;
```

Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 43 [7.292]

[7.1231]

    }
    public bool SetDestination(Vector3 target) {
        _lastTargetPosition = target;
        return _agent.SetDestination(target);

Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 5 [6.11658]
B:BD[6.11756] → [6.11756:11779]
```
using UnityEngine.AI;
```
Insertion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 8 [6.11658]
[6.11821]
[6.11821]
```
    MoveToAction _moveAction;
```
Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 11 [6.11658]
B:BD[6.11879] → [6.11879:11905]
B:BD[6.11905] → [2.663:701]
∅:D[2.701] → [7.2513:2584]
B:BD[6.11943] → [7.2513:2584]
B:BD[8.1803] → [3.33887436:33887490]
```
    NavMeshAgent _agent;
    float _originalStoppingDistance;
    float _desiredStoppingDistance;
    bool _isFirstAdvance = true;
    static State resetState = new(false, 0f, false);
```

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 14 [6.11658]

B:BD[6.12107] → [6.12107:12477]

B:BD[6.12588] → [7.2585:2639]

        if (unit == null) {
            throw new ArgumentNullException("unit");
        }
        if (stoppingDistance < 0) {
            throw new ArgumentException("Cannot be < 0", "stoppingDistance");
        }
        if (unit.TryGetComponent(out _agent) == false) {
            throw new ArgumentException("Missing NavMeshAgent", "unit");
        }
        _desiredStoppingDistance = stoppingDistance;

[6.12107]

[6.12739]

        _lastTargetPosition = target.position;
        _moveAction = new(unit, _lastTargetPosition, stoppingDistance);

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 18 [6.11658]

∅:D[8.1888] → [7.2640:2672]

B:BD[6.12775] → [7.2640:2672]

B:BD[7.2672] → [2.702:768]

∅:D[2.768] → [7.2672:2776]

B:BD[7.2672] → [7.2672:2776]

        if (_isFirstAdvance) {
            _originalStoppingDistance = _agent.stoppingDistance;
            _agent.stoppingDistance = _desiredStoppingDistance;
            _agent.isStopped = false;

[8.1888]

[6.12831]

        if (_lastTargetPosition != _target.position) {

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 20 [6.11658]

B:BD[6.12884] → [6.12884:12941]

B:BD[6.12941] → [7.2777:2815]

            _agent.SetDestination(_lastTargetPosition);
            _isFirstAdvance = false;

[6.12884]

[6.12941]

            _moveAction.SetDestination(_lastTargetPosition);

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 22 [6.11658]

B:BD[6.12952] → [7.2816:3036]

∅:D[7.3036] → [6.12952:12954]

B:BD[6.12952] → [6.12952:12954]

B:BD[6.12954] → [8.1889:2044]

B:BD[8.2044] → [3.33887491:33887560]

        else {
            if (_lastTargetPosition != _target.position) {
                _lastTargetPosition = _target.position;
                _agent.SetDestination(_lastTargetPosition);
            }
        }
        bool isAdvanced = _agent.pathPending || _agent.remainingDistance > _agent.stoppingDistance;
        float completionStatus = CompletionStatus();
        return new State(isAdvanced, completionStatus, isAdvanced);

[6.12952]

[6.13044]

        
        return _moveAction.Advance();

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 27 [6.11658]
∅:D[8.2138] → [6.13081:13115]
B:BD[6.13081] → [6.13081:13115]
B:BD[6.13115] → [2.769:831]
∅:D[2.831] → [6.13177:13206]
∅:D[5.1755] → [6.13177:13206]
B:BD[6.13177] → [6.13177:13206]
B:BD[6.13206] → [2.832:865]
∅:D[2.865] → [6.13206:13208]
B:BD[6.13206] → [6.13206:13208]
B:BD[6.13208] → [8.2139:2167]
```
        _agent.isStopped = true;
        _agent.stoppingDistance = _originalStoppingDistance;
        _agent.ResetPath();
        _isFirstAdvance = true;
        return resetState;
```
[8.2138]
[9.30676]
```
        return _moveAction.Cancel();
```

Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 36 [6.11658]

B:BD[9.30834] → [8.2168:2315]

B:BD[8.2315] → [3.33887561:33887682]

∅:D[3.33887682] → [8.2380:2468]

B:BD[8.2380] → [8.2380:2468]

B:BD[8.2468] → [3.33887683:33887717]

∅:D[3.33887717] → [8.2468:2488]

B:BD[8.2468] → [8.2468:2488]

    readonly public struct State : IActionState
    {
        public bool IsAdvanced { get; }
        public float CompletionStatus { get; }
        public bool IsMoving { get; }
        public State(bool isAdvanced, float completionStatus, bool isMoving) {
            IsAdvanced = isAdvanced;
            CompletionStatus = completionStatus;
            IsMoving = isMoving;
        }
    }

Simplify FollowAction to use MoveAction

Dependencies

In channels

Change contents

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 60 [3.535]

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 74 [3.535]

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 87 [3.535]

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 104 [3.535]

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 120 [3.535]

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 135 [3.535]

Deletion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 5 [6.9309]

Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 43 [7.292]

Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 5 [6.11658]

Insertion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 8 [6.11658]

Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 11 [6.11658]

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 14 [6.11658]

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 18 [6.11658]

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 20 [6.11658]

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 22 [6.11658]

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 27 [6.11658]

Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 36 [6.11658]