itai.sharim/TagFight - Change R52YYK6WMYXCCIMHE4CKMSAQO7I4AHTJ2UHK4Z3V5UHI5KQWV5IAC

Create IRegisterType

Created by RaniSharim on May 13, 2023

R52YYK6WMYXCCIMHE4CKMSAQO7I4AHTJ2UHK4Z3V5UHI5KQWV5IAC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/Combat/Runes/Effects/ResourceAccessors/ContextResourceAccessors.cs at line 1 [3.5096]

B:BD[3.5096] → [3.5097:5147]

B:BD[3.5147] → [4.10659:10684]

∅:D[4.10684] → [3.5147:5196]

B:BD[3.5147] → [3.5147:5196]

B:BD[3.5198] → [3.5198:5200]

B:BD[3.5200] → [5.4511:4567]

∅:D[5.4567] → [3.5230:5233]

B:BD[3.5230] → [3.5230:5233]

B:BD[3.5233] → [5.4568:4600]

∅:D[5.4600] → [3.5306:5313]

∅:D[4.10708] → [3.5306:5313]

B:BD[3.5306] → [3.5306:5313]

B:BD[3.5313] → [4.10709:11377]

∅:D[4.11377] → [6.3879:3890]

B:BD[6.3879] → [6.3879:3890]

∅:D[6.3890] → [3.5548:5550]

B:BD[3.5548] → [3.5548:5550]

B:BD[3.5550] → [4.11378:12090]

∅:D[4.12090] → [6.4180:4191]

B:BD[6.4180] → [6.4180:4191]

B:BD[6.4191] → [5.4601:4608]

∅:D[6.4191] → [3.5805:5807]

∅:D[5.4608] → [3.5805:5807]

B:BD[3.5805] → [3.5805:5807]

B:BD[3.5807] → [5.4609:4745]

∅:D[5.4745] → [4.12114:12125]

B:BD[4.12114] → [4.12114:12125]

B:BD[4.12125] → [5.4746:4804]

B:BD[5.4804] → [7.19051:19098]

∅:D[7.19098] → [8.16001:16086]

B:BD[5.4844] → [8.16001:16086]

∅:D[8.16086] → [5.4967:5061]

B:BD[5.4967] → [5.4967:5061]

B:BD[5.5061] → [8.16087:16157]

∅:D[5.5126] → [4.12728:12743]

∅:D[8.16157] → [4.12728:12743]

B:BD[4.12728] → [4.12728:12743]

B:BD[4.12743] → [5.5127:5212]

∅:D[5.5212] → [6.4417:4428]

∅:D[4.12743] → [6.4417:4428]

B:BD[6.4417] → [6.4417:4428]

B:BD[6.4428] → [5.5213:5220]

∅:D[6.4428] → [3.6192:6194]

∅:D[5.5220] → [3.6192:6194]

B:BD[3.6192] → [3.6192:6194]

B:BD[3.6194] → [5.5221:5359]

∅:D[5.5359] → [4.12767:12778]

B:BD[4.12767] → [4.12767:12778]

B:BD[4.12778] → [5.5360:5418]

B:BD[5.5418] → [7.19099:19146]

∅:D[6.4727] → [3.6447:6449]

∅:D[5.5458] → [3.6447:6449]

∅:D[4.12976] → [3.6447:6449]

∅:D[7.19146] → [3.6447:6449]

B:BD[3.6447] → [3.6447:6449]

B:BD[3.6449] → [5.5459:5562]

∅:D[5.5562] → [3.6519:6521]

∅:D[4.13088] → [3.6519:6521]

B:BD[3.6519] → [3.6519:6521]

B:BD[3.6521] → [8.16158:16256]

∅:D[8.16256] → [5.5699:5793]

B:BD[5.5699] → [5.5699:5793]

B:BD[5.5793] → [8.16257:16347]

∅:D[8.16347] → [5.5878:5893]

B:BD[5.5878] → [5.5878:5893]

