From d9a3b158bd7ba08eb2b2b2dfe00dbf1ed3cf028c Mon Sep 17 00:00:00 2001
From: Stedd <toanpa+git@pm.me>
Date: Sat, 15 Apr 2023 12:26:50 +0200
Subject: [PATCH] Cleanup

---
 Assets/Enemies/Scripts/EnemyAI.cs | 1 -
 Assets/FlashLight.cs              | 6 ++----
 Assets/Pickups/AmmoPickup.cs      | 7 ++-----
 Assets/Pickups/BatteryPickup.cs   | 9 +++------
 Assets/Weapons/Scripts/Weapon.cs  | 1 -
 Packages/manifest.json            | 2 +-
 Packages/packages-lock.json       | 2 +-
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Assets/Enemies/Scripts/EnemyAI.cs b/Assets/Enemies/Scripts/EnemyAI.cs
index 13c6bc2..d3a23cb 100644
--- a/Assets/Enemies/Scripts/EnemyAI.cs
+++ b/Assets/Enemies/Scripts/EnemyAI.cs
@@ -1,4 +1,3 @@
-using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.AI;
 
diff --git a/Assets/FlashLight.cs b/Assets/FlashLight.cs
index d9fe891..d857d99 100644
--- a/Assets/FlashLight.cs
+++ b/Assets/FlashLight.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.InputSystem;
 
@@ -40,7 +37,7 @@ public class FlashLight : MonoBehaviour
         {
             CurrentCharge -= _powerDraw * Time.deltaTime;
             CurrentCharge = Mathf.Clamp(CurrentCharge, 0, _maxCharge);
-            if (CurrentCharge == 0)
+            if (CurrentCharge >= 0)
             {
                 FlashLightOff();
             }
@@ -52,6 +49,7 @@ public class FlashLight : MonoBehaviour
     private void FlashLightOff()
     {
         _light.enabled = false;
+        _isActive = false;
     }
 
     private void FlashLightOn()
diff --git a/Assets/Pickups/AmmoPickup.cs b/Assets/Pickups/AmmoPickup.cs
index f76ed3e..a1fc467 100644
--- a/Assets/Pickups/AmmoPickup.cs
+++ b/Assets/Pickups/AmmoPickup.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class AmmoPickup : MonoBehaviour
@@ -12,13 +9,13 @@ public class AmmoPickup : MonoBehaviour
     private void OnTriggerEnter(Collider other)
     {
         var ammoBelt = other.GetComponentInChildren<AmmoBelt>();
-        var amountBefore = ammoBelt.GetBeltCurrentAmmoAmount(_ammoType);
+        int amountBefore = ammoBelt.GetBeltCurrentAmmoAmount(_ammoType);
         if (ammoBelt != null)
         {
             ammoBelt.ModifyBeltCurrentAmmoAmount(_ammoType, _pickupAmount);
         }
 
-        var amountAfter = ammoBelt.GetBeltCurrentAmmoAmount(_ammoType);
+        int amountAfter = ammoBelt.GetBeltCurrentAmmoAmount(_ammoType);
 
         if (amountBefore != amountAfter)
         {
diff --git a/Assets/Pickups/BatteryPickup.cs b/Assets/Pickups/BatteryPickup.cs
index 226f524..063aec9 100644
--- a/Assets/Pickups/BatteryPickup.cs
+++ b/Assets/Pickups/BatteryPickup.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class BatteryPickup : MonoBehaviour
@@ -12,15 +9,15 @@ public class BatteryPickup : MonoBehaviour
     {
         print("Battery Pickup" + other);
         var flashLight = other.GetComponentInChildren<FlashLight>();
-        var amountBefore = flashLight.CurrentCharge;
+        float amountBefore = flashLight.CurrentCharge;
         if (flashLight != null)
         {
             flashLight.ModifyCharge(_pickupAmount);
         }
 
-        var amountAfter = flashLight.CurrentCharge;
+        float amountAfter = flashLight.CurrentCharge;
 
-        if (amountBefore != amountAfter)
+        if (Mathf.Approximately(amountBefore, amountAfter))
         {
             Destroy(gameObject.transform.parent.gameObject);
         }
diff --git a/Assets/Weapons/Scripts/Weapon.cs b/Assets/Weapons/Scripts/Weapon.cs
index cbc574b..d783f4b 100644
--- a/Assets/Weapons/Scripts/Weapon.cs
+++ b/Assets/Weapons/Scripts/Weapon.cs
@@ -1,5 +1,4 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class Weapon : MonoBehaviour
diff --git a/Packages/manifest.json b/Packages/manifest.json
index a715254..20169c1 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -3,7 +3,7 @@
     "com.unity.cinemachine": "2.8.6",
     "com.unity.collab-proxy": "1.17.2",
     "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.16",
+    "com.unity.ide.rider": "3.0.18",
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.4.2",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 01fe812..b4c5cc9 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -45,7 +45,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.16",
+      "version": "3.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {