itai.sharim/TagFight - Change MVKH53ZVMYP2567BJWADIPYITZAKH2FOB4CZAX674ITMQKZJPXTQC

Align ConeArea and PathArea target acquisition to EffectSystem Display. Current behavior ignores caster look direction

Created by itai.sharim on October 7, 2023

MVKH53ZVMYP2567BJWADIPYITZAKH2FOB4CZAX674ITMQKZJPXTQC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/Systems/Effects/EffectSystem.cs at line 1 [3.2503]

B:BD[3.2503] → [4.6737:14929]

#nullable enable
namespace TagFighter
{
    using System;
    using System.Collections;
    using System.Collections.Generic;
    using System.Linq;
    using CareBoo.Serially;
    using TagFighter.Resources;
    using UnityEngine;
    [ProvideSourceInfo]
    [Serializable]
    public class EffectSystem : IEffectSystem
    {
        // ParticleSystem _rippleOutVfx;
        [SerializeField] Effects.EffectColors? _colorMapping;
        const string PulseMaterial = "Materials/PulseMaterial2";
        class EffectRunner : MonoBehaviour
        {
            public GameObject? EffectObj;
            public Material? Material;
            public float PlayTime;
            public void Run(GameObject effectObj, Material material, float playTime) {
                EffectObj = effectObj;
                Material = material;
                PlayTime = playTime;
                Material.SetFloat("_Phase", 0);
                EffectObj.SetActive(true);
                StartCoroutine(PlayEffect(material, PlayTime));
            }
            public IEnumerator PlayEffect(Material material, float playTime) {
                float totalTime = 0;
                float phase = 0;
                while (phase < 0.98) {
                    totalTime += Time.deltaTime;
                    phase = totalTime / playTime;
                    material.SetFloat("_Phase", phase);
                    yield return null;
                }
                Destroy(EffectObj);
            }
        }
        public EffectSystem() {
        }
        public void ApplyTagsEffect(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, IAreaOfEffect areaOfEffect) {
            switch (areaOfEffect) {
                case SingleTarget: ApplyTagsEffectSingle(); break;
                case CircleArea aoe: ApplyTagsEffectRadius(tags, origin, direction, aoe); break;
                case ConeArea aoe: ApplyTagsEffectCone(tags, origin, direction, aoe); break;
                case PathArea aoe: ApplyTagsEffectPath(tags, origin, direction, aoe); break;
            }
        }
        public void ApplyTagsEffect(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, EffectTarget effectLocation, IAreaOfEffect areaOfEffect) {
            var directionVector = (effectLocation.Transform.position - origin.Transform.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            ApplyTagsEffect(tags, origin, direction, areaOfEffect);
        }
        void ApplyTagsEffectSingle() {
            Debug.Log("ApplyTagsEffectSingle");
        }
        void ApplyTagsEffectPath(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, PathArea areaOfEffect) {
            var color = GetEffectColor(tags);
            var mesh = CreateQuadMeshForUnit(origin.Transform, areaOfEffect.Width, areaOfEffect.Length);
            // Add a new to clone the shared resource
            Material material = new(UnityEngine.Resources.Load<Material>(PulseMaterial));
            material.SetColor("_Color", color);
            DisplayEffect(origin, direction, mesh, material);
        }
        void ApplyTagsEffectRadius(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, CircleArea areaOfEffect) {
            var color = GetEffectColor(tags);
            var mesh = CreateArcMeshForUnit(origin.Transform, 360, areaOfEffect.Radius);
            // Add a new to clone the shared resource
            Material material = new(UnityEngine.Resources.Load<Material>(PulseMaterial));
            material.SetColor("_Color", color);
            DisplayEffect(origin, direction, mesh, material);
        }
        void ApplyTagsEffectCone(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, ConeArea areaOfEffect) {
            Debug.Log("ApplyTagsEffectCone");
            var color = GetEffectColor(tags);
            var mesh = CreateArcMeshForUnit(origin.Transform, areaOfEffect.Angle, areaOfEffect.Radius);
            // Add a new to clone the shared resource
            Material material = new(UnityEngine.Resources.Load<Material>(PulseMaterial));
            material.SetColor("_Color", color);
            DisplayEffect(origin, direction, mesh, material);
        }
        public Color GetEffectColor(IEnumerable<(Type, IUnit)> tags) {
            Debug.Log("GetEffectColor");
            var color = new Color();
            Debug.Log($"GetEffectColor length {tags.Count()}");
            if (_colorMapping != null) {
                foreach (var tag in tags) {
                    Debug.Log("GetEffectColor tag");
                    if (_colorMapping.ContainsKey(tag.Item1)) {
                        Debug.Log("GetEffectColor mapping found");
                        var mappedColor = _colorMapping[tag.Item1];
                        // TODO: scale color by amount
                        color += mappedColor;
                    }
                }
            }
            Debug.Log("GetEffectColor Finished");
            return color;
        }
        public Mesh CreateArcMeshForUnit(Transform unit, float arc, float length, int numberOfVerticesInArc = 100) {
            return CreateArcMesh(arc, length, numberOfVerticesInArc, Vector3.up);
        }
        public Mesh CreateQuadMeshForUnit(Transform unit, float width, float length) {
            return CreateQuadMesh(width, length, Vector3.up);
        }
        void DisplayEffect(EffectOrigin originUnit, Quaternion direction, Mesh mesh, Material material) {
            GameObject effectObj = new();
            effectObj.SetActive(false);
            effectObj.transform.position = originUnit.Transform.position;
            effectObj.transform.rotation = direction;
            var meshRenderer = effectObj.AddComponent<MeshRenderer>();
            meshRenderer.sharedMaterial = material;
            meshRenderer.shadowCastingMode = 0;
            meshRenderer.receiveShadows = false;
            var meshFilter = effectObj.AddComponent<MeshFilter>();
            meshFilter.mesh = mesh;
            effectObj.AddComponent<EffectRunner>();
            var effectRunner = effectObj.GetComponent<EffectRunner>();
            effectRunner.Run(effectObj, material, 1f);
        }
        public Mesh CreateArcMesh(float arc, float length, int numberOfVerticesInArc, Vector3 rotationAxis) {
            var origin = Vector3.zero;
            var direction = Vector3.forward;
            Mesh mesh = new();
            var n = numberOfVerticesInArc + 1;
            var arcStep = arc / (n - 2);
            var currentDegrees = -arc / 2;
            var vertices = new Vector3[n];
            var uv = new Vector2[n];
            vertices[0] = origin;
            uv[0] = origin;
            for (var i = 1; i < n; i++) {
                vertices[i] = Quaternion.AngleAxis(currentDegrees, rotationAxis) * direction * length;
                uv[i] = new Vector2(0, 1);
                //Debug.Log($"Current Degrees: {currentDegrees} -> {vertices[i]}");
                currentDegrees += arcStep;
            }
            mesh.vertices = vertices;
            mesh.uv = uv;
            var tris = new int[(n - 2) * 3];
            for (var i = 0; i < n - 2; i++) {
                tris[i * 3] = 0;
                tris[i * 3 + 1] = i + 1;
                tris[i * 3 + 2] = i + 2;
            }
            mesh.triangles = tris;
            var normals = new Vector3[n];
            for (var i = 0; i < n; i++) {
                normals[i] = rotationAxis;
            }
            mesh.normals = normals;
            return mesh;
        }
        public Mesh CreateQuadMesh(float width, float length, Vector3 rotationAxis) {
            Mesh mesh = new();
            var origin = Vector3.zero;
            // TODO: how to calculate local rotation? direction
            var vertices

[3.2503]

[4.14929]

#nullable enable
namespace TagFighter
{
    using System;
    using System.Collections;
    using System.Collections.Generic;
    using System.Linq;
    using CareBoo.Serially;
    using TagFighter.Resources;
    using UnityEngine;
    [ProvideSourceInfo]
    [Serializable]
    public class EffectSystem : IEffectSystem
    {
        // ParticleSystem _rippleOutVfx;
        [SerializeField] Effects.EffectColors? _colorMapping;
        const string PulseMaterial = "Materials/PulseMaterial2";
        const string PhaseProperty = "_Phase";
        const string ColorProperty = "_Color";
        class EffectRunner : MonoBehaviour
        {
            public GameObject? EffectObj;
            public Material? Material;
            public float PlayTime;
            public void Run(GameObject effectObj, Material material, float playTime) {
                EffectObj = effectObj;
                Material = material;
                PlayTime = playTime;
                Material.SetFloat(PhaseProperty, 0);
                EffectObj.SetActive(true);
                StartCoroutine(PlayEffect(material, PlayTime));
            }
            public IEnumerator PlayEffect(Material material, float playTime) {
                float totalTime = 0;
                float phase = 0;
                while (phase < 0.98) {
                    totalTime += Time.deltaTime;
                    phase = totalTime / playTime;
                    material.SetFloat(PhaseProperty, phase);
                    yield return null;
                }
                Destroy(EffectObj);
            }
        }
        public EffectSystem() {
        }
        public void ApplyTagsEffect(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, IAreaOfEffect areaOfEffect) {
            switch (areaOfEffect) {
                case SingleTarget: ApplyTagsEffectSingle(); break;
                case CircleArea aoe: ApplyTagsEffectRadius(tags, origin, direction, aoe); break;
                case ConeArea aoe: ApplyTagsEffectCone(tags, origin, direction, aoe); break;
                case PathArea aoe: ApplyTagsEffectPath(tags, origin, direction, aoe); break;
            }
        }
        public void ApplyTagsEffect(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, EffectTarget effectLocation, IAreaOfEffect areaOfEffect) {
            var directionVector = (effectLocation.Transform.position - origin.Transform.position).normalized;
            directionVector.y = 0;
            var direction = Quaternion.LookRotation(directionVector, Vector3.up);
            ApplyTagsEffect(tags, origin, direction, areaOfEffect);
        }
        void ApplyTagsEffectSingle() {
            Debug.Log("ApplyTagsEffectSingle");
        }
        void ApplyTagsEffectPath(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, PathArea areaOfEffect) {
            var color = GetEffectColor(tags);
            var mesh = CreateQuadMeshForUnit(areaOfEffect.Width, areaOfEffect.Length);
            // Add a new to clone the shared resource
            Material material = new(UnityEngine.Resources.Load<Material>(PulseMaterial));
            material.SetColor(ColorProperty, color);
            DisplayEffect(origin, direction, mesh, material);
        }
        void ApplyTagsEffectRadius(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, CircleArea areaOfEffect) {
            var color = GetEffectColor(tags);
            var mesh = CreateArcMeshForUnit(360, areaOfEffect.Radius);
            // Add a new to clone the shared resource
            Material material = new(UnityEngine.Resources.Load<Material>(PulseMaterial));
            material.SetColor(ColorProperty, color);
            DisplayEffect(origin, direction, mesh, material);
        }
        void ApplyTagsEffectCone(IEnumerable<(Type, IUnit)> tags, EffectOrigin origin, Quaternion direction, ConeArea areaOfEffect) {
            Debug.Log("ApplyTagsEffectCone");
            var color = GetEffectColor(tags);
            var mesh = CreateArcMeshForUnit(areaOfEffect.Angle, areaOfEffect.Radius);
            // Add a new to clone the shared resource
            Material material = new(UnityEngine.Resources.Load<Material>(PulseMaterial));
            material.SetColor(ColorProperty, color);
            DisplayEffect(origin, direction, mesh, material);
        }
        public Color GetEffectColor(IEnumerable<(Type, IUnit)> tags) {
            Debug.Log("GetEffectColor");
            var color = new Color();
            Debug.Log($"GetEffectColor length {tags.Count()}");
            if (_colorMapping != null) {
                foreach (var tag in tags) {
                    Debug.Log("GetEffectColor tag");
                    if (_colorMapping.ContainsKey(tag.Item1)) {
                        Debug.Log("GetEffectColor mapping found");
                        var mappedColor = _colorMapping[tag.Item1];
                        // TODO: scale color by amount
                        color += mappedColor;
                    }
                }
            }
            Debug.Log("GetEffectColor Finished");
            return color;
        }
        public Mesh CreateArcMeshForUnit(float arc, float length, int numberOfVerticesInArc = 100) {
            return CreateArcMesh(arc, length, numberOfVerticesInArc, Vector3.up);
        }
        public Mesh CreateQuadMeshForUnit(float width, float length) {
            return CreateQuadMesh(width, length, Vector3.up);
        }
        void DisplayEffect(EffectOrigin originUnit, Quaternion direction, Mesh mesh, Material material) {
            GameObject effectObj = new();
            effectObj.SetActive(false);
            effectObj.transform.position = originUnit.Transform.position;
            effectObj.transform.rotation = direction;
            var meshRenderer = effectObj.AddComponent<MeshRenderer>();
            meshRenderer.sharedMaterial = material;
            meshRenderer.shadowCastingMode = 0;
            meshRenderer.receiveShadows = false;
            var meshFilter = effectObj.AddComponent<MeshFilter>();
            meshFilter.mesh = mesh;
            effectObj.AddComponent<EffectRunner>();
            var effectRunner = effectObj.GetComponent<EffectRunner>();
            effectRunner.Run(effectObj, material, 1f);
        }
        public Mesh CreateArcMesh(float arc, float length, int numberOfVerticesInArc, Vector3 rotationAxis) {
            var origin = Vector3.zero;
            var direction = Vector3.forward;
            Mesh mesh = new();
            var n = numberOfVerticesInArc + 1;
            var arcStep = arc / (n - 2);
            var currentDegrees = -arc / 2;
            var vertices = new Vector3[n];
            var uv = new Vector2[n];
            vertices[0] = origin;
            uv[0] = origin;
            for (var i = 1; i < n; i++) {
                vertices[i] = Quaternion.AngleAxis(currentDegrees, rotationAxis) * direction * length;
                uv[i] = new Vector2(0, 1);
                //Debug.Log($"Current Degrees: {currentDegrees} -> {vertices[i]}");
                currentDegrees += arcStep;
            }
            mesh.vertices = vertices;
            mesh.uv = uv;
            var tris = new int[(n - 2) * 3];
            for (var i = 0; i < n - 2; i++) {
                tris[i * 3] = 0;
                tris[i * 3 + 1] = i + 1;
                tris[i * 3 + 2] = i + 2;
            }
            mesh.triangles = tris;
            var normals = new Vector3[n];
            for (var i = 0; i < n; i++) {
                normals[i] = rotationAxis;
            }
            mesh.normals = normals;
            return mesh;
        }
        public Mesh CreateQuadMesh(float width, float length, Vector3 rotationAxis) {
            Mesh mesh = new();
            var origin = Vector3.zero;
            // TODO: how to calculate local rotation? direction
            var vertices

Replacement in Assets/Scripts/PlayerKeyActions.cs at line 1 [5.780106155]

B:BD[5.780106155] → [6.67957:72952]

using System;
using TagFighter.Events;
using UnityEngine;
using UnityEngine.EventSystems;
namespace TagFighter
{
    public class UnitActionEventArgs : EventArgs
    {
        public Transform UnitTransform { get; }
        public UnitActionEventArgs(Transform unitTransform) {
            UnitTransform = unitTransform;
        }
    }
    public class UnitMoveEventArgs : EventArgs
    {
        public Vector3 Point { get; }
        public UnitMoveEventArgs(Vector3 point) {
            Point = point;
        }
    }
    public class PlayerKeyActions : MonoBehaviour
    {
        [SerializeField] CameraController _cameraController;
        [SerializeField] LayerMask _unitSelectionLayerMask;
        [SerializeField] LayerMask _unitMovementLayerMask;
        [SerializeField] EventAggregator _eventAggregator;
        bool _anyGameWorldHidden = false;
        protected void Update() {
            if (_anyGameWorldHidden == false) {
                HandleTimeDilation();
                HandleCameraMovement();
                HandleCameraRotation();
                HandleUnitActions();
            }
            HandleAdditionalKeyboadClicks();
            HandleMouseClick();
        }
        void HandleAdditionalKeyboadClicks() {
            if (Input.GetKeyDown(KeyCode.R)) {
                if (Input.GetKey(KeyCode.LeftControl)) {
                    _eventAggregator.OnWeaveBuilderScreenToggleSelected(this, EventArgs.Empty);
                    _anyGameWorldHidden = !_anyGameWorldHidden;
                }
            }
            if (Input.GetKeyDown(KeyCode.C)) {
                _eventAggregator.OnPawnSheetToggleSelected(this, new());
            }
        }
        void HandleUnitActions() {
        }
        void HandleMouseClick() {
            if (!EventSystem.current.IsPointerOverGameObject()) {
                if (Input.GetKeyDown(KeyCode.Mouse0)) {
                    var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                    if (Physics.Raycast(ray, out var hit)) {
                        var objectHit = hit.transform;
                        if (_unitSelectionLayerMask.IsLayerInMask(objectHit.gameObject.layer)) {
                            _eventAggregator.OnUnitSelected(this, new(objectHit));
                        }
                    }
                }
                else if (Input.GetKeyDown(KeyCode.Mouse1)) {
                    var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                    if (Physics.Raycast(ray, out var hit)) {
                        var objectHit = hit.transform;
                        if (_unitSelectionLayerMask.IsLayerInMask(objectHit.gameObject.layer)) {
                            _eventAggregator.OnTargetSelected(this, new(objectHit));
                        }
                        else if (_unitMovementLayerMask.IsLayerInMask(objectHit.gameObject.layer)) {
                            if (Input.GetKey(KeyCode.LeftControl)) {
                                _eventAggregator.OnUnitMove(this, new(hit.point));
                            }
                            else {
                                _eventAggregator.OnPlannedActionsClearSelected(this, EventArgs.Empty);
                                _eventAggregator.OnUnitMove(this, new(hit.point));
                            }
                        }
                    }
                }
            }
        }
        void HandleTimeDilation() {
            if (Input.GetKeyDown(KeyCode.Period)) {
                _eventAggregator.OnTimeDilationSpeedUp(this, EventArgs.Empty);
            }
            if (Input.GetKeyDown(KeyCode.Comma)) {
                _eventAggregator.OnTimeDilationSpeedDown(this, EventArgs.Empty);
            }
            if (Input.GetKeyDown(KeyCode.Slash)) {
                _eventAggregator.OnTimeDilationSpeedReset(this, EventArgs.Empty);
            }
        }
        void HandleCameraMovement() {
            if (Input.GetKey(KeyCode.W)) {
                _cameraController.MoveForward();
            }
            if (Input.GetKey(KeyCode.A)) {
                _cameraController.MoveLeft();
            }
            if (Input.GetKey(KeyCode.S)) {
                _cameraController.MoveBack();
            }
            if (Input.GetKey(KeyCode.D)) {
                _cameraController.MoveRight();
            }
        }
        void HandleCameraRotation() {
            if (Input.GetKey(KeyCode.Q)) {
                _cameraController.RotateLeft();
            }
            if (Input.GetKey(KeyCode.E)) {
                _cameraController.RotateRight();
            }
        }
    }
    public static class LayerMaskExtensions
    {
        public static bool IsLayerInMask(this LayerMask layerMask, int layer) {
            return layerMask == (layerMask | (1 << layer));
        }
    }
}

[5.780106155]

using System;
using TagFighter.Events;
using UnityEngine;
using UnityEngine.EventSystems;
namespace TagFighter
{
    public class UnitActionEventArgs : EventArgs
    {
        public Transform UnitTransform { get; }
        public UnitActionEventArgs(Transform unitTransform) {
            UnitTransform = unitTransform;
        }
    }
    public class UnitMoveEventArgs : EventArgs
    {
        public Vector3 Point { get; }
        public UnitMoveEventArgs(Vector3 point) {
            Point = point;
        }
    }
    public class PlayerKeyActions : MonoBehaviour
    {
        [SerializeField] CameraController _cameraController;
        [SerializeField] LayerMask _unitSelectionLayerMask;
        [SerializeField] LayerMask _unitMovementLayerMask;
        [SerializeField] EventAggregator _eventAggregator;
        bool _anyGameWorldHidden = false;
        protected void Update() {
            if (_anyGameWorldHidden == false) {
                HandleTimeDilation();
                HandleCameraMovement();
                HandleCameraRotation();
                HandleUnitActions();
            }
            HandleAdditionalKeyboadClicks();
            HandleMouseClick();
        }
        void HandleAdditionalKeyboadClicks() {
            if (Input.GetKeyDown(KeyCode.R)) {
                if (Input.GetKey(KeyCode.LeftControl)) {
                    _eventAggregator.OnWeaveBuilderScreenToggleSelected(this, EventArgs.Empty);
                    _anyGameWorldHidden = !_anyGameWorldHidden;
                }
            }
            if (Input.GetKeyDown(KeyCode.C)) {
                _eventAggregator.OnPawnSheetToggleSelected(this, new());
            }
        }
        void HandleUnitActions() {
        }
        void HandleMouseClick() {
            if (!EventSystem.current.IsPointerOverGameObject()) {
                if (Input.GetKeyDown(KeyCode.Mouse0)) {
                    var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                    if (Physics.Raycast(ray, out var hit)) {
                        var objectHit = hit.transform;
                        if (_unitSelectionLayerMask.IsLayerInMask(objectHit.gameObject.layer)) {
                            _eventAggregator.OnUnitSelected(this, new(objectHit));
                        }
                    }
                }
                else if (Input.GetKeyDown(KeyCode.Mouse1)) {
                    var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                    if (Physics.Raycast(ray, out var hit)) {
                        var objectHit = hit.transform;
                        if (_unitSelectionLayerMask.IsLayerInMask(objectHit.gameObject.layer)) {
                            _eventAggregator.OnTargetSelected(this, new(objectHit));
                        }
                        else if (_unitMovementLayerMask.IsLayerInMask(objectHit.gameObject.layer)) {
                            if (Input.GetKey(KeyCode.LeftControl)) {
                                _eventAggregator.OnUnitMove(this, new(hit.point));
                            }
                            else {
                                _eventAggregator.OnPlannedActionsClearSelected(this, EventArgs.Empty);
                                _eventAggregator.OnUnitMove(this, new(hit.point));
                            }
                        }
                    }
                }
            }
        }
        void HandleTimeDilation() {
            if (Input.GetKeyDown(KeyCode.Period)) {
                _eventAggregator.OnTimeDilationSpeedUp(this, EventArgs.Empty);
            }
            if (Input.GetKeyDown(KeyCode.Comma)) {
                _eventAggregator.OnTimeDilationSpeedDown(this, EventArgs.Empty);
            }
            if (Input.GetKeyDown(KeyCode.Slash)) {
                _eventAggregator.OnTimeDilationSpeedReset(this, EventArgs.Empty);
            }
        }
        void HandleCameraMovement() {
            if (Input.GetKey(KeyCode.W)) {
                _cameraController.MoveForward();
            }
            if (Input.GetKey(KeyCode.A)) {
                _cameraController.MoveLeft();
            }
            if (Input.GetKey(KeyCode.S)) {
                _cameraController.MoveBack();
            }
            if (Input.GetKey(KeyCode.D)) {
                _cameraController.MoveRight();
            }
        }
        void HandleCameraRotation() {
            if (Input.GetKey(KeyCode.Q)) {
                _cameraController.RotateLeft();
            }
            if (Input.GetKey(KeyCode.E)) {
                _cameraController.RotateRight();
            }
        }
    }
}

File addition: ExtensionMethods.cs.meta (---x------)

[5.780105839]

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

File addition: ExtensionMethods.cs (---x------)

[5.780105839]


namespace TagFighter
{
    public static class LayerMaskExtensions
    {
        public static bool IsLayerInMask(this UnityEngine.LayerMask layerMask, int layer) {
            return layerMask == (layerMask | (1 << layer));
        }
        public static int GetUnitsLayerMask() => UnityEngine.LayerMask.GetMask("Units");
    }
}

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 1 [7.8100]
B:BD[7.8100] → [7.8101:8116]
B:BD[7.8143] → [7.8143:8178]
B:BD[7.8198] → [7.8198:8218]
B:BD[7.8218] → [8.409:429]
```
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
```
[7.8100]
[9.9116]
```
#nullable enable
```

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 5 [7.8100]

[8.455]

[7.8285]

    using System;
    using System.Collections.Generic;
    using System.Linq;
    using UnityEngine;

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

B:BD[4.33006] → [4.33006:33129]

            var hits = Physics.SphereCastAll(origin.position, Radius, origin.forward, 0, LayerMask.NameToLayer("units"));

[4.33006]

[7.9174]

            var hits = Physics.SphereCastAll(origin.position, Radius, origin.forward, 0, LayerMaskExtensions.GetUnitsLayerMask());

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 53 [7.8100]

[4.33598]

            var direction = (effectTarget.Transform.position - origin.position).normalized;

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

B:BD[4.33755] → [4.33755:33886]

            var possibleHits = Physics.SphereCastAll(origin.position, Radius, origin.forward, 0, LayerMask.NameToLayer("units"));

[4.33755]

[10.1006]

            var possibleHits = Physics.SphereCastAll(origin.position, Radius, origin.forward, 0, LayerMaskExtensions.GetUnitsLayerMask());

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

B:BD[4.34299] → [4.34299:34386]

                var targetAngle = Math.Abs(Vector3.Angle(targetDir, origin.forward));

[4.34299]

[4.34386]

                var targetAngle = Math.Abs(Vector3.Angle(targetDir, direction));

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 95 [7.8100]

[4.35138]

[7.10091]

            var direction = (effectTarget.Transform.position - origin.position).normalized;

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

B:BD[4.35180] → [4.35180:35344]

            var hits = Physics.BoxCastAll(origin.position, new Vector3(Width / 2, 0, 0), origin.forward, origin.rotation, Length, LayerMask.NameToLayer("units"));

[4.35180]

[11.837]

            var hits = Physics.BoxCastAll(origin.position, new Vector3(Width / 2, 0, 0), direction, origin.rotation, Length, LayerMaskExtensions.GetUnitsLayerMask());

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

B:BD[4.35384] → [4.35384:35472]

                Debug.Log($"PathArea:GetAffectedUnits hit: {h.transform.gameObject}");

[4.35384]

[4.35472]

                Debug.Log($"PathArea:GetAffectedUnits hit: {h.transform.gameObject} Location: {h.transform.position}");

Insertion in Assets/ScriptableObjects/Runes/TestRune.asset at line 21 [13.237]

[12.30311]

--- !u!114 &-9019365814078591465
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: c419ef0e55c3e694cb24080375e68c2e, type: 3}
  m_Name: ConstValue
  m_EditorClassIdentifier: 
  Position: {x: 77.32001, y: 501}
  Guid: 339865fc-1796-4d64-9ee0-0d1ac9d1fb7f
  _value: 2

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 53 [13.237]
B:BD[12.30817] → [12.30817:30831]
```
  - 10
  - 10
```
[12.30817]
[12.30831]
```
  - 5
  - 5
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 56 [13.237]
B:BD[12.30862] → [4.35700:35733]
```
--- !u!114 &-8370226476145813476
```
[12.30862]
[12.30895]
```
--- !u!114 &-8333881345047911341
```

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 68 [13.237]

B:BD[12.31235] → [4.35836:35917]

  Position: {x: 321.1667, y: 733.5}
  Guid: 8ede9f77-e01c-4f77-8380-8d23682aa702

[12.31235]

[4.35917]

  Position: {x: 353.4167, y: 693.3334}
  Guid: 72a586de-d21b-42a6-b1cf-c272f4037cb4

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 104 [13.237]
B:BD[4.36437] → [4.36437:36443]
```
  - 5
```
[4.36437]
[4.36443]
```
  - 0
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 107 [13.237]
B:BD[4.36478] → [4.36478:36511]
```
--- !u!114 &-5807716216484026408
```
[4.36478]
[12.31881]
```
--- !u!114 &-6009515404405647998
```

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 119 [13.237]

B:BD[12.32218] → [4.36512:36606]

  Position: {x: 321.1667, y: 656.5}
  Guid: beed3a3b-38e0-49f6-9831-e94e71274917
  _value: 20

[12.32218]

[12.32304]

  Position: {x: 77.32001, y: 578}
  Guid: 12429a6b-2dc4-4abd-a9f8-69b978cba436
  _value: 10

Insertion in Assets/ScriptableObjects/Runes/TestRune.asset at line 138 [13.237]

[12.32797]

--- !u!114 &-5636335752426550300
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e3d165e54b32e6d4cbcc75c5b0cf7a68, type: 3}
  m_Name: ConeAreaGet
  m_EditorClassIdentifier: 
  Position: {x: 500.4167, y: 628.3334}
  Guid: a425dfab-0efa-40f0-bb74-fa3e5da060a5
  _radius:
    Node: {fileID: -1214726755475985884}
  _angle:
    Node: {fileID: -8333881345047911341}

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 243 [13.237]

B:BD[4.36656] → [4.36656:36760]

  - {fileID: -5807716216484026408}
  - {fileID: -8370226476145813476}
  - {fileID: 1913254018762623428}

[4.36656]

[14.11703]

  - {fileID: -1214726755475985884}
  - {fileID: -5636335752426550300}
  - {fileID: -8333881345047911341}
  - {fileID: -1963700819192917910}
  - {fileID: 8335726072227545003}
  - {fileID: -814420615276200093}

Insertion in Assets/ScriptableObjects/Runes/TestRune.asset at line 285 [13.237]
[15.2006]
[16.5797]
```
  - {fileID: -9019365814078591465}
  - {fileID: -6009515404405647998}
```

Insertion in Assets/ScriptableObjects/Runes/TestRune.asset at line 309 [13.237]

[12.36490]

--- !u!114 &-1963700819192917910
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: f4cad4d5d3585fd4b81d7232454ed130, type: 3}
  m_Name: PathAreaGet
  m_EditorClassIdentifier: 
  Position: {x: 500.4167, y: 808.8334}
  Guid: d6165fe2-972b-4a0c-9825-6dcd1a1658ae
  _width:
    Node: {fileID: 8335726072227545003}
  _length:
    Node: {fileID: -814420615276200093}
--- !u!114 &-1214726755475985884
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: c419ef0e55c3e694cb24080375e68c2e, type: 3}
  m_Name: ConstValue
  m_EditorClassIdentifier: 
  Position: {x: 353.4167, y: 616.3334}
  Guid: fb5887e0-ecdb-4573-91f2-af0e5bc4fcd8
  _value: 20
--- !u!114 &-814420615276200093
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: c419ef0e55c3e694cb24080375e68c2e, type: 3}
  m_Name: ConstValue
  m_EditorClassIdentifier: 
  Position: {x: 361.7367, y: 859.3334}
  Guid: d8162945-af8d-4a69-a48c-7215cee56053
  _value: 10

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 372 [13.237]
B:BD[12.36944] → [4.36775:36815]
```
    Node: {fileID: 6326256876420960218}
```
[12.36944]
[13.733]
```
    Node: {fileID: 6644894672603807178}
```

Deletion in Assets/ScriptableObjects/Runes/TestRune.asset at line 422 [13.237]

B:BD[12.37769] → [4.36858:37412]

--- !u!114 &1913254018762623428
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e3d165e54b32e6d4cbcc75c5b0cf7a68, type: 3}
  m_Name: ConeAreaGet
  m_EditorClassIdentifier: 
  Position: {x: 501.1667, y: 510.5}
  Guid: 086e1033-2340-463f-afb8-420e1aa3eb29
  _radius:
    Node: {fileID: -5807716216484026408}
  _angle:
    Node: {fileID: -8370226476145813476}

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 439 [13.237]
B:BD[12.38271] → [4.37413:37453]
```
    Node: {fileID: 1913254018762623428}
```
[12.38271]
[12.38312]
```
    Node: {fileID: -1963700819192917910}
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 510 [13.237]
B:BD[14.12641] → [15.2048:2077]
```
  Position: {x: 249, y: 189}
```
[14.12641]
[14.12670]
```
  Position: {x: 216, y: 347}
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 551 [13.237]
B:BD[15.2494] → [15.2494:2523]
```
  Position: {x: 216, y: 362}
```
[15.2494]
[15.2523]
```
  Position: {x: 216, y: 527.5}
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 554 [13.237]
B:BD[15.2578] → [4.37538:37560]
```
    Node: {fileID: 0}
```
[15.2578]
[15.2619]
```
    Node: {fileID: -9019365814078591465}
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 556 [13.237]
B:BD[15.2630] → [4.37561:37583]
```
    Node: {fileID: 0}
```
[15.2630]
[12.40756]
```
    Node: {fileID: -6009515404405647998}
```
Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 584 [13.237]
B:BD[12.41596] → [15.2672:2700]
```
  Position: {x: 249, y: 77}
```
[12.41596]
[12.41625]
```
  Position: {x: 216, y: 217}
```

Insertion in Assets/ScriptableObjects/Runes/TestRune.asset at line 588 [13.237]

[14.12871]

[12.41722]

--- !u!114 &8335726072227545003
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: c419ef0e55c3e694cb24080375e68c2e, type: 3}
  m_Name: ConstValue
  m_EditorClassIdentifier: 
  Position: {x: 361.7367, y: 782.3334}
  Guid: d487af54-4ecc-4ae1-b4e2-3655091b87a2
  _value: 2

