itai.sharim/TagFight - Change N6YTMLNYZLR4BEDGYC7RJQ43KJ3XZFILZ6ODN26Z7RF3LZ6LVUOQC

Added some more moves to sword

Created by itai.sharim on September 10, 2022

N6YTMLNYZLR4BEDGYC7RJQ43KJ3XZFILZ6ODN26Z7RF3LZ6LVUOQC

Dependencies

In channels

main

Change contents

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 11 [3.535]

[3.950]

    [SerializeField] string _slashDown = "GreatSwordSlashDown";
    [SerializeField] string _slashSpin = "GreatSwordSlashSpin";
    [SerializeField] string _hiltBash = "GreatSwordHiltBash";

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 147 [3.535]

B:BD[2.10036] → [2.10036:10038]

[2.10036]

[2.10038]

    string MoveNameToState(string moveName) {
        string state = _idle;
        print($"Searching for {moveName}");
        switch (moveName) {
            case "Slash":
                state = _slash;
                break;
            case "Spin":
                state = _slashSpin;
                break;
            case "Hilt Bash":
                state = _hiltBash;
                break;
            case "Slash Down":
                state = _slashDown;
                break;
        }
        return state;
    }

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 167 [3.535]
[2.10090]
[2.10090]
```
        string moveState = MoveNameToState(nextWeave.Move.moveName);
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 169 [3.535]

B:BD[2.10193] → [2.10193:10306]

        _animator.CrossFade(_slash, 0.25f, _layer);
        float animationLength = _animationLengths[_slash];

[2.10193]

[2.10306]

        if (_animator.GetCurrentAnimatorStateInfo(_layer).normalizedTime > 0.9f) {
            _animator.Play(moveState);
        }
        else {
            _animator.CrossFade(moveState, 0.1f, _layer);
        }
        float animationLength = _animationLengths[moveState];

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 178 [3.535]
B:BD[2.10421] → [2.10421:10483]
```
            _animator.SetFloat($"SlashSpeed", desiredSpeed);
```
[2.10421]
[3.4391]
```
            _animator.SetFloat($"Speed", desiredSpeed);
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 183 [3.535]

B:BD[2.10625] → [2.10625:10893]

            float animationLength = _animationLengths[_slash];
            if (nextWeave.Move.speed > 0) {
                float desiredSpeed = animationLength / nextWeave.Move.speed;
                _animator.SetFloat($"SlashSpeed", desiredSpeed);
            }

[2.10625]

[2.10893]

            StartWeave(nextWeave);

Deletion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 185 [3.535]
B:BD[2.10904] → [2.10904:10906]
Deletion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 11 [4.292]
B:BD[4.515] → [4.515:553]
```
    float _originalStoppingDistance;
```
Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 14 [4.292]
[3.33887166]
[4.624]
```
    readonly static float baseStoppingDistance = 0.1f;
```
Deletion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 26 [4.292]
B:BD[5.807] → [5.807:869]
```
        _originalStoppingDistance = _agent.stoppingDistance;
```
Deletion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 42 [4.292]
B:BD[4.1115] → [4.1115:1177]
```
        _originalStoppingDistance = _agent.stoppingDistance;
```

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 58 [4.292]

B:BD[4.1672] → [4.1672:1734]

        _agent.stoppingDistance = _originalStoppingDistance;

[4.1672]

[4.1734]

        _agent.stoppingDistance = baseStoppingDistance;

Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 12 [6.11658]
B:BD[6.11905] → [6.11905:11943]
```
    float _originalStoppingDistance;
```
Insertion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 14 [6.11658]
[4.2584]
[7.1801]
```
    readonly static float baseStoppingDistance = 0.1f;
```
Deletion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 32 [6.11658]
B:BD[6.12526] → [6.12526:12588]
```
        _originalStoppingDistance = _agent.stoppingDistance;
```

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

B:BD[6.13115] → [6.13115:13177]

        _agent.stoppingDistance = _originalStoppingDistance;

[6.13115]

[6.13177]

        Debug.Log($"Setting stopping distance back to {baseStoppingDistance}");
        _agent.stoppingDistance = baseStoppingDistance;

File deletion: SpinningSlash.asset.meta

BF:BFD[8.10296] → [8.11232:11280]

BF:BFD[8.11280] → [8.11041:11041]

B:BD[8.11041] → [8.11042:11231]

fileFormatVersion: 2
guid: 6e88ca8055b9946448ca75ba8d9809c3
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: SpinningSlash.asset

BF:BFD[8.10296] → [8.11755:11798]

BF:BFD[8.11798] → [8.11282:11282]

B:BD[8.11282] → [8.11283:11699]

B:BD[8.11699] → [9.13251:13270]

∅:D[9.13270] → [8.11727:11741]

B:BD[8.11727] → [8.11727:11741]

B:BD[8.11741] → [2.13160:13173]

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 441094a99c1993a468045987c9bf3c40, type: 3}
  m_Name: SpinningSlash
  m_EditorClassIdentifier: 
  combatMove:
    moveName: Spin
    damage: 3
    speed: 3

