itai.sharim/TagFight - Change UBKE7KXKA35CBKZLD366TUQXK72GYT7RLPEMMLCR4XC3TLMXD7EQC

Get Resource directly from context. Cleanup.

Created by itai.sharim on October 22, 2022

UBKE7KXKA35CBKZLD366TUQXK72GYT7RLPEMMLCR4XC3TLMXD7EQC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 24 [4.1601]

B:BD[3.2333] → [3.2333:2460]

        context = new EffectContext(null, new EffectSystem(GameObject.Find("RippleOutVfx").GetComponent<ParticleSystem>())) {

[3.2333]

[5.2288]

        context = new EffectContext(new EffectSystem(GameObject.Find("RippleOutVfx").GetComponent<ParticleSystem>())) {

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 47 [7.3265]
B:BD[6.1003] → [6.1003:1064]
```
    public IEffect Effect = new CountTagsImmidiateEffect();
```
[6.1003]
[6.1064]
```
    public IEffect Effect;
```

File deletion: CountTagsImmidiateEffect.cs.meta

BF:BFD[7.4359] → [8.807:863]

BF:BFD[8.863] → [8.562:562]

B:BD[8.562] → [8.563:806]

fileFormatVersion: 2
guid: 7ff27c2a85e3e604b816a56c73b916b6
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: CountTagsImmidiateEffect.cs

BF:BFD[7.4359] → [8.1923:1974]

BF:BFD[8.1974] → [8.865:865]

∅:D[2.4955] → [8.886:906]

B:BD[8.886] → [8.886:906]

B:BD[8.906] → [3.8087:8107]

∅:D[3.8107] → [8.906:908]

B:BD[8.906] → [8.906:908]

∅:D[3.8138] → [8.957:960]

B:BD[8.957] → [8.957:960]

∅:D[6.1773] → [8.1037:1039]

∅:D[3.8294] → [8.1037:1039]

B:BD[8.1037] → [8.1037:1039]

∅:D[6.1817] → [8.1078:1080]

∅:D[3.8342] → [8.1078:1080]

B:BD[8.1078] → [8.1078:1080]

∅:D[3.8946] → [8.1509:1511]

B:BD[8.1509] → [8.1509:1511]

∅:D[3.9042] → [8.1579:1581]

B:BD[8.1579] → [8.1579:1581]

∅:D[9.2519] → [8.1673:1675]

∅:D[5.2942] → [8.1673:1675]

∅:D[3.9054] → [8.1673:1675]

B:BD[8.1673] → [8.1673:1675]

B:BD[8.1675] → [2.5105:5192]

∅:D[2.5192] → [8.1675:1682]

∅:D[3.9109] → [8.1675:1682]

B:BD[8.1675] → [8.1675:1682]

B:BD[8.1682] → [3.9110:9111]

B:BD[8.1581] → [3.9043:9054]

B:BD[8.1511] → [3.8947:9042]

B:BD[8.1080] → [3.8343:8456]

∅:D[2.5104] → [3.8604:8946]

B:BD[3.8604] → [3.8604:8946]

B:BD[3.8456] → [2.4956:5104]

B:BD[8.1039] → [3.8295:8342]

B:BD[8.960] → [3.8139:8294]

B:BD[8.908] → [3.8108:8138]

B:BD[8.865] → [2.4920:4955]

using System.Linq;
using UnityEngine;
{
        public void Apply(EffectContext context, IEnumerable<Transform> affected) { }
    }
}
        }
            context.EffectSystem.ApplyTagsEffect(tags, context.EffectLocation, AreaOfEffect);
        public void Effect(EffectContext context) {
            Debug.Log("CountTagsImmidiateEffect: Effect");
            // TODO: Apply friendOrFoeOff
            float amount = 0;
            foreach (TaggableUnit taggableUnit in targets) {
                amount += taggableUnit.CurrentTags[Color];
            }
            context.CurrentTags[Color] += amount;
            TagCounter tags = new() { };
            tags[Color] += amount;
            var targets = AreaOfEffect.GetAffectedUnits(context.EffectLocation).Select(t => t.GetComponent<TaggableUnit>()).Where(t => t != null);
        [SerializeField] bool FriendOrFoeOff;
    public class CountTagsImmidiateEffect : IEffect
    {
        [SerializeField] TagColor Color;
        [SerializeField] AreaOfEffect AreaOfEffect;
namespace TagFighter.Effects
using System.Collections.Generic;

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveResourceEffect.cs at line 17 [3.300]

∅:D[2.4287] → [3.836:885]

B:BD[3.836] → [3.836:885]

B:BD[3.885] → [2.4288:4431]

∅:D[2.4431] → [3.1146:1288]

B:BD[3.1146] → [3.1146:1288]

            Debug.Log($"{_effectName}: Apply");
            Unit<TUnit> newAdded = MultiplicativeBeforeFlat ?
                context.GetAdded<TResource, TUnit>() / Multiplicative - Flat :
                (context.GetAdded<TResource, TUnit>() - Flat) * Multiplicative;
            context.SetAdded<TResource, TUnit>(newAdded);

[2.4287]

[3.1288]

            Debug.Log($"{_effectName} : Apply");
            var resource = context.Resource<TResource, TUnit>();
            resource.Added = MultiplicativeBeforeFlat?
                resource.Added  / Multiplicative - Flat :
                (resource.Added - Flat) * Multiplicative;

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 1 [2.291]
B:BD[2.291] → [2.292:354]
```
using System.Collections;
using System.Collections.Generic;
```

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 42 [2.291]

[2.1692]

                context.EffectSystem.ApplyTagsEffect(null, context.EffectLocation, _areaOfEffect);

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 44 [2.291]
B:BD[2.1707] → [2.1707:1803]
```
            context.EffectSystem.ApplyTagsEffect(null, context.EffectLocation, _areaOfEffect);
```
Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 12 [7.6210]
∅:D[3.3315] → [10.13066:13068]
B:BD[10.13066] → [10.13066:13068]
B:BD[10.13068] → [3.3316:3389]
```
        public TagCounter CurrentTags { get; set; } = new TagCounter();
```
Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 19 [7.6210]
∅:D[3.3634] → [11.628:630]
∅:D[2.4647] → [11.628:630]
B:BD[11.628] → [11.628:630]
B:BD[11.630] → [3.3635:3693]
```
        public TagSystem TagSystem { get; private set; }
```

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 32 [7.6210]

B:BD[11.834] → [3.4230:4306]

        public Unit<TUnit> SetCurrent<TResource, TUnit>(Unit<TUnit> value)

[11.834]

[3.4306]

        public ResourceContext<TUnit> Resource<TResource, TUnit>()

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 39 [7.6210]

B:BD[3.4635] → [3.4635:4778]

            ((ResourceContext<TUnit>)resourceContext).Current = value;
            return ((ResourceContext<TUnit>)resourceContext).Current;

[3.4635]

[3.4778]

            return (ResourceContext<TUnit>)resourceContext;

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 41 [7.6210]

B:BD[3.4789] → [3.4789:5255]

        public Unit<TUnit> GetAdded<TResource, TUnit>()
            where TResource : Resource<TUnit>
            where TUnit : IUnit {
            if (!ResourceCounter.TryGetValue(typeof(TResource), out var resourceContext)) {
                resourceContext = new ResourceContext<TUnit>();
                ResourceCounter.Add(typeof(TResource), resourceContext);
            }
            return ((ResourceContext<TUnit>)resourceContext).Added;
        }

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 42 [7.6210]

B:BD[11.836] → [3.5256:6279]

∅:D[3.6279] → [12.1429:1431]

B:BD[12.1429] → [12.1429:1431]

B:BD[12.1431] → [3.6280:6839]

∅:D[3.6839] → [12.1870:1872]

B:BD[12.1870] → [12.1870:1872]

B:BD[12.1872] → [3.6840:6956]

        public Unit<TUnit> SetAdded<TResource, TUnit>(Unit<TUnit> value)
            where TResource : Resource<TUnit>
            where TUnit : IUnit {
            if (!ResourceCounter.TryGetValue(typeof(TResource), out var resourceContext)) {
                resourceContext = new ResourceContext<TUnit>();
                ResourceCounter.Add(typeof(TResource), resourceContext);
            }
            ((ResourceContext<TUnit>)resourceContext).Added = value;
            return ((ResourceContext<TUnit>)resourceContext).Added;
        }
        public Unit<TUnit> GetRemoved<TResource, TUnit>()
            where TResource : Resource<TUnit>
            where TUnit : IUnit {
            if (!ResourceCounter.TryGetValue(typeof(TResource), out var resourceContext)) {
                resourceContext = new ResourceContext<TUnit>();
                ResourceCounter.Add(typeof(TResource), resourceContext);
            }
            return ((ResourceContext<TUnit>)resourceContext).Removed;
        }
        public Unit<TUnit> SetRemoved<TResource, TUnit>(Unit<TUnit> value)
            where TResource : Resource<TUnit>
            where TUnit : IUnit {
            if (!ResourceCounter.TryGetValue(typeof(TResource), out var resourceContext)) {
                resourceContext = new ResourceContext<TUnit>();
                ResourceCounter.Add(typeof(TResource), resourceContext);
            }
            ((ResourceContext<TUnit>)resourceContext).Removed = value;
            return ((ResourceContext<TUnit>)resourceContext).Removed;
        }
        public EffectContext(TagSystem tagSystem, EffectSystem effectSystem) {
            TagSystem = tagSystem;

[11.836]

[3.6956]

        public EffectContext(EffectSystem effectSystem) {

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 55 [7.6210]
B:BD[3.7337] → [3.7337:7371]
```
            CurrentTags = new();
```

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 70 [7.6210]

B:BD[8.4569] → [3.7733:7851]

        private interface IResourceContext { };
        private class ResourceContext<TUnitType> : IResourceContext

[8.4569]

[3.7851]

        public interface IResourceContext { };
        public class ResourceContext<TUnitType> : IResourceContext

Replacement in Assets/Scripts/Combat/Runes/Effects/CountResourceEffect.cs at line 17 [10.299]
∅:D[2.5316] → [10.731:780]
B:BD[10.731] → [10.731:780]
```
            Debug.Log($"{_effectName}: Apply");
```
[2.5316]
[10.780]
```
            Debug.Log($"{_effectName} : Apply");
```

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

∅:D[2.5641] → [10.1156:1158]

B:BD[10.1156] → [10.1156:1158]

B:BD[10.1158] → [12.2114:2298]


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

[2.5641]

[10.1440]

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

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyResourceEffect.cs at line 14 [10.2450]
∅:D[2.5919] → [10.2833:2882]
B:BD[10.2833] → [10.2833:2882]
```
            Debug.Log($"{_effectName}: Apply");
```
[2.5919]
[2.5920]
```
            Debug.Log($"{_effectName} : Apply");
```

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyResourceEffect.cs at line 16 [10.2450]

∅:D[2.6057] → [12.3338:3415]

B:BD[10.3037] → [12.3338:3415]

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

[2.6057]

[10.3129]

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

Replacement in Assets/Scripts/Combat/Runes/Effects/AddResourceEffect.cs at line 17 [10.4292]

∅:D[2.6181] → [10.4814:4863]

B:BD[10.4814] → [10.4814:4863]

B:BD[10.4979] → [12.3422:3709]

            Debug.Log($"{_effectName}: Apply");
            Unit<TUnit> newAdded = MultiplicativeBeforeFlat? 
                context.GetAdded<TResource, TUnit>()  * Multiplicative + Flat : 
                (context.GetAdded<TResource, TUnit>() + Flat) * Multiplicative;
            context.SetAdded<TResource, TUnit>(newAdded);

[2.6181]

[10.5372]

            Debug.Log($"{_effectName} : Apply");
            var resource = context.Resource<TResource, TUnit>();
            resource.Added = MultiplicativeBeforeFlat?
                resource.Added  * Multiplicative + Flat :
                (resource.Added + Flat) * Multiplicative;

Deletion in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 13 [10.6182]
B:BD[10.6547] → [10.6547:6549]
Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 16 [10.6182]
∅:D[2.6305] → [10.6770:6819]
B:BD[10.6770] → [10.6770:6819]
```
            Debug.Log($"{_effectName}: Apply");
```
[2.6305]
[12.3712]
```
            Debug.Log($"{_effectName} : Apply");
```

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 18 [10.6182]

B:BD[12.3726] → [12.3726:3826]

∅:D[12.3826] → [10.6934:7038]

B:BD[10.6934] → [10.6934:7038]

B:BD[10.7038] → [12.3827:3923]

            var unitlessByResource = Multiplier * (int)context.GetCurrent<TResourceBy, TUnitBy>();
            Debug.Log($"Accumulating {unitlessByResource} into {typeof(TResourceDest).Name}.Current");
            context.SetCurrent<TResourceDest, TUnitDest>((Unit<TUnitDest>)unitlessByResource);

[12.3726]

[10.7153]

            var resourceBy = context.Resource<TResourceBy, TUnitBy>();
            var resourceDest = context.Resource<TResourceDest, TUnitDest>();
            var unitlessResourceBy = Multiplier * (int)resourceBy.Current;
            Debug.Log($"Accumulating {unitlessResourceBy} into {typeof(TResourceDest).Name}.Current");
            resourceDest.Current = (Unit<TUnitDest>)unitlessResourceBy;

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 47 [13.241]
B:BD[2.6925] → [2.6925:6945]
```
        _classRef: 
```
[2.6925]
[2.6945]
```
        _classRef: TagFighter.Effects.ReleaseEffect, Assembly-CSharp
```
Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 49 [13.241]
B:BD[2.6957] → [2.6957:6973]
```
        rid: -2
```
[2.6957]
[2.6973]
```
        rid: 7043444486337986594
```
Deletion in Assets/ScriptableObjects/Runes/Double Count.asset at line 57 [13.241]
B:BD[6.2669] → [2.7091:7140]
```
    - rid: -2
      type: {class: , ns: , asm: }
```

Insertion in Assets/ScriptableObjects/Runes/Double Count.asset at line 86 [13.241]

[2.7845]

    - rid: 7043444486337986594
      type: {class: ReleaseEffect, ns: TagFighter.Effects, asm: Assembly-CSharp}

Replacement in Assets/ScriptableObjects/Runes/DemoCount.asset at line 36 [8.2213]

B:BD[2.8256] → [2.8256:8314]

          length: 0
          width: 0
          shape: 0

[2.8256]

[2.8314]

          length: 15
          width: 15
          shape: 1

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

B:BD[14.780121071] → [2.8538:8616]

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

[14.780121071]

[15.33888019]

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

Replacement in Assets/Scenes/SampleScene.unity at line 8671 [14.780110080]
B:BD[14.780161886] → [2.8617:8656]
```
    m_SensorSize: {x: 1.0984128, y: 1}
```
[14.780161886]
[14.780161925]
```
    m_SensorSize: {x: 1.3068783, y: 1}
```

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

B:BD[14.780162310] → [2.8657:8735]

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

[14.780162310]

[15.33918016]

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

Get Resource directly from context. Cleanup.

Dependencies

In channels

Change contents

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 24 [4.1601]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 47 [7.3265]

File deletion: CountTagsImmidiateEffect.cs.meta

File deletion: CountTagsImmidiateEffect.cs

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveResourceEffect.cs at line 17 [3.300]

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 1 [2.291]

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 42 [2.291]

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 44 [2.291]

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 12 [7.6210]

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 19 [7.6210]

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 32 [7.6210]

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 39 [7.6210]

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 41 [7.6210]

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 42 [7.6210]

Deletion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 55 [7.6210]

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 70 [7.6210]

Replacement in Assets/Scripts/Combat/Runes/Effects/CountResourceEffect.cs at line 17 [10.299]

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

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyResourceEffect.cs at line 14 [10.2450]

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyResourceEffect.cs at line 16 [10.2450]

Replacement in Assets/Scripts/Combat/Runes/Effects/AddResourceEffect.cs at line 17 [10.4292]

Deletion in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 13 [10.6182]

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 16 [10.6182]

Replacement in Assets/Scripts/Combat/Runes/Effects/AccumulateResourceByResourceEffect.cs at line 18 [10.6182]

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 47 [13.241]

Replacement in Assets/ScriptableObjects/Runes/Double Count.asset at line 49 [13.241]

Deletion in Assets/ScriptableObjects/Runes/Double Count.asset at line 57 [13.241]

Insertion in Assets/ScriptableObjects/Runes/Double Count.asset at line 86 [13.241]

Replacement in Assets/ScriptableObjects/Runes/DemoCount.asset at line 36 [8.2213]

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

Replacement in Assets/Scenes/SampleScene.unity at line 8671 [14.780110080]

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