GetPlayerAmmo is now a SetPlayerAmmo instead to fix some potential problems if the player has no weapon at all

Fixed some systems added twice in Game.cpp

include/Game/Systems/AmmoPickupSystem.h

@@ -40,5 +40,17 @@ private:
     };
     std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
     void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
+    //class
+    enum class PlayerClass {
+        Assault,
+        Defender,
+        Sniper,
+        None
+    };
+    //helper methods
+    bool DoesPlayerHaveMaxAmmo(EntityWrapper &player);
+    PlayerClass DetermineClass(EntityWrapper &player);
+    void SetPlayerAmmo(EntityWrapper &player, int ammoGain);
+    int GetPlayerMaxAmmo(EntityWrapper &player);
 };
 #endif

resources/Schema/Components.xsd

@@ -65,5 +65,4 @@
 	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
 	<xs:include schemaLocation="Components/ScoreScreen.xsd"/>
 	<xs:include schemaLocation="Components/ScoreIdentity.xsd"/>
-	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
 </xs:schema>

resources/Schema/Components/NetworkComponent.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<NetworkComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="NetworkComponent.xsd">
-</NetworkComponent>

resources/Schema/Components/NetworkComponent.xsd

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="NetworkComponent">
-		<xs:annotation>
-			<xs:documentation>If an entity has this component, it will be broadcasted to clients in a snapshot.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Entities/AmmoPickup.xml

@@ -2,7 +2,6 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AmmoPickup/>
     <c:Model>
       <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>

resources/Schema/Entities/HealthPickup.xml

@@ -2,7 +2,6 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:HealthPickup/>
     <c:Model>
       <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>

resources/Schema/Entities/Player.xml

@@ -2,7 +2,6 @@
 <Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerAssaultBlue.xml

@@ -2,7 +2,6 @@
 <Entity name="PlayerAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerAssaultFallbackBlue.xml

@@ -2,7 +2,6 @@
 <Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerAssaultFallbackRed.xml

@@ -2,7 +2,6 @@
 <Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerAssaultRed.xml

@@ -2,7 +2,6 @@
 <Entity name="PlayerAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerDefenderBlue.xml

@@ -2,7 +2,6 @@
 <Entity name="PlayerDefender" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerRed.xml

@@ -2,7 +2,6 @@
 <Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/ScoreBoard.xml

@@ -2,7 +2,6 @@
 <Entity name="ScoreBoardOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:NetworkComponent/>
     <c:Transform>
       <Position X="66.4319992" Y="37.9560013" Z="0"/>
       <Orientation X="0" Y="4.71199989" Z="0"/>

resources/Schema/Types/Entity.xsd

@@ -68,7 +68,6 @@
 							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
 							<xs:element ref="c:ScoreScreen" minOccurs="0"/>
 							<xs:element ref="c:ScoreIdentity" minOccurs="0"/>
-							<xs:element ref="c:NetworkComponent" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

src/Engine/Network/Server.cpp

@@ -641,7 +641,22 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
-    return childEntity.HasComponent("NetworkComponent") || childEntity.FirstParentWithComponent("NetworkComponent").Valid();
+    auto children = m_World->GetDirectChildren(childEntity.ID);
+    for (auto it = children.first; it != children.second; it++) {
+        EntityWrapper child(m_World, it->second);
+        if (child.HasComponent("CapturePoint") || child.HasComponent("HealthPickup")
+            || child.HasComponent("AmmoPickup")) {
+            return true;
+        }
+    }
+    return childEntity.HasComponent("Player")
+        || childEntity.FirstParentWithComponent("Player").Valid()
+        || childEntity.HasComponent("CapturePoint")
+        || childEntity.HasComponent("HealthPickup")
+        || childEntity.HasComponent("AmmoPickup")
+        || childEntity.HasComponent("ScoreScreen")
+        || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
+        || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }
 
 PlayerID Server::getPlayerIDFromEndpoint()

src/Game/Game.cpp

@@ -137,20 +137,13 @@ 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<AmmoPickupSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<TextFieldReader>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<TextFieldReader>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);

src/Game/Systems/AmmoPickupSystem.cpp

@@ -37,8 +37,7 @@ void AmmoPickupSystem::Update(double dt)
 
                 //erase the current element (somePickup)
                 it = m_ETriggerTouchVector.erase(it);
-            }
-            else { 
+            } else {
                 it++;
             }
         }
@@ -48,7 +47,7 @@ void AmmoPickupSystem::Update(double dt)
                 m_PickupAtMaximum.erase(it);
                 break;
             }
-            if ((int)it->player["AssaultWeapon"]["Ammo"] < (int)it->player["AssaultWeapon"]["MaxAmmo"]) {
+            if (!DoesPlayerHaveMaxAmmo(it->player)) {
                 DoPickup(it->player, it->trigger);
                 m_PickupAtMaximum.erase(it);
                 break;
@@ -56,6 +55,58 @@ void AmmoPickupSystem::Update(double dt)
         }
     }
 }
