itai.sharim/TagFight - Change YI7M5RWLKUG256YXK6CGZKUPDCNHREU2PGV344L2IV24FF5PHG3AC

move cast inside EffectContext

Created by itai.sharim on October 20, 2022

YI7M5RWLKUG256YXK6CGZKUPDCNHREU2PGV344L2IV24FF5PHG3AC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 8 [3.6208]

B:BD[3.6328] → [3.6328:6410]

    public class Resource<T> : MonoBehaviour, IWatchableResource where T : IUnit

[3.6328]

[3.6410]

    public class Resource<TUnit> : MonoBehaviour, IWatchableResource where TUnit : IUnit

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 10 [3.6208]

B:BD[3.6417] → [3.6417:6506]

B:BD[3.6506] → [4.12229:12286]

        [SerializeField] Unit<T> _current;
        [SerializeField] Unit<T> _capacity;
        readonly Unit<T> _minimumCapacity = (Unit<T>)0;

[3.6417]

[3.6564]

        [SerializeField] Unit<TUnit> _current;
        [SerializeField] Unit<TUnit> _capacity;
        readonly Unit<TUnit> _minimumCapacity = (Unit<TUnit>)0;

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 14 [3.6208]

B:BD[3.6566] → [3.6566:6620]

        [SerializeField] Unit<T> regenerationAmount;

[3.6566]

[3.6620]

        [SerializeField] Unit<TUnit> regenerationAmount;

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 19 [3.6208]
B:BD[3.6742] → [3.6742:6777]
```
        public Unit<T> Capacity {
```
[3.6742]
[3.6777]
```
        public Unit<TUnit> Capacity {
```
Replacement in Assets/Scripts/PawnResources/Resource.cs at line 33 [3.6208]
B:BD[3.7154] → [3.7154:7188]
```
        public Unit<T> Current {
```
[3.7154]
[3.7188]
```
        public Unit<TUnit> Current {
```

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

B:BD[3.7237] → [4.12287:12392]

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

[3.7237]

[3.7344]

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

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 44 [3.6208]
B:BD[3.7555] → [3.7555:7600]
```
        public Unit<T> RegenerationAmount {
```
[3.7555]
[3.7600]
```
        public Unit<TUnit> RegenerationAmount {
```

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 55 [3.6208]

B:BD[3.8025] → [3.8025:8103]

        public static explicit operator OnChangeArgs(Resource<T> resource) {

[3.8025]

[3.8103]

        public static explicit operator OnChangeArgs(Resource<TUnit> resource) {

Replacement in Assets/Scripts/PawnResources/Resource.cs at line 75 [3.6208]
B:BD[4.12432] → [4.12432:12473]
```
            Current += (Unit<T>)amount;
```
[4.12432]
[4.12473]
```
            Current += (Unit<TUnit>)amount;
```
Deletion in Assets/Scripts/PawnResources/Resource.cs at line 77 [3.6208]
∅:D[4.12484] → [3.8708:8710]
B:BD[3.8708] → [3.8708:8710]

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 9 [5.6210]

B:BD[5.6295] → [4.12799:12924]

public interface IResourceContext<TResource, TUnit>
        where TResource : Resource<TUnit>
        where TUnit : IUnit

[5.6295]

[4.12924]

public interface IResourceContext<out TResource, TUnit>
    where TResource : Resource<TUnit>
    where TUnit : IUnit

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 60 [5.6210]

[5.6532]

[6.2574]

    public Unit<TUnit> GetCurrent<TResource, TUnit>()
        where TResource : Resource<TUnit>
        where TUnit : IUnit
    {
        return ((IResourceContext<TResource, TUnit>)this).Current;
    }
    public Unit<TUnit> SetCurrent<TResource, TUnit>(Unit<TUnit> value)
        where TResource : Resource<TUnit>
        where TUnit : IUnit
    {
        return ((IResourceContext<TResource, TUnit>)this).Current = value;
    }
    public Unit<TUnit> GetAdded<TResource, TUnit>()
        where TResource : Resource<TUnit>
        where TUnit : IUnit
    {
        return ((IResourceContext<TResource, TUnit>)this).Added;
    }
    public Unit<TUnit> SetAdded<TResource, TUnit>(Unit<TUnit> value)
        where TResource : Resource<TUnit>
        where TUnit : IUnit
    {
        return ((IResourceContext<TResource, TUnit>)this).Added = value;
    }

Insertion in Assets/Scripts/Combat/Runes/Effects/CountResourceEffect.cs at line 7 [4.299]
[4.404]
[4.404]

Replacement in Assets/Scripts/Combat/Runes/Effects/CountResourceEffect.cs at line 24 [4.299]

B:BD[4.1158] → [4.1158:1335]

            ((IResourceContext<TResource, TUnit>)context).Current += amount;
            Debug.Log($"{_effectName}: {((IResourceContext<TResource, TUnit>)context).Current}");

[4.1158]

[4.1335]

            context.SetCurrent<TResource, TUnit>(context.GetCurrent<TResource, TUnit>() + amount);
            Debug.Log($"{_effectName}: {context.GetCurrent<TResource, TUnit>()}");

Insertion in Assets/Scripts/Combat/Runes/Effects/CountResourceEffect.cs at line 35 [4.299]
[4.1623]
[4.1623]

Insertion in Assets/Scripts/Combat/Runes/Effects/CountResourceEffect.cs at line 44 [4.299]

[4.2102]


    // public class VarCountResourceEffect<TResource> : IEffect
    //     where TResource : IResource<IUnit>
    // {
    //     readonly string _effectName = $"Count({typeof(TResource).Name})Effect";
    //     public void Apply(EffectContext context) {
    //         Debug.Log($"{_effectName}: Apply");
    //         var amount = context.GetEffectedUnits()
    //                             .Select(transform => transform.GetComponent<TResource>())
    //                             .Where(resource => resource != null)
    //                             .Select(resource => resource.)
    //                             .Aggregate((Unit<IUnit>)0, (sum, next) => sum += next);
    //         Unit<IUnit> unit;
    //         var a = context.VarGetCurrent<TResource>();
    //     }
    //     public void Effect(EffectContext context) {
    //         throw new System.NotImplementedException();
    //     }
    // }
    // public class VarCountPainEffect : VarCountResourceEffect<Pain> {}

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyResourceEffect.cs at line 15 [4.2450]

B:BD[4.3037] → [4.3037:3129]

                resource.Current += ((IResourceContext<TResource, TUnit>)context).Current;

[4.3037]

[4.3129]

                resource.Current += context.GetCurrent<TResource, TUnit>();

Replacement in Assets/Scripts/Combat/Runes/Effects/AddResourceEffect.cs at line 21 [4.4292]

B:BD[4.4979] → [4.4979:5372]

            if (MultiplicativeBeforeFlat) {
                ((IResourceContext<TResource, TUnit>)context).Added = ((IResourceContext<TResource, TUnit>)context).Added * Multiplicative + Flat;
            }
            else {
                ((IResourceContext<TResource, TUnit>)context).Added = (((IResourceContext<TResource, TUnit>)context).Added + Flat) * Multiplicative;
            }

[4.4979]

[4.5372]

            Unit<TUnit> newAdded = MultiplicativeBeforeFlat? 
                context.GetAdded<TResource, TUnit>()  * Multiplicative + Flat : 
                (context.GetAdded<TResource, TUnit>() + Flat) * Multiplicative;
            context.SetAdded<TResource, TUnit>(newAdded);

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 17 [4.6182]

B:BD[4.6819] → [4.6819:6934]

            var unitlessByResource = Multiplier * (int)((IResourceContext<TResourceBy, TUnitBy>)context).Current;

[4.6819]

[4.6934]

            
            var unitlessByResource = Multiplier * (int)context.GetCurrent<TResourceBy, TUnitBy>();

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 20 [4.6182]

B:BD[4.7038] → [4.7038:7153]

            ((IResourceContext<TResourceDest, TUnitDest>)context).Current += (Unit<TUnitDest>)unitlessByResource;

[4.7038]

[4.7153]

            context.SetCurrent<TResourceDest, TUnitDest>((Unit<TUnitDest>)unitlessByResource);

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 31 [4.6182]

B:BD[4.7385] → [4.7385:8072]

        public sealed class AccumulatePainByPainTagEffect : AccumulateResourceByResourceEffect<Pain, PainUnit, Pain, PainUnit> { }
        public sealed class AccumulatePainByFatigueTagEffect : AccumulateResourceByResourceEffect<Pain, PainUnit, Fatigue, FatigueUnit> { }
        public sealed class AccumulatePainByBlueTagEffect : AccumulateResourceByResourceEffect<Pain, PainUnit, BlueTag, BlueTagUnit> { }
        public sealed class AccumulatePainByRedTagEffect : AccumulateResourceByResourceEffect<Pain, PainUnit, RedTag, RedTagUnit> { }
        public sealed class AccumulatePainByGreenTagEffect : AccumulateResourceByResourceEffect<Pain, PainUnit, GreenTag, GreenTagUnit> { }

[4.7385]

[4.8072]

        public class AccumulatePainByResource<TResourceBy, TUnitBy> : AccumulateResourceByResourceEffect<Pain, PainUnit, TResourceBy, TUnitBy>
            where TResourceBy : Resource<TUnitBy>
            where TUnitBy : IUnit { }
        public sealed class AccumulatePainByPainTagEffect : AccumulatePainByResource<Pain, PainUnit> { }
        public sealed class AccumulatePainByFatigueTagEffect : AccumulatePainByResource<Fatigue, FatigueUnit> { }
        public sealed class AccumulatePainByBlueTagEffect : AccumulatePainByResource<BlueTag, BlueTagUnit> { }
        public sealed class AccumulatePainByRedTagEffect : AccumulatePainByResource<RedTag, RedTagUnit> { }
        public sealed class AccumulatePainByGreenTagEffect : AccumulatePainByResource<GreenTag, GreenTagUnit> { }

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 42 [4.6182]

B:BD[4.8129] → [4.8129:8861]

        public sealed class AccumulateFatigueByPainTagEffect : AccumulateResourceByResourceEffect<Fatigue, FatigueUnit, Pain, PainUnit> { }
        public sealed class AccumulateFatigueByFatigueTagEffect : AccumulateResourceByResourceEffect<Fatigue, FatigueUnit, Fatigue, FatigueUnit> { }
        public sealed class AccumulateFatigueByBlueTagEffect : AccumulateResourceByResourceEffect<Fatigue, FatigueUnit, BlueTag, BlueTagUnit> { }
        public sealed class AccumulateFatigueByRedTagEffect : AccumulateResourceByResourceEffect<Fatigue, FatigueUnit, RedTag, RedTagUnit> { }
        public sealed class AccumulateFatigueByGreenTagEffect : AccumulateResourceByResourceEffect<Fatigue, FatigueUnit, GreenTag, GreenTagUnit> { }

[4.8129]

[4.8861]

        public class AccumulateFatigueByResource<TResourceBy, TUnitBy> : AccumulateResourceByResourceEffect<Fatigue, FatigueUnit, TResourceBy, TUnitBy>
            where TResourceBy : Resource<TUnitBy>
            where TUnitBy : IUnit { }
        public sealed class AccumulateFatigueByPainTagEffect : AccumulateFatigueByResource<Pain, PainUnit> { }
        public sealed class AccumulateFatigueByFatigueTagEffect : AccumulateFatigueByResource<Fatigue, FatigueUnit> { }
        public sealed class AccumulateFatigueByBlueTagEffect : AccumulateFatigueByResource<BlueTag, BlueTagUnit> { }
        public sealed class AccumulateFatigueByRedTagEffect : AccumulateFatigueByResource<RedTag, RedTagUnit> { }
        public sealed class AccumulateFatigueByGreenTagEffect : AccumulateFatigueByResource<GreenTag, GreenTagUnit> { }

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 53 [4.6182]

B:BD[4.8918] → [4.8918:9650]

        public sealed class AccumulateBlueTagByPainTagEffect : AccumulateResourceByResourceEffect<BlueTag, BlueTagUnit, Pain, PainUnit> { }
        public sealed class AccumulateBlueTagByFatigueTagEffect : AccumulateResourceByResourceEffect<BlueTag, BlueTagUnit, Fatigue, FatigueUnit> { }
        public sealed class AccumulateBlueTagByBlueTagEffect : AccumulateResourceByResourceEffect<BlueTag, BlueTagUnit, BlueTag, BlueTagUnit> { }
        public sealed class AccumulateBlueTagByRedTagEffect : AccumulateResourceByResourceEffect<BlueTag, BlueTagUnit, RedTag, RedTagUnit> { }
        public sealed class AccumulateBlueTagByGreenTagEffect : AccumulateResourceByResourceEffect<BlueTag, BlueTagUnit, GreenTag, GreenTagUnit> { }

[4.8918]

[4.9650]

        public class AccumulateBlueTagByResource<TResourceBy, TUnitBy> : AccumulateResourceByResourceEffect<BlueTag, BlueTagUnit, TResourceBy, TUnitBy>
            where TResourceBy : Resource<TUnitBy>
            where TUnitBy : IUnit { }
        public sealed class AccumulateBlueTagByPainTagEffect : AccumulateBlueTagByResource<Pain, PainUnit> { }
        public sealed class AccumulateBlueTagByFatigueTagEffect : AccumulateBlueTagByResource<Fatigue, FatigueUnit> { }
        public sealed class AccumulateBlueTagByBlueTagEffect : AccumulateBlueTagByResource<BlueTag, BlueTagUnit> { }
        public sealed class AccumulateBlueTagByRedTagEffect : AccumulateBlueTagByResource<RedTag, RedTagUnit> { }
        public sealed class AccumulateBlueTagByGreenTagEffect : AccumulateBlueTagByResource<GreenTag, GreenTagUnit> { }

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 64 [4.6182]

B:BD[4.9706] → [4.9706:10420]

        public sealed class AccumulateRedTagByPainTagEffect : AccumulateResourceByResourceEffect<RedTag, RedTagUnit, Pain, PainUnit> { }
        public sealed class AccumulateRedTagByFatigueEffect : AccumulateResourceByResourceEffect<RedTag, RedTagUnit, Fatigue, FatigueUnit> { }
        public sealed class AccumulateRedTagByBlueTagEffect : AccumulateResourceByResourceEffect<RedTag, RedTagUnit, BlueTag, BlueTagUnit> { }
        public sealed class AccumulateRedTagByRedTagEffect : AccumulateResourceByResourceEffect<RedTag, RedTagUnit, RedTag, RedTagUnit> { }
        public sealed class AccumulateRedTagByGreenTagEffect : AccumulateResourceByResourceEffect<RedTag, RedTagUnit, GreenTag, GreenTagUnit> { }

[4.9706]

[4.10420]

        public class AccumulateRedTagByResource<TResourceBy, TUnitBy> : AccumulateResourceByResourceEffect<RedTag, RedTagUnit, TResourceBy, TUnitBy>
            where TResourceBy : Resource<TUnitBy>
            where TUnitBy : IUnit { }
        public sealed class AccumulateRedTagByPainTagEffect : AccumulateRedTagByResource<Pain, PainUnit> { }
        public sealed class AccumulateRedTagByFatigueEffect : AccumulateRedTagByResource<Fatigue, FatigueUnit> { }
        public sealed class AccumulateRedTagByBlueTagEffect : AccumulateRedTagByResource<BlueTag, BlueTagUnit> { }
        public sealed class AccumulateRedTagByRedTagEffect : AccumulateRedTagByResource<RedTag, RedTagUnit> { }
        public sealed class AccumulateRedTagByGreenTagEffect : AccumulateRedTagByResource<GreenTag, GreenTagUnit> { }

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 75 [4.6182]

B:BD[4.10478] → [4.10478:11222]

        public sealed class AccumulateGreenTagByPainTagEffect : AccumulateResourceByResourceEffect<GreenTag, GreenTagUnit, Pain, PainUnit> { }
        public sealed class AccumulateGreenTagByFatigueEffect : AccumulateResourceByResourceEffect<GreenTag, GreenTagUnit, Fatigue, FatigueUnit> { }
        public sealed class AccumulateGreenTagByBlueTagEffect : AccumulateResourceByResourceEffect<GreenTag, GreenTagUnit, BlueTag, BlueTagUnit> { }
        public sealed class AccumulateGreenTagByRedTagEffect : AccumulateResourceByResourceEffect<GreenTag, GreenTagUnit, RedTag, RedTagUnit> { }
        public sealed class AccumulateGreenTagByGreenTagEffect : AccumulateResourceByResourceEffect<GreenTag, GreenTagUnit, GreenTag, GreenTagUnit> { }

[4.10478]

[4.11222]

        public class AccumulateGreeTagByResource<TResourceBy, TUnitBy> : AccumulateResourceByResourceEffect<GreenTag, GreenTagUnit, TResourceBy, TUnitBy>
            where TResourceBy : Resource<TUnitBy>
            where TUnitBy : IUnit { }
        public sealed class AccumulateGreenTagByPainTagEffect : AccumulateGreeTagByResource<Pain, PainUnit> { }
        public sealed class AccumulateGreenTagByFatigueEffect : AccumulateGreeTagByResource<Fatigue, FatigueUnit> { }
        public sealed class AccumulateGreenTagByBlueTagEffect : AccumulateGreeTagByResource<BlueTag, BlueTagUnit> { }
        public sealed class AccumulateGreenTagByRedTagEffect : AccumulateGreeTagByResource<RedTag, RedTagUnit> { }
        public sealed class AccumulateGreenTagByGreenTagEffect : AccumulateGreeTagByResource<GreenTag, GreenTagUnit> { }

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

B:BD[7.780121071] → [2.642:723]

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

[7.780121071]

[8.33888019]

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

Replacement in Assets/Scenes/SampleScene.unity at line 8671 [7.780110080]
B:BD[7.780161886] → [2.724:763]
```
    m_SensorSize: {x: 1.2931217, y: 1}
```
[7.780161886]
[7.780161925]
```
    m_SensorSize: {x: 1.3079365, y: 1}
```

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

B:BD[7.780162310] → [2.764:845]

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

[7.780162310]

[8.33918016]

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