∅:D[6.4966] → [3.6836:6838]

∅:D[5.5893] → [3.6836:6838]

∅:D[4.13439] → [3.6836:6838]

B:BD[3.6836] → [3.6836:6838]

B:BD[3.6838] → [5.5894:5977]

∅:D[5.5977] → [6.5256:5267]

∅:D[4.13542] → [6.5256:5267]

B:BD[6.5256] → [6.5256:5267]

B:BD[3.7160] → [3.7160:7168]

using System;
using System.Collections.Generic;
using CareBoo.Serially;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.Effects.ResourceLocationAccessors
{
    namespace ContextRegisters
    {
        [Serializable] public sealed class Current : ContextRegister<Current> { }
        [Serializable] public sealed class Added : ContextRegister<Added> { }
        [Serializable] public sealed class Removed : ContextRegister<Removed> { }
        public interface IContextRegister
        {
            public IEnumerable<Unit<TUnit>> Get<TResource, TUnit>(EffectContext context)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType;
            public void Set<TResource, TUnit>(EffectContext context, Unit<TUnit> value)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType;
        }
        public class ContextRegister<TRegister> : IContextRegister
        {
            public IEnumerable<Unit<TUnit>> Get<TResource, TUnit>(EffectContext context)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                yield return context.GetResource<TResource, TUnit, TRegister>();
            }
            public void Set<TResource, TUnit>(EffectContext context, Unit<TUnit> value)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                context.SetResource<TResource, TUnit, TRegister>(value);
            }
            public override string ToString() => typeof(TRegister).Name;
        }
    }
    namespace Get
    {
        using ContextRegisters;
        [Serializable]
        public class Context : IResourceLocationGet
        {
            [SerializeReference, ShowSerializeReference]
            public IContextRegister Register;
            public IEnumerable<Unit<TUnit>> Get<TResource, TUnit>(EffectInput data)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                return Register.Get<TResource, TUnit>(data.Context);
            }
            public override string ToString() => $"{nameof(Context)}.{Register}";
        }
    }
    namespace Set
    {
        using ContextRegisters;
        [Serializable]
        public class Context : IResourceLocationSet
        {
            [SerializeReference, ShowSerializeReference]
            public IContextRegister Register;
            [SerializeReference, ShowSerializeReference]
            public IResourceOperator SetAs;
            public void Set<TResource, TUnit>(EffectInput data, IEnumerable<Unit<TUnit>> values)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                Register.Set<TResource, TUnit>(data.Context, SetAs.OperateEnum(values));
            }
            public override string ToString() => $"{nameof(Context)}.{Register}";
        }
    }
}

[3.5096]

using System;
using System.Collections.Generic;
using CareBoo.Serially;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.Effects.ResourceLocationAccessors
{
    namespace ContextRegisters
    {
        public interface IRegisterType { }
        [Serializable] public sealed class Current : IRegisterType { }
        [Serializable] public sealed class Added : IRegisterType { }
        [Serializable] public sealed class Removed : IRegisterType { }
        public interface IContextRegister
        {
            public IEnumerable<Unit<TUnit>> Get<TResource, TUnit>(EffectContext context)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType;
            public void Set<TResource, TUnit>(EffectContext context, Unit<TUnit> value)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType;
        }
        public class ContextRegister<TRegisterType> : IContextRegister where TRegisterType : IRegisterType
        {
            public IEnumerable<Unit<TUnit>> Get<TResource, TUnit>(EffectContext context)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                yield return context.GetResource<TResource, TUnit, TRegisterType>();
            }
            public void Set<TResource, TUnit>(EffectContext context, Unit<TUnit> value)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                context.SetResource<TResource, TUnit, TRegisterType>(value);
            }
            public override string ToString() => typeof(TRegisterType).Name;
        }
    }
    namespace Get
    {
        using ContextRegisters;
        [Serializable]
        public class Context : IResourceLocationGet
        {
            [SerializeReference, ShowSerializeReference]
            public IContextRegister Register;
            public IEnumerable<Unit<TUnit>> Get<TResource, TUnit>(EffectInput data)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                return Register.Get<TResource, TUnit>(data.Context);
            }
            public override string ToString() => $"{nameof(Context)}.{Register}";
        }
    }
    namespace Set
    {
        using ContextRegisters;
        [Serializable]
        public class Context : IResourceLocationSet
        {
            [SerializeReference, ShowSerializeReference]
            public IContextRegister Register;
            [SerializeReference, ShowSerializeReference]
            public IResourceOperator SetAs;
            public void Set<TResource, TUnit>(EffectInput data, IEnumerable<Unit<TUnit>> values)
                where TResource : Resource<TUnit>
                where TUnit : IUnitType {
                Register.Set<TResource, TUnit>(data.Context, SetAs.OperateEnum(values));
            }
            public override string ToString() => $"{nameof(Context)}.{Register}";
        }
    }
}

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

