Merge remote-tracking branch 'origin/NewStory' into NewStory

Assets/Meshes/scroll/scrollMat2D.mat

@@ -157,7 +157,7 @@ Material:
     - _StencilWriteMask: 255
     - _Strength: 0.2
     - _Surface: 0
-    - _Threshold: 1
+    - _Threshold: 0
     - _UIMaskSoftnessX: 1
     - _UIMaskSoftnessY: 1
     - _UseUIAlphaClip: 0

Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller

@@ -2997,7 +2997,8 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400022, guid: c5937c944a220444aa33be3fe1480174, type: 3}
+  m_Motion: {fileID: 1827226128182048838, guid: 0e637c252c2643d4d9770ad55b6e71c1,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: Direction
   m_MirrorParameter: 
@@ -45090,7 +45091,8 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400024, guid: c5937c944a220444aa33be3fe1480174, type: 3}
+  m_Motion: {fileID: 1827226128182048838, guid: 10c005d4a1cfe8648af9ff7bfc4f7275,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: Direction
   m_MirrorParameter: 

Assets/Prefabs/Debug/PORTAL.prefab

@@ -5048,7 +5048,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 'Test Hub '
+  m_text: Universal
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -14733,6 +14733,11 @@ PrefabInstance:
       propertyPath: 'excludedLevels.Array.data[0]'
       value: Land_of_Death_River1_Valley
       objectReference: {fileID: 0}
+    - target: {fileID: 915461623958344526, guid: eff13c23b3c35454a9e0fb9591fb3b48,
+        type: 3}
+      propertyPath: fireOnce
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2343288757411488203, guid: eff13c23b3c35454a9e0fb9591fb3b48,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Prefabs/Spells/ScannVFX.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 03b028c9a91184b8bbbae340069578ae
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/00_Fight_Arena/Fight_Arena.unity

@@ -19978,12 +19978,12 @@ PrefabInstance:
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 8313224
+      value: 13310657
       objectReference: {fileID: 0}
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1330118.2
+      value: -2129729.5
       objectReference: {fileID: 0}
     - target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -20530,6 +20530,36 @@ PrefabInstance:
       propertyPath: startItems.Array.data[28].addToEquipArea
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[3].changeAttributes
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[3].attributes.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[3].attributes.Array.data[0].name
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[3].attributes.Array.data[1].name
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[3].attributes.Array.data[0].value
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[3].attributes.Array.data[1].value
+      value: 200
+      objectReference: {fileID: 0}
     - target: {fileID: 5613825752652024524, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer

Assets/Scenes/Old_Levels!/TestHub.unity

@@ -14059,42 +14059,42 @@ PrefabInstance:
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -135
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210.00003
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -45
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 703778627114599771, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15165,22 +15165,22 @@ PrefabInstance:
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -225
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4204595259268909078, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15420,22 +15420,22 @@ PrefabInstance:
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -315
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15905,12 +15905,12 @@ PrefabInstance:
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 2239812
+      value: 2272933.2
       objectReference: {fileID: 0}
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -358369.6
+      value: -363668.97
       objectReference: {fileID: 0}
     - target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -16820,22 +16820,22 @@ PrefabInstance:
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -405
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -18158,21 +18158,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1203476819518978270, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
-        type: 3}
-      propertyPath: fireOnce
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4356717714091686263, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
         type: 3}
       propertyPath: m_Name
       value: PORTAL universal
       objectReference: {fileID: 0}
-    - target: {fileID: 5236832152036474326, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
-        type: 3}
-      propertyPath: m_text
-      value: Universal
-      objectReference: {fileID: 0}
     - target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Scripts/Characters/Skills/DurationSpell.cs