Replacement in Assets/ScriptableObjects/Runes/TestRune.asset at line 633 [13.237]
B:BD[12.42658] → [12.42658:42671]
```
  _value: 10
```
[12.42658]
[12.42671]
```
  _value: 5
```

Insertion in Assets/Scenes/SampleScene.unity at line 336 [5.780110080]

[5.780114017]

      objectReference: {fileID: 0}
    - target: {fileID: 1185082912798350, guid: 71442e8cd72511e4fabb72f1a2cc82dd, type: 3}
      propertyPath: m_Layer
      value: 6

Replacement in Assets/Scenes/SampleScene.unity at line 5768 [5.780110080]

B:BD[5.780121071] → [2.11243:11324]

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

[5.780121071]

[17.33888019]

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

Insertion in Assets/Scenes/SampleScene.unity at line 6384 [5.780110080]

[5.780126438]

      objectReference: {fileID: 0}
    - target: {fileID: 1369031296425274, guid: 22a3fd8d3e59a1149bdcd775c0e87241, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 6887 [5.780110080]

[5.780137417]

      objectReference: {fileID: 0}
    - target: {fileID: 1435283653269720, guid: 00e2e59cbc04eab4a982218df54ce70b, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 6960 [5.780110080]

[5.780140099]

      objectReference: {fileID: 0}
    - target: {fileID: 1275909538635612, guid: 2767c12992d890f44b14f433fe854668, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 7025 [5.780110080]

[5.780142754]

      objectReference: {fileID: 0}
    - target: {fileID: 1740273473050372, guid: 63ce2b31e16acab4d8a41f884c36333c, type: 3}
      propertyPath: m_Layer
      value: 6

Replacement in Assets/Scenes/SampleScene.unity at line 7091 [5.780110080]
B:BD[5.780145125] → [5.780145125:780145138]
```
  m_Layer: 0
```
[5.780145125]
[5.780145138]
```
  m_Layer: 6
```

Insertion in Assets/Scenes/SampleScene.unity at line 7229 [5.780110080]

[5.780149155]

      objectReference: {fileID: 0}
    - target: {fileID: 1612273161005096, guid: ae9772ea62bbc724eb9b8ef81109f733, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 7290 [5.780110080]

[5.780151615]

      objectReference: {fileID: 0}
    - target: {fileID: 1783979763778466, guid: bd1a894f239d58d4dbf63f27e28096bd, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 7351 [5.780110080]

[5.780154072]

      objectReference: {fileID: 0}
    - target: {fileID: 1235107498267470, guid: efd8147160aa6c64c8121a2ed788744e, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 7767 [5.780110080]

[5.780158624]

    - target: {fileID: 1458573784885960, guid: 6910e2407cd484a42a0c2598114751a0, type: 3}
      propertyPath: m_Layer
      value: 6
      objectReference: {fileID: 0}

Replacement in Assets/Scenes/SampleScene.unity at line 7971 [5.780110080]
B:BD[5.780161886] → [2.11325:11364]
```
    m_SensorSize: {x: 1.5153439, y: 1}
```
[5.780161886]
[5.780161925]
```
    m_SensorSize: {x: 1.3904762, y: 1}
```

Replacement in Assets/Scenes/SampleScene.unity at line 7987 [5.780110080]

B:BD[5.780162310] → [2.11365:11446]

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

[5.780162310]

[17.33918016]

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

Insertion in Assets/Scenes/SampleScene.unity at line 8025 [5.780110080]

[5.780162996]

    - target: {fileID: 1435283653269720, guid: 00e2e59cbc04eab4a982218df54ce70b, type: 3}
      propertyPath: m_Layer
      value: 6
      objectReference: {fileID: 0}

Insertion in Assets/Scenes/SampleScene.unity at line 8085 [5.780110080]

[5.780165418]

      objectReference: {fileID: 0}
    - target: {fileID: 1783979763778466, guid: bd1a894f239d58d4dbf63f27e28096bd, type: 3}
      propertyPath: m_Layer
      value: 6

Insertion in Assets/Scenes/SampleScene.unity at line 8229 [5.780110080]

[18.555005]

      propertyPath: m_Layer
      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 1232766363669618, guid: 2b519101e10d4a74580d4c86ac9e03e6, type: 3}