B:BD[9.6210] → [2.97110:97125]

∅:D[5.6361] → [9.6238:6273]

∅:D[2.97125] → [9.6238:6273]

B:BD[9.6238] → [9.6238:6273]

∅:D[10.12765] → [11.1261:1281]

B:BD[9.6273] → [11.1261:1281]

∅:D[12.1478] → [10.12766:12795]

∅:D[13.3211] → [10.12766:12795]

B:BD[11.1281] → [10.12766:12795]

∅:D[11.1281] → [9.6273:6293]

∅:D[10.12795] → [9.6273:6293]

B:BD[9.6273] → [9.6273:6293]

∅:D[10.12798] → [9.6293:6295]

B:BD[9.6293] → [9.6293:6295]

B:BD[9.6295] → [14.3169:3199]

∅:D[15.1219] → [10.12924:12927]

∅:D[14.3199] → [10.12924:12927]

B:BD[10.12924] → [10.12924:12927]

B:BD[10.12927] → [2.97126:97361]

∅:D[2.97361] → [13.3436:3445]

B:BD[13.3436] → [13.3436:3445]

∅:D[13.3445] → [14.3200:3239]

B:BD[10.12927] → [14.3200:3239]

B:BD[14.3239] → [16.429:496]

∅:D[16.496] → [10.13397:13399]

∅:D[14.3389] → [10.13397:13399]

∅:D[4.13614] → [10.13397:13399]

B:BD[10.13397] → [10.13397:13399]

B:BD[10.13399] → [14.3390:3492]

∅:D[14.3492] → [17.578:580]

B:BD[17.578] → [17.578:580]

∅:D[6.5383] → [12.1543:1587]

B:BD[12.1543] → [12.1543:1587]

∅:D[12.1587] → [17.580:582]

∅:D[14.3549] → [17.580:582]

B:BD[17.580] → [17.580:582]

B:BD[17.582] → [18.4570:4647]

∅:D[14.3693] → [17.724:726]

B:BD[17.724] → [17.724:726]

B:BD[17.726] → [19.11640:11705]

∅:D[14.4229] → [17.832:834]

∅:D[20.4266] → [17.832:834]

∅:D[19.11705] → [17.832:834]

∅:D[10.13480] → [17.832:834]

B:BD[17.832] → [17.832:834]

B:BD[17.834] → [2.97362:97428]

∅:D[2.97428] → [13.3510:3512]

B:BD[13.3510] → [13.3510:3512]

∅:D[13.3512] → [19.11706:11797]

B:BD[17.834] → [19.11706:11797]

B:BD[19.11797] → [13.3513:3553]

∅:D[13.3553] → [4.13716:13727]

∅:D[19.11797] → [4.13716:13727]

B:BD[4.13716] → [4.13716:13727]

B:BD[4.13727] → [16.497:570]

∅:D[16.570] → [14.4306:4353]

∅:D[21.1028] → [14.4306:4353]

∅:D[4.13808] → [14.4306:4353]

