itai.sharim/TagFight - Change 7PYVWF7I4JWTDZ5M7Q5BCKGEICUXHXKWEYQB4OGUXZE5VBJ45PBQC

Add combat form selection and track preferred form per weapon

Created by itai.sharim on August 24, 2022

7PYVWF7I4JWTDZ5M7Q5BCKGEICUXHXKWEYQB4OGUXZE5VBJ45PBQC

Dependencies

In channels

main

Change contents

Insertion in Assets/Scripts/Weaver.cs at line 16 [3.286]

[2.13979]

[3.386]


public class CombatFormEquippedArgs : EventArgs {
    public CombatForm CombatForm {get;}
    public Weaver Weaver {get;}
    public CombatFormEquippedArgs(CombatForm combatForm, Weaver weaver) {
        CombatForm = combatForm;
        Weaver = weaver;
    }
}

Replacement in Assets/Scripts/Weaver.cs at line 28 [3.286]

B:BD[3.470] → [3.470:552]

    [SerializeField] List<CombatFormRef> knownForms;
    Weapon _equipedWeapon;

[3.470]

[2.13980]

    [SerializeField] List<CombatFormRef> _knownForms;
    Weapon _equippedWeapon;
    CombatForm _equippedForm;
    Dictionary<Weapon, CombatForm> _preferedCombatFormByWeapon = new Dictionary<Weapon, CombatForm>();

Insertion in Assets/Scripts/Weaver.cs at line 34 [3.286]

[2.14058]

[3.552]

    public static event EventHandler<CombatFormEquippedArgs> OnCombatFormEquipped;

Insertion in Assets/Scripts/Weaver.cs at line 38 [3.286]

