itai.sharim/TagFight - Change EF6FXKYIVJCURLSC2CLS27FCTECIIIU2EEPI352ZTCIKYKW5VOBQC

Use Ref objects in weave

Created by itai.sharim on October 16, 2022

EF6FXKYIVJCURLSC2CLS27FCTECIIIU2EEPI352ZTCIKYKW5VOBQC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/UnitHandling/Weaver.cs at line 143 [7.529]

B:BD[6.28240357] → [6.28240357:28240624]

        var weaponMoveSet = _equippedWeapon.GetCombatMoveSet().CombatMoves();
        var weaveMoveSet = weave.martialSequence.GetSequence();
        return weaveMoveSet.All(weaveMove => weaponMoveSet.Any(weaponMove => weaveMove.moveName == weaponMove.moveName));

[6.28240357]

[7.4607]

        var weaponMoveSet = _equippedWeapon.GetCombatMoveSetRef().combatMoveSet.CombatMoves();
        var weaveMoveSet = weave.martialSequence.GetSequence().Select(moveRef => moveRef.combatMove);
        return weaveMoveSet.All(weaveMove => weaponMoveSet.Any(weaponMove => weaveMove.moveName == weaponMove.combatMove.moveName));

Replacement in Assets/Scripts/UnitHandling/Weaver.cs at line 151 [7.529]

B:BD[7.4817] → [7.4817:5004]

    public IEnumerable<CombatForm> GetAvailableCombatFormsForEquipedWeapon() => _knownForms.Select(combatFormRef => combatFormRef.Value).Intersect(_equippedWeapon.GetCompatibleForms());

[7.4817]

[8.30079]

    public IEnumerable<CombatFormRef> GetAvailableCombatFormsForEquipedWeapon() => _knownForms.Select(combatFormRef => combatFormRef).Intersect(_equippedWeapon.GetCompatibleFormRefs());

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 48 [7.9309]
∅:D[8.30429] → [7.10757:10759]
B:BD[7.10757] → [7.10757:10759]
[8.30429]
[9.623]
```
        
```
Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 53 [10.294]
B:BD[10.1995] → [7.41666:41717]
```
        void AddMoveToSequence(CombatMove move) {
```
[10.1995]
[7.41717]
```
        void AddMoveToSequence(CombatMoveRef moveRef) {
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 59 [10.294]

B:BD[7.42043] → [7.42043:42098]

            martialSequenceClicker.CombatMove = move;

[7.42043]

[7.42098]

            martialSequenceClicker.CombatMoveRef = moveRef;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 61 [10.294]
B:BD[7.42157] → [7.42157:42206]
```
            _martialSequenceTime += move.speed;
```
[7.42157]
[10.2635]
```
            _martialSequenceTime += moveRef.combatMove.speed;
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 63 [10.294]

B:BD[10.2637] → [11.12570:12636]

∅:D[11.12636] → [7.42207:42252]

B:BD[10.2637] → [7.42207:42252]

            combatMoveNodeNodeTransform.sizeDelta *= move.speed;
            nameLabel.text = move.moveName;

[10.2637]

[7.42252]

            combatMoveNodeNodeTransform.sizeDelta *= moveRef.combatMove.speed;
            nameLabel.text = moveRef.combatMove.moveName;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 72 [10.294]

B:BD[7.42512] → [7.42512:42590]

            _martialSequenceTime -= martialSequenceClicker.CombatMove.speed;

[7.42512]

[10.2944]

            _martialSequenceTime -= martialSequenceClicker.CombatMoveRef.combatMove.speed;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 82 [10.294]
