itai.sharim/TagFight - Change 426KOWJWOX7ZE24UIJCIHRI5KUZYO6NIGK7KC2HOONFDX242UYIQC

Add helper functions to Unit<T>. Change ConeArea to have Radius and Angle as input

Created by itai.sharim on October 22, 2022

426KOWJWOX7ZE24UIJCIHRI5KUZYO6NIGK7KC2HOONFDX242UYIQC

Dependencies

In channels

main

Change contents

Insertion in Assets/Scripts/PawnResources/Unit.cs at line 16 [4.1105]

[4.1589]

        public int CompareTo(Unit<T> other) => _value.CompareTo(other._value);

Insertion in Assets/Scripts/PawnResources/Unit.cs at line 64 [4.1105]

[4.3297]


        public static Unit<T> Min(Unit<T> a, Unit<T> b) => (Unit<T>)Math.Min(a._value, b._value);
        public static Unit<T> Max(Unit<T> a, Unit<T> b) => (Unit<T>)Math.Max(a._value, b._value);
        public static Unit<T> Clamp(Unit<T> value, Unit<T> min, Unit<T> max) => (Unit<T>)Math.Clamp(value._value, min._value, max._value);

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 36 [4.6208]

B:BD[4.7237] → [5.727:836]

                var valueToSet = (Unit<TUnit>)Math.Clamp((int)value, (int)_minimumCapacity, (int)Capacity);

[4.7237]

[4.7344]

                var valueToSet = Unit<TUnit>.Clamp(value, _minimumCapacity, Capacity);

Deletion in Assets/Scripts/PawnResources/Resource.cs at line 72 [4.6208]
B:BD[4.8688] → [4.8688:8701]
B:BD[4.8701] → [6.12393:12432]
B:BD[6.12432] → [5.970:1015]
```
        }
        public void Add(int amount) {
            Current += (Unit<TUnit>)amount;
```

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 43 [7.8100]

B:BD[3.2337] → [3.2337:2550]

    public float Length;
    public float Width;
    public IEnumerable<Transform> GetAffectedUnits(Transform origin) {
        float radius = Width;
        float coneAngle = Mathf.Asin(Width / 2 * Length);

[3.2337]

[7.9509]

    public float Radius;

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 45 [7.8100]

B:BD[7.9511] → [7.9511:9662]

B:BD[7.9662] → [3.2551:2684]

        // Its problematic to cast a real cone, so we cast the full path and later
        // calculate if the potential target is withint the cone.
        RaycastHit[] hits = Physics.SphereCastAll(origin.position, radius, origin.forward, Length, LayerMask.NameToLayer("units"));

[7.9511]

[7.9795]

    [Range(0f,360f)]
    public float Angle;
    public IEnumerable<Transform> GetAffectedUnits(Transform origin) {
        // Its problematic to cast a real cone, so we cast the sphere and later
        // calculate if the potential target is within the cone.
        RaycastHit[] hits = Physics.SphereCastAll(origin.position, Radius, origin.forward, 0, LayerMask.NameToLayer("units"));

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 56 [7.8100]

B:BD[2.340] → [2.340:430]

            return (coneAngle <= angleBetween || 180 - angleBetween <= 180 - coneAngle);

[2.340]

[7.9981]

            // Angle = 50  => 180 - Angle = 130
            // angle = 40  => 180 - angle = 140
            return (Angle <= angleBetween || 180 - angleBetween <= 180 - Angle);

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 48 [9.241]
B:BD[8.8303] → [3.3481:3516]
```
          rid: 7043444504695668750
```
[8.8303]
[8.8363]
```
          rid: 7043444504695668755
```

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 62 [9.241]

B:BD[8.8619] → [3.3517:3548]

    - rid: 7043444504695668750

[8.8619]

[3.3548]

    - rid: 7043444504695668753
      type: {class: DelayedEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}
    - rid: 7043444504695668755

Deletion in Assets/ScriptableObjects/Runes/Double Count.asset at line 68 [9.241]

B:BD[3.3639] → [3.3639:3751]

    - rid: 7043444504695668753
      type: {class: DelayedEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}

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

B:BD[10.780121071] → [3.3834:3912]

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

[10.780121071]

[11.33888019]

  m_LocalRotation: {x: 0.22914574, y: -0.070709124, z: 0.016692158, w: 0.970677}

Replacement in Assets/Scenes/SampleScene.unity at line 8671 [10.780110080]
B:BD[10.780161886] → [3.3913:3952]
```
    m_SensorSize: {x: 1.1820105, y: 1}
```
[10.780161886]
[10.780161925]
```
    m_SensorSize: {x: 1.2687831, y: 1}
```

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

B:BD[10.780162310] → [3.3953:4031]

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

[10.780162310]

[11.33918016]

  m_LocalRotation: {x: 0.22914574, y: -0.070709124, z: 0.016692158, w: 0.970677}