itai.sharim/TagFight - Change 4PLSNSVW4VOQW5ZXXZGUWB56WI33SXTGWOCD7PNE36OWDGD7NRJAC

Add sequences to save. Allow Loading of weaves. Change weave screen toggle to ctrl+r. disable many player action when weave screen is shown

Created by itai.sharim on August 30, 2022

4PLSNSVW4VOQW5ZXXZGUWB56WI33SXTGWOCD7PNE36OWDGD7NRJAC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/UnitController.cs at line 46 [4.294]

B:BD[4.1237] → [4.1237:1298]

            selectedAgent.destination = unitMoveArgs.point;

[4.1237]

[4.1298]

            selectedAgent.destination = unitMoveArgs.Point;

Replacement in Assets/Scripts/UnitController.cs at line 51 [4.294]

B:BD[5.19337] → [5.19337:19393]

        selectedUnit = unitSelectedArgs.unitTransform;

[5.19337]

[5.19393]

        selectedUnit = unitSelectedArgs.UnitTransform;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 174 [6.294]

B:BD[3.4037] → [3.4037:4089]

        // weaveToLoad.runeWeaving.martialSequence

[3.4037]

[3.4089]

        foreach (var combatMove in weaveToLoad.runeWeaving.martialSequence.GetSequence()) {
            AddMoveToSequence(combatMove);
        }
        foreach (var rune in weaveToLoad.runeWeaving.runeBindingSequence.GetSequence()) {
            AddRuneToSequence(rune);
        }
        UpdateScrollLayoutGroup();

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 3 [3.1674]
[3.1737]
[3.1737]
```
using TMPro;
```
Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 5 [3.1674]
[3.1757]
[3.1757]
```
using UnityEngine.EventSystems;
```
Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 7 [3.1674]
B:BD[3.1759] → [3.1759:1806]
```
public class WeaveLoadClicker : MonoBehaviour
```
[3.1759]
[3.1806]
```
public class WeaveLoadClicker : MonoBehaviour, IPointerClickHandler
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 9 [3.1674]

B:BD[3.1809] → [3.1809:1898]

    // Start is called before the first frame update
    void Start()
    {

[3.1809]

[3.1898]

    public WeaveNavigator weaveNavigator;
    public RuneWeavingBank runeWeavingBank;
    public TMP_Dropdown weavePicker;
    public void OnPointerClick(PointerEventData eventData) {
        switch (eventData.button) {
            case PointerEventData.InputButton.Left:
                HandleLoadWeave();
                break;
            case PointerEventData.InputButton.Right:
                break;
        }

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 23 [3.1674]

B:BD[3.1907] → [3.1907:1983]

    // Update is called once per frame
    void Update()
    {

[3.1907]

[3.1983]

    void HandleLoadWeave() {
        if (ValidWeaveName.TryParse(weavePicker.options[weavePicker.value].text, out ValidWeaveName validWeaveName)) {
            if (runeWeavingBank.TryGetWeaveByName(validWeaveName, out RuneWeavingContainer runeWeavingContainer)) {
                weaveNavigator.Reload(runeWeavingContainer);
            }
        }

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveBuilderScreenToggle.cs at line 10 [7.12185]
B:BD[7.12424] → [7.12424:12448]
```
    public bool _show;
```
[7.12424]
[7.12448]
```
    bool _show = false;
```
Deletion in Assets/Scripts/UI/WeaveBuilder/WeaveBuilderScreenToggle.cs at line 21 [7.12185]
B:BD[7.12841] → [8.262:312]
```
        // StartCoroutine(SetVisibility(_show));
```

Replacement in Assets/Scripts/UI/HUD/WeaponView.cs at line 25 [7.24775]

B:BD[7.25579] → [9.17739:17898]

        if ((unitSelectedArgs.unitTransform.GetComponent<PartyMember>() != null) && unitSelectedArgs.unitTransform.TryGetComponent<Weaver>(out var weaver)) {

[7.25579]

[7.25740]

        if ((unitSelectedArgs.UnitTransform.GetComponent<PartyMember>() != null) && unitSelectedArgs.UnitTransform.TryGetComponent<Weaver>(out var weaver)) {

Replacement in Assets/Scripts/UI/HUD/PartyView.cs at line 35 [7.29456]

B:BD[7.30784] → [7.30784:30877]

        if (unitSelectedArgs.unitTransform.TryGetComponent<PartyMember>(out partyMember)) {

[7.30784]

[7.30877]

        if (unitSelectedArgs.UnitTransform.TryGetComponent<PartyMember>(out partyMember)) {

Replacement in Assets/Scripts/UI/HUD/CombatFormView.cs at line 36 [7.33574]

B:BD[7.34692] → [7.34692:34853]

        if ((unitSelectedArgs.unitTransform.GetComponent<PartyMember>() != null) && (unitSelectedArgs.unitTransform.TryGetComponent<Weaver>(out var weaver))) {

[7.34692]

[7.34853]

        if ((unitSelectedArgs.UnitTransform.GetComponent<PartyMember>() != null) && (unitSelectedArgs.UnitTransform.TryGetComponent<Weaver>(out var weaver))) {

Replacement in Assets/Scripts/SelectionIndicator.cs at line 29 [10.298]
B:BD[10.1102] → [2.378:426]
```
        SetSelectedTransform(e.unitTransform);