Replacement in Assets/ScriptableObjects/CombatScriptableObjects/MoveSets/SwordMoveSet.asset at line 18 [8.13757]
B:BD[8.14267] → [8.14267:14341]
```
    - {fileID: 11400000, guid: 9e652c05d857cd44a86bdc45faef2d00, type: 2}
```
[8.14267]
[8.14341]
```
    - {fileID: 11400000, guid: 29f070238f32e6c458467aec4297a66f, type: 2}
```
Insertion in Assets/ScriptableObjects/CombatScriptableObjects/MoveSets/SwordMoveSet.asset at line 20 [8.13757]
[8.14415]
```
    - {fileID: 11400000, guid: 249259461a8068c499eed99085edde54, type: 2}
```

Replacement in Assets/Scenes/SampleScene.unity at line 865 [10.780110080]

B:BD[10.780121071] → [2.13204:13285]

  m_LocalRotation: {x: 0.22914574, y: -0.070709124, z: 0.016692158, w: 0.970677}

[10.780121071]

[3.33888019]

  m_LocalRotation: {x: 0.22914574, y: -0.070709094, z: 0.016692149, w: 0.970677}

Insertion in Assets/Scenes/SampleScene.unity at line 3517 [10.780110080]

[3.33902509]

[11.17833]

  _slashDown: GreatSwordSlashDown
  _slashSpin: GreatSwordSlashSpin
  _hiltBash: GreatSwordHiltBash

Replacement in Assets/Scenes/SampleScene.unity at line 4424 [10.780110080]

B:BD[10.780162310] → [2.13325:13406]

  m_LocalRotation: {x: 0.22914574, y: -0.070709124, z: 0.016692158, w: 0.970677}

[10.780162310]

[3.33918016]

  m_LocalRotation: {x: 0.22914574, y: -0.070709094, z: 0.016692149, w: 0.970677}

Insertion in Assets/Scenes/SampleScene.unity at line 5330 [10.780110080]

[9.14771]

      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1016026731590471352, guid: c019ba8566ee76c469b4eb0195d5458f,
        type: 3}
      propertyPath: m_AnchoredPosition.y

Insertion in Assets/Scenes/SampleScene.unity at line 5480 [10.780110080]

[12.206201]

[12.206386]

      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7745832478553142370, guid: c019ba8566ee76c469b4eb0195d5458f,
        type: 3}
      propertyPath: m_AnchorMin.y

Insertion in Assets/Scenes/SampleScene.unity at line 5502 [10.780110080]

[12.207190]

[12.207371]

    - target: {fileID: 8527490558266320249, guid: c019ba8566ee76c469b4eb0195d5458f,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 0.000061035156
      objectReference: {fileID: 0}

Insertion in Assets/AnimationControllers/GreatSword.controller at line 81 [2.243]

[2.2352]

  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-4139713767341009278
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordSlashSpin
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
  m_Motion: {fileID: -203655887218126122, guid: 607982dd9a782134cb778aedcac4158c,
    type: 3}
  m_Tag: 
  m_SpeedParameter: Speed
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-3526797389270466627
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordSlashDown
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
  m_Motion: {fileID: -203655887218126122, guid: 65666cb3536e4104eb3fa24279641971,
    type: 3}
  m_Tag: 
  m_SpeedParameter: Speed

Replacement in Assets/AnimationControllers/GreatSword.controller at line 174 [2.243]
B:BD[2.3366] → [2.3366:3389]
```
  - m_Name: SlashSpeed
```
[2.3366]
[2.3389]
```
  - m_Name: Speed
```

Replacement in Assets/AnimationControllers/GreatSword.controller at line 216 [2.243]

B:BD[2.4449] → [2.4449:4480]

  m_SpeedParameter: SlashSpeed

[2.4449]

[2.4480]

  m_SpeedParameter: Speed
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &2617321622862822054
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordHiltBash
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
  m_SpeedParameterActive: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
  m_Motion: {fileID: -203655887218126122, guid: 1bf55e603d8fc484899d18d8a280ef62,
    type: 3}
  m_Tag: 
  m_SpeedParameter: Speed

Replacement in Assets/AnimationControllers/GreatSword.controller at line 338 [2.243]
B:BD[2.6911] → [2.6911:6950]
```
    m_Position: {x: 500, y: 200, z: 0}
```
[2.6911]
[2.6950]
```
    m_Position: {x: 20, y: 360, z: 0}
```

Insertion in Assets/AnimationControllers/GreatSword.controller at line 360 [2.243]

[2.7699]

  - serializedVersion: 1
    m_State: {fileID: -4139713767341009278}
    m_Position: {x: 500, y: 100, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 2617321622862822054}
    m_Position: {x: 500, y: 140, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -3526797389270466627}
    m_Position: {x: 500, y: 180, z: 0}

Added some more moves to sword

Dependencies

In channels

Change contents

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 11 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 147 [3.535]

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 167 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 169 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 178 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 183 [3.535]

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

Deletion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 11 [4.292]

Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 14 [4.292]

Deletion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 26 [4.292]

Deletion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 42 [4.292]

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 58 [4.292]

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

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

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