@@ -0,0 +1,80 @@
+using System.Collections;
+using UnityEngine;
+
+namespace Beyond
+{
+    [CreateAssetMenu(menuName = "Magic/Spells/Duration Effect (Shield, Push, Flame)")]
+    public class DurationSpell : SpellDefinition
+    {
+        public enum DurationType { Simple, Shield, Flamethrower }
+        public DurationType type = DurationType.Simple;
+
+        public GameObject effectPrefab;
+        public float preCastDelay = 0f; // Matches 'startTime'
+        public float duration = 2f;     // Matches 'endTime'
+        public float postEndDelay = 0f; // Matches 'delay'
+        
+        public override void Cast(MagicAttacks caster, Transform target)
+        {
+            caster.StartCoroutine(CastRoutine(caster, target));
+        }
+
+        private IEnumerator CastRoutine(MagicAttacks caster, Transform target)
+        {
+            // 1. Rotation (Only Push and Flame used rotation in your old script)
+            if (type != DurationType.Shield)
+            {
+                yield return caster.RotateTowardsTargetRoutine(target, rotationDuration);
+            }
+            
+            // 2. Pre-cast Delay
+            if (preCastDelay > 0) yield return new WaitForSeconds(preCastDelay);
+
+            // 3. Instantiate attached to player
+            GameObject instance = Instantiate(effectPrefab, caster.transform);
+            // Reset local position/rotation to ensure it aligns with player
+            instance.transform.localPosition = Vector3.zero;
+            instance.transform.localRotation = Quaternion.identity;
+
+            // 4. Initialize Specific Logic
+            if (type == DurationType.Shield)
+            {
+                var shieldCtrl = instance.GetComponent<ShieldEffectController>();
+                if (shieldCtrl) shieldCtrl.InitializeEffect();
+            }
+            else if (type == DurationType.Flamethrower)
+            {
+                var ps = instance.GetComponent<ParticleSystem>();
+                if (ps) ps.Play();
+            }
+
+            caster.ApplyDamageModifiers(instance);
+
+            // 5. Wait Duration (With Trinket Mods)
+            float finalDuration = duration;
+            if (type == DurationType.Shield && Player.Instance.CurrentTrinketStats.effectCalmness)
+            {
+                finalDuration *= 1.5f;
+            }
+
+            yield return new WaitForSeconds(finalDuration);
+
+            // 6. Cleanup Logic
+            if (type == DurationType.Flamethrower)
+            {
+                var ps = instance.GetComponent<ParticleSystem>();
+                if (ps) ps.Stop();
+            }
+            else if (type == DurationType.Shield)
+            {
+                var shieldCtrl = instance.GetComponent<ShieldEffectController>();
+                if (shieldCtrl) shieldCtrl.DisableEffect();
+            }
+
+            // 7. Post Delay
+            if (postEndDelay > 0) yield return new WaitForSeconds(postEndDelay);
+
+            Destroy(instance);
+        }
+    }
+}

Assets/Scripts/Characters/Skills/DurationSpell.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2fa1c233b63854f6d845066ccd8e48cd

Assets/Scripts/Characters/Skills/MagicAttacks.cs

@@ -724,5 +724,57 @@ namespace Beyond
             yield return new WaitForSeconds(fireballDamagerDuration);
             collider.enabled = false;
         }
+
+        //placeholder for future methods related to magic attacks
+         /// <summary>
+        /// Spells call this to rotate the player before firing
+        /// </summary>
+        public IEnumerator RotateTowardsTargetRoutine(Transform target, float duration)
+        {
+            if (target == null || duration <= 0) yield break;
+
+            float timer = 0f;
+            while (timer < duration)
+            {
+                if (target == null) yield break;
+                
+                Vector3 dir = (target.position - transform.position);
+                dir.y = 0;
+                if (dir.sqrMagnitude > 0.01f)
+                {
+                    Quaternion look = Quaternion.LookRotation(dir);
+                    transform.rotation = Quaternion.RotateTowards(transform.rotation, look, Time.deltaTime * 500f); // Fast rotation
+                }
+                timer += Time.deltaTime;
+                yield return null;
+            }
+        }
+
+        /// <summary>
+        /// Helper to apply Trinket damage (Soulfire) to an object
+        /// </summary>
+        public void ApplyDamageModifiers(GameObject spellObject)
+        {
+            float mult = Player.Instance.CurrentTrinketStats.soulfireDamageMult;
+            if (Mathf.Abs(mult - 1f) < 0.01f) return;
+
+            var damages = spellObject.GetComponentsInChildren<Invector.vObjectDamage>();
+            foreach (var d in damages)
+            {
+                d.damage.damageValue = Mathf.RoundToInt(d.damage.damageValue * mult);
+            }
+        }
+
+        public bItem GetEquippedSpellItem()
+        {
+            if (powersArea != null && powersArea.equipSlots.Count > 0)
+            {
+                // Assuming the logic uses the current selection
+                // If powersArea tracks selection internally, use powersArea.currentEquippedItem
+                return powersArea.currentEquippedItem; 
+            }
+            return null;
+        }
+
     }
 }