B:BD[14.4306] → [14.4306:4353]

B:BD[14.4353] → [4.13809:13848]

B:BD[4.13848] → [22.700:755]

B:BD[22.755] → [5.6362:6458]

∅:D[5.6458] → [16.714:853]

B:BD[16.714] → [16.714:853]

∅:D[16.853] → [14.4778:4789]

∅:D[21.1090] → [14.4778:4789]

∅:D[4.14263] → [14.4778:4789]

B:BD[14.4778] → [14.4778:4789]

∅:D[20.4319] → [17.834:836]

∅:D[14.5255] → [17.834:836]

∅:D[10.13535] → [17.834:836]

B:BD[17.834] → [17.834:836]

B:BD[17.836] → [16.854:942]

∅:D[16.942] → [4.14345:14431]

B:BD[4.14345] → [4.14345:14431]

B:BD[4.14431] → [22.756:811]

∅:D[22.811] → [16.1006:1227]

B:BD[16.1006] → [16.1006:1227]

∅:D[16.1227] → [14.6998:7009]

∅:D[4.14704] → [14.6998:7009]

B:BD[14.6998] → [14.6998:7009]

∅:D[14.7009] → [15.2102:2104]

B:BD[15.2102] → [15.2102:2104]

B:BD[15.2104] → [18.4648:4708]

∅:D[18.4708] → [14.7070:7181]

B:BD[14.7070] → [14.7070:7181]

B:BD[14.7181] → [23.439:568]

B:BD[23.568] → [24.15271:15354]

∅:D[24.15354] → [23.658:660]

B:BD[23.658] → [23.658:660]

B:BD[23.660] → [24.15355:15394]

∅:D[24.15394] → [23.700:977]

B:BD[23.700] → [23.700:977]

∅:D[23.977] → [14.7248:7259]

∅:D[18.4776] → [14.7248:7259]

B:BD[14.7248] → [14.7248:7259]

∅:D[14.7259] → [25.2727:2729]

B:BD[25.2727] → [25.2727:2729]

B:BD[25.2729] → [26.5081:5112]

∅:D[26.5112] → [5.6499:6538]

B:BD[5.6499] → [5.6499:6538]

∅:D[5.6538] → [17.981:992]

∅:D[14.7410] → [17.981:992]

B:BD[17.981] → [17.981:992]

∅:D[17.1062] → [9.6532:6534]

B:BD[9.6532] → [9.6532:6534]

B:BD[9.6534] → [14.7411:7482]

∅:D[20.4594] → [17.1344:1351]

∅:D[14.8082] → [17.1344:1351]

B:BD[17.1344] → [17.1344:1351]

B:BD[17.1351] → [14.8083:8084]