```
[10.1102]
[2.426]
```
        SetSelectedTransform(e.UnitTransform);
```
Replacement in Assets/Scripts/PlayerKeyActions.cs at line 8 [11.780106155]
∅:D[5.19673] → [4.3465:3508]
B:BD[4.3465] → [4.3465:3508]
```
    public Transform unitTransform {get;}
```
[5.19673]
[5.19674]
```
    public Transform UnitTransform {get;}
```
Replacement in Assets/Scripts/PlayerKeyActions.cs at line 10 [11.780106155]
∅:D[5.19728] → [4.3564:3609]
B:BD[4.3564] → [4.3564:3609]
```
        this.unitTransform = unitTransform;
```
[5.19728]
[4.3609]
```
        UnitTransform = unitTransform;
```
Replacement in Assets/Scripts/PlayerKeyActions.cs at line 15 [11.780106155]
B:BD[4.3661] → [4.3661:3694]
```
    public Vector3 point {get;}
```
[4.3661]
[4.3694]
```
    public Vector3 Point {get;}
```
Replacement in Assets/Scripts/PlayerKeyActions.cs at line 17 [11.780106155]
B:BD[4.3736] → [4.3736:3765]
```
        this.point = point;
```
[4.3736]
[4.3765]
```
        Point = point;
```
Insertion in Assets/Scripts/PlayerKeyActions.cs at line 30 [11.780106155]
[4.3914]
[11.780106493]
```
    bool _anyGameWorldHidden = false;
```

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 35 [11.780106155]

B:BD[11.780106523] → [12.412:443]

∅:D[12.443] → [11.780106523:780106589]

B:BD[11.780106523] → [11.780106523:780106589]

B:BD[11.780106589] → [5.19857:19887]

        HandleTimeDilation();
        HandleCameraMovement();
        HandleCameraRotation();
        HandleUnitActions();

[11.780106523]

[7.186829]

        if (_anyGameWorldHidden == false) {
            HandleTimeDilation();
            HandleCameraMovement();
            HandleCameraRotation();
            HandleUnitActions();
        }

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 48 [11.780106155]

B:BD[7.186973] → [7.186973:187059]

            eventAggregator.InvokeOnToggleWeaveBuilderScreen(this, EventArgs.Empty);

[7.186973]

[7.187059]

            if (Input.GetKey(KeyCode.LeftControl)) {
                eventAggregator.InvokeOnToggleWeaveBuilderScreen(this, EventArgs.Empty);
                _anyGameWorldHidden = !_anyGameWorldHidden;
            }

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 24 [13.1301]

[3.4817]

        }
        return found;
    }
    public bool TryGetWeaveByName(ValidWeaveName weaveName, out RuneWeavingContainer runeWeavingContainer) {
        bool found = false;
        int weaveIndex = runeWeavings.FindIndex(weave => weave.weaveName == weaveName);
        found = weaveIndex != -1;
        if (found == true) {
            runeWeavingContainer = runeWeavings[weaveIndex];
        } else {
            runeWeavingContainer = null;

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 1 [14.761]
[14.761]
[14.762]
```
using System;
```
Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 6 [14.761]
[14.846]
[14.846]
```
[Serializable]
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 12 [14.761]

B:BD[13.6395] → [13.6395:6483]

∅:D[13.6483] → [15.13158:13160]