+bool AmmoPickupSystem::DoesPlayerHaveMaxAmmo(EntityWrapper &player) {
+    PlayerClass playerClass = DetermineClass(player);
+    if (playerClass == PlayerClass::Defender) {
+        return !((int)player["DefenderWeapon"]["Ammo"] < (int)player["DefenderWeapon"]["MaxAmmo"]);
+    } else if (playerClass == PlayerClass::Sniper) {
+        return !((int)player["SniperWeapon"]["Ammo"] < (int)player["SniperWeapon"]["MaxAmmo"]);
+    } else if (playerClass == PlayerClass::Assault) {
+        return !((int)player["AssaultWeapon"]["Ammo"] < (int)player["AssaultWeapon"]["MaxAmmo"]);
+    } else {
+        return false;
+    }
+}
+void AmmoPickupSystem::SetPlayerAmmo(EntityWrapper &player, int ammoGain) {
+    int maxWeaponAmmo = GetPlayerMaxAmmo(player);
+
+    PlayerClass playerClass = DetermineClass(player);
+    if (playerClass == PlayerClass::Defender) {
+        (int&)player["DefenderWeapon"]["Ammo"] = std::min((int)player["DefenderWeapon"]["Ammo"] + ammoGain, maxWeaponAmmo);
+    } else if (playerClass == PlayerClass::Sniper) {
+        (int&)player["SniperWeapon"]["Ammo"] = std::min((int)player["SniperWeapon"]["Ammo"] + ammoGain, maxWeaponAmmo);
+    } else if (playerClass == PlayerClass::Assault) {
+        (int&)player["AssaultWeapon"]["Ammo"] = std::min((int)player["AssaultWeapon"]["Ammo"] + ammoGain, maxWeaponAmmo);
+    } else {
+        //unknown class - ignore
+    }
+}
+int AmmoPickupSystem::GetPlayerMaxAmmo(EntityWrapper &player) {
+    PlayerClass playerClass = DetermineClass(player);
+    if (playerClass == PlayerClass::Defender) {
+        return (int)player["DefenderWeapon"]["MaxAmmo"];
+    } else if (playerClass == PlayerClass::Sniper) {
+        return (int)player["SniperWeapon"]["MaxAmmo"];
+    } else if (playerClass == PlayerClass::Assault) {
+        return (int)player["AssaultWeapon"]["MaxAmmo"];
+    } else {
+        return -1;
+    }
+}
+AmmoPickupSystem::PlayerClass AmmoPickupSystem::DetermineClass(EntityWrapper &player)
+{
+    //determine the class based on what component the inflictor-player has
+    if (m_World->HasComponent(player.ID, "DashAbility")) {
+        return PlayerClass::Assault;
+    }
+    if (m_World->HasComponent(player.ID, "ShieldAbility")) {
+        return PlayerClass::Defender;
+    }
+    if (m_World->HasComponent(player.ID, "SprintAbility")) {
+        return PlayerClass::Sniper;
+    }
+    return PlayerClass::None;
+}
 
 bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
 {
@@ -63,7 +114,7 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
         return false;
     }
     //TODO: add other weapontypes
-    if (!e.Entity.HasComponent("AssaultWeapon")) {
+    if (DetermineClass(e.Entity) == PlayerClass::None) {
         return false;
     }
     if (!e.Trigger.HasComponent("AmmoPickup")) {
@@ -71,7 +122,7 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
     }
 
     //if at maxammo, save the trigger-touch to a vector since standing inside it will not re-trigger the trigger
-    if ((int)e.Entity["AssaultWeapon"]["Ammo"] >= (int)e.Entity["AssaultWeapon"]["MaxAmmo"]) {
+    if (DoesPlayerHaveMaxAmmo(e.Entity)) {
         m_PickupAtMaximum.push_back({ e.Entity, e.Trigger });
         return false;
     }
@@ -85,18 +136,16 @@ bool AmmoPickupSystem::OnAmmoPickup(Events::AmmoPickup & e)
         return false;
     }
     //TODO: add other weapontypes
-    if (!e.Player.HasComponent("AssaultWeapon")) {
+    if (DetermineClass(e.Player) == PlayerClass::None) {
         return false;
     }
-    int maxWeaponAmmo = (int)e.Player["AssaultWeapon"]["MaxAmmo"];
-    int& currentAmmo = (int)e.Player["AssaultWeapon"]["Ammo"];
     //cant pick up ammopacks if you are already at MaxAmmo
-    if (currentAmmo >= maxWeaponAmmo) {
+    if (DoesPlayerHaveMaxAmmo(e.Player)) {
         return false;
     }
+    SetPlayerAmmo(e.Player, e.AmmoGain);
 
-    currentAmmo = std::min(currentAmmo + e.AmmoGain, maxWeaponAmmo);
-    return false;
+    return true;
 }
 
 bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
@@ -114,8 +163,11 @@ bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
 }
 
 void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
-    int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
-    int& currentAmmo = (int)player["AssaultWeapon"]["Ammo"];
+    //trigger should be valid but if it isnt we just return (to avoid crash)
+    if (!trigger.Valid()) {
+        return;
+    }
+    int maxWeaponAmmo = GetPlayerMaxAmmo(player);
     int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
 
     Events::AmmoPickup ePlayerAmmoPickup;
@@ -123,9 +175,6 @@ void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
     ePlayerAmmoPickup.Player = player;
     m_EventBroker->Publish(ePlayerAmmoPickup);
 
-    //immediately give the player the ammo (on server)
-    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({ (glm::vec3)trigger["Transform"]["Position"], trigger["AmmoPickup"]["AmmoGain"],

src/Game/Systems/PickupSpawnSystem.cpp

@@ -83,6 +83,10 @@ bool PickupSpawnSystem::OnTriggerLeave(Events::TriggerLeave& e)
 }
 void PickupSpawnSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger)
 {
+    //trigger should be valid but if it isnt we just return (to avoid crash)
+    if (!trigger.Valid()) {
+        return;
+    }
     double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];
 
     //only the server will increase the players hp and set it in the next delta