Assets/Scripts/Characters/Skills/ProjectileSpell.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using UnityEngine;
+using Invector;
+
+namespace Beyond
+{
+    [CreateAssetMenu(menuName = "Magic/Spells/Projectile Spell")]
+    public class ProjectileSpell : SpellDefinition
+    {
+        [Header("Projectile Settings")]
+        public GameObject projectilePrefab;
+        public float spawnDelay = 0.2f; // Sync with animation hand throw
+        public float lifeTime = 5f;
+        public float aimHeightOffset = 1.0f;
+
+        public override void Cast(MagicAttacks caster, Transform target)
+        {
+            caster.StartCoroutine(CastRoutine(caster, target));
+        }
+
+        private IEnumerator CastRoutine(MagicAttacks caster, Transform target)
+        {
+            // 1. Rotate
+            yield return caster.RotateTowardsTargetRoutine(target, rotationDuration);
+
+            // 2. Wait for animation point
+            yield return new WaitForSeconds(Mathf.Max(0, spawnDelay - rotationDuration));
+
+            // 3. Spawn
+            Vector3 spawnPos = caster.transform.position + caster.transform.forward + Vector3.up * 1.5f;
+            GameObject obj = Instantiate(projectilePrefab, spawnPos, caster.transform.rotation);
+            
+            // 4. Aim
+            if (target != null)
+            {
+                Vector3 aimDir = (target.position + Vector3.up * aimHeightOffset) - spawnPos;
+                obj.transform.rotation = Quaternion.LookRotation(aimDir);
+            }
+
+            // 5. Apply Modifiers
+            caster.ApplyDamageModifiers(obj);
+
+            Destroy(obj, lifeTime);
+        }
+    }
+}

Assets/Scripts/Characters/Skills/ProjectileSpell.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ad80a581f715a4b9d9c0f9a0c1c42e64

Assets/Scripts/Characters/Skills/ScanSpell.cs

@@ -0,0 +1,52 @@
+using System.Collections;
+using UnityEngine;
+using UnityEngine.VFX;
+
+namespace Beyond
+{
+    [CreateAssetMenu(menuName = "Magic/Spells/Scan")]
+    public class ScanSpell : SpellDefinition
+    {
+        public GameObject effectPrefab;
+        public float maxRange = 50f;
+        public float scanDuration = 2f; // time for wave to travel
+        public float startDelay = 0.6f;
+
+        public override void Cast(MagicAttacks caster, Transform target)
+        {
+            caster.StartCoroutine(CastRoutine(caster));
+        }
+
+        private IEnumerator CastRoutine(MagicAttacks caster)
+        {
+            yield return new WaitForSeconds(startDelay);
+            // Instantiate visual
+            GameObject instance = Instantiate(effectPrefab, caster.transform.position, Quaternion.identity);
+            VisualEffect vfx = instance.GetComponent<VisualEffect>();
+            if (vfx) vfx.Play();
+
+            // Shader Logic
+            float speed = maxRange / scanDuration;
+            float timer = 0f;
+
+            while (timer < scanDuration)
+            {
+                Shader.SetGlobalFloat("_WaveTime", speed * timer);
+                timer += Time.deltaTime;
+                yield return null;
+            }
+            Shader.SetGlobalFloat("_WaveTime", 0f);
+
+            // Detection Logic
+            int mask = 1 << LayerMask.NameToLayer("Triggers") | 1 << LayerMask.NameToLayer("HiddenObject");
+            var colliders = Physics.OverlapSphere(caster.transform.position, maxRange, mask);
+            foreach (var c in colliders)
+            {
+                var h = c.gameObject.GetComponent<IScannable>();
+                if (h != null) h.OnScanned();
+            }
+
+            Destroy(instance);
+        }
+    }
+}

Assets/Scripts/Characters/Skills/ScanSpell.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: af5ce789b2ab94e9bb1181148355aa91

Assets/Scripts/Characters/Skills/SilentPeekSpell.cs

