Merge branch 'master' into Respawning

include/Game/Systems/AmmoPickupSystem.h

@@ -20,6 +20,9 @@ public:
 private:
     EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
+
     EventRelay<AmmoPickupSystem, Events::AmmoPickup> m_EAmmoPickup;
     bool OnAmmoPickup(Events::AmmoPickup& e);
 
@@ -31,5 +34,11 @@ private:
         EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif

include/Game/Systems/BoostSystem.h

@@ -0,0 +1,21 @@
+#ifndef BoostSystem_h__
+#define BoostSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFileParser.h"
+#include "Core/EPlayerDamage.h"
+#include "Common.h"
+
+class BoostSystem : public System
+{
+public:
+    BoostSystem(SystemParams params);
+
+private:
+    EventRelay<BoostSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(Events::PlayerDamage& e);
+
+    std::string DetermineClass(EntityWrapper player);
+};
+#endif

include/Game/Systems/PickupSpawnSystem.h

@@ -9,7 +9,6 @@
 #include "Core/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
-#include <tuple>
 
 class PickupSpawnSystem : public ImpureSystem
 {
@@ -21,6 +20,8 @@ public:
 private:
     EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<PickupSpawnSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
 
     struct NewHealthPickup {
         glm::vec3 Pos;
@@ -30,5 +31,11 @@ private:
         EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif