net.dreditor.minigames.ca 0.1.6 → 0.1.8

package/Panels/ClosingArgumentReticle.cs

@@ -1,170 +1,170 @@
-// Original Author: Henry (Meowpixel)
-// Updated/Reworked by: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.EventObjects;
-using DREditor.UIHandling.Reticles;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Serialization;
-
-namespace DREditor.Minigames.CA.Panels
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(HoverReticle) + ", " + nameof(Reticle) +
-        "\n\n")]
-    public class ClosingArgumentReticle : HoverReticle
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [FormerlySerializedAs("caInputAllowed")]
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inputAllowed = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int bufferFrames = 5;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Range(0, 1)]
-        [Tooltip("")]
-        [SerializeField] protected float dampenScaleFactor = 0.012f;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected Rigidbody2D rigidBody = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected List<Collider2D> currentColliders = new();
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected Coroutine enterCoroutine = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected Coroutine exitCoroutine = null;
-
-
-        protected virtual void OnEnable() => inputAllowed.AddListener(OnInputUpdated);
-
-        protected virtual void OnDisable() => inputAllowed.RemoveListener(OnInputUpdated);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="canInput"></param>
-        protected virtual void OnInputUpdated(bool canInput) => SetLock(!canInput);
-
-
-        /// <inheritdoc/>
-        protected override void Start()
-        {
-            base.Start();
-
-            rigidBody = GetComponent<Rigidbody2D>();
-        }
-
-
-        protected virtual void OnTriggerEnter2D(Collider2D collision)
-        {
-            currentColliders.Add(collision);
-
-            if (enterCoroutine != null)
-                StopCoroutine(enterCoroutine);
-
-            enterCoroutine = StartCoroutine(CheckEnter(collision));
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="collision"></param>
-        protected virtual IEnumerator CheckEnter(Collider2D collision)
-        {
-            yield return new WaitForSeconds(Time.deltaTime * bufferFrames);
-
-            if (!locked)
-            {
-                QuestionPanelBase foundQuestion = collision.gameObject.GetComponent<QuestionPanelBase>();
-
-                object foundPanel = foundQuestion;
-
-                if (foundPanel != null && foundPanel != hoveredObject)
-                    HoverObject(foundQuestion.transform, foundQuestion);
-            }
-        }
-
-
-        protected virtual void OnTriggerExit2D(Collider2D collision)
-        {
-            currentColliders.Remove(collision);
-
-            if (exitCoroutine != null)
-                StopCoroutine(exitCoroutine);
-
-            exitCoroutine = StartCoroutine(CheckExit());
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator CheckExit()
-        {
-            yield return new WaitForSeconds(Time.deltaTime * bufferFrames);
-
-            if (currentColliders.Count == 0)
-                StopHoveringObject();
-            else
-                HoverObject(currentColliders[0].transform,
-                    currentColliders[0].gameObject.GetComponent<QuestionPanelBase>());
-            //For above,
-            //if it's colliding with two at the same time and leaving the collision of one.
-            //Otherwise the selection would be wrongly set to null.
-        }
-
-
-        /// <inheritdoc/>
-        protected override Vector3 GrabMovement() => base.GrabMovement() * dampenScaleFactor;
-
-        /// <inheritdoc/>
-        protected override void ApplyCalculatedMovement(Vector3 calculatedMovement)
-        {
-            if (rigidBody != null)
-                rigidBody.MovePosition(rigidBody.position + (Vector2)calculatedMovement);
-            else
-                base.ApplyCalculatedMovement(calculatedMovement);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="to"></param>
-        public override void SetLock(bool to)
-        {
-            base.SetLock(to);
-
-            if (!locked)
-                gameObject.GetComponent<BoxCollider2D>().enabled = !to;
-        }
-    }
+// Original Author: Henry (Meowpixel)
+// Updated/Reworked by: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.EventObjects;
+using DREditor.UIHandling.Reticles;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace DREditor.Minigames.CA.Panels
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(HoverReticle) + ", " + nameof(Reticle) +
+        "\n\n")]
+    public class ClosingArgumentReticle : HoverReticle
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [FormerlySerializedAs("caInputAllowed")]
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inputAllowed = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int bufferFrames = 5;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Range(0, 1)]
+        [Tooltip("")]
+        [SerializeField] protected float dampenScaleFactor = 0.012f;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected Rigidbody2D rigidBody = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected List<Collider2D> currentColliders = new();
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected Coroutine enterCoroutine = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected Coroutine exitCoroutine = null;
+
+
+        protected virtual void OnEnable() => inputAllowed.AddListener(OnInputUpdated);
+
+        protected virtual void OnDisable() => inputAllowed.RemoveListener(OnInputUpdated);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="canInput"></param>
+        protected virtual void OnInputUpdated(bool canInput) => SetLock(!canInput);
+
+
+        /// <inheritdoc/>
+        protected override void Start()
+        {
+            base.Start();
+
+            rigidBody = GetComponent<Rigidbody2D>();
+        }
+
+
+        protected virtual void OnTriggerEnter2D(Collider2D collision)
+        {
+            currentColliders.Add(collision);
+
+            if (enterCoroutine != null)
+                StopCoroutine(enterCoroutine);
+
+            enterCoroutine = StartCoroutine(CheckEnter(collision));
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="collision"></param>
+        protected virtual IEnumerator CheckEnter(Collider2D collision)
+        {
+            yield return new WaitForSeconds(Time.deltaTime * bufferFrames);
+
+            if (!locked)
+            {
+                QuestionPanelBase foundQuestion = collision.gameObject.GetComponent<QuestionPanelBase>();
+
+                object foundPanel = foundQuestion;
+
+                if (foundPanel != null && foundPanel != hoveredObject)
+                    HoverObject(foundQuestion.transform, foundQuestion);
+            }
+        }
+
+
+        protected virtual void OnTriggerExit2D(Collider2D collision)
+        {
+            currentColliders.Remove(collision);
+
+            if (exitCoroutine != null)
+                StopCoroutine(exitCoroutine);
+
+            exitCoroutine = StartCoroutine(CheckExit());
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator CheckExit()
+        {
+            yield return new WaitForSeconds(Time.deltaTime * bufferFrames);
+
+            if (currentColliders.Count == 0)
+                StopHoveringObject();
+            else
+                HoverObject(currentColliders[0].transform,
+                    currentColliders[0].gameObject.GetComponent<QuestionPanelBase>());
+            //For above,
+            //if it's colliding with two at the same time and leaving the collision of one.
+            //Otherwise the selection would be wrongly set to null.
+        }
+
+
+        /// <inheritdoc/>
+        protected override Vector3 GrabMovement() => base.GrabMovement() * dampenScaleFactor;
+
+        /// <inheritdoc/>
+        protected override void ApplyCalculatedMovement(Vector3 calculatedMovement)
+        {
+            if (rigidBody != null)
+                rigidBody.MovePosition(rigidBody.position + (Vector2)calculatedMovement);
+            else
+                base.ApplyCalculatedMovement(calculatedMovement);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="to"></param>
+        public override void SetLock(bool to)
+        {
+            base.SetLock(to);
+
+            if (!locked)
+                gameObject.GetComponent<BoxCollider2D>().enabled = !to;
+        }
+    }
 }

package/Panels/ClosingArgumentReticle.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 0d6771b3bb2bf8b4e8d08d26660a2037
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 0d6771b3bb2bf8b4e8d08d26660a2037
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Panels/ClosingArgumentShooter.cs

@@ -1,154 +1,154 @@
-// Original Author: Henry (Meowpixel)
-// Updated/Reworked by: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.EventObjects;
-using DREditor.UIHandling.Reticles;
-using System.Collections;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.InputSystem;
-
-namespace DREditor.Minigames.CA.Panels
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(ControlledComponent) + ", " + nameof(IClosingArgumentResetable) +
-        "\n\n")]
-    public class ClosingArgumentShooter : ControlledComponent, IClosingArgumentResetable
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected InputActionReference choose = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TransformWithEvent caPanelTarget = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent caResult = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected HoverReticle reticle = null;
-
-
-        [Header("")]
-        [SerializeField] protected UnityEvent OnStockFly = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected IActiveStockPanel activeStockPanel;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected IClosingArgumentListener[] argumentListeners;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        protected QuestionPanelBase hoveredPanel;
-
-
-        /// <inheritdoc/>
-        public override void ActivateControls() 
-            => choose.action.performed += EvaluateSelectedStock;
-
-        /// <inheritdoc/>
-        public override void DeactivateControls() 
-            => choose.action.performed -= EvaluateSelectedStock;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual void EvaluateSelectedStock(InputAction.CallbackContext context)
-        {
-            hoveredPanel = reticle.GetHoveredObject<QuestionPanelBase>();
-
-            if (!(hoveredPanel != null && context.performed))
-                return;
-
-            activeStockPanel ??= transform.root.GetComponentInChildren<IActiveStockPanel>();
-
-            if (!activeStockPanel.CurrentStockSelectable())
-                return;
-
-            argumentListeners ??= FindObjectsByType<MonoBehaviour>().OfType<IClosingArgumentListener>().ToArray();
-
-            OnStockFly?.Invoke();
-
-            DisableInput();
-
-            StartCoroutine(ShootPanelRoutine());
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator ShootPanelRoutine()
-        {
-            SetPanelTargetPosition();
-
-            yield return ShootStockAnimation();
-
-            ProcessPanelShot();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void SetPanelTargetPosition()
-        {
-            Transform hoveredPanelTransform = hoveredPanel.transform;
-
-            caPanelTarget.SetValue(new(hoveredPanelTransform.position, Quaternion.identity));
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator ShootStockAnimation() => activeStockPanel.ShootStock();
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ProcessPanelShot()
-        {
-            bool result = ShotStockResult();
-
-            if (caResult.Value != result)
-                caResult.SetValue(result);
-            else
-                caResult.Invoke();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual bool ShotStockResult()
-        {
-            Transform hoveredStockTransform = hoveredPanel.GetStockTransform();
-
-            return activeStockPanel.CurrentStockMatches(hoveredStockTransform);
-        }
-
-
-        /// <inheritdoc/>
-        public virtual void CAReset() => argumentListeners = null;
-    }
+// Original Author: Henry (Meowpixel)
+// Updated/Reworked by: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.EventObjects;
+using DREditor.UIHandling.Reticles;
+using System.Collections;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.InputSystem;
+
+namespace DREditor.Minigames.CA.Panels
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(ControlledComponent) + ", " + nameof(IClosingArgumentResetable) +
+        "\n\n")]
+    public class ClosingArgumentShooter : ControlledComponent, IClosingArgumentResetable
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected InputActionReference choose = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TransformWithEvent caPanelTarget = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent caResult = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected HoverReticle reticle = null;
+
+
+        [Header("")]
+        [SerializeField] protected UnityEvent OnStockFly = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected IActiveStockPanel activeStockPanel;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected IClosingArgumentListener[] argumentListeners;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected QuestionPanelBase hoveredPanel;
+
+
+        /// <inheritdoc/>
+        public override void ActivateControls() 
+            => choose.action.performed += EvaluateSelectedStock;
+
+        /// <inheritdoc/>
+        public override void DeactivateControls() 
+            => choose.action.performed -= EvaluateSelectedStock;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="context"></param>
+        protected virtual void EvaluateSelectedStock(InputAction.CallbackContext context)
+        {
+            hoveredPanel = reticle.GetHoveredObject<QuestionPanelBase>();
+
+            if (!(hoveredPanel != null && context.performed))
+                return;
+
+            activeStockPanel ??= transform.root.GetComponentInChildren<IActiveStockPanel>();
+
+            if (!activeStockPanel.CurrentStockSelectable())
+                return;
+
+            argumentListeners ??= FindObjectsByType<MonoBehaviour>().OfType<IClosingArgumentListener>().ToArray();
+
+            OnStockFly?.Invoke();
+
+            DisableInput();
+
+            StartCoroutine(ShootPanelRoutine());
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator ShootPanelRoutine()
+        {
+            SetPanelTargetPosition();
+
+            yield return ShootStockAnimation();
+
+            ProcessPanelShot();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void SetPanelTargetPosition()
+        {
+            Transform hoveredPanelTransform = hoveredPanel.transform;
+
+            caPanelTarget.SetValue(new(hoveredPanelTransform.position, Quaternion.identity));
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator ShootStockAnimation() => activeStockPanel.ShootStock();
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ProcessPanelShot()
+        {
+            bool result = ShotStockResult();
+
+            if (caResult.Value != result)
+                caResult.SetValue(result);
+            else
+                caResult.Invoke();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual bool ShotStockResult()
+        {
+            Transform hoveredStockTransform = hoveredPanel.GetStockTransform();
+
+            return activeStockPanel.CurrentStockMatches(hoveredStockTransform);
+        }
+
+
+        /// <inheritdoc/>
+        public virtual void CAReset() => argumentListeners = null;
+    }
 }