@@ -0,0 +1,64 @@
+using System.Collections;
+using UnityEngine;
+
+namespace Beyond
+{
+    [CreateAssetMenu(menuName = "Magic/Spells/Silent Peek")]
+    public class SilentPeekSpell : SpellDefinition
+    {
+        [Header("Timing")]
+        [Tooltip("Time to wait before toggling (Matches old 'Start Time')")]
+        public float startDelay = 0.85f; 
+
+        // 1. Logic: Angel Eye makes this spell cost 0 Faith
+        public override float GetFaithCost(Player player)
+        {
+            if (player.CurrentTrinketStats.effectAngelEye)
+            {
+                return 0f;
+            }
+            return base.GetFaithCost(player);
+        }
+
+        public override void Cast(MagicAttacks caster, Transform target)
+        {
+            caster.StartCoroutine(CastRoutine(caster));
+        }
+
+        private IEnumerator CastRoutine(MagicAttacks caster)
+        {
+            // 2. Logic: Wait for the animation to reach the point (Start Time)
+            if (startDelay > 0) yield return new WaitForSeconds(startDelay);
+
+            if (SilentPeekController.instance != null)
+            {
+                if (SilentPeekController.instance.IsActive())
+                {
+                    // Turn Off
+                    SilentPeekController.instance.SetActive(false);
+                }
+                else
+                {
+                    // Turn On
+                    
+                    // A. Get the Item from the Caster (Requires the helper method added above)
+                    bItem spellItem = caster.GetEquippedSpellItem();
+
+                    // B. Handle Zora's Focus (Effect Breeze) logic
+                    // (Placeholder: Your original code noted this was for future implementation)
+                    if (Player.Instance.CurrentTrinketStats.effectBreeze)
+                    {
+                        // Example: Increase radius or duration here in the future
+                    }
+
+                    // C. Activate Controller
+                    SilentPeekController.instance.SetActive(true, spellItem);
+                }
+            }
+            else
+            {
+                Debug.LogWarning("SilentPeekSpell: SilentPeekController Instance is null.");
+            }
+        }
+    }
+}

Assets/Scripts/Characters/Skills/SilentPeekSpell.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6cf5fce543d1c4a279a6d4571b819684

Assets/Scripts/Characters/Skills/SpawnAtPlayerSpell.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using UnityEngine;
+
+namespace Beyond
+{
+    [CreateAssetMenu(menuName = "Magic/Spells/Spawn At Player Spell")]
+    public class SpawnAtPlayerSpell : SpellDefinition
+    {
+        public GameObject effectPrefab;
+        public float duration = 3f;
+        public float delay = 0.0f;
+        public bool attachToPlayer = true;
+        
+        [Header("Trinket Special Interactions")]
+        public bool isShieldSpell; // Flag to apply Calmness
+
+        public override void Cast(MagicAttacks caster, Transform target)
+        {
+            caster.StartCoroutine(SpawnRoutine(caster));
+        }
+
+        private IEnumerator SpawnRoutine(MagicAttacks caster)
+        {
+            yield return new WaitForSeconds(delay);
+
+            GameObject instance;
+            
+            if (attachToPlayer)
+                instance = Instantiate(effectPrefab, caster.transform);
+            else
+                instance = Instantiate(effectPrefab, caster.transform.position, caster.transform.rotation);
+
+            // Apply specific Trinket logic (Strategy pattern allows custom overrides too)
+            float finalDuration = duration;
+            if (isShieldSpell && Player.Instance.CurrentTrinketStats.effectCalmness)
+            {
+                finalDuration *= 1.5f;
+            }
+
+            caster.ApplyDamageModifiers(instance);
+
+            yield return new WaitForSeconds(finalDuration);
+            Destroy(instance);
+        }
+    }
+}

Assets/Scripts/Characters/Skills/SpawnAtPlayerSpell.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f4842a395b80848e389ee3b6a5cc5e0c

Assets/Scripts/Characters/Skills/SpellDefinition.cs

@@ -0,0 +1,43 @@
+using UnityEngine;
+using Sirenix.OdinInspector;
+
+namespace Beyond
+{
+    public abstract class SpellDefinition : ScriptableObject
+    {
+        [Header("General Settings")]
+        public string spellName;
+        public string animationClipName;
+        [TextArea] public string description;
+
+        [Header("Costs & Timing")]
+        public int baseFaithCost = 10;
+        public float castTime = 0.5f; // Time until the effect spawns (Animation event timing)
+        
+        [Header("Targeting")]
+        public float rotationDuration = 0.3f; // How long player rotates towards target
+
+        /// <summary>
+        /// Calculates final cost based on Trinkets (Bloom, Angel Eye, etc)
+        /// </summary>
+        public virtual float GetFaithCost(Player player)
+        {
+            float cost = baseFaithCost;
+
+            // 1. Apply Global Reductions (e.g. Bloom)
+            if (player.CurrentTrinketStats.effectBloom)
+            {
+                cost *= 0.8f;
+            }
+
+            return cost;
+        }
+
+        /// <summary>
+        /// The logic for the specific spell.
+        /// </summary>
+        /// <param name="caster">The MonoBehavior running the spell (MagicAttacks)</param>
+        /// <param name="target">The current auto-target (can be null)</param>
+        public abstract void Cast(MagicAttacks caster, Transform target);
+    }
+}

