experimental fix for pickup

include/Engine/Input/FirstPersonInputController.h

@@ -192,6 +192,8 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 
 template <typename EventContext>
 void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
+    ImGui::Text(std::to_string(m_AssaultDashCoolDownTimer).c_str());
+
     m_AssaultDashDoubleTapDeltaTime += dt;
     m_AssaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)

include/Game/Systems/AmmoPickupSystem.h

@@ -20,6 +20,8 @@ public:
 private:
     EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
 
     struct NewAmmoPickup {
         glm::vec3 Pos;
@@ -28,6 +30,13 @@ private:
         double DecreaseThisRespawnTimer;
         EntityID parentID;
     };
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper pickup;
+    };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+    std::vector<EntityAtMaxValuePickupStruct> m_AmmoPickupAtMaxHealthAmmo;
+    
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif