itai.sharim/TagFight - Change 6BA5NHNF3UWSL65KCWSXLRTPGYVS4N4NORDJ4FZTZ5SRRDPI4YZAC

Actions now return immutable states

Created by itai.sharim on September 7, 2022

6BA5NHNF3UWSL65KCWSXLRTPGYVS4N4NORDJ4FZTZ5SRRDPI4YZAC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/UnitHandling/Weaver.cs at line 48 [5.529]

B:BD[4.28730] → [4.28730:28768]

            if (!action.Advance()) {

[4.28730]

[4.28768]

            IActionState actionState = action.Advance();
            if (!actionState.IsAdvanced) {

Insertion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 15 [5.9309]
[5.9634]
[5.9634]
```
    static State resetState = new(false, 0f);
```

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 28 [5.9309]

B:BD[5.10010] → [5.10010:10112]

    public bool Advance() {
        bool isAdvanced;
        isAdvanced = _followAction.Advance();

[5.10010]

[5.10112]

    public IActionState Advance() {
        bool isAdvanced = _followAction.Advance().IsAdvanced;

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 44 [5.9309]
B:BD[5.10595] → [5.10595:10623]
```
        return isAdvanced;
```
[5.10595]
[5.10623]
```
        return new State(isAdvanced, CompletionStatus());
```

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 47 [5.9309]

B:BD[5.10632] → [5.10632:10726]

    public bool Cancel() {
        bool success;
        success = _followAction.Cancel();

[5.10632]

[4.30386]

    public IActionState Cancel() {
        _followAction.Cancel();

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 51 [5.9309]
B:BD[5.10759] → [5.10759:10784]
```
        return success;
```
[5.10759]
[5.10784]
```
        return resetState;
```

Insertion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 58 [5.9309]

[4.30623]

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

Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 14 [2.292]
[2.624]
[2.624]
```
    static State resetState = new(false, 0f);
```
Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 46 [2.292]
B:BD[2.1238] → [2.1238:1267]
```
    public bool Advance() {
```
[2.1238]
[2.1267]
```
    public IActionState Advance() {
```

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 54 [2.292]

B:BD[2.1511] → [2.1511:1601]

        return _agent.pathPending || _agent.remainingDistance > _agent.stoppingDistance;

[2.1511]

[2.1601]

        bool isAdvanced = _agent.pathPending || _agent.remainingDistance > _agent.stoppingDistance;
        return new State(isAdvanced, CompletionStatus());

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 58 [2.292]
B:BD[2.1610] → [2.1610:1638]
```
    public bool Cancel() {
```
[2.1610]
[2.1638]
```
    public IActionState Cancel() {
```
Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 63 [2.292]
B:BD[2.1765] → [2.1765:1787]
```
        return true;
```
[2.1765]
[2.1787]
```
        return resetState;
```

Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 71 [2.292]

[2.1952]

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

Replacement in Assets/Scripts/UnitHandling/Actions/IAction.cs at line 7 [5.11121]
B:BD[5.11244] → [5.11244:11272]
```
    public bool Advance();
```
[5.11244]
[5.11272]
```
    public IActionState Advance();
```
Replacement in Assets/Scripts/UnitHandling/Actions/IAction.cs at line 9 [5.11121]
B:BD[5.11300] → [5.11300:11327]
```
    public bool Cancel();
```
[5.11300]
[4.30633]
```
    public IActionState Cancel();
```

Insertion in Assets/Scripts/UnitHandling/Actions/IAction.cs at line 13 [5.11121]

[5.11330]


public interface IActionState
{
    public bool IsAdvanced { get; }
    public float CompletionStatus { get; }
}

Insertion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 15 [5.11658]
[2.2584]
[5.11943]
```
    static State resetState = new(false, 0f);
```
Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 35 [5.11658]
B:BD[5.12746] → [5.12746:12775]
```
    public bool Advance() {
```
[5.12746]
[2.2640]
```
    public IActionState Advance() {
```

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 50 [5.11658]

B:BD[5.12954] → [5.12954:13044]

        return _agent.pathPending || _agent.remainingDistance > _agent.stoppingDistance;

[5.12954]

[5.13044]

        bool isAdvanced = _agent.pathPending || _agent.remainingDistance > _agent.stoppingDistance;
        float completionStatus = CompletionStatus();
        return new State(isAdvanced, completionStatus);

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 55 [5.11658]
B:BD[5.13053] → [5.13053:13081]
```
    public bool Cancel() {
```
[5.13053]
[5.13081]
```
    public IActionState Cancel() {
```
Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 60 [5.11658]
B:BD[5.13208] → [5.13208:13230]
```
        return true;
```
[5.13208]
[4.30676]
```
        return resetState;
```

Insertion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 69 [5.11658]

[4.30834]

[5.13237]

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

Replacement in Assets/Scripts/Combat/Tags/TagUIController.cs at line 42 [6.20178]

B:BD[6.21257] → [5.86774:86856]

        // Debug.Log($"Setting {tagSlot.color.ToString()} to {tagSlot.amount}");

[6.21257]

[6.21336]

        Debug.Log($"Setting {tagSlot.color.ToString()} to {tagSlot.amount}");

Replacement in Assets/Scripts/Combat/Tags/TagUIController.cs at line 46 [6.20178]

B:BD[3.10511] → [3.10511:10738]

        // tag.fillAmount = tagSlot.amount / TagCounter.MaxAmount;
        tag.fillAmount = 1;
        var tempColor = tag.color;
        tempColor.a = tagSlot.amount / TagCounter.MaxAmount;
        tag.color = tempColor;

[3.10511]

[6.21806]

        tag.fillAmount = tagSlot.amount / TagCounter.MaxAmount;
        // tag.fillAmount = 1;
        // var tempColor = tag.color;
        // tempColor.a = tagSlot.amount / TagCounter.MaxAmount;
        // tag.color = tempColor;

Replacement in Assets/Scenes/SampleScene.unity at line 2511 [7.780110080]
B:BD[3.11738] → [3.11738:11792]
```
  m_Color: {r: 1, g: 0.28627452, b: 0.28627452, a: 1}
```
[3.11738]
[3.11792]
```
  m_Color: {r: 1, g: 1, b: 1, a: 0.19215687}
```

Insertion in Assets/Prefabs/PartyMember.prefab at line 262 [7.783567805]

[8.71258]

      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3256331014992949503, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3256331014992949503, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchorMin.y

Insertion in Assets/Prefabs/PartyMember.prefab at line 274 [7.783567805]

[8.71676]

[9.18800]

    - target: {fileID: 3256331014992949503, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3256331014992949503, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_SizeDelta.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3256331014992949503, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3256331014992949503, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}

Insertion in Assets/Prefabs/PartyMember.prefab at line 329 [7.783567805]

[9.19495]

[10.24448]

    - target: {fileID: 8485390993021493102, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8485390993021493102, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchorMin.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8485390993021493102, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8485390993021493102, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_SizeDelta.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8485390993021493102, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8485390993021493102, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}

Insertion in Assets/Prefabs/PartyMember.prefab at line 389 [7.783567805]

[10.25572]

    - target: {fileID: 9057831269798601643, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 9057831269798601643, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchorMin.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 9057831269798601643, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 9057831269798601643, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_SizeDelta.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 9057831269798601643, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 9057831269798601643, guid: f66c1753496bea64fb3cc777a3883d2e,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}

Actions now return immutable states

Dependencies

In channels

Change contents

Replacement in Assets/Scripts/UnitHandling/Weaver.cs at line 48 [5.529]

Insertion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 15 [5.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 28 [5.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 44 [5.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 47 [5.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 51 [5.9309]

Insertion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 58 [5.9309]

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

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 46 [2.292]

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 54 [2.292]

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

Replacement in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 63 [2.292]

Insertion in Assets/Scripts/UnitHandling/Actions/MoveToAction.cs at line 71 [2.292]

Replacement in Assets/Scripts/UnitHandling/Actions/IAction.cs at line 7 [5.11121]

Replacement in Assets/Scripts/UnitHandling/Actions/IAction.cs at line 9 [5.11121]

Insertion in Assets/Scripts/UnitHandling/Actions/IAction.cs at line 13 [5.11121]

Insertion in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 15 [5.11658]

Replacement in Assets/Scripts/UnitHandling/Actions/FollowAction.cs at line 35 [5.11658]