B:BD[10.3419] → [7.42827:42872]
```
        void AddRuneToSequence(Rune rune) {
```
[10.3419]
[7.42872]
```
        void AddRuneToSequence(RuneRef runeRef) {
```
Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 88 [10.294]
B:BD[10.3500] → [7.43321:43374]
```
            runeBindingSequenceClicker.Rune = rune;
```
[10.3500]
[7.43374]
```
            runeBindingSequenceClicker.RuneRef = runeRef;
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 90 [10.294]

B:BD[7.43441] → [7.43441:43494]

            _runeBindingSequenceTime += rune.speed;

[7.43441]

[10.3973]

            _runeBindingSequenceTime += runeRef.rune.speed;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 92 [10.294]

B:BD[10.3975] → [7.43495:43599]

            runeBindingNodeTransform.sizeDelta *= rune.speed;
            nameLabel.text = rune.name;

[10.3975]

[7.43599]

            runeBindingNodeTransform.sizeDelta *= runeRef.rune.speed;
            nameLabel.text = runeRef.name;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 99 [10.294]

B:BD[7.43831] → [7.43831:43911]

            _runeBindingSequenceTime -= runeBindingSequenceClicker.Rune.speed;

[7.43831]

[10.4316]

            _runeBindingSequenceTime -= runeBindingSequenceClicker.RuneRef.rune.speed;

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 111 [10.294]

B:BD[7.44276] → [7.44276:44409]

                (_runeBindingSequenceTime <= _martialSequenceTime - _martialSequence[positionInSequence].CombatMove.speed + 0.01f);

[7.44276]

[10.4803]

                (_runeBindingSequenceTime <= _martialSequenceTime - _martialSequence[positionInSequence].CombatMoveRef.combatMove.speed + 0.01f);

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 127 [10.294]
B:BD[10.5491] → [7.44885:44936]
```
        public bool TryAddMove(CombatMove move) {
```
[10.5491]
[7.44936]
```
        public bool TryAddMove(CombatMoveRef moveRef) {
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 129 [10.294]

B:BD[7.44983] → [7.44983:45062]

            if (CanAddMove(move)) {
                AddMoveToSequence(move);

[7.44983]

[7.45062]

            if (CanAddMove(moveRef)) {
                AddMoveToSequence(moveRef);

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 156 [10.294]
B:BD[7.45995] → [7.45995:46040]
```
        public bool TryAddRune(Rune rune) {
```
[7.45995]
[7.46040]
```
        public bool TryAddRune(RuneRef runeRef) {
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 158 [10.294]

B:BD[7.46087] → [7.46087:46166]

            if (CanAddRune(rune)) {
                AddRuneToSequence(rune);

[7.46087]

[7.46166]

            if (CanAddRune(runeRef)) {
                AddRuneToSequence(runeRef);

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 189 [10.294]

B:BD[7.47090] → [7.47090:47182]

B:BD[7.47182] → [4.253:356]

            return new RuneWeaving(_martialSequence.Select(clicker => clicker.CombatMove),
                                   _runeBindingSequence.Select(clicker => clicker.Rune), null, null);

[7.47090]

[12.633]

            return new RuneWeaving(_martialSequence.Select(clicker => clicker.CombatMoveRef),
                                   _runeBindingSequence.Select(clicker => clicker.RuneRef), null, null);

Replacement in Assets/Scripts/UI/WeaveBuilder/RuneBindingSequenceClicker.cs at line 9 [10.7094]
B:BD[7.53320] → [7.53320:53360]
```
        public Rune Rune { get; set; }
```
[7.53320]
[10.7348]
```
        public RuneRef RuneRef { get; set; }
```

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 25 [13.19447]

B:BD[7.56668] → [7.56668:56764]

            CombatMoveSet formedMoveSet = combatForm.FormedMoveSet(weapon.GetCombatMoveSet());

[7.56668]

[7.56764]

            CombatMoveSet formedMoveSet = combatForm.FormedMoveSet(weapon.GetCombatMoveSetRef());

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 30 [13.19447]

B:BD[7.57071] → [7.57071:57128]

                    moveNameLabel.text = move.moveName;

[7.57071]

[7.57128]

                    moveNameLabel.text = move.combatMove.moveName;

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 32 [13.19447]

B:BD[7.57147] → [7.57147:57292]

                if (movePickUIObject.TryGetComponent<MoveClicker>(out MoveClicker moveClicker)) {
                    moveClicker.Move = move;

[7.57147]

[7.57292]

                if (movePickUIObject.TryGetComponent(out MoveClicker moveClicker)) {
                    moveClicker.MoveRef = move;

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 54 [13.19447]

B:BD[13.20922] → [7.57916:57992]

            if (moveClicker.TryGetComponent<Image>(out currentSelected)) {

[13.20922]

[7.57992]

            if (moveClicker.TryGetComponent(out currentSelected)) {

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 60 [13.19447]

B:BD[7.58130] → [7.58130:58188]

            WeaveNavigator.TryAddMove(moveClicker.Move);

[7.58130]

[13.21205]

            WeaveNavigator.TryAddMove(moveClicker.MoveRef);

Replacement in Assets/Scripts/UI/WeaveBuilder/MoveClicker.cs at line 12 [13.21556]
B:BD[13.21846] → [7.58384:58430]
```
        public CombatMove Move { get; set; }
```
[13.21846]
[7.58430]
```
        public CombatMoveRef MoveRef { get; set; }
```
Replacement in Assets/Scripts/UI/WeaveBuilder/MartialSequenceClicker.cs at line 9 [10.8150]
B:BD[7.59206] → [7.59206:59258]
```
        public CombatMove CombatMove { get; set; }
```
[7.59206]
[10.8400]
```
        public CombatMoveRef CombatMoveRef { get; set; }
```

Replacement in Assets/Scripts/UI/WeaveBuilder/CombatFormPicker.cs at line 25 [13.22615]

B:BD[7.60450] → [7.60450:60599]

                _selectedWeapon.GetCompatibleForms()
                .Intersect(availableCombatForms.Select(combatFormRef => combatFormRef.Value))

[7.60450]

[7.60599]

                _selectedWeapon.GetCompatibleFormRefs().Select(combatFormRef => combatFormRef.combatForm)
                .Intersect(availableCombatForms.Select(combatFormRef => combatFormRef.combatForm))

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 2 [14.1301]
B:BD[14.1317] → [14.1317:1344]
```
using System.Collections;
```
Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 3 [14.1301]
B:BD[14.1379] → [8.32707:32817]
```
using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
```
[14.1379]
[14.1379]
```
using System.Linq;
```
Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 5 [14.1301]
[14.1399]
[14.1399]
```
using UnityEditor;
```
Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 11 [14.1301]
B:BD[14.1584] → [15.18173:18227]
```
    List<RuneWeavingContainer> runeWeavings = new();
```
[14.1584]
[14.1759]
```
    public List<RuneWeavingContainer> runeWeavings = new();
```

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 27 [14.1301]

B:BD[12.2790] → [12.2790:2799]

B:BD[12.2799] → [5.1467:1665]

    }
    protected void OnEnable() {
        foreach (RuneWeavingContainer runeWeaving in runeWeavings) {
            runeWeaving.runeWeaving.runeBindingSequence.PopulateRunes();
        }

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 43 [14.1301]
B:BD[15.18618] → [15.18618:18620]
Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 58 [14.1301]
[16.4984]
[16.4984]
```
    public void OnAfterDeserialize() {
            
    }
```
Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 67 [14.1301]
∅:D[8.33134] → [16.5037:5060]
B:BD[16.5037] → [16.5037:5060]
```
    string weaveName;
```
[8.33134]
[16.5060]
```
    [SerializeField] string weaveName;
```

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

B:BD[14.6395] → [4.1806:1945]

    public RuneWeaving(IEnumerable<CombatMove> combatMovesSequence, IEnumerable<Rune> runeSequence, Transform caster, Transform target) {

[14.6395]

[12.3353]

    public RuneWeaving(IEnumerable<CombatMoveRef> combatMovesSequence, IEnumerable<RuneRef> runeSequence, Transform caster, Transform target) {

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 11 [17.1601]
B:BD[18.13347] → [18.13347:13370]
```
    List<Rune> runes;
```
[18.13347]
[18.13370]
```
    [SerializeField] List<RuneRef> runeRefs;
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 19 [17.1601]

B:BD[18.13477] → [4.2015:2117]

∅:D[19.1751] → [12.3578:3618]

∅:D[4.2117] → [12.3578:3618]

B:BD[12.3578] → [12.3578:3618]

    public RuneBindingSequence(IEnumerable<Rune> runeSequence, Transform caster, Transform target) {
        runes = runeSequence.ToList();

[18.13477]

[4.2118]

    public RuneBindingSequence(IEnumerable<RuneRef> runeSequence, Transform caster, Transform target) {
        runeRefs = runeSequence.ToList();

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 37 [17.1601]
∅:D[20.3006] → [18.13801:13847]
B:BD[17.1779] → [18.13801:13847]
```
        if (currentRuneIdx >= runes.Count) {
```
[20.3006]
[20.3101]
```
        if (currentRuneIdx >= runeRefs.Count) {
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 42 [17.1601]

B:BD[18.13915] → [2.341:455]

∅:D[2.455] → [7.86474:86605]

B:BD[20.3242] → [7.86474:86605]

∅:D[7.86605] → [20.3369:3477]

B:BD[20.3369] → [20.3369:3477]

        while ((currentRuneIdx < runes.Count) && (currentTime - lastRuneTime >= runes[currentRuneIdx].speed))  {
            Debug.Log($"Finished executing {runes[currentRuneIdx].name} - {currentRuneIdx + 1}/{runes.Count} at {currentTime} ");
            runes[currentRuneIdx].Cast(context);
            lastRuneTime += runes[currentRuneIdx].speed;

[18.13915]

[18.14118]

        while ((currentRuneIdx < runeRefs.Count) && (currentTime - lastRuneTime >= runeRefs[currentRuneIdx].rune.speed))  {
            Debug.Log($"Finished executing {runeRefs[currentRuneIdx].name} - {currentRuneIdx + 1}/{runeRefs.Count} at {currentTime} ");
            runeRefs[currentRuneIdx].rune.Cast(context);
            lastRuneTime += runeRefs[currentRuneIdx].rune.speed;

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 55 [17.1601]
B:BD[12.3628] → [12.3628:3682]
```
    public IEnumerable<Rune> GetSequence() => runes;
```
[12.3628]
[8.33346]
```
    public IEnumerable<RuneRef> GetSequence() => runeRefs;
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 57 [17.1601]

B:BD[8.33385] → [8.33385:33448]

        return currentTime / runes.Sum((rune) => rune.speed);

[8.33385]

[5.1679]

        return currentTime / runeRefs.Sum((runeRef) => runeRef.rune.speed);

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 59 [17.1601]
B:BD[5.1686] → [5.1686:1804]
∅:D[5.1804] → [8.33448:33455]
B:BD[8.33448] → [8.33448:33455]
```
    public void PopulateRunes() {
        foreach (Rune rune in runes) {
            rune.Populate();
        }
    }
```
Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 10 [17.2175]
B:BD[17.2305] → [12.3739:3774]
```
    List<CombatMove> combatMoves;
```
[17.2305]
[20.3503]
```
    [SerializeField] List<CombatMoveRef> combatMoveRefs;
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 15 [17.2175]

B:BD[18.14243] → [12.3775:3903]

    public MartialSequence(IEnumerable<CombatMove> combatMovesSequence) {
        combatMoves = combatMovesSequence.ToList();

[18.14243]

[12.3903]

    public MartialSequence(IEnumerable<CombatMoveRef> combatMoveRefsSequence) {
        combatMoveRefs = combatMoveRefsSequence.ToList();

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 25 [17.2175]

B:BD[20.3737] → [20.3737:3912]

        if (currentMoveIdx >= combatMoves.Count) {
            Debug.Log($"Executed Martial Sequence  {currentMoveIdx}/{combatMoves.Count} moves in {currentTime} seconds");

[20.3737]

[20.3912]

        if (currentMoveIdx >= combatMoveRefs.Count) {
            Debug.Log($"Executed Martial Sequence  {currentMoveIdx}/{combatMoveRefs.Count} moves in {currentTime} seconds");

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 31 [17.2175]

B:BD[20.3987] → [2.512:637]

∅:D[2.637] → [7.86608:86765]

B:BD[20.4110] → [7.86608:86765]

        while ((currentMoveIdx < combatMoves.Count) && (currentTime - lastMoveTime >= combatMoves[currentMoveIdx].speed)) {
            Debug.Log($"Finished executing Martial move {combatMoves[currentMoveIdx].moveName} {currentMoveIdx + 1}/{combatMoves.Count} at {currentTime}");

[20.3987]

[20.4258]

        while ((currentMoveIdx < combatMoveRefs.Count) && (currentTime - lastMoveTime >= combatMoveRefs[currentMoveIdx].combatMove.speed)) {
            Debug.Log($"Finished executing Martial move {combatMoveRefs[currentMoveIdx].combatMove.moveName} {currentMoveIdx + 1}/{combatMoveRefs.Count} at {currentTime}");

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 34 [17.2175]

B:BD[20.4301] → [2.638:702]

            lastMoveTime += combatMoves[currentMoveIdx].speed;

[20.4301]

[20.4364]

            lastMoveTime += combatMoveRefs[currentMoveIdx].combatMove.speed;

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 47 [17.2175]

B:BD[11.12919] → [11.12919:13019]

        if (currentMoveIdx < combatMoves.Count) {
            move = combatMoves[currentMoveIdx];

[11.12919]

[11.13019]

        if (currentMoveIdx < combatMoveRefs.Count) {
            move = combatMoveRefs[currentMoveIdx];

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 53 [17.2175]
B:BD[12.3991] → [12.3991:4057]
```
    public IEnumerable<CombatMove> GetSequence() => combatMoves;
```
[12.3991]
[8.33458]
```
    public IEnumerable<CombatMoveRef> GetSequence() => combatMoveRefs;
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 56 [17.2175]

B:BD[8.33499] → [8.33499:33568]

        return currentTime / combatMoves.Sum((move) => move.speed);

[8.33499]

[8.33568]

        return currentTime / combatMoveRefs.Sum((move) => move.combatMove.speed);

Replacement in Assets/Scripts/Combat/Weaving/Sequences/ISequence.cs at line 14 [17.2747]
∅:D[20.4475] → [17.2974:2977]
∅:D[8.33618] → [17.2974:2977]
B:BD[17.2974] → [17.2974:2977]
```
}
```
[8.33618]
```
}
```
Insertion in Assets/Scripts/Combat/Runes/Rune.cs at line 4 [18.3265]
[18.3383]
[18.3383]
```
using UnityEngine;
```
Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 8 [18.3265]
B:BD[18.3403] → [18.3403:3422]
```
public class Rune
```
[18.3403]
[18.3422]
```
public class Rune :  ISerializationCallbackReceiver
```
Insertion in Assets/Scripts/Combat/Runes/Rune.cs at line 38 [18.3265]
[18.4099]
[18.4099]
```
    }
    public void OnBeforeSerialize() {
```
Insertion in Assets/Scripts/Combat/Runes/Rune.cs at line 42 [18.3265]
[18.4106]
[18.4110]
```
    public void OnAfterDeserialize() {
        Populate();
    }
```
Deletion in Assets/Scripts/Combat/Martial/WeaponRef.cs at line 10 [22.5086]
∅:D[21.494] → [22.5439:5441]
B:BD[22.5439] → [22.5439:5441]
B:BD[22.5441] → [23.4631:4664]
∅:D[23.4664] → [22.5472:5553]
B:BD[22.5472] → [22.5472:5553]
```
    protected void OnEnable() {
        if (weapon != null) {
            weapon.Populate();
        }
    }
```
Deletion in Assets/Scripts/Combat/Martial/WeaponRef.cs at line 11 [22.5086]
B:BD[22.5555] → [23.4665:4699]
∅:D[23.4699] → [22.5587:5658]
B:BD[22.5587] → [22.5587:5658]
B:BD[22.5718] → [22.5718:5725]
```
    protected void OnDisable() {
        if (weapon != null) {
            weapon.Clear();
        }
    }
```
Deletion in Assets/Scripts/Combat/Martial/Weapon.cs at line 13 [17.3534]
B:BD[22.20414] → [22.20414:20449]
```
    CombatMoveSet _weaponMoveSet;
```
Deletion in Assets/Scripts/Combat/Martial/Weapon.cs at line 14 [17.3534]
B:BD[22.20514] → [23.4702:4756]
∅:D[21.626] → [22.20560:20613]
∅:D[23.4756] → [22.20560:20613]
B:BD[22.20560] → [22.20560:20613]
∅:D[24.302] → [17.3834:3836]
∅:D[22.20613] → [17.3834:3836]
B:BD[17.3834] → [17.3834:3836]
B:BD[17.3836] → [22.20614:20644]
B:BD[22.20644] → [21.627:645]
∅:D[21.645] → [22.20644:20764]
B:BD[22.20644] → [22.20644:20764]
B:BD[22.20764] → [21.646:760]
∅:D[21.760] → [22.20907:20925]
B:BD[22.20907] → [22.20907:20925]
```
    List<CombatForm> _compatibleCombatForms = new();
    public Weapon() {
        Populate();
    }
    public void Populate() {
        Clear();
        if ((compatibleCombatForms != null) && (weaponMoveSet != null)) {
            _weaponMoveSet = weaponMoveSet;
            _compatibleCombatForms.AddRange(compatibleCombatForms.Select(CombatFormRef => CombatFormRef.Value));
        }
    }
```

Replacement in Assets/Scripts/Combat/Martial/Weapon.cs at line 15 [17.3534]

B:BD[22.20927] → [22.20927:21133]

    public void Clear() {
        _weaponMoveSet = null;
        _compatibleCombatForms.Clear();
    }
    public IEnumerable<CombatForm> GetCompatibleForms() {
        return _compatibleCombatForms;

[22.20927]

[22.21133]

    public IEnumerable<CombatFormRef> GetCompatibleFormRefs() {
        return compatibleCombatForms;

Replacement in Assets/Scripts/Combat/Martial/Weapon.cs at line 19 [17.3534]

B:BD[13.187326] → [13.187326:187390]

    public CombatMoveSet GetCombatMoveSet() => _weaponMoveSet;

[13.187326]

[25.2670]

    public CombatMoveSetRef GetCombatMoveSetRef() => weaponMoveSet;

Deletion in Assets/Scripts/Combat/Martial/CombatMoveSetRef.cs at line 10 [22.6064]
B:BD[22.6456] → [22.6456:6458]
B:BD[22.6458] → [23.4759:4792]
∅:D[23.4792] → [22.6489:6584]
B:BD[22.6489] → [22.6489:6584]
```
    protected void OnEnable() {
        if (combatMoveSet != null) {
            combatMoveSet.Populate();
        }
    }
```
Deletion in Assets/Scripts/Combat/Martial/CombatMoveSetRef.cs at line 11 [22.6064]
B:BD[22.6586] → [23.4793:4827]
∅:D[23.4827] → [22.6618:6710]
B:BD[22.6618] → [22.6618:6710]
```
    protected void OnDisable() {
        if (combatMoveSet != null) {
            combatMoveSet.Clear();
        }
    }
```

Replacement in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 11 [17.4167]

B:BD[17.4386] → [22.21206:21261]

B:BD[22.21261] → [23.4830:4874]

    [SerializeField] List<CombatMoveRef> combatMoves;
    List<CombatMove> _combatMoves = new();

[17.4386]

[22.21297]

    [SerializeField] List<CombatMoveRef> combatMoves = new();

Replacement in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 13 [17.4167]

B:BD[22.21299] → [22.21299:21350]

    public CombatMoveSet() {
        Populate();

[22.21299]

[22.21350]

    public IEnumerable<CombatMoveRef> CombatMoves() {
        return combatMoves;

Deletion in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 16 [17.4167]
B:BD[22.21357] → [22.21357:21389]
B:BD[22.21389] → [21.848:866]
∅:D[21.866] → [22.21389:21425]
B:BD[22.21389] → [22.21389:21425]
B:BD[22.21425] → [21.867:961]
∅:D[21.961] → [22.21548:21566]
B:BD[22.21548] → [22.21548:21566]
∅:D[22.21566] → [17.4428:4430]
B:BD[17.4428] → [17.4428:4430]
B:BD[17.4430] → [22.21567:21721]
```
    public void Populate() {
        Clear();
        if (combatMoves != null) {
            _combatMoves.AddRange(combatMoves.Select(CombatMoveRef => CombatMoveRef.Value));
        }
    }
    public void Clear() {
        _combatMoves.Clear();
    }
    public IEnumerable<CombatMove> CombatMoves() {
        return _combatMoves;
    }
```

Replacement in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 19 [17.4167]

B:BD[17.4591] → [22.21787:21918]

    public CombatMoveSet AddMoves(IEnumerable<CombatMove> additionalMoveSet) {
        _combatMoves.AddRange(additionalMoveSet);

[17.4591]

[17.4729]

    public CombatMoveSet AddMoves(IEnumerable<CombatMoveRef> additionalMoveSet) {
        combatMoves.AddRange(additionalMoveSet);

Deletion in Assets/Scripts/Combat/Martial/CombatForm.cs at line 28 [17.5662]
B:BD[22.22558] → [22.22558:22592]
```
        // return formedMoveSet;
```
Replacement in Assets/Scripts/Combat/Martial/CombatForm.cs at line 30 [17.5662]
B:BD[17.6187] → [17.6187:6244]
```
    private CombatMove FormMove(CombatMove basicMove) {
```
[17.6187]
[17.6244]
```
    private CombatMoveRef FormMove(CombatMoveRef basicMove) {
```
Insertion in Assets/ScriptableObjects/WeavingBankObjects/PartyRuneWeavingBank.asset at line 16 [14.2520]
[15.19209]
```
  runeWeavings: []
```
Insertion in Assets/ScriptableObjects/Runes/RuneBanks/AllRunes.asset at line 20 [26.2098]
[5.1959]
```
  - {fileID: 11400000, guid: d4e968054a75a114da71f543e64fa4b1, type: 2}
```

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 18 [5.241]

B:BD[5.682] → [5.682:743]

        _classRef: CountTagsImmidiateEffect, Assembly-CSharp

[5.682]

[5.743]

        _classRef: CountTagsEffect, Assembly-CSharp

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 24 [5.241]
B:BD[5.842] → [5.842:879]
```
        length: 15
        width: 15
```
[5.842]
[5.879]
```
        length: 1
        width: 1
```
Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 29 [5.241]
B:BD[5.937] → [5.937:950]
```
    speed: 0
```
[5.937]
[5.950]
```
    speed: 0.7
```
Replacement in Assets/ScriptableObjects/Runes/DemoCount.asset at line 17 [27.2213]
B:BD[27.2633] → [27.2633:2670]
```
    - EffectType: CountTagsImmidiate
```
[27.2633]
[27.2670]
```
    - EffectType:
        _classRef: CountTagsImmidiateEffect, Assembly-CSharp
```

Replacement in Assets/ScriptableObjects/Runes/DemoCount.asset at line 28 [27.2213]

B:BD[27.2847] → [27.2847:3093]

    - EffectType: CountTags
      Color: 0
      Multiplicative: 0
      Flat: 0
      MultiplicativeBeforeFlat: 0
      Area:
        length: 15
        width: 15
        shape: 1
      FriendOrFoeOff: 0
    name: Double count tags
    speed: 0

[27.2847]

[27.3093]

    name: Test
    speed: 0.3

Replacement in Assets/ScriptableObjects/Runes/DemoCount.asset at line 31 [27.2213]
B:BD[27.3109] → [27.3109:3135]
```
  RuneSprite: {fileID: 0}
```
[27.3109]
```
  RuneSprite: {fileID: 21300000, guid: 0d46cad69341aca459223c81c1faa7c4, type: 3}
```

Replacement in Assets/Scenes/SampleScene.unity at line 5861 [28.780110080]

B:BD[28.780121071] → [27.5546:5625]

  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}

[28.780121071]

[29.33888019]

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

Replacement in Assets/Scenes/SampleScene.unity at line 8666 [28.780110080]
B:BD[28.780161886] → [3.611:650]
```
    m_SensorSize: {x: 1.3915344, y: 1}
```
[28.780161886]
[28.780161925]
```
    m_SensorSize: {x: 1.1724868, y: 1}
```

Replacement in Assets/Scenes/SampleScene.unity at line 8682 [28.780110080]

B:BD[28.780162310] → [27.5626:5705]

  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}

[28.780162310]

[29.33918016]

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

Use Ref objects in weave

Dependencies

In channels

Change contents

Replacement in Assets/Scripts/UnitHandling/Weaver.cs at line 143 [7.529]

Replacement in Assets/Scripts/UnitHandling/Weaver.cs at line 151 [7.529]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 48 [7.9309]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 53 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 59 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 61 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 63 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 72 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 82 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 88 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 90 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 92 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 99 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 111 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 127 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 129 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 156 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 158 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 189 [10.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/RuneBindingSequenceClicker.cs at line 9 [10.7094]

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 25 [13.19447]

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 30 [13.19447]

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 32 [13.19447]

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 54 [13.19447]

Replacement in Assets/Scripts/UI/WeaveBuilder/MovePicker.cs at line 60 [13.19447]

Replacement in Assets/Scripts/UI/WeaveBuilder/MoveClicker.cs at line 12 [13.21556]

Replacement in Assets/Scripts/UI/WeaveBuilder/MartialSequenceClicker.cs at line 9 [10.8150]

Replacement in Assets/Scripts/UI/WeaveBuilder/CombatFormPicker.cs at line 25 [13.22615]

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 2 [14.1301]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 3 [14.1301]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 5 [14.1301]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 11 [14.1301]

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 27 [14.1301]

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 43 [14.1301]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 58 [14.1301]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 67 [14.1301]

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

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 11 [17.1601]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 19 [17.1601]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 37 [17.1601]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 42 [17.1601]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 55 [17.1601]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 57 [17.1601]

Deletion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 59 [17.1601]

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

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 15 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 25 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 31 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 34 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 47 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 53 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 56 [17.2175]

Replacement in Assets/Scripts/Combat/Weaving/Sequences/ISequence.cs at line 14 [17.2747]

Insertion in Assets/Scripts/Combat/Runes/Rune.cs at line 4 [18.3265]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 8 [18.3265]

Insertion in Assets/Scripts/Combat/Runes/Rune.cs at line 38 [18.3265]

Insertion in Assets/Scripts/Combat/Runes/Rune.cs at line 42 [18.3265]

Deletion in Assets/Scripts/Combat/Martial/WeaponRef.cs at line 10 [22.5086]

Deletion in Assets/Scripts/Combat/Martial/WeaponRef.cs at line 11 [22.5086]

Deletion in Assets/Scripts/Combat/Martial/Weapon.cs at line 13 [17.3534]

Deletion in Assets/Scripts/Combat/Martial/Weapon.cs at line 14 [17.3534]

Replacement in Assets/Scripts/Combat/Martial/Weapon.cs at line 15 [17.3534]

Replacement in Assets/Scripts/Combat/Martial/Weapon.cs at line 19 [17.3534]

Deletion in Assets/Scripts/Combat/Martial/CombatMoveSetRef.cs at line 10 [22.6064]

Deletion in Assets/Scripts/Combat/Martial/CombatMoveSetRef.cs at line 11 [22.6064]

Replacement in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 11 [17.4167]

Replacement in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 13 [17.4167]

Deletion in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 16 [17.4167]

Replacement in Assets/Scripts/Combat/Martial/CombatMoveSet.cs at line 19 [17.4167]

Deletion in Assets/Scripts/Combat/Martial/CombatForm.cs at line 28 [17.5662]

Replacement in Assets/Scripts/Combat/Martial/CombatForm.cs at line 30 [17.5662]

Insertion in Assets/ScriptableObjects/WeavingBankObjects/PartyRuneWeavingBank.asset at line 16 [14.2520]

Insertion in Assets/ScriptableObjects/Runes/RuneBanks/AllRunes.asset at line 20 [26.2098]

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 18 [5.241]

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 24 [5.241]

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 29 [5.241]