Assets/Scripts/Characters/Skills/SpellDefinition.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 296908ba0f0f14b4c8c57a84bf4bd5b2

Assets/Scripts/Characters/Skills/Spell_CovertGaze.asset

@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: 6cf5fce543d1c4a279a6d4571b819684, type: 3}
+  m_Name: Spell_CovertGaze
+  m_EditorClassIdentifier: 
+  spellName: Covert Gaze
+  animationClipName: Fireball
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0.3
+  startDelay: 0.85

Assets/Scripts/Characters/Skills/Spell_CovertGaze.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 51e2575f2639b4c1980f4d657aac4507
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Skills/Spell_QuantumBlast.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: 2fa1c233b63854f6d845066ccd8e48cd, type: 3}
+  m_Name: Spell_QuantumBlast
+  m_EditorClassIdentifier: 
+  spellName: Quantum Blast
+  animationClipName: MagicPush
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0
+  type: 0
+  effectPrefab: {fileID: 8935763087124063772, guid: c6853e03448db034b98691aaf1e5f95f,
+    type: 3}
+  preCastDelay: 0
+  duration: 5
+  postEndDelay: 0

Assets/Scripts/Characters/Skills/Spell_QuantumBlast.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 593b751fb37ef4e1693026f13ecfb5ff
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Skills/Spell_QuantumShield.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: 2fa1c233b63854f6d845066ccd8e48cd, type: 3}
+  m_Name: Spell_QuantumShield
+  m_EditorClassIdentifier: 
+  spellName: Quantum Shield
+  animationClipName: Shield
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0
+  type: 1
+  effectPrefab: {fileID: 4418269076189414613, guid: 4ae14a17e640b604f8b4921d230b0c96,
+    type: 3}
+  preCastDelay: 1
+  duration: 10
+  postEndDelay: 2

Assets/Scripts/Characters/Skills/Spell_QuantumShield.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e97e46ee2bee6459aad693bfa6680277
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Skills/Spell_SparkOfJustice.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: ad80a581f715a4b9d9c0f9a0c1c42e64, type: 3}
+  m_Name: Spell_SparkOfJustice
+  m_EditorClassIdentifier: 
+  spellName: Spark of Justice
+  animationClipName: Fireball
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0.85
+  projectilePrefab: {fileID: 11175768915115734, guid: fa8fab8e229636f44b7f773bd46aaf07,
+    type: 3}
+  spawnDelay: 0.85
+  lifeTime: 10
+  aimHeightOffset: 0.75

Assets/Scripts/Characters/Skills/Spell_SparkOfJustice.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0baead00b71554981b1681361e85af78
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Skills/Spell_SpectrumScan.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+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: af5ce789b2ab94e9bb1181148355aa91, type: 3}
+  m_Name: Spell_SpectrumScan
+  m_EditorClassIdentifier: 
+  spellName: Spectrum Scan
+  animationClipName: Scan
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0.3
+  effectPrefab: {fileID: 140570917138448771, guid: 03b028c9a91184b8bbbae340069578ae,
+    type: 3}
+  maxRange: 50
+  scanDuration: 4.4
+  startDelay: 0.6

Assets/Scripts/Characters/Skills/Spell_SpectrumScan.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc808b91d3d2c4c53873cfe6fc9f0305
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/InvectorDerivatives/ScriptableObjects/items.asset

@@ -20,6 +20,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -75,6 +76,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -129,6 +131,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -183,6 +186,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -241,6 +245,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 9
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -308,6 +313,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -359,6 +365,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -413,6 +420,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -463,6 +471,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -512,6 +521,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -562,6 +572,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -613,6 +624,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -669,6 +681,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -723,6 +736,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -780,6 +794,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -834,6 +849,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -891,6 +907,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -944,6 +961,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1002,6 +1020,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 10
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1051,6 +1070,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1107,6 +1127,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 15
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1161,6 +1182,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1223,6 +1245,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1292,6 +1315,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1350,6 +1374,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1400,6 +1425,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1459,6 +1485,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1531,6 +1558,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1588,6 +1616,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 8
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1653,6 +1682,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1712,6 +1742,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1768,6 +1799,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1832,6 +1864,7 @@ MonoBehaviour:
   secondaryDescription: Scan spell description
   type: 10
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1880,6 +1913,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1935,6 +1969,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -1986,6 +2021,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2040,6 +2076,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 9
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2123,6 +2160,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2178,6 +2216,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2232,6 +2271,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2283,6 +2323,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2341,6 +2382,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2400,6 +2442,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2469,6 +2512,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 15
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2524,6 +2568,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2579,6 +2624,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2630,6 +2676,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2685,6 +2732,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2734,6 +2782,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2784,6 +2833,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -2923,7 +2973,7 @@ MonoBehaviour:
   - {fileID: -5307908156765189853}
   - {fileID: 6848363969753274938}
   - {fileID: 7127115710233842467}
