Initial SpawnSystem fixes

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;
@@ -29,5 +31,15 @@ private:
         EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+
+
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper pickup;
+
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
+
 };
 #endif

include/Game/Systems/HealthPickupSystem.h

@@ -1,5 +1,5 @@
-#ifndef PickupSpawnSystem_h__
-#define PickupSpawnSystem_h__
+#ifndef HealthPickupSystem_h__
+#define HealthPickupSystem_h__
 
 #include "Core/System.h"
 #include "Core/Transform.h"
@@ -11,16 +11,18 @@
 #include "Common.h"
 #include <tuple>
 
-class PickupSpawnSystem : public ImpureSystem
+class HealthPickupSystem : public ImpureSystem
 {
 public:
-    PickupSpawnSystem(SystemParams params);
+    HealthPickupSystem(SystemParams params);
 
     virtual void Update(double dt) override;
 
 private:
-    EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
+    EventRelay<HealthPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<HealthPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
 
     struct NewHealthPickup {
         glm::vec3 Pos;
@@ -30,5 +32,11 @@ private:
         EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper pickup;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif

src/Game/Game.cpp

@@ -13,7 +13,7 @@
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
 #include "Game/Systems/CapturePointHUDSystem.h"
-#include "Game/Systems/PickupSpawnSystem.h"
+#include "Game/Systems/HealthPickupSystem.h"
 #include "Game/Systems/AmmoPickupSystem.h"
 #include "Game/Systems/DamageIndicatorSystem.h"
 #include "Game/Systems/Weapon/WeaponSystem.h"
@@ -124,7 +124,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<HealthPickupSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);

src/Game/Systems/AmmoPickupSystem.cpp

@@ -4,6 +4,7 @@ AmmoPickupSystem::AmmoPickupSystem(SystemParams params)
     : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &AmmoPickupSystem::OnTriggerTouch);
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &AmmoPickupSystem::OnTriggerLeave);
 }
 
 void AmmoPickupSystem::Update(double dt)
@@ -36,6 +37,21 @@ void AmmoPickupSystem::Update(double dt)
             break;
         }
     }
+    //still touching AmmoPickupAtMaxHealthAmmo?
+    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+        if (!it->player.Valid() || !it->pickup.Valid()) {
+            m_PickupAtMaximum.erase(it);
+            break;
+
+        }
+        if ((int)it->player["AssaultWeapon"]["Ammo"] < (int)it->player["AssaultWeapon"]["MaxAmmo"]) {
+            DoPickup(it->player, it->pickup);
+            m_PickupAtMaximum.erase(it);
+            break;
+
+        }
+    }
+
 }
 
 
@@ -51,29 +67,47 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
     if (!e.Trigger.HasComponent("AmmoPickup")) {
         return false;
     }
-    int maxWeaponAmmo = (int)e.Entity["AssaultWeapon"]["MaxAmmo"];
-    int& currentAmmo = (int)e.Entity["AssaultWeapon"]["Ammo"];
 
-    int ammoGiven = 0.01*(double)e.Trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
     //cant pick up ammopacks if you are already at MaxAmmo
-    if (currentAmmo >= maxWeaponAmmo) {
+    if ((int)e.Entity["AssaultWeapon"]["Ammo"] >= (int)e.Entity["AssaultWeapon"]["MaxAmmo"]) {
+        m_PickupAtMaximum.push_back({ e.Entity, e.Trigger });
         return false;
     }
+    DoPickup(e.Entity, e.Trigger);
+
+    return true;
+}
+bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
+    //triggerleave erases possible AmmoPickupAtMaxHealthAmmo
+    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+        if (it->pickup.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
+            m_PickupAtMaximum.erase(it);
+            break;
+
+        }
+
+    }
+    return true;
+}
+void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
+    int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
+    int& currentAmmo = (int)player["AssaultWeapon"]["Ammo"];
+    int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
 
     //personEntered = e.Entity, thingEntered = e.Trigger
     Events::AmmoPickup ePlayerAmmoPickup;
     ePlayerAmmoPickup.AmmoGain = ammoGiven;
-    ePlayerAmmoPickup.Player = e.Entity;
+    ePlayerAmmoPickup.Player = player;
     m_EventBroker->Publish(ePlayerAmmoPickup);
+
     //immediately give the player the ammo
     currentAmmo = std::min(currentAmmo + ammoGiven, maxWeaponAmmo);
 
     //copy position, ammogain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each ammoPickup
-    m_ETriggerTouchVector.push_back({ e.Trigger["Transform"]["Position"], e.Trigger["AmmoPickup"]["AmmoGain"],
-        e.Trigger["AmmoPickup"]["RespawnTimer"], e.Trigger["AmmoPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) });
+    m_ETriggerTouchVector.push_back({ trigger["Transform"]["Position"], trigger["AmmoPickup"]["AmmoGain"],
+        trigger["AmmoPickup"]["RespawnTimer"], trigger["AmmoPickup"]["RespawnTimer"], m_World->GetParent(trigger.ID) });
 
     //delete the ammopickup
-    m_World->DeleteEntity(e.Trigger.ID);
-    return true;
-}
+    m_World->DeleteEntity(trigger.ID);
+}

src/Game/Systems/HealthPickupSystem.cpp

@@ -1,12 +1,13 @@
-#include "Systems/PickupSpawnSystem.h"
+#include "Systems/HealthPickupSystem.h"
 
-PickupSpawnSystem::PickupSpawnSystem(SystemParams params)
+HealthPickupSystem::HealthPickupSystem(SystemParams params)
     : System(params)
 {
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &PickupSpawnSystem::OnTriggerTouch);
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &HealthPickupSystem::OnTriggerTouch);
+    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &HealthPickupSystem::OnTriggerLeave);
 }
 
-void PickupSpawnSystem::Update(double dt)
+void HealthPickupSystem::Update(double dt)
 {
     for (auto it = m_ETriggerTouchVector.begin(); it != m_ETriggerTouchVector.end(); ++it)
     {
@@ -36,32 +37,62 @@ void PickupSpawnSystem::Update(double dt)
             break;
         }
     }
+    //still touching AmmoPickupAtMaxHealthAmmo?
+    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+        if (!it->player.Valid() || !it->pickup.Valid()) {
+            m_PickupAtMaximum.erase(it);
+            break;
+
+        }
+        if ((int)it->player["Health"]["Health"] < (int)it->player["Health"]["MaxHealth"]) {
+            DoPickup(it->player, it->pickup);
+            m_PickupAtMaximum.erase(it);
+            break;
+
+        }
+    }
 }
 
 
-bool PickupSpawnSystem::OnTriggerTouch(Events::TriggerTouch& e)
+bool HealthPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
 {
     if (!e.Trigger.HasComponent("HealthPickup")) {
         return false;
     }
-    double healthGiven = 0.01*(double)e.Trigger["HealthPickup"]["HealthGain"] * (double)e.Entity["Health"]["MaxHealth"];
     //cant pick up healthpacks if you are already at MaxHealth
     if ((double)e.Entity["Health"]["Health"] >= (double)e.Entity["Health"]["MaxHealth"]) {
+        m_PickupAtMaximum.push_back({ e.Entity, e.Trigger });
         return false;
     }
 
+    DoPickup(e.Entity, e.Trigger);
+    return true;
+}
+bool HealthPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
+    //triggerleave erases possible AmmoPickupAtMaxHealthAmmo
+    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+        if (it->pickup.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
+            m_PickupAtMaximum.erase(it);
+            break;
+        }
+    }
+    return true;
+}
+void HealthPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
+    double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];
+
     //personEntered = e.Entity, thingEntered = e.Trigger
     Events::PlayerHealthPickup ePlayerHealthPickup;
     ePlayerHealthPickup.HealthAmount = healthGiven;
-    ePlayerHealthPickup.Player = e.Entity;
+    ePlayerHealthPickup.Player = player;
     m_EventBroker->Publish(ePlayerHealthPickup);
 
     //copy position, healthgain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each healthPickup
-    m_ETriggerTouchVector.push_back({ (glm::vec3)e.Trigger["Transform"]["Position"] ,e.Trigger["HealthPickup"]["HealthGain"],
-        e.Trigger["HealthPickup"]["RespawnTimer"],e.Trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) });
+    m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"] ,trigger["HealthPickup"]["HealthGain"],
+        trigger["HealthPickup"]["RespawnTimer"],trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(trigger.ID) });
 
     //delete the healthpickup
-    m_World->DeleteEntity(e.Trigger.ID);
-    return true;
+    m_World->DeleteEntity(trigger.ID);
 }
+

src/Tests/PickupSpawnTest.cpp

@@ -41,7 +41,7 @@ PickupSpawnTest::PickupSpawnTest(int runTestNumber)
     // Create system pipeline
     m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker, false, false);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
-    m_SystemPipeline->AddSystem<PickupSpawnSystem>(1);
+    m_SystemPipeline->AddSystem<HealthPickupSystem>(1);
 
     //must register components (Components.xsd), else you cant create entities. Easiest done by loading a test xsd file
     auto file = ResourceManager::Load<EntityFile>("Schema/Entities/HealthPickup.xml");

src/Tests/PickupSpawnTest.h

@@ -31,7 +31,7 @@
 #include "Collision/CollisionSystem.h"
 #include "Core/EntityFileWriter.h"
 #include "Game/Systems/HealthSystem.h"
-#include "Game/Systems/PickupSpawnSystem.h"
+#include "Game/Systems/HealthPickupSystem.h"
 
 #include "Core/ResourceManager.h"
 
@@ -56,9 +56,9 @@ private:
     EntityID m_PlayerID, m_HealthPickupID;
     int m_RunTestNumber;
 
-    EventRelay<PickupSpawnSystem, Events::PlayerHealthPickup> m_HP;
+    EventRelay<HealthPickupSystem, Events::PlayerHealthPickup> m_HP;
     bool OnHealthPickup(Events::PlayerHealthPickup& e);
-    EventRelay<PickupSpawnSystem, Events::PickupSpawned> m_PS;
+    EventRelay<HealthPickupSystem, Events::PickupSpawned> m_PS;
     bool OnPickupSpawned(Events::PickupSpawned& e);
 
     bool m_TestStage1Success = false;