using System;
using System.Collections.Generic;
using System.Linq;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.Effects
{
    public class ReleaseMultiplier
    {
        public Type MatchingAoe { get; set; }
        public float MatchingAoeReleaseMultiplier { get; set; } = 1f;
        public float NonMatchingAoeReleaseMultiplier { get; set; } = 1f;
    }
    public class EffectContext
    {
        Dictionary<System.Type, IUnit> _resourceRegistry = new();
        public Transform Caster { get; set; }
        public Transform EffectLocation { get; set; }
        public IAreaOfEffect AreaOfEffect;
        public List<IDelayedEffect> EffectsToTrigger { get; set; } = new();
        public IEffectSystem EffectSystem { get; private set; }
        public ReleaseMultiplier ReleaseMultiplier { get; set; }
        public EffectContext() {
            EffectSystem = SystemsHandler.EffectSystem;
            ReleaseMultiplier = new();
        }
        public Unit<TUnit> GetResource<TResource, TUnit, TRegister>()
            where TResource : Resource<TUnit>
            where TUnit : IUnitType {
            var key = typeof((TResource, TRegister));
            var value = (Unit<TUnit>)_resourceRegistry.GetValueOrDefault(key, (Unit<TUnit>)0);
            Debug.Log($"{nameof(GetResource)} ({typeof(TResource).Name},{typeof(TRegister).Name}) = {value}");
            return value;
        }
        public Unit<TUnit> SetResource<TResource, TUnit, TRegister>(Unit<TUnit> value)
            where TResource : Resource<TUnit>
            where TUnit : IUnitType {
            var key = typeof((TResource, TRegister));
            var newValue = (Unit<TUnit>)(_resourceRegistry[key] = value);
            Debug.Log($"{nameof(SetResource)} ({typeof(TResource).Name},{typeof(TRegister).Name})  = {newValue}");
            return newValue;
        }
        public IEnumerable<Transform> GetAffectedUnits() {
            if (AreaOfEffect == null) {
                return Enumerable.Empty<Transform>();
            }
            var directionVector = (EffectLocation.position - Caster.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            GameObject tmpGo = new();
            tmpGo.transform.position = EffectLocation.position;
            tmpGo.transform.rotation = direction;
            var affectedUnits = AreaOfEffect.GetAffectedUnits(EffectLocation);
            GameObject.Destroy(tmpGo);
            return affectedUnits;
        }
        void ResetEffects() {
            EffectsToTrigger.Clear();
        }
        public void Reset() {
            ResetEffects();
        }
    }
}

[9.6210]

using System;
using System.Collections.Generic;
using System.Linq;
using TagFighter.Effects.ResourceLocationAccessors.ContextRegisters;
using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.Effects
{
    public class ReleaseMultiplier
    {
        public Type MatchingAoe { get; set; }
        public float MatchingAoeReleaseMultiplier { get; set; } = 1f;
        public float NonMatchingAoeReleaseMultiplier { get; set; } = 1f;
    }
    public class EffectContext
    {
        Dictionary<System.Type, IUnit> _resourceRegistry = new();
        public Transform Caster { get; set; }
        public Transform EffectLocation { get; set; }
        public IAreaOfEffect AreaOfEffect;
        public List<IDelayedEffect> EffectsToTrigger { get; set; } = new();
        public IEffectSystem EffectSystem { get; private set; }
        public ReleaseMultiplier ReleaseMultiplier { get; set; }
        public EffectContext() {
            EffectSystem = SystemsHandler.EffectSystem;
            ReleaseMultiplier = new();
        }
        public Unit<TUnit> GetResource<TResource, TUnit, TRegister>()
            where TResource : Resource<TUnit>
            where TUnit : IUnitType
            where TRegister : IRegisterType {
            var key = typeof((TResource, TRegister));
            var value = (Unit<TUnit>)_resourceRegistry.GetValueOrDefault(key, (Unit<TUnit>)0);
            Debug.Log($"{nameof(GetResource)} ({typeof(TResource).Name},{typeof(TRegister).Name}) = {value}");
            return value;
        }
        public Unit<TUnit> SetResource<TResource, TUnit, TRegister>(Unit<TUnit> value)
            where TResource : Resource<TUnit>
            where TUnit : IUnitType
            where TRegister : IRegisterType {
            var key = typeof((TResource, TRegister));
            var newValue = (Unit<TUnit>)(_resourceRegistry[key] = value);
            Debug.Log($"{nameof(SetResource)} ({typeof(TResource).Name},{typeof(TRegister).Name})  = {newValue}");
            return newValue;
        }
        public IEnumerable<Transform> GetAffectedUnits() {
            if (AreaOfEffect == null) {
                return Enumerable.Empty<Transform>();
            }
            var directionVector = (EffectLocation.position - Caster.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            GameObject tmpGo = new();
            tmpGo.transform.position = EffectLocation.position;
            tmpGo.transform.rotation = direction;
            var affectedUnits = AreaOfEffect.GetAffectedUnits(EffectLocation);
            GameObject.Destroy(tmpGo);
            return affectedUnits;
        }
        void ResetEffects() {
            EffectsToTrigger.Clear();
        }
        public void Reset() {
            ResetEffects();
        }
    }
}