net.dreditor.minigames.debates 0.1.6 → 0.1.7

package/Firing/FireBulletUIHandler.cs

@@ -1,193 +1,193 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-#if DOTWEEN
-using DG.Tweening;
-#endif
-using DREditor.EventObjects;
-using DREditor.Investigations;
-using DREditor.Minigames.Debates.Mechanics;
-using DREditor.UIHandling;
-using DREditor.UIHandling.Reticles;
-using DREditor.Utility;
-using System.Collections;
-using UnityEngine;
-using UnityEngine.Events;
-
-namespace DREditor.Minigames.Debates.Firing
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(ControlledComponent) + ", " + nameof(IFireBulletUIEvent) + ", " + nameof(IReloadResolverRoutine) +
-        "\n\n")]
-    public class FireBulletUIHandler : ControlledComponent, IFireBulletUIEvent, IReloadResolverRoutine
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inDialogue = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inCycle = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent canFire = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent bulletFired = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent cyclePass = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TransformWithEvent bulletEndPositionOffset = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TransformWithEvent bulletRestPosition = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected RectTransform bulletUI;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected RectTransform fireObject = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float toEndPosDuration = 0.5f;
-
-
-        [Header("")]
-        [SerializeField] protected UnityEvent<TruthBullet> onUIBulletFired;
-
-        public UnityEvent<TruthBullet> OnUIBulletFired { get => onUIBulletFired; set => onUIBulletFired = value; }
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected HoverReticle nsdReticle;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected IBulletSwapperUI bulletHandler;
-
-
-        // Functions unused because we're really just using the reverse event.
-        /// <inheritdoc/>
-        public override void ActivateControls() { }
-
-        /// <inheritdoc/>
-        public override void DeactivateControls() { }
-
-
-        /// <inheritdoc/>
-        protected override void OnDisable()
-        {
-            base.OnDisable();
-
-            bulletFired.SetValue(false);
-
-            bulletRestPosition.SetValue(new(bulletRestPosition.InitialValue.Pos.DeepCopy(), Quaternion.identity));
-        }
-
-
-        /// <inheritdoc/>
-        protected override void Start()
-        {
-            base.Start();
-
-            bulletRestPosition.Init();
-
-            if (fireObject == null)
-                fireObject = bulletUI;
-            else if (fireObject != bulletUI)
-                bulletRestPosition.SetValue(new(Vector3.zero, Quaternion.identity));
-
-            nsdReticle = transform.root.GetComponentInChildren<HoverReticle>();
-
-            bulletHandler = transform.root.GetComponentInChildren<IBulletSwapperUI>();
-        }
-
-
-        /// <inheritdoc/>
-        public virtual void FireUITruthBullet()
-        {
-            if (fireObject == bulletUI && (Vector2)bulletRestPosition.Value.Pos == Vector2.zero)
-                bulletRestPosition.SetValue(new(bulletRestPosition.InitialValue.Pos.DeepCopy(), Quaternion.identity));
-
-            UnityEngine.Debug.Log(nameof(FireBulletUIHandler) + ": REPORT: FIRING BULLET.");
-
-            canFire.SetValue(false);
-
-            cyclePass.SetValue(false);
-
-            Vector2 firePosition = new(
-                fireObject.anchoredPosition.x + bulletEndPositionOffset.Value.Pos.x,
-                fireObject.anchoredPosition.y + bulletEndPositionOffset.Value.Pos.y);
-#if DOTWEEN
-            fireObject.DOAnchorPos(firePosition, toEndPosDuration)
-                .SetUpdate(true)
-                .OnComplete(HideBulletOnComplete);
-#endif
-            if (nsdReticle != null)
-                nsdReticle.SetLock(true);
-
-            OnUIBulletFired?.Invoke(bulletHandler.GetCurrentBullet());
-
-            bulletFired.SetValue(true);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void HideBulletOnComplete()
-        {
-            if (fireObject.TryGetComponent<UIVisibilityComponent>(out var fireObjectUI) && fireObjectUI != null)
-                fireObjectUI.Hide();
-        }
-
-
-        /// <inheritdoc/>
-        public virtual IEnumerator OnReloadUIFinished()
-        {
-            if (!inCycle.Value && !inDialogue.Value && nsdReticle != null)
-                nsdReticle.SetLock(false);
-
-            bulletFired.SetValue(false);
-
-            if (!inCycle.Value)
-                canFire.SetValue(true);
-
-            cyclePass.SetValue(true);
-
-            yield break;
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+#if DOTWEEN
+using DG.Tweening;
+#endif
+using DREditor.EventObjects;
+using DREditor.Investigations;
+using DREditor.Minigames.Debates.Mechanics;
+using DREditor.UIHandling;
+using DREditor.UIHandling.Reticles;
+using DREditor.Utility;
+using System.Collections;
+using UnityEngine;
+using UnityEngine.Events;
+
+namespace DREditor.Minigames.Debates.Firing
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(ControlledComponent) + ", " + nameof(IFireBulletUIEvent) + ", " + nameof(IReloadResolverRoutine) +
+        "\n\n")]
+    public class FireBulletUIHandler : ControlledComponent, IFireBulletUIEvent, IReloadResolverRoutine
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inDialogue = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inCycle = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent canFire = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent bulletFired = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent cyclePass = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TransformWithEvent bulletEndPositionOffset = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TransformWithEvent bulletRestPosition = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected RectTransform bulletUI;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected RectTransform fireObject = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float toEndPosDuration = 0.5f;
+
+
+        [Header("")]
+        [SerializeField] protected UnityEvent<TruthBullet> onUIBulletFired;
+
+        public UnityEvent<TruthBullet> OnUIBulletFired { get => onUIBulletFired; set => onUIBulletFired = value; }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected HoverReticle nsdReticle;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected IBulletSwapperUI bulletHandler;
+
+
+        // Functions unused because we're really just using the reverse event.
+        /// <inheritdoc/>
+        public override void ActivateControls() { }
+
+        /// <inheritdoc/>
+        public override void DeactivateControls() { }
+
+
+        /// <inheritdoc/>
+        protected override void OnDisable()
+        {
+            base.OnDisable();
+
+            bulletFired.SetValue(false);
+
+            bulletRestPosition.SetValue(new(bulletRestPosition.InitialValue.Pos.DeepCopy(), Quaternion.identity));
+        }
+
+
+        /// <inheritdoc/>
+        protected override void Start()
+        {
+            base.Start();
+
+            bulletRestPosition.Init();
+
+            if (fireObject == null)
+                fireObject = bulletUI;
+            else if (fireObject != bulletUI)
+                bulletRestPosition.SetValue(new(Vector3.zero, Quaternion.identity));
+
+            nsdReticle = transform.root.GetComponentInChildren<HoverReticle>();
+
+            bulletHandler = transform.root.GetComponentInChildren<IBulletSwapperUI>();
+        }
+
+
+        /// <inheritdoc/>
+        public virtual void FireUITruthBullet()
+        {
+            if (fireObject == bulletUI && (Vector2)bulletRestPosition.Value.Pos == Vector2.zero)
+                bulletRestPosition.SetValue(new(bulletRestPosition.InitialValue.Pos.DeepCopy(), Quaternion.identity));
+
+            UnityEngine.Debug.Log(nameof(FireBulletUIHandler) + ": REPORT: FIRING BULLET.");
+
+            canFire.SetValue(false);
+
+            cyclePass.SetValue(false);
+
+            Vector2 firePosition = new(
+                fireObject.anchoredPosition.x + bulletEndPositionOffset.Value.Pos.x,
+                fireObject.anchoredPosition.y + bulletEndPositionOffset.Value.Pos.y);
+#if DOTWEEN
+            fireObject.DOAnchorPos(firePosition, toEndPosDuration)
+                .SetUpdate(true)
+                .OnComplete(HideBulletOnComplete);
+#endif
+            if (nsdReticle != null)
+                nsdReticle.SetLock(true);
+
+            OnUIBulletFired?.Invoke(bulletHandler.GetCurrentBullet());
+
+            bulletFired.SetValue(true);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void HideBulletOnComplete()
+        {
+            if (fireObject.TryGetComponent<UIVisibilityComponent>(out var fireObjectUI) && fireObjectUI != null)
+                fireObjectUI.Hide();
+        }
+
+
+        /// <inheritdoc/>
+        public virtual IEnumerator OnReloadUIFinished()
+        {
+            if (!inCycle.Value && !inDialogue.Value && nsdReticle != null)
+                nsdReticle.SetLock(false);
+
+            bulletFired.SetValue(false);
+
+            if (!inCycle.Value)
+                canFire.SetValue(true);
+
+            cyclePass.SetValue(true);
+
+            yield break;
+        }
+    }
 }

package/Firing/FireBulletUIHandler.cs.meta

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

package/Firing/FireTransformCalculator.cs

@@ -1,114 +1,114 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.UIHandling.Reticles;
-using System.Linq;
-using UnityEngine;
-
-namespace DREditor.Minigames.Debates.Firing
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(FireTransformCalculatorBase) +
-        "\n\n")]
-    public class FireTransformCalculator : FireTransformCalculatorBase
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TiltCalculatorBase tiltCalculator = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected float cameraFarPlane = 1;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float fireOffsetX = -204;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float fireOffsetY = 0;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int divideWidth = 8;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int divideHeight = 4;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float angleOffsetMultiplier = 2;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float angleOffset = -204;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float additionalAngleOffset = 10;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected Transform reticleTransform = null;
-
-
-        protected virtual void Awake()
-        {
-            var allComponents = transform.root.GetComponentsInChildren<Component>();
-
-            var reticle = allComponents.OfType<HoverReticle>().FirstOrDefault();
-
-            if (reticle != null)
-                reticleTransform = reticle.transform;
-            else
-                throw new System.NullReferenceException($"ALERT: Initializing {nameof(reticleTransform)} failed!");
-        }
-
-        /// <inheritdoc/>
-        public override Vector3 CalculateFirePosition()
-        {
-            var fireXPosition = reticleTransform.position.x * ((float)divideWidth / Screen.width) + fireOffsetX;
-
-            var fireYPosition = reticleTransform.position.y * ((float)divideHeight / Screen.height) + fireOffsetY;
-
-            return new Vector3(fireXPosition, fireYPosition, cameraFarPlane);
-        }
-
-
-        /// <inheritdoc/>
-        public override Quaternion CalculateFireRotation()
-        {
-            Vector3 firePosition = CalculateFirePosition();
-
-            float tilt = tiltCalculator.CalculateFiringTilt(firePosition);
-
-            float angleOffset = angleOffsetMultiplier * (firePosition.x - this.angleOffset) + additionalAngleOffset;
-
-            return Quaternion.Euler(0, angleOffset, transform.localRotation.x + tilt);
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.UIHandling.Reticles;
+using System.Linq;
+using UnityEngine;
+
+namespace DREditor.Minigames.Debates.Firing
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(FireTransformCalculatorBase) +
+        "\n\n")]
+    public class FireTransformCalculator : FireTransformCalculatorBase
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TiltCalculatorBase tiltCalculator = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected float cameraFarPlane = 1;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float fireOffsetX = -204;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float fireOffsetY = 0;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int divideWidth = 8;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int divideHeight = 4;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float angleOffsetMultiplier = 2;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float angleOffset = -204;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float additionalAngleOffset = 10;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected Transform reticleTransform = null;
+
+
+        protected virtual void Awake()
+        {
+            var allComponents = transform.root.GetComponentsInChildren<Component>();
+
+            var reticle = allComponents.OfType<HoverReticle>().FirstOrDefault();
+
+            if (reticle != null)
+                reticleTransform = reticle.transform;
+            else
+                throw new System.NullReferenceException($"ALERT: Initializing {nameof(reticleTransform)} failed!");
+        }
+
+        /// <inheritdoc/>
+        public override Vector3 CalculateFirePosition()
+        {
+            var fireXPosition = reticleTransform.position.x * ((float)divideWidth / Screen.width) + fireOffsetX;
+
+            var fireYPosition = reticleTransform.position.y * ((float)divideHeight / Screen.height) + fireOffsetY;
+
+            return new Vector3(fireXPosition, fireYPosition, cameraFarPlane);
+        }
+
+
+        /// <inheritdoc/>
+        public override Quaternion CalculateFireRotation()
+        {
+            Vector3 firePosition = CalculateFirePosition();
+
+            float tilt = tiltCalculator.CalculateFiringTilt(firePosition);
+
+            float angleOffset = angleOffsetMultiplier * (firePosition.x - this.angleOffset) + additionalAngleOffset;
+
+            return Quaternion.Euler(0, angleOffset, transform.localRotation.x + tilt);
+        }
+    }
 }

package/Firing/FireTransformCalculator.cs.meta

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