-  inEdition: 0
+  inEdition: 1
   itemsHidden: 1
 --- !u!114 &13007762861001616
 MonoBehaviour:
@@ -2950,6 +3000,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3005,6 +3056,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3059,6 +3111,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3112,6 +3165,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3168,6 +3222,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3227,6 +3282,7 @@ MonoBehaviour:
   secondaryDescription: And this is spell push description
   type: 10
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3275,6 +3331,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3332,6 +3389,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3385,6 +3443,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 8
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3474,6 +3533,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3529,6 +3589,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3586,6 +3647,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 10
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 21300000, guid: 686309ee74ddecf4881a11c0f29efcc6, type: 3}
   teriaryIcon: {fileID: 0}
@@ -3639,6 +3701,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3696,6 +3759,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 9
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3768,6 +3832,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3844,6 +3909,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 15
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3893,6 +3959,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 18
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -3943,6 +4010,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4001,6 +4069,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 10
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4054,6 +4123,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4108,6 +4178,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 22
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4172,6 +4243,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 15
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4218,6 +4290,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4271,6 +4344,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4349,6 +4423,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4400,6 +4475,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4458,6 +4534,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4511,6 +4588,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4563,6 +4641,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4621,6 +4700,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 8
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4701,6 +4781,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 21
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4755,6 +4836,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4815,6 +4897,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 17
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4869,6 +4952,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4922,6 +5006,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -4974,6 +5059,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 20
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5029,6 +5115,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 23
   trinketColor: 1
+  spellDefinition: {fileID: 0}
   icon: {fileID: 21300000, guid: 9e637b82da7408b45b28a9180b62ef60, type: 3}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5090,6 +5177,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5138,6 +5226,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 8
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5226,6 +5315,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 23
   trinketColor: 2
+  spellDefinition: {fileID: 0}
   icon: {fileID: 21300000, guid: 6952ccd6683db8344967f5c66ccd4dfa, type: 3}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5276,6 +5366,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 13
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5329,6 +5420,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5386,6 +5478,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 14
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5436,6 +5529,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 19
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5485,6 +5579,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 16
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5535,6 +5630,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 5
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5584,6 +5680,7 @@ MonoBehaviour:
   secondaryDescription: Secondary Description
   type: 0
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}
@@ -5635,6 +5732,7 @@ MonoBehaviour:
   secondaryDescription: Not used if cant be used
   type: 11
   trinketColor: 0
+  spellDefinition: {fileID: 0}
   icon: {fileID: 0}
   secondaryIcon: {fileID: 0}
   teriaryIcon: {fileID: 0}

Assets/Scripts/InvectorDerivatives/bItem.cs

@@ -1,4 +1,5 @@
 using Invector;
+using Sirenix.OdinInspector;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -29,6 +30,10 @@ namespace Beyond
         // If you have a custom Editor script for bItem, you may need to add a line there to draw this property.
         public TrinketColor trinketColor; 
         // -------------------------
+        [FoldoutGroup("Magic Settings")]
+        [InfoBox("Assign the Spell Definition here. If null, this item is not a spell.")]
+        [InlineEditor]
+        public SpellDefinition spellDefinition;
 
         [HideInInspector]
         public Sprite icon, secondaryIcon, teriaryIcon;

Packages/manifest.json

@@ -10,6 +10,7 @@
     "com.unity.render-pipelines.universal": "17.0.4",
     "com.unity.timeline": "1.8.9",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11",
+    "com.unity.visualeffectgraph": "17.0.4",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

@@ -282,6 +282,15 @@
         "com.unity.modules.imgui": "1.0.0"
       }
     },
+    "com.unity.visualeffectgraph": {
+      "version": "17.0.4",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.shadergraph": "17.0.4",
+        "com.unity.render-pipelines.core": "17.0.4"
+      }
+    },
     "com.unity.modules.accessibility": {
       "version": "1.0.0",
       "depth": 0,