itai.sharim/TagFight - Change 2RUZ7TTRT7SMZT2V7YWUCCTJJXNRT2LNJ2QBBVN4RMREMOGMGMHQC

Change AreaOfEffect to Types

Created by itai.sharim on October 22, 2022

2RUZ7TTRT7SMZT2V7YWUCCTJJXNRT2LNJ2QBBVN4RMREMOGMGMHQC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/Tester.cs at line 54 [6.286]

B:BD[3.51102] → [4.415:560]

            effectSystem.ApplyTagsEffect(new TagCounter(){}, affected, new AreaOfEffect() { shape = AoeShape.Radius ,length = 15, width = 15});

[3.51102]

[7.76071]

            effectSystem.ApplyTagsEffect(new TagCounter(){}, affected, new CircleArea() {Radius = 15});

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 11 [3.750]

B:BD[3.935] → [4.569:666]

∅:D[8.344] → [3.1033:1072]

∅:D[4.666] → [3.1033:1072]

B:BD[3.1033] → [3.1033:1072]

B:BD[3.1072] → [4.667:1023]

    public void ApplyTagsEffect(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {
        switch (areaOfEffect.shape) {
            case AoeShape.SingleTarget: ApplyTagsEffectSingle(tags, origin); break;
            case AoeShape.Path: ApplyTagsEffectPath(tags, origin, areaOfEffect); break;
            case AoeShape.Radius: ApplyTagsEffectRadius(tags, origin, areaOfEffect); break;
            case AoeShape.Cone: ApplyTagsEffectCone(tags, origin, areaOfEffect); break;

[3.935]

[3.1252]

    public void ApplyTagsEffect(TagCounter tags, Transform origin, IAreaOfEffect areaOfEffect) {
        switch (areaOfEffect) {
            case SingleTarget _: ApplyTagsEffectSingle(tags, origin); break;
            case CircleArea aoe: ApplyTagsEffectRadius(tags, origin, aoe); break;
            case ConeArea aoe: ApplyTagsEffectCone(tags, origin, aoe); break;
            case PathArea aoe: ApplyTagsEffectPath(tags, origin, aoe); break;

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 25 [3.750]

B:BD[3.1361] → [4.1102:1204]

    private void ApplyTagsEffectPath(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[3.1361]

[9.3855]

    private void ApplyTagsEffectPath(TagCounter tags, Transform origin, PathArea areaOfEffect) {

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 27 [3.750]

B:BD[9.3862] → [4.1205:1309]

    private void ApplyTagsEffectRadius(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[9.3862]

[10.12625]

    private void ApplyTagsEffectRadius(TagCounter tags, Transform origin, CircleArea areaOfEffect) {

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 31 [3.750]

B:BD[3.1641] → [3.1641:1717]

        mm.startSize = Mathf.Max(areaOfEffect.width, areaOfEffect.length);

[3.1641]

[3.1717]

        mm.startSize = areaOfEffect.Radius;

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 36 [3.750]

B:BD[3.1825] → [4.1310:1412]

    private void ApplyTagsEffectCone(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[3.1825]

[9.3966]

    private void ApplyTagsEffectCone(TagCounter tags, Transform origin, ConeArea areaOfEffect) {

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 2 [11.291]
[2.2517]
[11.354]
```
using CareBoo.Serially;
```
Replacement in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 22 [11.291]
B:BD[11.792] → [2.2518:2524]
```
    
```
[11.792]
[2.2524]

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 43 [11.291]

B:BD[11.1427] → [11.1427:1481]

        [SerializeField] AreaOfEffect _areaOfEffect;

[11.1427]

[11.1481]

        [SerializeReference]
        [ShowSerializeReference]
        IAreaOfEffect _areaOfEffect;

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 4 [13.6210]
[12.1281]
[10.12766]
```
using CareBoo.Serially;
```

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 17 [13.6210]

B:BD[14.580] → [15.3493:3549]

        public AreaOfEffect AreaOfEffect { get; set; }

[14.580]

        [SerializeReference]
        [ShowSerializeReference]
        public IAreaOfEffect AreaOfEffect;

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 8 [13.8100]
∅:D[15.9118] → [16.1104:1120]
B:BD[13.8220] → [16.1104:1120]
B:BD[16.1120] → [17.430:452]
```
[Serializable]
public enum AoeShape
```
[15.9118]
[17.452]
```
public interface IAreaOfEffect
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 10 [13.8100]
∅:D[17.455] → [13.8244:8282]
B:BD[13.8244] → [13.8244:8282]
```
    SingleTarget, Radius, Cone, Path
```
[17.455]
[13.8282]
```
    public IEnumerable<Transform> GetAffectedUnits(Transform origin);
    public IAreaOfEffect ShallowCopy();
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 15 [13.8100]
B:BD[16.1137] → [11.5644:5722]
∅:D[16.1137] → [13.8287:8314]
∅:D[11.5722] → [13.8287:8314]
B:BD[13.8287] → [13.8287:8314]
```
// Consider changing AreaOfEffect to Value type - AoeEffect has to deep copy
public class AreaOfEffect
```
[16.1137]
[13.8314]
```
public class SingleTarget : IAreaOfEffect
```
Deletion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 17 [13.8100]
B:BD[13.8317] → [17.456:503]
∅:D[17.503] → [16.1138:1164]
B:BD[13.8365] → [16.1138:1164]
∅:D[16.1164] → [13.8418:8420]
B:BD[13.8418] → [13.8418:8420]
B:BD[13.8420] → [16.1165:1190]
∅:D[16.1190] → [13.8472:8474]
B:BD[13.8472] → [13.8472:8474]
B:BD[13.8474] → [16.1191:1219]
∅:D[16.1219] → [13.8529:8531]
B:BD[13.8529] → [13.8529:8531]
```
    // TODO: might want to set it in context?
    public float length;
    public float width;
    public AoeShape shape;
```

Deletion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 18 [13.8100]

∅:D[11.5795] → [18.2247:2560]

B:BD[13.8603] → [18.2247:2560]

B:BD[18.2560] → [17.505:505]

∅:D[17.505] → [13.8944:9014]

∅:D[18.2560] → [13.8944:9014]

∅:D[19.7246] → [13.8944:9014]

B:BD[13.8944] → [13.8944:9014]

        return shape switch {
            AoeShape.SingleTarget => AffectSingle(origin),
            AoeShape.Radius => AffectRadius(origin),
            AoeShape.Cone => AffectCone(origin),
            AoeShape.Path => AffectPath(origin),
            _ => throw new IndexOutOfRangeException(),
        };
    }
    IEnumerable<Transform> AffectSingle(Transform origin) {

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 20 [13.8100]

B:BD[13.9063] → [13.9063:9174]

    IEnumerable<Transform> AffectRadius(Transform origin) {
        float radius = Mathf.Max(length, width);

[13.9063]

[13.9174]

    public IAreaOfEffect ShallowCopy() {
        return (IAreaOfEffect)MemberwiseClone();
    }
}

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 25 [13.8100]

B:BD[13.9176] → [13.9176:9304]

        RaycastHit[] hits = Physics.SphereCastAll(origin.position, radius, origin.forward, 0, LayerMask.NameToLayer("units"));

[13.9176]

[13.9304]

[Serializable]
public class CircleArea : IAreaOfEffect
{
    public float Radius;
    public IEnumerable<Transform> GetAffectedUnits(Transform origin) {
        RaycastHit[] hits = Physics.SphereCastAll(origin.position, Radius, origin.forward, 0, LayerMask.NameToLayer("units"));

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 33 [13.8100]

[17.598]

[13.9351]

    }
    public IAreaOfEffect ShallowCopy() {
        return (IAreaOfEffect)MemberwiseClone();

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 38 [13.8100]

B:BD[13.9358] → [13.9358:9448]

B:BD[13.9448] → [17.599:658]

    IEnumerable<Transform> AffectCone(Transform origin) {
        float radius = width;
        float coneAngle = Mathf.Asin(width / 2 * length);

[13.9358]

[13.9509]

}
[Serializable]
public class ConeArea : IAreaOfEffect
{
    public float Length;
    public float Width;
    public IEnumerable<Transform> GetAffectedUnits(Transform origin) {
        float radius = Width;
        float coneAngle = Mathf.Asin(Width / 2 * Length);

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 51 [13.8100]

B:BD[13.9662] → [13.9662:9795]

        RaycastHit[] hits = Physics.SphereCastAll(origin.position, radius, origin.forward, length, LayerMask.NameToLayer("units"));

[13.9662]

[13.9795]

        RaycastHit[] hits = Physics.SphereCastAll(origin.position, radius, origin.forward, Length, LayerMask.NameToLayer("units"));

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 59 [13.8100]

B:BD[13.10001] → [13.10001:10091]

    IEnumerable<Transform> AffectPath(Transform origin) {
        float radius = width;

[13.10001]

[13.10091]


    public IAreaOfEffect ShallowCopy() {
        return (IAreaOfEffect)MemberwiseClone();
    }
}

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 65 [13.8100]

B:BD[13.10093] → [13.10093:10226]

        RaycastHit[] hits = Physics.SphereCastAll(origin.position, radius, origin.forward, length, LayerMask.NameToLayer("units"));

[13.10093]

[13.10226]

[Serializable]
public class PathArea : IAreaOfEffect
{
    public float Radius;
    public float Length;
    public IEnumerable<Transform> GetAffectedUnits(Transform origin) {
        RaycastHit[] hits = Physics.SphereCastAll(origin.position, Radius, origin.forward, Length, LayerMask.NameToLayer("units"));

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 76 [13.8100]

[13.10284]

    public IAreaOfEffect ShallowCopy() {
        return (IAreaOfEffect)MemberwiseClone();
    }

Insertion in Assets/Scripts/Combat/Runes/Effects/AoeEffect.cs at line 4 [11.2463]
[11.2534]
[11.2534]
```
using CareBoo.Serially;
```

Replacement in Assets/Scripts/Combat/Runes/Effects/AoeEffect.cs at line 11 [11.2463]

B:BD[11.2634] → [11.2634:2688]

        [SerializeField] AreaOfEffect _areaOfEffect;

[11.2634]

[11.2688]

        [SerializeReference]
        [ShowSerializeReference]
        IAreaOfEffect _areaOfEffect;

Replacement in Assets/Scripts/Combat/Runes/Effects/AoeEffect.cs at line 15 [11.2463]

B:BD[11.2773] → [11.2773:3136]

            // Consider changing AreaOfEffect to Value type
            if (context.AreaOfEffect == null) {
                context.AreaOfEffect = new();
            }
            context.AreaOfEffect.length = _areaOfEffect.length;
            context.AreaOfEffect.width = _areaOfEffect.width;
            context.AreaOfEffect.shape = _areaOfEffect.shape;

[11.2773]

[11.3136]

            context.AreaOfEffect = _areaOfEffect.ShallowCopy();

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 26 [20.241]
B:BD[2.7710] → [2.7710:7743]
```
        rid: 7043444504695668747
```
[2.7710]
[10.15320]
```
        rid: 7043444504695668753
```

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 48 [20.241]

B:BD[2.8303] → [2.8303:8363]

          length: 15
          width: 15
          shape: 1

[2.8303]

[2.8363]

          rid: 7043444504695668750

Deletion in Assets/ScriptableObjects/Runes/Double Count.asset at line 58 [20.241]
B:BD[10.15987] → [2.8427:8458]
∅:D[2.8458] → [11.7540:7621]
B:BD[11.7540] → [11.7540:7621]
```
    - rid: 7043444504695668747
      type: {class: DelayedEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}
```

Insertion in Assets/ScriptableObjects/Runes/Double Count.asset at line 62 [20.241]

[2.8619]

    - rid: 7043444504695668750
      type: {class: CircleArea, ns: , asm: Assembly-CSharp}
      data:
        Radius: 15
    - rid: 7043444504695668753
      type: {class: DelayedEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}

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

B:BD[21.780121071] → [2.8735:8814]

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

[21.780121071]

[22.33888019]

  m_LocalRotation: {x: 0.22914575, y: -0.0707091, z: 0.01669215, w: 0.970677}

Replacement in Assets/Scenes/SampleScene.unity at line 8671 [21.780110080]
B:BD[21.780161886] → [2.8815:8854]
```
    m_SensorSize: {x: 1.2962962, y: 1}
```
[21.780161886]
[21.780161925]
```
    m_SensorSize: {x: 1.1820105, y: 1}
```

Replacement in Assets/Scenes/SampleScene.unity at line 8687 [21.780110080]

B:BD[21.780162310] → [2.8855:8934]

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

[21.780162310]

[22.33918016]

  m_LocalRotation: {x: 0.22914575, y: -0.0707091, z: 0.01669215, w: 0.970677}