[2.14114]

    }
    private void SetCombatForm(CombatForm combatForm) {
        _equippedForm = combatForm;
        OnCombatFormEquipped?.Invoke(this, new CombatFormEquippedArgs(_equippedForm, this));
    }
    private void EquipPreferredCombatFormOfWeapon(Weapon weapon) {
        _preferedCombatFormByWeapon.TryGetValue(weapon, out CombatForm tryEquipForm);
        SetCombatForm(tryEquipForm);

Replacement in Assets/Scripts/Weaver.cs at line 51 [3.286]

B:BD[2.14160] → [2.14160:14228]

        _equipedWeapon = _inventory.GetAvailableWeapons().First();

[2.14160]

[2.14228]

        _equippedWeapon = _inventory.GetAvailableWeapons().First();

Replacement in Assets/Scripts/Weaver.cs at line 58 [3.286]

B:BD[3.821] → [3.821:871]

B:BD[3.871] → [2.14236:14331]

                _equipedWeapon = tryEquipWeapon;
                OnWeaponEquipped?.Invoke(this, new WeaponEquippedArgs(_equipedWeapon, this));

[3.821]

[3.871]

                _equippedWeapon = tryEquipWeapon;
                OnWeaponEquipped?.Invoke(this, new WeaponEquippedArgs(_equippedWeapon, this));
                EquipPreferredCombatFormOfWeapon(_equippedWeapon);

Insertion in Assets/Scripts/Weaver.cs at line 66 [3.286]

[3.1094]

    public bool TryEquipCombatForm(string combatFormName) {
        CombatForm combatForm = GetAvailableCombatFormsForEquipedWeapon().Where(combatForm => combatForm.name == combatFormName).FirstOrDefault();
        _preferedCombatFormByWeapon[_equippedWeapon] = combatForm;
        SetCombatForm(combatForm);

Insertion in Assets/Scripts/Weaver.cs at line 71 [3.286]
[3.1096]
[3.1096]
```
        return (combatForm != null);
    }
```
Replacement in Assets/Scripts/Weaver.cs at line 74 [3.286]
B:BD[3.1141] → [3.1141:1180]
```
        if (_equipedWeapon != null) {
```
[3.1141]
[3.1180]
```
        if (_equippedWeapon != null) {
```

Replacement in Assets/Scripts/Weaver.cs at line 77 [3.286]

B:BD[3.1241] → [3.1241:1421]

            sb.Append(String.Format($"PrintEquipedWeaponDebug (equipedWeapon = {_equipedWeapon.name})"));
            foreach (var form in _equipedWeapon.GetCompatibleForms()) {

[3.1241]

[3.1421]

            sb.Append(String.Format($"PrintEquipedWeaponDebug (equipedWeapon = {_equippedWeapon.name})"));
            foreach (var form in _equippedWeapon.GetCompatibleForms()) {

Replacement in Assets/Scripts/Weaver.cs at line 85 [3.286]

B:BD[4.14355] → [4.14355:14403]

            foreach (var form in knownForms) {

[4.14355]

[4.14403]

            foreach (var form in _knownForms) {

Replacement in Assets/Scripts/Weaver.cs at line 93 [3.286]

B:BD[4.14496] → [2.14363:14415]

    public Weapon EquipedWeapon => _equipedWeapon;

[4.14496]

    public Weapon EquippedWeapon => _equippedWeapon;
    public CombatForm EquippedForm => _equippedForm;

Replacement in Assets/Scripts/Weaver.cs at line 96 [3.286]

B:BD[4.14589] → [2.14416:14601]

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

[4.14589]

[3.1548]

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

Insertion in Assets/Scripts/UnitController.cs at line 18 [5.294]

[2.14681]

[3.18909]

        CombatFormSelectUI.OnCombatFormSelected += CombatFormSelectUI_OnCombatFormSelected;
    }
    private void CombatFormSelectUI_OnCombatFormSelected(object sender, CombatFormSelectedArgs e)
    {
        if (selectedUnit.TryGetComponent<Weaver>(out Weaver trySelectWeaver)) {
            trySelectWeaver.TryEquipCombatForm(e.CombatForm.name);
        }

Replacement in Assets/Scripts/HUD/WeaponView.cs at line 19 [4.290]

B:BD[2.15028] → [2.15028:15077]

        SetSelectedWeaponByName(e.Weapon.name);

[2.15028]

[4.901]

        string weaponName = e.Weapon == null ? "":e.Weapon.name;
        SetSelectedWeaponByName(weaponName);

Replacement in Assets/Scripts/HUD/WeaponView.cs at line 42 [4.290]

B:BD[4.1877] → [2.15207:15268]

        SetSelectedWeaponByName(weaver.EquipedWeapon.name);

[4.1877]

        SetSelectedWeaponByName(weaver.EquippedWeapon.name);

Insertion in Assets/Scripts/HUD/CombatFormView.cs at line 18 [2.294]

[2.810]

        Weaver.OnCombatFormEquipped += Weaver_OnCombatFormEquipped;
    }

Insertion in Assets/Scripts/HUD/CombatFormView.cs at line 21 [2.294]

[2.812]

    private void Weaver_OnCombatFormEquipped(object sender, CombatFormEquippedArgs e)
    {
        string combatFormName = e.CombatForm == null ? "":e.CombatForm.name;
        SetSelectedCombatFormByName(combatFormName);

Deletion in Assets/Scripts/HUD/CombatFormView.cs at line 28 [2.294]

B:BD[2.823] → [2.823:994]

    private void Clear() {
        foreach (Transform combatFormSelectUI in transform)
        {
            Destroy(combatFormSelectUI.gameObject);
        }
    }

Insertion in Assets/Scripts/HUD/CombatFormView.cs at line 53 [2.294]

[2.2258]

        }
        if (weaver.EquippedForm != null) {
            SetSelectedCombatFormByName(weaver.EquippedForm.name);

Insertion in Assets/Scripts/HUD/CombatFormView.cs at line 59 [2.294]

[2.2278]

    private void SetSelectedCombatFormByName(string combatFormName) {
        foreach (Transform combatFormButtonTransform in transform) {
            var combatFormSelectUI = combatFormButtonTransform.GetComponent<CombatFormSelectUI>();
            if (combatFormSelectUI.GetCombatFormName() == combatFormName) {
                combatFormSelectUI.SetSelected();
            } else {
                combatFormSelectUI.SetNotSelected();
            }
        }
    }
    private void Clear() {
        foreach (Transform combatFormSelectUI in transform)
        {
            Destroy(combatFormSelectUI.gameObject);
        }
    }

Insertion in Assets/Scripts/HUD/CombatFormView.cs at line 80 [2.294]
[2.2548]
[2.2548]
```
        Weaver.OnCombatFormEquipped -= Weaver_OnCombatFormEquipped;
```
Insertion in Assets/Scripts/HUD/CombatFormSelectUI.cs at line 3 [2.2899]
[2.2962]
[2.2962]
```
using System;
```

Insertion in Assets/Scripts/HUD/CombatFormSelectUI.cs at line 7 [2.2899]

[2.3019]


public class CombatFormSelectedArgs : EventArgs {
    public CombatForm CombatForm {get;}
    public CombatFormSelectedArgs(CombatForm combatForm) {
        CombatForm = combatForm;
    }
}

Insertion in Assets/Scripts/HUD/CombatFormSelectUI.cs at line 21 [2.2899]

[2.3288]

    CombatForm _combatForm;
    public static event EventHandler<CombatFormSelectedArgs> OnCombatFormSelected;

Insertion in Assets/Scripts/HUD/CombatFormSelectUI.cs at line 31 [2.2899]
[2.3584]
[2.3584]
```
        _combatForm = combatForm;
```

Insertion in Assets/Scripts/HUD/CombatFormSelectUI.cs at line 33 [2.2899]

[2.3629]

        combatFormButton.onClick.AddListener(() => {
            OnCombatFormSelected?.Invoke(this, new CombatFormSelectedArgs(_combatForm));
        });

Insertion in Assets/Scripts/HUD/CombatFormSelectUI.cs at line 37 [2.2899]
[2.3636]
[2.3636]
```
    public string GetCombatFormName() => this.combatFormName.text;
```
Replacement in Assets/Scenes/SampleScene.unity at line 747 [6.780110080]
B:BD[6.780121151] → [6.780121151:780121205]
```
  m_LocalPosition: {x: 53.44764, y: 20, z: 16.416702}
```
[6.780121151]
[6.780121205]
```
  m_LocalPosition: {x: 54.34764, y: 20, z: 30.316704}
```

Insertion in Assets/Scenes/SampleScene.unity at line 1177 [6.780110080]

[3.22893]

      propertyPath: _knownForms.Array.size
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1763275424511731206, guid: 689a4763a3cde4b46a7c011ddb15ea97,
        type: 3}

Insertion in Assets/Scenes/SampleScene.unity at line 1186 [6.780110080]

[3.23051]

[7.268]

    - target: {fileID: 1763275424511731206, guid: 689a4763a3cde4b46a7c011ddb15ea97,
        type: 3}
      propertyPath: _knownForms.Array.data[0]
      value: 
      objectReference: {fileID: 11400000, guid: 6d28336306dbd8f41b717755a0ee572c,
        type: 2}

Replacement in Assets/Scenes/SampleScene.unity at line 2050 [6.780110080]
B:BD[6.780134675] → [6.780134675:780134719]
```
  m_LocalPosition: {x: 49.1, y: 0, z: 46.1}
```
[6.780134675]
[6.780134719]
```
  m_LocalPosition: {x: 50, y: 0, z: 60}
```

Insertion in Assets/Scenes/SampleScene.unity at line 2632 [6.780110080]

[3.23195]

[2.17557]

      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 1763275424511731206, guid: 689a4763a3cde4b46a7c011ddb15ea97,
        type: 3}
      propertyPath: _knownForms.Array.size

Insertion in Assets/Scenes/SampleScene.unity at line 2651 [6.780110080]

[2.17832]

[7.4959]

    - target: {fileID: 1763275424511731206, guid: 689a4763a3cde4b46a7c011ddb15ea97,
        type: 3}
      propertyPath: _knownForms.Array.data[0]
      value: 
      objectReference: {fileID: 11400000, guid: 6d28336306dbd8f41b717755a0ee572c,
        type: 2}
    - target: {fileID: 1763275424511731206, guid: 689a4763a3cde4b46a7c011ddb15ea97,
        type: 3}
      propertyPath: _knownForms.Array.data[1]
      value: 
      objectReference: {fileID: 11400000, guid: 7cd9798399927f44ab0774af3f49897a,
        type: 2}

Replacement in Assets/Scenes/SampleScene.unity at line 4845 [6.780110080]
B:BD[6.780162390] → [6.780162390:780162444]
```
  m_LocalPosition: {x: 53.44764, y: 20, z: 16.416702}
```
[6.780162390]
[6.780162444]
```
  m_LocalPosition: {x: 54.34764, y: 20, z: 30.316704}
```