itai.sharim/TagFight - Change 6IGB3OBVTMSJEDSSYDOCA6I4EWSTIWKAACJOFFLDPDKFW3ZP5FUAC

Change IAreaOfEffect API to receive both origin and target

Created by itai.sharim on October 7, 2023

6IGB3OBVTMSJEDSSYDOCA6I4EWSTIWKAACJOFFLDPDKFW3ZP5FUAC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/Combat/Runes/Effects/Nodes/Release/ReleaseEffect.cs at line 35 [3.3938]

B:BD[3.4840] → [2.21937:22030]

            blackBoard.Affected = aoe.GetAffectedUnits(blackBoard.Context.Caster).ToList();

[3.4840]

[3.4932]

            blackBoard.Affected = aoe.GetAffectedUnits(blackBoard.Context.Caster, blackBoard.Context.EffectLocation).ToList();

Replacement in Assets/Scripts/Combat/Runes/Effects/EffectModes.cs at line 1 [4.291]

B:BD[4.291] → [2.22063:27832]

using System;
using System.Collections.Generic;
using System.Linq;
using CareBoo.Serially;
using TagFighter.Effects.ResourceLocationAccessors.ContextRegisters;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.Effects
{
    public interface IDelayedEffect
    {
        void DelayedAction(EffectInput data);
    }
    public interface IImmediateEffect
    {
        void ImmediateAction(EffectContext context, IEffect effect);
    }
    public interface IEffectMode
    {
        void Apply(EffectContext context);
        void Effect(EffectContext context, IEffect effect);
    }
    [ProvideSourceInfo]
    [Serializable]
    public class DelayedEffect : IImmediateEffect, IDelayedEffect
    {
        IEffect _effect;
        public void DelayedAction(EffectInput data) {
            _effect.Apply(data);
            // direction towards target
            var directionVector = (data.Context.EffectLocation.Transform.position - data.Context.Caster.Transform.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            var appliedResource = data.Context.GetAllResourcesInRegister<Added>();
            data.Context.EffectSystem.ApplyTagsEffect(appliedResource, data.Context.Caster, direction, data.Context.AreaOfEffect);
        }
        public void ImmediateAction(EffectContext context, IEffect effect) {
            if (effect != null) {
                _effect = effect;
                context.EffectsToTrigger.Add(this);
            }
        }
    }
    [ProvideSourceInfo]
    [Serializable]
    public class ImmediateEffect : IImmediateEffect
    {
        [SerializeReference, ShowSerializeReference]
        AoeShapes.IAoeShape _areaOfEffect;
        public void ImmediateAction(EffectContext context, IEffect effect) {
            if (effect != null) {
                // direction towards target
                var directionVector = (context.EffectLocation.Transform.position - context.Caster.Transform.position).normalized;
                directionVector.y = 0;
                var direction = Quaternion.LookRotation(directionVector, Vector3.up);
                EffectInput data = new(context, Enumerable.Empty<Transform>(), StatModifierAccessor.Permanent);
                var areaOfEffect = _areaOfEffect.AreaOfEffect(data);
                // Copy the location of the effect and merge with the direction caster -> target
                GameObject tmpGo = new();
                tmpGo.transform.position = context.EffectLocation.Transform.position;
                tmpGo.transform.rotation = direction;
                data.Affected = areaOfEffect.GetAffectedUnits(new(tmpGo.transform));
                GameObject.Destroy(tmpGo);
                effect.Apply(data);
                var appliedResource = context.GetAllResourcesInRegister<Added>();
                context.EffectSystem.ApplyTagsEffect(appliedResource, context.Caster, direction, areaOfEffect);
            }
        }
    }
    [ProvideSourceInfo]
    [Serializable]
    public class ImmediateWeave : IImmediateEffect
    {
        public void ImmediateAction(EffectContext context, IEffect effect) {
            EffectInput data = new(context, context.GetAffectedUnits(), StatModifierAccessor.Permanent);
            if (effect != null) {
                effect.Apply(data);
                data.Affected = context.GetAffectedUnits();
            }
            Materialize(data);
        }
        void Materialize(EffectInput data) {
            foreach (var effect in data.Context.EffectsToTrigger) {
                effect.DelayedAction(data);
            }
            data.Context.EffectsToTrigger.Clear();
        }
    }
    [ProvideSourceInfo]
    [Serializable]
    public class PeriodicWeave : IImmediateEffect
    {
        [SerializeReference, ShowSerializeReference]
        public AoeShapes.IAoeShape AreaOfEffect;
        [SerializeReference, ShowSerializeReference]
        public Triggers.ITrigger ApplyTrigger;
        [SerializeReference, ShowSerializeReference]
        public Triggers.ITrigger EndTrigger;
        public bool IsPermanent;
        public void ImmediateAction(EffectContext context, IEffect effect) {
            EffectInput data = new(context, context.GetAffectedUnits(), StatModifierAccessor.Permanent);
            if (effect != null) {
                effect.Apply(data);
                data.Affected = context.GetAffectedUnits();
            }
            Materialize(data);
        }
        void Materialize(EffectInput data) {
            var areaOfEffect = AreaOfEffect.AreaOfEffect(data);
            /// Move all effects in context to condition context.
            List<IDelayedEffect> effectsToTrigger = new(data.Context.EffectsToTrigger);
            data.Context.EffectsToTrigger.Clear();
            var origin = data.Context.Caster;
            foreach (var affectedPawn in data.Affected) {
                var condition = IsPermanent ? affectedPawn.gameObject.AddComponent<PawnCondition>() : affectedPawn.gameObject.AddComponent<TransientPawnCondition>();
                condition.EndTrigger = EndTrigger?.ShallowCopy();
                condition.ApplyTrigger = ApplyTrigger?.ShallowCopy();
                condition.Origin = origin;
                condition.Context = new EffectContext(new(affectedPawn), new(affectedPawn)) {
                    AreaOfEffect = areaOfEffect,
                    EffectsToTrigger = effectsToTrigger
                };
                condition.Apply();
            }
        }
    }
}

[4.291]

using System;
using System.Collections.Generic;
using System.Linq;
using CareBoo.Serially;
using TagFighter.Effects.ResourceLocationAccessors.ContextRegisters;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.Effects
{
    public interface IDelayedEffect
    {
        void DelayedAction(EffectInput data);
    }
    public interface IImmediateEffect
    {
        void ImmediateAction(EffectContext context, IEffect effect);
    }
    public interface IEffectMode
    {
        void Apply(EffectContext context);
        void Effect(EffectContext context, IEffect effect);
    }
    [ProvideSourceInfo]
    [Serializable]
    public class DelayedEffect : IImmediateEffect, IDelayedEffect
    {
        IEffect _effect;
        public void DelayedAction(EffectInput data) {
            _effect.Apply(data);
            // direction towards target
            var directionVector = (data.Context.EffectLocation.Transform.position - data.Context.Caster.Transform.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            var appliedResource = data.Context.GetAllResourcesInRegister<Added>();
            data.Context.EffectSystem.ApplyTagsEffect(appliedResource, data.Context.Caster, direction, data.Context.AreaOfEffect);
        }
        public void ImmediateAction(EffectContext context, IEffect effect) {
            if (effect != null) {
                _effect = effect;
                context.EffectsToTrigger.Add(this);
            }
        }
    }
    [ProvideSourceInfo]
    [Serializable]
    public class ImmediateEffect : IImmediateEffect
    {
        [SerializeReference, ShowSerializeReference]
        AoeShapes.IAoeShape _areaOfEffect;
        public void ImmediateAction(EffectContext context, IEffect effect) {
            if (effect != null) {
                // direction towards target
                var directionVector = (context.EffectLocation.Transform.position - context.Caster.Transform.position).normalized;
                directionVector.y = 0;
                var direction = Quaternion.LookRotation(directionVector, Vector3.up);
                EffectInput data = new(context, Enumerable.Empty<Transform>(), StatModifierAccessor.Permanent);
                var areaOfEffect = _areaOfEffect.AreaOfEffect(data);
                // Copy the location of the effect and merge with the direction caster -> target
                // GameObject tmpGo = new();
                // tmpGo.transform.position = context.EffectLocation.Transform.position;
                // tmpGo.transform.rotation = direction;
                data.Affected = areaOfEffect.GetAffectedUnits(context.Caster, context.EffectLocation);
                // GameObject.Destroy(tmpGo);
                effect.Apply(data);
                var appliedResource = context.GetAllResourcesInRegister<Added>();
                context.EffectSystem.ApplyTagsEffect(appliedResource, context.Caster, direction, areaOfEffect);
            }
        }
    }
    [ProvideSourceInfo]
    [Serializable]
    public class ImmediateWeave : IImmediateEffect
    {
        public void ImmediateAction(EffectContext context, IEffect effect) {
            EffectInput data = new(context, context.GetAffectedUnits(), StatModifierAccessor.Permanent);
            if (effect != null) {
                effect.Apply(data);
                data.Affected = context.GetAffectedUnits();
            }
            Materialize(data);
        }
        void Materialize(EffectInput data) {
            foreach (var effect in data.Context.EffectsToTrigger) {
                effect.DelayedAction(data);
            }
            data.Context.EffectsToTrigger.Clear();
        }
    }
    [ProvideSourceInfo]
    [Serializable]
    public class PeriodicWeave : IImmediateEffect
    {
        [SerializeReference, ShowSerializeReference]
        public AoeShapes.IAoeShape AreaOfEffect;
        [SerializeReference, ShowSerializeReference]
        public Triggers.ITrigger ApplyTrigger;
        [SerializeReference, ShowSerializeReference]
        public Triggers.ITrigger EndTrigger;
        public bool IsPermanent;
        public void ImmediateAction(EffectContext context, IEffect effect) {
            EffectInput data = new(context, context.GetAffectedUnits(), StatModifierAccessor.Permanent);
            if (effect != null) {
                effect.Apply(data);
                data.Affected = context.GetAffectedUnits();
            }
            Materialize(data);
        }
        void Materialize(EffectInput data) {
            var areaOfEffect = AreaOfEffect.AreaOfEffect(data);
            /// Move all effects in context to condition context.
            List<IDelayedEffect> effectsToTrigger = new(data.Context.EffectsToTrigger);
            data.Context.EffectsToTrigger.Clear();
            var origin = data.Context.Caster;
            foreach (var affectedPawn in data.Affected) {
                var condition = IsPermanent ? affectedPawn.gameObject.AddComponent<PawnCondition>() : affectedPawn.gameObject.AddComponent<TransientPawnCondition>();
                condition.EndTrigger = EndTrigger?.ShallowCopy();
                condition.ApplyTrigger = ApplyTrigger?.ShallowCopy();
                condition.Origin = origin;
                condition.Context = new EffectContext(new(affectedPawn), new(affectedPawn)) {
                    AreaOfEffect = areaOfEffect,
                    EffectsToTrigger = effectsToTrigger
                };
                condition.Apply();
            }
        }
    }
}

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

B:BD[5.6210] → [2.27835:32186]

#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
using TagFighter.Effects.ResourceLocationAccessors.ContextRegisters;
using TagFighter.Effects.Steps;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter
{
    public struct EffectOrigin
    {
        public Transform Transform;
        public EffectOrigin(Transform transform) {
            Transform = transform;
        }
    }
    public struct EffectTarget
    {
        public Transform Transform;
        public EffectTarget(Transform transform) {
            Transform = transform;
        }
    }
}
namespace TagFighter.Effects
{
    public class ReleaseMultiplier
    {
        public Type? MatchingAoe { get; set; }
        public float MatchingAoeReleaseMultiplier { get; set; } = 1f;
        public float NonMatchingAoeReleaseMultiplier { get; set; } = 1f;
    }
    public record RegistryKey
    {
        public Type ContextRegisterType;
        public Type ResourceType;
        public RegistryKey(Type contextRegisterType, Type resourceType) {
            ContextRegisterType = contextRegisterType;
            ResourceType = resourceType;
        }
    }
    public class EffectContext
    {
        Dictionary<RegistryKey, IUnit> _resourceRegistry = new();
        public EffectOrigin Caster { get; set; }
        public EffectTarget EffectLocation { get; set; }
        public IAreaOfEffect AreaOfEffect;
        public List<IDelayedEffect> EffectsToTrigger { get; set; } = new();
        public List<OutputStep<bool>> EffectStepsToTrigger { get; set; } = new();
        public IEffectSystem EffectSystem { get; private set; }
        public ReleaseMultiplier ReleaseMultiplier { get; set; }
        public EffectContext(EffectOrigin caster, EffectTarget effectLocation) {
            EffectSystem = SystemsHandler.EffectSystem;
            ReleaseMultiplier = new();
            Caster = caster;
            EffectLocation = effectLocation;
            AreaOfEffect = new SingleTarget();
        }
        public Unit<TUnit> GetResource<TResource, TUnit, TContextRegister>()
            where TResource : Resource<TUnit>
            where TUnit : IUnitType
            where TContextRegister : IContextRegister {
            var key = new RegistryKey(typeof(TContextRegister), typeof(TResource));
            var value = (Unit<TUnit>)_resourceRegistry.GetValueOrDefault(key, (Unit<TUnit>)0);
            Debug.Log($"{nameof(GetResource)} ({typeof(TResource).Name},{typeof(TContextRegister).Name}) = {value}");
            return value;
        }
        public Unit<TUnit> SetResource<TResource, TUnit, TContextRegister>(Unit<TUnit> value)
            where TResource : Resource<TUnit>
            where TUnit : IUnitType
            where TContextRegister : IContextRegister {
            var key = new RegistryKey(typeof(TContextRegister), typeof(TResource));
            var newValue = (Unit<TUnit>)(_resourceRegistry[key] = value);
            Debug.Log($"{nameof(SetResource)} ({typeof(TResource).Name},{typeof(TContextRegister).Name})  = {newValue}");
            return newValue;
        }
        public IEnumerable<(Type, IUnit)> GetAllResourcesInRegister<TContextRegister>() where TContextRegister : IContextRegister {
            return _resourceRegistry.Where(x => x.Key.ContextRegisterType == typeof(TContextRegister)).Select(x => (x.Key.ResourceType, x.Value));
        }
        public IEnumerable<Transform> GetAffectedUnits() {
            var directionVector = (EffectLocation.Transform.position - Caster.Transform.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            GameObject tmpGo = new();
            tmpGo.transform.position = EffectLocation.Transform.position;
            tmpGo.transform.rotation = direction;
            var affectedUnits = AreaOfEffect.GetAffectedUnits(Caster);
            GameObject.Destroy(tmpGo);
            return affectedUnits;
        }
        void ResetEffects() {
            EffectsToTrigger.Clear();
            EffectStepsToTrigger.Clear();
        }
        public void Reset() {
            ResetEffects();
        }
    }
}

[5.6210]

#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
using TagFighter.Effects.ResourceLocationAccessors.ContextRegisters;
using TagFighter.Effects.Steps;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter
{
    public struct EffectOrigin
    {
        public Transform Transform;
        public EffectOrigin(Transform transform) {
            Transform = transform;
        }
    }
    public struct EffectTarget
    {
        public Transform Transform;
        public EffectTarget(Transform transform) {
            Transform = transform;
        }
    }
}
namespace TagFighter.Effects
{
    public class ReleaseMultiplier
    {
        public Type? MatchingAoe { get; set; }
        public float MatchingAoeReleaseMultiplier { get; set; } = 1f;
        public float NonMatchingAoeReleaseMultiplier { get; set; } = 1f;
    }
    public record RegistryKey
    {
        public Type ContextRegisterType;
        public Type ResourceType;
        public RegistryKey(Type contextRegisterType, Type resourceType) {
            ContextRegisterType = contextRegisterType;
            ResourceType = resourceType;
        }
    }
    public class EffectContext
    {
        Dictionary<RegistryKey, IUnit> _resourceRegistry = new();
        public EffectOrigin Caster { get; set; }
        public EffectTarget EffectLocation { get; set; }
        public IAreaOfEffect AreaOfEffect;
        public List<IDelayedEffect> EffectsToTrigger { get; set; } = new();
        public List<OutputStep<bool>> EffectStepsToTrigger { get; set; } = new();
        public IEffectSystem EffectSystem { get; private set; }
        public ReleaseMultiplier ReleaseMultiplier { get; set; }
        public EffectContext(EffectOrigin caster, EffectTarget effectLocation) {
            EffectSystem = SystemsHandler.EffectSystem;
            ReleaseMultiplier = new();
            Caster = caster;
            EffectLocation = effectLocation;
            AreaOfEffect = new SingleTarget();
        }
        public Unit<TUnit> GetResource<TResource, TUnit, TContextRegister>()
            where TResource : Resource<TUnit>
            where TUnit : IUnitType
            where TContextRegister : IContextRegister {
            var key = new RegistryKey(typeof(TContextRegister), typeof(TResource));
            var value = (Unit<TUnit>)_resourceRegistry.GetValueOrDefault(key, (Unit<TUnit>)0);
            Debug.Log($"{nameof(GetResource)} ({typeof(TResource).Name},{typeof(TContextRegister).Name}) = {value}");
            return value;
        }
        public Unit<TUnit> SetResource<TResource, TUnit, TContextRegister>(Unit<TUnit> value)
            where TResource : Resource<TUnit>
            where TUnit : IUnitType
            where TContextRegister : IContextRegister {
            var key = new RegistryKey(typeof(TContextRegister), typeof(TResource));
            var newValue = (Unit<TUnit>)(_resourceRegistry[key] = value);
            Debug.Log($"{nameof(SetResource)} ({typeof(TResource).Name},{typeof(TContextRegister).Name})  = {newValue}");
            return newValue;
        }
        public IEnumerable<(Type, IUnit)> GetAllResourcesInRegister<TContextRegister>() where TContextRegister : IContextRegister {
            return _resourceRegistry.Where(x => x.Key.ContextRegisterType == typeof(TContextRegister)).Select(x => (x.Key.ResourceType, x.Value));
        }
        public IEnumerable<Transform> GetAffectedUnits() {
            var affectedUnits = AreaOfEffect.GetAffectedUnits(Caster, EffectLocation);
            return affectedUnits;
        }
        void ResetEffects() {
            EffectsToTrigger.Clear();
            EffectStepsToTrigger.Clear();
        }
        public void Reset() {
            ResetEffects();
        }
    }
}

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 11 [5.8100]

B:BD[2.32255] → [2.32255:32339]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin);

[2.32255]

[2.32339]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin, EffectTarget effectTarget);

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 18 [5.8100]

B:BD[2.32461] → [2.32461:32644]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin) {
            var origin = effectOrigin.Transform;
            return new Transform[] { origin };

[2.32461]

[2.32644]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin, EffectTarget effectTarget) {
            return new Transform[] { effectTarget.Transform };

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 30 [5.8100]

B:BD[2.32871] → [2.32871:32956]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin) {

[2.32871]

[2.32956]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin, EffectTarget effectTarget) {

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 50 [5.8100]

B:BD[5.9511] → [2.33463:33548]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin) {

[5.9511]

[2.33548]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin, EffectTarget effectTarget) {

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 91 [5.8100]

B:BD[2.35003] → [2.35003:35088]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin) {

[2.35003]

[2.35088]

        public IEnumerable<Transform> GetAffectedUnits(EffectOrigin effectOrigin, EffectTarget effectTarget) {

Replacement in Assets/Scenes/SampleScene.unity at line 5764 [6.780110080]

B:BD[6.780121071] → [2.37860:37939]

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

[6.780121071]

[7.33888019]

  m_LocalRotation: {x: 0.22914574, y: -0.070709094, z: 0.016692149, w: 0.970677}

Replacement in Assets/Scenes/SampleScene.unity at line 7935 [6.780110080]
B:BD[6.780161886] → [8.9120:9158]
```
    m_SensorSize: {x: 1.362963, y: 1}
```
[6.780161886]
[6.780161925]
```
    m_SensorSize: {x: 1.5153439, y: 1}
```

Replacement in Assets/Scenes/SampleScene.unity at line 7951 [6.780110080]

B:BD[6.780162310] → [2.38419:38498]

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

[6.780162310]

[7.33918016]

  m_LocalRotation: {x: 0.22914574, y: -0.070709094, z: 0.016692149, w: 0.970677}