B:BD[14.985] → [15.13158:13160]

    public RuneWeaving(IEnumerable<CombatMove> combatMoves, IEnumerable<Rune> runes) {

[13.6395]

[13.6484]

    public RuneWeaving(IEnumerable<CombatMove> combatMovesSequence, IEnumerable<Rune> runeSequence) {
        martialSequence = new(combatMovesSequence);
        runeBindingSequence = new(runeSequence);

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 4 [14.1601]
[14.1684]
[14.1684]
```
using System.Linq;
using System;
```
Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 7 [14.1601]
[14.1686]
[14.1686]
```
[Serializable]
```

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 19 [14.1601]

[15.13477]

    public RuneBindingSequence(IEnumerable<Rune> runeSequence) {
        runes = runeSequence.ToList();
    }

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 50 [14.1601]
[14.1829]
[14.1829]
```
    public IEnumerable<Rune> GetSequence() => runes;
```
Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 1 [14.2175]
[14.2175]
[14.2176]
```
using System;
```
Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 4 [14.2175]
[14.2238]
[14.2238]
```
using System.Linq;
```
Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 7 [14.2175]
[14.2260]
[14.2260]
```
[Serializable]
```
Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 10 [14.2175]
B:BD[14.2305] → [15.14213:14241]
```
    public void Reset() {}
```
[14.2305]
[15.14241]
```
    List<CombatMove> combatMoves;
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 12 [14.2175]

∅:D[15.14243] → [14.2305:2353]

B:BD[14.2305] → [14.2305:2353]

    public void Advance(float deltaTime) {

[15.14243]

[14.2353]

    public MartialSequence(IEnumerable<CombatMove> combatMovesSequence) {
        combatMoves = combatMovesSequence.ToList();
    }
    public void Reset() { }
    public void Advance(float deltaTime) {

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 22 [14.2175]
B:BD[14.2394] → [14.2394:2404]
```
        
```
[14.2394]
[14.2404]
Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 24 [14.2175]
[14.2411]
[14.2411]
```
    public IEnumerable<CombatMove> GetSequence() => combatMoves;
```
Replacement in Assets/Prefabs/TechBuilder.prefab at line 4593 [7.38950]
B:BD[6.26237] → [3.22261:22317]
```
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
```
[6.26237]
[6.26293]
```
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
```

Insertion in Assets/Prefabs/TechBuilder.prefab at line 6578 [7.38950]

[3.34346]

  weaveNavigator: {fileID: 3324304565325699897}
  runeWeavingBank: {fileID: 11400000, guid: 067c599629dfba343a27c65dbc02140a, type: 2}
  weavePicker: {fileID: 8728948813704816496}

Replacement in Assets/Prefabs/TechBuilder.prefab at line 7909 [7.38950]

B:BD[6.58081] → [3.42514:42605]

  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}

[6.58081]

[6.58174]

  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
  m_AnchoredPosition: {x: 0, y: -60}

Replacement in Assets/Prefabs/TechBuilder.prefab at line 8733 [7.38950]

B:BD[6.62528] → [3.50917:51008]

  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}

[6.62528]

[6.62622]

  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
  m_AnchoredPosition: {x: 0, y: -170}

Add sequences to save. Allow Loading of weaves. Change weave screen toggle to ctrl+r. disable many player action when weave screen is shown

Dependencies

In channels

Change contents

Replacement in Assets/Scripts/UnitController.cs at line 46 [4.294]

Replacement in Assets/Scripts/UnitController.cs at line 51 [4.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 174 [6.294]

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 3 [3.1674]

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 5 [3.1674]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 7 [3.1674]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 9 [3.1674]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveLoadClicker.cs at line 23 [3.1674]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveBuilderScreenToggle.cs at line 10 [7.12185]

Deletion in Assets/Scripts/UI/WeaveBuilder/WeaveBuilderScreenToggle.cs at line 21 [7.12185]

Replacement in Assets/Scripts/UI/HUD/WeaponView.cs at line 25 [7.24775]

Replacement in Assets/Scripts/UI/HUD/PartyView.cs at line 35 [7.29456]

Replacement in Assets/Scripts/UI/HUD/CombatFormView.cs at line 36 [7.33574]

Replacement in Assets/Scripts/SelectionIndicator.cs at line 29 [10.298]

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 8 [11.780106155]

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 10 [11.780106155]

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 15 [11.780106155]

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 17 [11.780106155]

Insertion in Assets/Scripts/PlayerKeyActions.cs at line 30 [11.780106155]

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 35 [11.780106155]

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 48 [11.780106155]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 24 [13.1301]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 1 [14.761]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 6 [14.761]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 12 [14.761]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 4 [14.1601]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 7 [14.1601]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 19 [14.1601]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 50 [14.1601]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 1 [14.2175]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 4 [14.2175]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 7 [14.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 10 [14.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 12 [14.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 22 [14.2175]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 24 [14.2175]

Replacement in Assets/Prefabs/TechBuilder.prefab at line 4593 [7.38950]

Insertion in Assets/Prefabs/TechBuilder.prefab at line 6578 [7.38950]

Replacement in Assets/Prefabs/TechBuilder.prefab at line 7909 [7.38950]

Replacement in Assets/Prefabs/TechBuilder.prefab at line 8733 [7.38950]