Merge branch 'master' into JumpHeightAdjustment

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerRed.xml
#	src/Game/Systems/PlayerMovementSystem.cpp

include/Engine/Collision/CollisionSystem.h

@@ -24,6 +24,7 @@ public:
 private:
     Octree<EntityAABB>* m_Octree;
     std::vector<EntityAABB> m_OctreeResult;
+    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };
 
 #endif

include/Engine/Core/EntityWrapper.h

@@ -29,16 +29,22 @@ struct EntityWrapper
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
+    EntityWrapper Clone(EntityWrapper parent = EntityWrapper::Invalid);
+    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
+    void DeleteChildren();
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid() const;
 
     ComponentWrapper operator[](const char* componentName);
+    ComponentWrapper operator[](const std::string& componentName);
     bool operator==(const EntityWrapper& e) const;
     bool operator!=(const EntityWrapper& e) const;
     explicit operator EntityID() const;
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
+    EntityWrapper cloneRecursive(EntityWrapper entity, EntityWrapper parent);
+    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };
 
 namespace std

include/Engine/Core/System.h

@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Core/World.h

@@ -40,7 +40,7 @@ public:
     // Change the parent of an entity
     void SetParent(EntityID entity, EntityID parent);
     // Get children of an entity
-    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
+    const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetDirectChildren(EntityID entity);
     // Get all component pools
     const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
     // Get the entity children map

include/Engine/Editor/EditorGUI.h

@@ -73,6 +73,12 @@ public:
     // Called when the user means to rename an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnEntityChangeName_t;
     void SetEntityChangeNameCallback(OnEntityChangeName_t f) { m_OnEntityChangeName = f; }
+    // Called when the user pastes an entity previously "copied"
+    // @param EntityWrapper The entity to copy
+    // @param EntityWrapper The entity to parent the new copy to
+    // @return The new copy of the entity
+    typedef std::function<EntityWrapper(EntityWrapper, EntityWrapper)> OnEntityPaste_t;
+    void SetEntityPasteCallback(OnEntityPaste_t f) { m_OnEntityPaste = f; }
     // Called when the user means to attach a new component to an entity.
     typedef std::function<void(EntityWrapper, const std::string&)> OnComponentAttach_t;
     void SetComponentAttachCallback(OnComponentAttach_t f) { m_OnComponentAttach = f; }
@@ -111,6 +117,7 @@ private:
     std::string m_DroppedFile = "";
     bool m_Paused = false;
     bool m_MouseLocked = false;
+    EntityWrapper m_CopyTarget = EntityWrapper::Invalid;
 
     // Callbacks
     OnEntitySelectedCallback_t m_OnEntitySelected = nullptr;
@@ -124,6 +131,7 @@ private:
     OnComponentDelete_t m_OnComponentDelete = nullptr;
     OnWidgetMode_t m_OnWidgetMode = nullptr;
     OnWidgetSpace_t m_OnWidgetSpace = nullptr;
+    OnEntityPaste_t m_OnEntityPaste = nullptr;
 
     // Events
     EventRelay<EditorGUI, Events::KeyDown> m_EKeyDown;

include/Engine/Editor/EditorSystem.h

@@ -56,6 +56,7 @@ private:
     void OnEntityDelete(EntityWrapper entity);
     void OnEntityChangeParent(EntityWrapper entity, EntityWrapper parent);
     void OnEntityChangeName(EntityWrapper entity, const std::string& name);
+    EntityWrapper OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent);
     void OnComponentAttach(EntityWrapper entity, const std::string& componentType);
     void OnComponentDelete(EntityWrapper entity, const std::string& componentType);
     void OnWidgetSpace(EditorGUI::WidgetSpace widgetSpace);

include/Engine/Network/Client.h

@@ -19,8 +19,10 @@
 #include "Core/World.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
+#include "Core/EPlayerDeath.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
+#include "../Game/Events/EDoubleJump.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
@@ -47,7 +49,9 @@ public:
 
     void Connect(std::string address, int port);
     void Update() override;
-
+private:
+    UDPClient m_Unreliable;
+    TCPClient m_Reliable;
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();
     // Save for children
@@ -101,9 +105,9 @@ public:
     void parseEntityDeletion(Packet& packet);
     void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
+    void parseDoubleJump(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
-    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
     void identifyPacketLoss();
     void hasServerTimedOut();
     EntityID createPlayer();
@@ -127,11 +131,10 @@ public:
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
     EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
+    EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
+    bool OnDoubleJump(Events::DoubleJump & e);
     bool OnSearchForServers(const Events::SearchForServers& e);
-private:
-    UDPClient m_Unreliable;
     UDPClient m_ServerlistRequest;
-    TCPClient m_Reliable;
     std::vector<ServerInfo> m_Serverlist;
     bool m_SearchingForServers = false;
     std::clock_t m_StartSearchTime;

include/Engine/Network/MessageType.h

@@ -19,6 +19,7 @@ enum class MessageType
     EntityDeleted,
     ComponentDeleted,
     PlayerTransform,
+    OnDoubleJump,
     ServerlistRequest,
     Invalid
 };

include/Engine/Network/Server.h

@@ -8,7 +8,6 @@
 
 #include "Network/TCPServer.h"
 #include "Network/UDPServer.h"
-#include "Network/UDPClient.h" //LOL
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -18,6 +17,7 @@
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Core/EPlayerSpawned.h"
+#include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 
@@ -81,8 +81,9 @@ private:
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
     void parsePing();
-    void parseUDPConnect(Packet & packet);
+    bool parseDoubleJump(Packet& packet);
-    void parseTCPConnect(Packet & packet);
+    void parseUDPConnect(Packet& packet);
+    void parseTCPConnect(Packet& packet);
     void parseDisconnect();
     void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);

include/Engine/Network/TCPServer.h

@@ -25,10 +25,9 @@ private:
     std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
     boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
 
-    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
-        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        const boost::system::error_code& error);
     int readBuffer(PlayerDefinition& playerDefinition);
+    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+        boost::asio::ip::address address, unsigned short port);
     int GetPort();
     std::string GetAddress();
     int m_Port = 0;

include/Game/Events/EDoubleJump.h

@@ -8,7 +8,7 @@ namespace Events
 
 struct DoubleJump : public Event
 {
-
+    EntityID entityID;
 };
 
 }

include/Game/Systems/PlayerMovementSystem.h

@@ -34,9 +34,13 @@ private:
     glm::vec3 m_LastPosition = glm::vec3();
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
+    // Spawn a hexagon at origin of an Entity
+    void spawnHexagon(EntityWrapper target);
 
     EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
+    EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
+    bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);
 
     void updateMovementControllers(double dt);
     void updateVelocity(EntityWrapper player, double dt);

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,37 +1,33 @@
+#ifndef AssaultWeaponBehaviour_h__
+#define AssaultWeaponBehaviour_h__
+
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Collision/Collision.h"
-#include "Rendering/AnimationSystem.h"
 #include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
 #include "../SpawnerSystem.h"
 #include "Core/EPlayerDamage.h"
 #include "Core/EShoot.h"
 
-
+class AssaultWeaponBehaviour : public WeaponBehaviour<AssaultWeaponBehaviour>
-class AssaultWeaponBehaviour : public WeaponBehaviour
 {
 public:
-    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
+    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
-    
+        : WeaponBehaviour(systemParams, "AssaultWeapon", renderer, collisionOctree) 
-    virtual void Fire() override;
+    { }
-    virtual void CeaseFire() override;
-    virtual void Reload() override;
 
-    virtual void Update(double dt) override;
+protected:
+    virtual void OnPrimaryFire(WeaponInfo& wi) override;
+    virtual void OnCeasePrimaryFire(WeaponInfo& wi) override;
+    virtual void OnReload(WeaponInfo& wi) override;
 
 private:
-    EntityWrapper m_FirstPersonModel;
-    EntityWrapper m_ThirdPersonModel;
     // State
     bool m_Firing = false;
     bool m_Reloading = false;
     double m_ReloadTimer = 0.0;
-    EntityWrapper m_FirstPersonReloadImpersonator;
-    EntityWrapper m_ThirdPersonReloadImpersonator;
     double m_TimeSinceLastFire = 0.0;
-
+    EntityWrapper m_FirstPersonReloadImpostor;
-    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
-    bool OnAnimationComplete(Events::AnimationComplete& e);
 
     bool hasAmmo();
     void fireRound();
@@ -47,3 +43,5 @@ private:
     bool shoot(double damage);
     void showHitMarker();
 };
+
+#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -0,0 +1,38 @@
+#include "WeaponBehaviour.h"
+#include "Collision/Collision.h"
+#include "Core/EPlayerDamage.h"
+#include "Rendering/ESetCamera.h"
+
+class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
+{
+public:
+    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
+        : System(systemParams)
+        , WeaponBehaviour(systemParams, "DefenderWeapon", renderer, collisionOctree)
+        , m_RandomEngine(m_RandomDevice())
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &DefenderWeaponBehaviour::OnSetCamera);
+    }
+
+    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
+    void UpdateWeapon(WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(WeaponInfo& wi) override;
+    bool OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e) override;
+
+private:
+    std::random_device m_RandomDevice;
+    std::mt19937 m_RandomEngine;
+    EntityWrapper m_CurrentCamera;
+
+    EventRelay<DefenderWeaponBehaviour, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(const Events::SetCamera& e);
+
+    // Weapon functions
+    void fireShell(WeaponInfo& wi);
+    void dealDamage(WeaponInfo& wi, glm::vec3 direction, double damage);
+
+    // Utility
+    float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
+    Camera cameraFromEntity(EntityWrapper camera);
+};

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -5,30 +5,177 @@
 #include "Rendering/IRenderer.h"
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
+#include "Input/EInputCommand.h"
+#include "Systems/SpawnerSystem.h"
 
-class WeaponBehaviour : public System
+template <typename ETYPE>
+class WeaponBehaviour : public PureSystem
 {
+    friend class WeaponSystem;
+
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
+    WeaponBehaviour(SystemParams params, std::string componentType, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
-        : System(systemParams)
+        : System(params)
+        , PureSystem(componentType)
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
-        , m_Player(player)
+    {
-    { }
+        EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &WeaponBehaviour::_OnInputCommand)
+    }
     virtual ~WeaponBehaviour() = default;
 
-    WeaponBehaviour(const WeaponBehaviour&) = delete;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
-    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
+    {
-
+        auto weapon = getActiveWeapon(entity);
-    virtual void Fire() = 0;
+        if (!weapon) {
-    virtual void CeaseFire() { }
+            return;
-    virtual void Reload() { }
+        } else {
-    virtual void Update(double dt) { }
+            UpdateWeapon(*weapon, dt);
+        }
+    }
 
 protected:
+    struct WeaponInfo
+    {
+        std::string WeaponComponent;
+        EntityWrapper Player;
+        EntityWrapper WeaponEntity;
+        EntityWrapper FirstPersonEntity;
+        EntityWrapper ThirdPersonEntity;
+        ComponentWrapper GetComponent() { return WeaponEntity[WeaponComponent]; }
+    };
+
     IRenderer* m_Renderer;
     Octree<EntityAABB>* m_CollisionOctree;
-    EntityWrapper m_Player;
+    std::unordered_map<EntityWrapper, WeaponInfo> m_ActiveWeapons;
+
+    virtual void UpdateWeapon(WeaponInfo& wi, double dt) { }
+    virtual void OnPrimaryFire(WeaponInfo& wi) { }
+    virtual void OnCeasePrimaryFire(WeaponInfo& wi) { }
+    virtual void OnReload(WeaponInfo& wi) { }
+    virtual bool OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e) { return false; }
+
+private:
+    EventRelay<ETYPE, Events::InputCommand> m_EInputCommand;
+    bool _OnInputCommand(const Events::InputCommand& e)
+    {
+        EntityWrapper player = e.Player;
+        if (e.PlayerID == -1) {
+            player = LocalPlayer;
+        }
+
+        // Make sure the player is alive
+        if (!player.Valid()) {
+            return false;
+        }
+
+        // Make sure the player has this weapon
+        auto weapon = getWeaponComponent(player);
+        if (!weapon) {
+            return false;
+        }
+
+        // Weapon selection
+        if (e.Command == "SelectWeapon") {
+            if (static_cast<ComponentInfo::EnumType>(e.Value) == static_cast<ComponentInfo::EnumType>((*weapon)["Slot"])) {
+                selectWeapon(player);
+            }
+        }
+
+        // Only handle weapon actions if the weapon is active
+        auto activeWeapon = getActiveWeapon(player);
+        if (!activeWeapon) {
+            return false;
+        }
+
+        // Fire
+        if (e.Command == "PrimaryFire") {
+            if (e.Value > 0) {
+                OnPrimaryFire(*activeWeapon);
+            } else {
+                OnCeasePrimaryFire(*activeWeapon);
+            }
+        }
+
+        // Reload
+        if (e.Command == "Reload" && e.Value != 0) {
+            OnReload(*activeWeapon);
+        }
+
+        return OnInputCommand(*activeWeapon, e);
+    }
+
+    boost::optional<ComponentWrapper> getWeaponComponent(EntityWrapper player)
+    {
+        if (!player.HasComponent(m_ComponentType)) {
+            return boost::none;
+        }
+
+        return player[m_ComponentType];
+    }
+
+    boost::optional<WeaponInfo&> getActiveWeapon(EntityWrapper player)
+    {
+        auto it = m_ActiveWeapons.find(player);
+        if (it == m_ActiveWeapons.end()) {
+            return boost::none;
+        }
+        WeaponInfo& activeWeapon = it->second;
+
+        if (!activeWeapon.FirstPersonEntity.Valid() && !activeWeapon.ThirdPersonEntity.Valid()) {
+            return boost::none;
+        }
+
+        return activeWeapon;
+    }
+
+    void selectWeapon(EntityWrapper player)
+    {
+        // Find the weapon attachments matching the weapon type
+        std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
+        EntityWrapper firstPersonAttachment;
+        EntityWrapper thirdPersonAttachment;
+        for (auto& attachment : weaponAttachments) {
+            ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
+            if ((std::string&)cWeaponAttachment["Weapon"] == m_ComponentType) {
+                ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
+                if ((ComponentInfo::EnumType)person == person.Enum("FirstPerson")) {
+                    firstPersonAttachment = attachment;
+                } else if ((ComponentInfo::EnumType)person == person.Enum("ThirdPerson")) {
+                    thirdPersonAttachment = attachment;
+                }
+            }
+        }
+
+        if (!firstPersonAttachment.Valid() && !thirdPersonAttachment.Valid()) {
+            LOG_WARNING("No weapon attachment found for %s of player #%i", m_ComponentType.c_str(), player.ID);
+            return;
+        }
+
+        // Purge other weapon entities
+        for (auto& attachment : weaponAttachments) {
+            //if (attachment == firstPersonAttachment || attachment == thirdPersonAttachment) {
+            //    continue;
+            //}
+            attachment.DeleteChildren();
+        }
+
+        // Spawn the weapon(s)
+        EntityWrapper firstPersonWeapon;
+        EntityWrapper thirdPersonWeapon;
+        if (firstPersonAttachment.Valid()) {
+            firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+        }
+        if (thirdPersonAttachment.Valid()) {
+            thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+        }
+
+        m_ActiveWeapons[player].WeaponComponent = m_ComponentType;
+        m_ActiveWeapons[player].Player = player;
+        m_ActiveWeapons[player].WeaponEntity = player;
+        m_ActiveWeapons[player].FirstPersonEntity = firstPersonWeapon;
+        m_ActiveWeapons[player].ThirdPersonEntity = thirdPersonWeapon;
+    }
 };
 
 #endif

resources/Schema/Components.xsd

@@ -47,4 +47,6 @@
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
 	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
+	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
+	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
 </xs:schema>

resources/Schema/Components/AssaultWeapon.xml

@@ -8,4 +8,5 @@
 	<RPM>120</RPM>
 	<ViewPunch>0.01</ViewPunch>
 	<ReloadTime>2</ReloadTime>
+	<Slot><Primary/></Slot>
 </AssaultWeapon>

resources/Schema/Components/AssaultWeapon.xsd

@@ -2,6 +2,7 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:include schemaLocation="../Types/WeaponSlotEnum.xsd"/>
 
 	<xs:element name="AssaultWeapon">
 		<xs:complexType>
@@ -28,6 +29,7 @@
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Time it takes to reload the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/DefenderWeapon.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<DefenderWeapon xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DefenderWeapon.xsd">
+	<MagazineAmmo>8</MagazineAmmo>
+	<MagazineSize>8</MagazineSize>
+	<Ammo>64</Ammo>
+	<MaxAmmo>64</MaxAmmo>
+	<BaseDamage>90</BaseDamage>
+	<SpreadAngle>0.174533</SpreadAngle> <!-- 0.174533 = 10 degrees -->
+	<NumPellets>10</NumPellets>
+	<RPM>120</RPM>
+	<ViewPunch>0.01</ViewPunch>
+	<ReloadTime>0.5</ReloadTime>
+	<Slot><Primary/></Slot>
+	<IsFiring>false</IsFiring>
+	<TimeSinceLastFire>0</TimeSinceLastFire>
+</DefenderWeapon>

resources/Schema/Components/DefenderWeapon.xsd

@@ -0,0 +1,44 @@
+<?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:include schemaLocation="../Types/WeaponSlotEnum.xsd"/>
+
+	<xs:element name="DefenderWeapon">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="MagazineAmmo" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Ammo currently loaded into the magazine</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="MagazineSize" type="t:int" minOccurs="0">
+									<xs:annotation><xs:documentation>Max number of rounds in a magazine</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Ammo" type="t:int" minOccurs="0">
+									<xs:annotation><xs:documentation>Current ammo carried</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="MaxAmmo" type="t:int" minOccurs="0">
+									<xs:annotation><xs:documentation>Maximum ammo able to be carried</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="BaseDamage" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Damage dealt if all shotgun pellets hit</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="SpreadAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Spread angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NumPellets" type="t:int" minOccurs="0"/>
+				<xs:element name="RPM" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Rate of fire in rounds per minute</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
+				<xs:element name="IsFiring" type="t:bool" minOccurs="0"/>
+				<xs:element name="TimeSinceLastFire" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Physics.xml

@@ -2,7 +2,6 @@
 <Physics xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Physics.xsd">
 	<Velocity X="0" Y="0" Z="0"/>
 	<Gravity>true</Gravity>
-	<PrevOrigin X="-9876.5" Y="-9876.5" Z="-9876.5"/>
 	<IsOnGround>false</IsOnGround>
 	<VerticalStepHeight>0.33</VerticalStepHeight>
 </Physics>

resources/Schema/Components/Physics.xsd

@@ -13,7 +13,6 @@
 					<xs:annotation><xs:documentation>m/s^2</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Gravity" type="t:bool" minOccurs="0"/>
-				<xs:element name="PrevOrigin" type="t:Vector" minOccurs="0"/>
 				<xs:element name="IsOnGround" type="t:bool" minOccurs="0"/>
 				<xs:element name="VerticalStepHeight" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>The largest height of a "stair-step" that can be walked over</xs:documentation></xs:annotation>

resources/Schema/Components/Player.xml

@@ -4,4 +4,5 @@
 	<CrouchSpeed>1.5</CrouchSpeed>
 	<JumpSpeed>4.0</JumpSpeed>
 	<CurrentWishDirection X="0" Y="0" Z="0"/>
+	<CurrentWeapon></CurrentWeapon>
 </Player>

resources/Schema/Components/Player.xsd

@@ -15,6 +15,7 @@
 					<xs:annotation><xs:documentation>Vertical velocity set when jumping.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="CurrentWishDirection" type="t:Vector" minOccurs="0"/>
+				<xs:element name="CurrentWeapon" type="t:string" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Weapon.xml

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

resources/Schema/Components/Weapon.xsd

@@ -1,17 +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="Weapon">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="MagSize" type="t:int" minOccurs="0"/>
-				<xs:element name="MaxAmmo" type="t:int" minOccurs="0"/>
-				<xs:element name="CurrentAmmoInMag" type="t:int" minOccurs="0"/>
-				<xs:element name="CurrentAmmo" type="t:int" minOccurs="0"/>
-				<xs:element name="RPM" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/WeaponAttachment.xml

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

resources/Schema/Components/WeaponAttachment.xsd

@@ -0,0 +1,28 @@
+<?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:complexType name="PersonEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="FirstPerson" type="t:int" fixed="0" minOccurs="0"/>
+					<xs:element name="ThirdPerson" type="t:int" fixed="1" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="WeaponAttachment">
+		<xs:annotation><xs:documentation>Combine with a spawner to define a weapon attachment point</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Weapon" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The weapon component type this attachment refers to</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Person" type="PersonEnum" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/AssaultWeaponView.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
+      <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="FirstPersonReloadSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionHUD">
+      <Components>
+        <c:AmmunitionHUD/>
+        <c:Transform>
+          <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
+          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="AmmunitionHUDBackground">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.00200000009"/>
+              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AmmunitionText">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>32</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>360</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/AssaultWeaponWorld.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ThirdPersonWeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
+      <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ThirdPersonReloadSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DefenderShield.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Shield" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Shield">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitPlane.mesh</Resource>
+        </c:Model>
+        <c:Shield/>
+        <c:Transform>
+          <Scale X="1.11800003" Y="0.0320000015" Z="1.9180001"/>
+          <Orientation X="-1.57079995" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="VisibleSide">
+      <Components>
+        <c:Shielded/>
+        <c:Model>
+          <Resource>Models/Core/UnitHexagon.mesh</Resource>
+          <Color A="0" B="1" G="0" R="0"/>
+          <Transparent>true</Transparent>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.0179871861"/>
+          <Scale X="1.01900005" Y="0.0120000001" Z="1.91000009"/>
+          <Orientation X="-1.57079995" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DefenderWeaponView.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+      <PositionOffset X="0" Y="0.0480000004" Z="-0.183000013"/>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.120430306" Y="0.775375426" Z="1.36542225"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.00191565475" Y="0.0324025005" Z="-0.2021029"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="FirstPersonReloadSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionHUD">
+      <Components>
+        <c:AmmunitionHUD/>
+        <c:Transform>
+          <Position X="-0.0490000024" Y="0.0520000011" Z="-0.063000001"/>
+          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="AmmunitionHUDBackground">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.00200000009"/>
+              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AmmunitionText">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>32</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>360</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DefenderWeaponViewRed.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+      <PositionOffset X="0" Y="0.0480000004" Z="-0.183000013"/>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Red/DefenderGunRed.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.120430306" Y="0.775375426" Z="1.36542225"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.00191565475" Y="0.0324025005" Z="-0.2021029"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="FirstPersonReloadSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionHUD">
+      <Components>
+        <c:AmmunitionHUD/>
+        <c:Transform>
+          <Position X="-0.0490000024" Y="0.0520000011" Z="-0.063000001"/>
+          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="AmmunitionHUDBackground">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.00200000009"/>
+              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AmmunitionText">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>32</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>360</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DefenderWeaponWorld.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ThirdPersonWeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+      <PositionOffset X="0" Y="0.0320000015" Z="-0.165000007"/>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.162026152" Y="1.05794585" Z="-0.380744517"/>
+      <Orientation X="-0.0628969446" Y="-0.0509683639" Z="0.118739031"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.000284185546" Y="0.0318552479" Z="-0.193328083"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ThirdPersonReloadSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DefenderWeaponWorldRed.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ThirdPersonWeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+      <PositionOffset X="0" Y="0.0320000015" Z="-0.165000007"/>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Red/DefenderGunRed.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.162026152" Y="1.05794585" Z="-0.380744517"/>
+      <Orientation X="-0.0628969446" Y="-0.0509683639" Z="0.118739031"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.000284185546" Y="0.0318552479" Z="-0.193328083"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ThirdPersonReloadSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MovementTest.xml

@@ -10,7 +10,7 @@
       <Components>
         <c:PlayerSpawn/>
         <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+          <EntityFile>Schema/Entities/PlayerRed.xml</EntityFile>
         </c:Spawner>
         <c:Team>
           <Team>
@@ -118,257 +118,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="Player">
-      <Components>
-        <c:AABB>
-          <Origin X="0" Y="0.772000015" Z="0"/>
-          <Size X="1" Y="1.60000002" Z="1"/>
-        </c:AABB>
-        <c:AssaultWeapon>
-          <RPM>600</RPM>
-        </c:AssaultWeapon>
-        <c:Collidable/>
-        <c:DashAbility/>
-        <c:Health/>
-        <c:Physics>
-          <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-        </c:Physics>
-        <c:Player>
-          <MovementSpeed>5</MovementSpeed>
-        </c:Player>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="0" Y="0.0288832653" Z="2.64837074"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Camera">
-          <Components>
-            <c:Camera/>
-            <c:Transform>
-              <Position X="0" Y="1.27700007" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="PlayerName">
-              <Components>
-                <c:Text>
-                  <Resource>Fonts/DroidSans.ttf,100</Resource>
-                  <Color A="1" B="0" G="1" R="0"/>
-                </c:Text>
-                <c:Transform>
-                  <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
-                  <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-                  <Orientation X="0" Y="3.14199996" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="CameraModel">
-              <Components>
-                <c:Model>
-                  <Resource>Models/Widgets/Camera.mesh</Resource>
-                  <Visible>false</Visible>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-                  <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.5"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Model>
-                      <Resource>Models/Core/UnitHexagon.mesh</Resource>
-                      <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
-                      <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
-                      <Orientation X="0" Y="0.594000041" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="Crosshair">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                      <DepthSort>false</DepthSort>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="0.200000003"/>
-                      <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="Hands">
-              <Components>
-                <c:Animation>
-                  <AnimationName1>Idle</AnimationName1>
-                  <Time1>1.9569972344146196</Time1>
-                  <Speed1>1</Speed1>
-                </c:Animation>
-                <c:Model>
-                  <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-                  <Transparent>true</Transparent>
-                </c:Model>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="WeaponModel">
-                  <Components>
-                    <c:BoneAttachment>
-                      <BoneName>R_Arm_Weapon_Joint</BoneName>
-                    </c:BoneAttachment>
-                    <c:Model>
-                      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                      <Transparent>true</Transparent>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="0.120748013" Y="-0.228470564" Z="-0.151475638"/>
-                      <Orientation X="0.010404693" Y="-0.00268176314" Z="0.0428441502"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="WeaponMuzzle">
-                      <Components>
-                        <c:Spawner>
-                          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                        </c:Spawner>
-                        <c:Transform>
-                          <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="FirstPersonReloadSpawner">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/WeaponReloadEffect.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="ThirdPersonCamera">
-          <Components>
-            <c:Camera/>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-              <Orientation X="5.95600033" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="PlayerModel">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8055945618467364</Time1>
-              <Speed1>1</Speed1>
-            </c:Animation>
-            <c:AnimationOffset>
-              <AnimationName>AimRifle</AnimationName>
-              <Time>0.5</Time>
-            </c:AnimationOffset>
-            <c:HiddenForLocalPlayer/>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-              <Color A="1" B="0" G="0" R="1"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="ThirdPersonWeaponModel">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                  <Visible>false</Visible>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0.158578917" Y="1.02878916" Z="-0.215411991"/>
-                  <Orientation X="-0.0626687407" Y="-0.0361274257" Z="0.120101407"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="ThirdPersonWeaponMuzzle">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform>
-                      <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="AABBStanding">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="0.427450985" B="1" G="1" R="1"/>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.772000015" Z="0"/>
-              <Scale X="1" Y="1.60000002" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="AABBCrouching">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="0.745098054" B="1" G="0" R="1"/>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.772000015" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/Player.xml

@@ -7,25 +7,31 @@
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
     <c:AssaultWeapon>
-      <RPM>600</RPM>
+      <Slot>
+        <Secondary/>
+      </Slot>
     </c:AssaultWeapon>
     <c:Collidable/>
-    <c:DashAbility/>
+    <c:DefenderWeapon>
+      <TimeSinceLastFire>1.6944730461160304</TimeSinceLastFire>
+    </c:DefenderWeapon>
     <c:DoubleJump/>
     <c:Health/>
     <c:Physics>
-      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
       <MovementSpeed>5</MovementSpeed>
+      <CurrentWeapon></CurrentWeapon>
     </c:Player>
     <c:Team>
       <Team>
         <Blue/>
       </Team>
     </c:Team>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="-1.42731023" Y="0.0288832653" Z="3.63052702"/>
+    </c:Transform>
   </Components>
 
   <Children>
@@ -305,7 +311,8 @@
                   </Children>
                 </Entity>
               </Children>
-            </Entity>            <Entity name="KillFeed">
+            </Entity>
+            <Entity name="KillFeed">
               <Components>
                 <c:KillFeed/>
                 <c:Transform>
@@ -365,7 +372,7 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>0.97725610639912475</Time1>
+              <Time1>0.67172915251515519</Time1>
               <Speed1>1</Speed1>
               <AnimationName2></AnimationName2>
               <AnimationName3></AnimationName3>
@@ -377,100 +384,29 @@
             <c:Transform/>
           </Components>
           <Children>
-            <Entity name="WeaponModel">
+            <Entity name="PrimaryAttachment">
               <Components>
-                <c:BoneAttachment>
+                <c:Spawner>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                  <EntityFile>Schema/Entities/DefenderWeaponView.xml</EntityFile>
-                </c:BoneAttachment>
+                </c:Spawner>
-                <c:Model>
+                <c:Transform/>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+                <c:WeaponAttachment>
-                </c:Model>
+                  <Weapon>DefenderWeapon</Weapon>
-                <c:Transform>
+                </c:WeaponAttachment>
-                  <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
-                  <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
-                </c:Transform>
               </Components>
-              <Children>
+              <Children/>
-                <Entity name="WeaponMuzzle">
+            </Entity>
-                  <Components>
+            <Entity name="SecondaryAttachment">
-                    <c:Spawner>
+              <Components>
-                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+                <c:Spawner>
-                    </c:Spawner>
+                  <EntityFile>Schema/Entities/AssaultWeaponView.xml</EntityFile>
-                    <c:Transform>
+                </c:Spawner>
-                      <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
+                <c:Transform/>
-                    </c:Transform>
+                <c:WeaponAttachment>
-                  </Components>
+                  <Weapon>AssaultWeapon</Weapon>
-                  <Children/>
+                </c:WeaponAttachment>
-                </Entity>
+              </Components>
-                <Entity name="FirstPersonReloadSpawner">
+              <Children/>
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AmmunitionHUD">
-                  <Components>
-                    <c:AmmunitionHUD/>
-                    <c:Transform>
-                      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
-                      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="AmmunitionHUDBackground">
-                      <Components>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <Color A="0.588235319" B="0" G="0" R="0"/>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="-0.00200000009"/>
-                          <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="AmmunitionText">
-                      <Components>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="MagazineAmmo">
-                          <Components>
-                            <c:Text>
-                              <Content>32</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Ammo">
-                          <Components>
-                            <c:Text>
-                              <Content>360</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-                              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
             </Entity>
           </Children>
         </Entity>
@@ -494,7 +430,6 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>0.87583812735846323</Time1>
           <Speed1>1</Speed1>
           <AnimationName2></AnimationName2>
           <AnimationName3></AnimationName3>
@@ -503,6 +438,7 @@
           <AnimationName>AimRifle</AnimationName>
           <Time>0.5</Time>
         </c:AnimationOffset>
+        <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
@@ -511,41 +447,35 @@
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="ThirdPersonWeaponModel">
+        <Entity name="PrimaryAttachment">
           <Components>
-            <c:BoneAttachment>
+            <c:Spawner>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
+              <EntityFile>Schema/Entities/DefenderWeaponWorld.xml</EntityFile>
-            </c:BoneAttachment>
+            </c:Spawner>
-            <c:Model>
+            <c:Transform/>
-              <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+            <c:WeaponAttachment>
-            </c:Model>
+              <Weapon>DefenderWeapon</Weapon>
-            <c:Transform>
+              <Person>
-              <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
+                <ThirdPerson/>
-              <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
+              </Person>
-            </c:Transform>
+            </c:WeaponAttachment>
           </Components>
-          <Children>
+          <Children/>
-            <Entity name="ThirdPersonWeaponMuzzle">
+        </Entity>
-              <Components>
+        <Entity name="SecondaryAttachment">
-                <c:Spawner>
+          <Components>
-                  <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            <c:Spawner>
-                </c:Spawner>
+              <EntityFile>Schema/Entities/AssaultWeaponWorld.xml</EntityFile>
-                <c:Transform>
+            </c:Spawner>
-                  <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
+            <c:Transform/>
-                </c:Transform>
+            <c:WeaponAttachment>
-              </Components>
+              <Weapon>AssaultWeapon</Weapon>
-              <Children/>
+              <Person>
-            </Entity>
+                <ThirdPerson/>
-            <Entity name="ThirdPersonReloadSpawner">
+              </Person>
-              <Components>
+            </c:WeaponAttachment>
-                <c:Spawner>
+          </Components>
-                  <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
+          <Children/>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
         </Entity>
       </Children>
     </Entity>
@@ -611,6 +541,17 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity name="ShieldAttachment">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/DefenderShield.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0" Y="0.859000027" Z="-0.976999998"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/PlayerRed.xml

@@ -7,25 +7,31 @@
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
     <c:AssaultWeapon>
-      <RPM>600</RPM>
+      <Slot>
+        <Secondary/>
+      </Slot>
     </c:AssaultWeapon>
     <c:Collidable/>
-    <c:DashAbility/>
+    <c:DefenderWeapon>
+      <TimeSinceLastFire>1.6944730461160304</TimeSinceLastFire>
+    </c:DefenderWeapon>
     <c:DoubleJump/>
     <c:Health/>
     <c:Physics>
-      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
       <MovementSpeed>5</MovementSpeed>
+      <CurrentWeapon></CurrentWeapon>
     </c:Player>
     <c:Team>
       <Team>
         <Red/>
       </Team>
     </c:Team>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="0" Y="0.0288832653" Z="3.63052702"/>
+    </c:Transform>
   </Components>
 
   <Children>
@@ -366,7 +372,7 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.2667383999985162</Time1>
+              <Time1>0.67172915251515519</Time1>
               <Speed1>1</Speed1>
               <AnimationName2></AnimationName2>
               <AnimationName3></AnimationName3>
@@ -378,100 +384,29 @@
             <c:Transform/>
           </Components>
           <Children>
-            <Entity name="WeaponModel">
+            <Entity name="PrimaryAttachment">
               <Components>
-                <c:BoneAttachment>
+                <c:Spawner>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                  <EntityFile>Schema/Entities/DefenderWeaponViewRed.xml</EntityFile>
-                </c:BoneAttachment>
+                </c:Spawner>
-                <c:Model>
+                <c:Transform/>
-                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
+                <c:WeaponAttachment>
-                </c:Model>
+                  <Weapon>DefenderWeapon</Weapon>
-                <c:Transform>
+                </c:WeaponAttachment>
-                  <Position X="0.120430425" Y="-0.242105931" Z="-0.181454822"/>
-                  <Orientation X="0.010404665" Y="-0.00268179877" Z="0.0428443067"/>
-                </c:Transform>
               </Components>
-              <Children>
+              <Children/>
-                <Entity name="WeaponMuzzle">
+            </Entity>
-                  <Components>
+            <Entity name="SecondaryAttachment">
-                    <c:Spawner>
+              <Components>
-                      <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
+                <c:Spawner>
-                    </c:Spawner>
+                  <EntityFile>Schema/Entities/AssaultWeaponView.xml</EntityFile>
-                    <c:Transform>
+                </c:Spawner>
-                      <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
+                <c:Transform/>
-                    </c:Transform>
+                <c:WeaponAttachment>
-                  </Components>
+                  <Weapon>AssaultWeapon</Weapon>
-                  <Children/>
+                </c:WeaponAttachment>
-                </Entity>
+              </Components>
-                <Entity name="FirstPersonReloadSpawner">
+              <Children/>
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectViewRed.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AmmunitionHUD">
-                  <Components>
-                    <c:AmmunitionHUD/>
-                    <c:Transform>
-                      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
-                      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="AmmunitionHUDBackground">
-                      <Components>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <Color A="0.588235319" B="0" G="0" R="0"/>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="-0.00200000009"/>
-                          <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="AmmunitionText">
-                      <Components>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="MagazineAmmo">
-                          <Components>
-                            <c:Text>
-                              <Content>32</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Ammo">
-                          <Components>
-                            <c:Text>
-                              <Content>360</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-                              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
             </Entity>
           </Children>
         </Entity>
@@ -495,7 +430,6 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>0.26532318661337229</Time1>
           <Speed1>1</Speed1>
           <AnimationName2></AnimationName2>
           <AnimationName3></AnimationName3>
@@ -504,6 +438,7 @@
           <AnimationName>AimRifle</AnimationName>
           <Time>0.5</Time>
         </c:AnimationOffset>
+        <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
@@ -512,41 +447,35 @@
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="ThirdPersonWeaponModel">
+        <Entity name="PrimaryAttachment">
           <Components>
-            <c:BoneAttachment>
+            <c:Spawner>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
+              <EntityFile>Schema/Entities/DefenderWeaponWorldRed.xml</EntityFile>
-            </c:BoneAttachment>
+            </c:Spawner>
-            <c:Model>
+            <c:Transform/>
-              <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
+            <c:WeaponAttachment>
-            </c:Model>
+              <Weapon>DefenderWeapon</Weapon>
-            <c:Transform>
+              <Person>
-              <Position X="0.159282878" Y="1.0300566" Z="-0.216084003"/>
+                <ThirdPerson/>
-              <Orientation X="-0.0626799241" Y="-0.0390551724" Z="0.119761385"/>
+              </Person>
-            </c:Transform>
+            </c:WeaponAttachment>
           </Components>
-          <Children>
+          <Children/>
-            <Entity name="ThirdPersonWeaponMuzzle">
+        </Entity>
-              <Components>
+        <Entity name="SecondaryAttachment">
-                <c:Spawner>
+          <Components>
-                  <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
+            <c:Spawner>
-                </c:Spawner>
+              <EntityFile>Schema/Entities/AssaultWeaponWorld.xml</EntityFile>
-                <c:Transform>
+            </c:Spawner>
-                  <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
+            <c:Transform/>
-                </c:Transform>
+            <c:WeaponAttachment>
-              </Components>
+              <Weapon>AssaultWeapon</Weapon>
-              <Children/>
+              <Person>
-            </Entity>
+                <ThirdPerson/>
-            <Entity name="ThirdPersonReloadSpawner">
+              </Person>
-              <Components>
+            </c:WeaponAttachment>
-                <c:Spawner>
+          </Components>
-                  <EntityFile>Schema/Entities/ReloadEffectWorldRed.xml</EntityFile>
+          <Children/>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
         </Entity>
       </Children>
     </Entity>
@@ -585,20 +514,20 @@
           <Color A="1" B="0" G="1" R="0"/>
         </c:Text>
         <c:Transform>
-          <Position X="0.100000001" Y="1.50199997" Z="-0.248000011"/>
+          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
           <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
           <Orientation X="0" Y="3.14199996" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
     </Entity>
-    <Entity>
+    <Entity name="Indicator">
       <Components>
         <c:Sprite>
           <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
           <DepthSort>false</DepthSort>
           <GlowMap></GlowMap>
-          <Color A="1" B="0" G="0" R="1"/>
+          <Color A="1" B="1" G="0.309803933" R="0"/>
         </c:Sprite>
         <c:HiddenForLocalPlayer/>
         <c:SpriteIndicator>
@@ -606,12 +535,23 @@
           <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
         </c:SpriteIndicator>
         <c:Transform>
-          <Position X="0" Y="1.84000003" Z="0"/>
+          <Position X="0" Y="1.84019077" Z="0"/>
           <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
         </c:Transform>
       </Components>
       <Children/>
     </Entity>
+    <Entity name="ShieldAttachment">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/DefenderShield.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0" Y="0.859000027" Z="-0.976999998"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Types/Entity.xsd

@@ -50,6 +50,8 @@
 							<xs:element ref="c:Menu" minOccurs="0"/>
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
+							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
+							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Schema/Types/WeaponSlotEnum.xsd

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:complexType name="WeaponSlotEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="Primary" type="t:int" fixed="1" minOccurs="0"/>
+					<xs:element name="Secondary" type="t:int" fixed="2" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>

src/Engine/Collision/CollisionSystem.cpp

@@ -16,51 +16,51 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     EntityAABB& boxA = *boundingBox;
     bool everHitTheGround = false;
 
-    glm::vec3 size = boxA.Size();
+    auto prevPosIt = m_PrevPositions.find(entity);
-    float diameter = std::min(size.x, size.z);
+    if (prevPosIt != m_PrevPositions.end()) {
-    glm::vec3 prevOrigin = (glm::vec3)cPhysics["PrevOrigin"];
+        glm::vec3 size = boxA.Size();
-    glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
+        float diameter = std::min(size.x, size.z);
-    float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
+        glm::vec3 prevOrigin = prevPosIt->second;
-    //If the entity has moved farther than the size of its box, we need to handle it specially.
+        glm::vec3 toCurrentPos = boxA.Origin() - prevOrigin;
-    bool traceCollision = rayLength > diameter;
+        float rayLength = glm::length(toCurrentPos) + 0.5f*diameter;
-    //hack solution: If prevOrigin is less than -9000 in all dimensions, 
+        //If the entity has moved farther than the size of its box, we need to handle it specially.
-    //then it means it is not set, i.e. this is the first collision check for the entity.
+        if (rayLength > diameter) {
-    if (traceCollision && glm::any(glm::greaterThan((glm::vec3)cPhysics["PrevOrigin"], glm::vec3(-9000.f)))) {
+            Ray ray(prevOrigin, toCurrentPos);
-        Ray ray(prevOrigin, toCurrentPos);
+            m_OctreeResult.clear();
-        m_OctreeResult.clear();
+            m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
-        m_Octree->ObjectsPossiblyHitByRay(ray, m_OctreeResult);
+            for (auto& boxB : m_OctreeResult) {
-        for (auto& boxB : m_OctreeResult) {
+                if (boxA.Entity == boxB.Entity) {
-            if (boxA.Entity == boxB.Entity) {
-                continue;
-            }
-            bool hit;
-            float dist;
-            if (boxB.Entity.HasComponent("Model")) {
-                RawModel* model;
-                std::string res = (std::string)boxB.Entity["Model"]["Resource"];
-                try {
-                    model = ResourceManager::Load<RawModel, true>(res);
-                } catch (const std::exception&) {
                     continue;
                 }
-                float u, v;
+                bool hit;
-                hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
+                float dist;
-            } else {
+                if (boxB.Entity.HasComponent("Model")) {
-                hit = Collision::RayVsAABB(ray, boxB, dist);
+                    RawModel* model;
-            }
+                    std::string res = (std::string)boxB.Entity["Model"]["Resource"];
-            if (hit && dist < rayLength) {
+                    try {
-                //Set the entity to where it was colliding, minus the maximum box size. 
+                        model = ResourceManager::Load<RawModel, true>(res);
-                //TODO: Perhaps this should be done slightly more properly.
+                    } catch (const std::exception&) {
-                glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
+                        continue;
-                glm::vec3 resolve = newOriginPos - boxA.Origin();
+                    }
-                (glm::vec3&)cTransform["Position"] += resolve;
+                    float u, v;
-                boxA = *Collision::EntityAbsoluteAABB(entity);
+                    hit = Collision::RayVsModel(ray, model->Vertices(), model->m_Indices, Transform::ModelMatrix(boxB.Entity), dist, u, v);
-                if (resolve.y > 0) {
+                } else {
-                    everHitTheGround = true;
+                    hit = Collision::RayVsAABB(ray, boxB, dist);
-                    (bool)cPhysics["IsOnGround"] = true;
+                }
-                    ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
+                if (hit && dist < rayLength) {
+                    //Set the entity to where it was colliding, minus the maximum box size. 
+                    //TODO: Perhaps this should be done slightly more properly.
+                    glm::vec3 newOriginPos = ray.Origin() + (dist - 0.707107f*diameter) * ray.Direction();
+                    glm::vec3 resolve = newOriginPos - boxA.Origin();
+                    (glm::vec3&)cTransform["Position"] += resolve;
+                    boxA = *Collision::EntityAbsoluteAABB(entity);
+                    if (resolve.y > 0) {
+                        everHitTheGround = true;
+                        (bool)cPhysics["IsOnGround"] = true;
+                        ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
+                    }
+                    break;
                 }
-                break;
             }
         }
     }
@@ -90,6 +90,7 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
             float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
             if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
                 (glm::vec3&)cTransform["Position"] += resolutionVector;
+                boxA = *Collision::EntityAbsoluteAABB(entity);
                 cPhysics["Velocity"] = inOutVelocity;
                 if (isOnGround) {
                     everHitTheGround = true;
@@ -99,6 +100,7 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
         } else if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
             //Enter here if boxB has no Model.
             (glm::vec3&)cTransform["Position"] += resolutionVector;
+            boxA = *Collision::EntityAbsoluteAABB(entity);
             if (resolutionVector.y > 0) {
                 everHitTheGround = true;
                 (bool)cPhysics["IsOnGround"] = true;
@@ -112,5 +114,5 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
         (bool)cPhysics["IsOnGround"] = false;
     }
 
-    (glm::vec3&)cPhysics["PrevOrigin"] = boxA.Origin();
+    m_PrevPositions[entity] = boxA.Origin();
 }

src/Engine/Core/EntityWrapper.cpp

@@ -51,6 +51,40 @@ EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& compone
     return EntityWrapper::Invalid;
 }
 
+EntityWrapper EntityWrapper::Clone(EntityWrapper parent /*= Invalid*/)
+{
+    if (!Valid()) {
+        return EntityWrapper::Invalid;
+    }
+
+    EntityWrapper clone = cloneRecursive(*this, EntityWrapper::Invalid);
+    this->World->SetParent(clone.ID, parent.ID);
+    return clone;
+}
+
+std::vector<EntityWrapper> EntityWrapper::ChildrenWithComponent(const std::string& componentType)
+{
+    std::vector<EntityWrapper> childrenWithComponent;
+    childrenWithComponentRecursive(componentType, *this, childrenWithComponent);
+    return childrenWithComponent;
+}
+
+void EntityWrapper::DeleteChildren()
+{
+    auto itPair = this->World->GetDirectChildren(this->ID);
+    if (itPair.first == itPair.second) {
+        return;
+    }
+
+    std::vector<EntityID> entitiesToDelete;
+    for (auto it = itPair.first; it != itPair.second; it++) {
+        entitiesToDelete.push_back(it->second);
+    }
+    for (auto& e : entitiesToDelete) {
+        this->World->DeleteEntity(e);
+    }
+}
+
 bool EntityWrapper::IsChildOf(EntityWrapper potentialParent)
 {
     EntityWrapper entity = *this;
@@ -90,6 +124,11 @@ ComponentWrapper EntityWrapper::operator[](const char* componentName)
     }
 }
 
+ComponentWrapper EntityWrapper::operator[](const std::string& componentName)
+{
+    return this->operator[](componentName.c_str());
+}
+
 bool EntityWrapper::operator==(const EntityWrapper& e) const
 {
     return (this->ID == e.ID) && (this->World == e.World);
@@ -111,7 +150,7 @@ EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name,
         return EntityWrapper::Invalid;
     }
 
-    auto itPair = this->World->GetChildren(parent);
+    auto itPair = this->World->GetDirectChildren(parent);
     if (itPair.first == itPair.second) {
         return EntityWrapper::Invalid;
     }
@@ -131,3 +170,42 @@ EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name,
     return EntityWrapper::Invalid;
 }
 
+EntityWrapper EntityWrapper::cloneRecursive(EntityWrapper entity, EntityWrapper parent)
+{
+    EntityWrapper clone = EntityWrapper(entity.World, entity.World->CreateEntity(parent.ID));
+    entity.World->SetName(clone.ID, entity.Name());
+
+    // Clone components
+    for (auto& kv : entity.World->GetComponentPools()) {
+        if (kv.second->KnowsEntity(entity.ID)) {
+            ComponentWrapper c1 = kv.second->GetByEntity(entity.ID);
+            ComponentWrapper c2 = entity.World->AttachComponent(clone.ID, kv.first);
+            c1.Copy(c2);
+        }
+    }
+
+    // Clone children
+    auto children = entity.World->GetDirectChildren(entity.ID);
+    for (auto it = children.first; it != children.second; ++it) {
+        EntityWrapper child(entity.World, it->second);
+        cloneRecursive(child, clone);
+    }
+      
+    return clone;
+}
+
+void EntityWrapper::childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent)
+{
+    auto itPair = this->World->GetDirectChildren(entity.ID);
+    if (itPair.first == itPair.second) {
+        return;
+    }
+
+    for (auto it = itPair.first; it != itPair.second; ++it) {
+        EntityWrapper child = EntityWrapper(entity.World, it->second);
+        if (child.HasComponent(componentType)) {
+            childrenWithComponent.push_back(child);
+        }
+        childrenWithComponentRecursive(componentType, child, childrenWithComponent);
+    }
+}

src/Engine/Core/Util/Logging.cpp

@@ -33,8 +33,8 @@ void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int
 	va_end(args);
 
 	if (logLevel == LOG_LEVEL_ERROR) {
-		std::cerr << file << ":" << line << " " << func << std::endl;
+		//std::cerr << file << ":" << line << " " << func << std::endl;
-		std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+		//std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
 	} else {
 		std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
 	}

src/Engine/Core/World.cpp

@@ -127,7 +127,7 @@ void World::SetParent(EntityID entity, EntityID parent)
     m_EntityChildren.insert(std::make_pair(parent, entity));
 }
 
-const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> World::GetChildren(EntityID entity)
+const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> World::GetDirectChildren(EntityID entity)
 {
     return m_EntityChildren.equal_range(entity);
 }

src/Engine/Editor/EditorGUI.cpp

@@ -598,6 +598,19 @@ bool EditorGUI::OnKeyDown(const Events::KeyDown& e)
         entityImport(m_World);
     }
 
+    if (e.ModCtrl && e.KeyCode == GLFW_KEY_C) {
+        m_CopyTarget = m_CurrentSelection;
+    }
+
+    if (e.ModCtrl && e.KeyCode == GLFW_KEY_V) {
+        if (m_OnEntityPaste != nullptr) {
+            EntityWrapper copy = m_OnEntityPaste(m_CopyTarget, m_CurrentSelection);
+            if (copy != EntityWrapper::Invalid) {
+                SelectEntity(copy);
+            }
+        }
+    }
+
     if (e.KeyCode == GLFW_KEY_DELETE) {
         if (m_CurrentSelection.Valid()) {
             entityDelete(m_CurrentSelection);

src/Engine/Editor/EditorSystem.cpp

@@ -28,6 +28,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_EditorGUI->SetEntityDeleteCallback(std::bind(&EditorSystem::OnEntityDelete, this, std::placeholders::_1));
     m_EditorGUI->SetEntityChangeParentCallback(std::bind(&EditorSystem::OnEntityChangeParent, this, std::placeholders::_1, std::placeholders::_2));
     m_EditorGUI->SetEntityChangeNameCallback(std::bind(&EditorSystem::OnEntityChangeName, this, std::placeholders::_1, std::placeholders::_2));
+    m_EditorGUI->SetEntityPasteCallback(std::bind(&EditorSystem::OnEntityPaste, this, std::placeholders::_1, std::placeholders::_2));
     m_EditorGUI->SetComponentAttachCallback(std::bind(&EditorSystem::OnComponentAttach, this, std::placeholders::_1, std::placeholders::_2));
     m_EditorGUI->SetComponentDeleteCallback(std::bind(&EditorSystem::OnComponentDelete, this, std::placeholders::_1, std::placeholders::_2));
     m_EditorGUI->SetWidgetModeCallback(std::bind(&EditorSystem::setWidgetMode, this, std::placeholders::_1));
@@ -160,6 +161,11 @@ void EditorSystem::OnEntityChangeName(EntityWrapper entity, const std::string& n
     }
 }
 
+EntityWrapper EditorSystem::OnEntityPaste(EntityWrapper entityToCopy, EntityWrapper parent)
+{
+    return entityToCopy.Clone(parent);
+}
+
 void EditorSystem::OnComponentAttach(EntityWrapper entity, const std::string& componentType)
 {
     if (entity.Valid()) {

src/Engine/Network/Client.cpp

@@ -32,6 +32,7 @@ void Client::Connect(std::string address, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Client::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
+    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &Client::OnDoubleJump);
     EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_Address = address;
@@ -140,6 +141,9 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::OnPlayerDamage:
         parsePlayerDamage(packet);
         break;
+    case MessageType::OnDoubleJump:
+        parseDoubleJump(packet);
+        break;
     default:
         break;
     }
@@ -257,8 +261,14 @@ void Client::parseEntityDeletion(Packet & packet)
     if (m_ServerIDToClientID.find(entityToDelete) != m_ServerIDToClientID.end()) {
         EntityID localEntity = m_ServerIDToClientID.at(entityToDelete);
         if (m_World->ValidEntity(localEntity)) {
-            m_World->DeleteEntity(localEntity);
+            if (m_World->HasComponent(localEntity,"Player")) {
-            deleteFromServerClientMaps(entityToDelete, localEntity);
+                Events::PlayerDeath e;
+                e.Player = EntityWrapper(m_World, localEntity);
+                m_EventBroker->Publish(e);
+            } else {
+                m_World->DeleteEntity(localEntity);
+                deleteFromServerClientMaps(entityToDelete, localEntity);
+            }
         }
     }
 }
@@ -272,6 +282,20 @@ void Client::parseComponentDeletion(Packet & packet)
     }
 }
 
+void Client::parseDoubleJump(Packet & packet)
+{
+    EntityID serverID = packet.ReadPrimitive<EntityID>();
+    if (!serverClientMapsHasEntity(serverID)) {
+        return;
+    }
+    Events::DoubleJump e;
+    e.entityID = m_ServerIDToClientID.at(serverID);
+    // If player is local player do not publish to prevent infinite feedback loop
+    if (e.entityID != m_LocalPlayer.ID) {
+        m_EventBroker->Publish(e);
+    }
+}
+
 void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID)
 {
     for (auto field : componentInfo.FieldsInOrder) {
@@ -348,9 +372,7 @@ void Client::parseSnapshot(Packet& packet)
                 EntityWrapper localEntity(m_World, localEntityID);
                 // Update entity
                 if (m_World->HasComponent(localEntityID, componentType)) {
-                    if (localEntity.Name() == "CapturePointHUD") {
+                    // TODO Fix memory leak here
-                        UpdateLocalCapturePointHUD(localEntity);
-                    }
                     SharedComponentWrapper newComponent = createSharedComponent(packet, localEntityID, componentInfo);
                     bool shouldApply = true;
                     // Apply potential filter function
@@ -361,6 +383,7 @@ void Client::parseSnapshot(Packet& packet)
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
+
                     //if (localEntity != m_LocalPlayer && !localEntity.IsChildOf(m_LocalPlayer)) {
                     //    updateFields(packet, componentInfo, localEntityID);
                     //} else {
@@ -377,7 +400,11 @@ void Client::parseSnapshot(Packet& packet)
                 if (serverParentID == EntityID_Invalid) {
                     newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
                 } else {
-                    newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
+                    if (serverClientMapsHasEntity(serverParentID)) {
+                        newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
+                    } else {
+                        newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
+                    }
                 }
                 m_World->SetName(newLocalEntityID, serverEntityName);
                 insertIntoServerClientMaps(serverEntityID, newLocalEntityID);
@@ -387,26 +414,16 @@ void Client::parseSnapshot(Packet& packet)
         }
         // Parent logic
         // This should be enough beacause we know that the entities arives in pre-order (there will always be a parent)
-        if (serverParentID != EntityID_Invalid) {
+        if (serverParentID != EntityID_Invalid && serverClientMapsHasEntity(serverParentID)) {
             EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
-            m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
+            if (m_World->GetParent(localEntityID) != m_ServerIDToClientID.at(serverParentID)) {
+                m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
+            }
         }
     }
     parseSpawnEvents();
 }
 
-
-void Client::UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD)
-{
-    //auto children = m_World->GetChildren(capturePointHUD.ID);
-    //for (auto it = children.first; it != children.second; it++) {
-    //    it->first
-    //}
-    //
-    //EntityWrapper& localHUD = m_LocalPlayer.FirstChildByName("HUD").FirstChildByName("CapturePointHUD");
-    //m_World->GetComponentPools()
-}
-
 void Client::disconnect()
 {
     m_IsConnected = false;
@@ -469,6 +486,11 @@ bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
     if (e.Inflictor != m_LocalPlayer) {
         return false;
     }
+    // Could this happen?
+    //if (!clientServerMapsHasEntity(e.Inflictor.ID) 
+    //    || !clientServerMapsHasEntity(e.Victim.ID)) {
+    //    return;
+    //}
 
     Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
     packet.WritePrimitive(m_ClientIDToServerID.at(e.Inflictor.ID));
@@ -503,7 +525,7 @@ void Client::parsePlayerDamage(Packet& packet)
     Events::PlayerDamage e;
     PlayerID victimID = packet.ReadPrimitive<EntityID>();
     PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
-    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
+    if (!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)) {
         return;
     }
     e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));
@@ -515,6 +537,17 @@ void Client::parsePlayerDamage(Packet& packet)
     }
 }
 
+bool Client::OnDoubleJump(Events::DoubleJump & e)
+{
+    if (!clientServerMapsHasEntity(e.entityID) || e.entityID != m_LocalPlayer.ID) {
+        return false;
+    }
+    Packet packet(MessageType::OnDoubleJump);
+    packet.WritePrimitive(m_ClientIDToServerID.at(e.entityID));
+    m_Reliable.Send(packet);
+    return true;
+}
+
 void Client::sendLocalPlayerTransform()
 {
     if (!m_LocalPlayer.Valid()) {

src/Engine/Network/Server.cpp

@@ -29,9 +29,8 @@ Server::~Server()
 
 void Server::Update()
 {
-    PlayerDefinition pd;
-
     m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
+
     for (auto& kv : m_ConnectedPlayers) {
         while (kv.second.TCPSocket->available()) {
             // Packet will get real data in receive
@@ -47,6 +46,7 @@ void Server::Update()
         }
     }
 
+    PlayerDefinition pd;
     while (m_Unreliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);
@@ -65,7 +65,7 @@ void Server::Update()
         PlayerDefinition localArea;
         localArea.Endpoint = boost::asio::ip::udp::endpoint();
         m_ServerlistRequest.Receive(packet, localArea);
-        if(packet.GetMessageType() == MessageType::ServerlistRequest) {
+        if (packet.GetMessageType() == MessageType::ServerlistRequest) {
             packet.ReadPrimitive<int>(); // Pop size
             packet.ReadPrimitive<int>(); // Pop MsgType
             packet.ReadPrimitive<int>(); // Pop packet ID
@@ -76,7 +76,7 @@ void Server::Update()
     }
 
     // Check if players have disconnected
-     for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
+    for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
         disconnect(m_PlayersToDisconnect.at(i));
     }
     m_PlayersToDisconnect.clear();
@@ -136,7 +136,10 @@ void Server::parseMessageType(Packet& packet)
         parseOnPlayerDamage(packet);
         break;
     case MessageType::PlayerTransform:
-       parsePlayerTransform(packet);
+        parsePlayerTransform(packet);
+        break;
+    case MessageType::OnDoubleJump:
+        parseDoubleJump(packet);
         break;
     default:
         break;
@@ -183,7 +186,7 @@ void Server::addInputCommandsToPacket(Packet& packet)
 
 void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
 {
-    auto itPair = m_World->GetChildren(entityID);
+    auto itPair = m_World->GetDirectChildren(entityID);
     std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
     // Loop through every child
     for (auto it = itPair.first; it != itPair.second; it++) {
@@ -191,49 +194,47 @@ void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
         // HACK: Only sync players for now, since the map turned out to be TOO LARGE to send in one snapshot and Simon's computer shits itself
         // HACK: Also checked CapturePointHUD for now. (this would get out of sync);
         EntityWrapper childEntity(m_World, childEntityID);
-        if (!shouldSendToClient(childEntity)) {
+        if (shouldSendToClient(childEntity)) {
-            continue;
+            // Write EntityID and parentsID and Entity name
-        }
+            packet.WritePrimitive(childEntityID);
-
+            packet.WritePrimitive(entityID);
-        // Write EntityID and parentsID and Entity name
+            packet.WriteString(m_World->GetName(childEntityID));
-        packet.WritePrimitive(childEntityID);
+            // Write components to child
-        packet.WritePrimitive(entityID);
+            int numberOfComponents = 0;
-        packet.WriteString(m_World->GetName(childEntityID));
+            for (auto& i : worldComponentPools) {
-        // Write components to child
+                if (i.second->KnowsEntity(childEntityID)) {
-        int numberOfComponents = 0;
+                    numberOfComponents++;
-        for (auto& i : worldComponentPools) {
+                }
-            if (i.second->KnowsEntity(childEntityID)) {
-                numberOfComponents++;
             }
-        }
+            // Write how many components should be read
-        // Write how many components should be read
+            packet.WritePrimitive(numberOfComponents);
-        packet.WritePrimitive(numberOfComponents);
+            for (auto& i : worldComponentPools) {
-        for (auto& i : worldComponentPools) {
+                // If the entity exist in the pool
-            // If the entity exist in the pool
+                if (i.second->KnowsEntity(childEntityID)) {
-            if (i.second->KnowsEntity(childEntityID)) {
+                    ComponentWrapper componentWrapper = i.second->GetByEntity(childEntityID);
-                ComponentWrapper componentWrapper = i.second->GetByEntity(childEntityID);
+                    // ComponentType
-                // ComponentType
+                    packet.WriteString(componentWrapper.Info.Name);
-                packet.WriteString(componentWrapper.Info.Name);
+                    // Loop through fields
-                // Loop through fields
+                    for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
-                for (auto& componentField : componentWrapper.Info.FieldsInOrder) {
+                        ComponentInfo::Field_t fieldInfo = componentWrapper.Info.Fields.at(componentField);
-                    ComponentInfo::Field_t fieldInfo = componentWrapper.Info.Fields.at(componentField);
+                        if (fieldInfo.Type == "string") {
-                    if (fieldInfo.Type == "string") {
+                            std::string& value = componentWrapper[componentField];
-                        std::string& value = componentWrapper[componentField];
+                            packet.WriteString(value);
-                        packet.WriteString(value);
+                        } else {
-                    } else {
+                            packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
-                        packet.WriteData(componentWrapper.Data + fieldInfo.Offset, fieldInfo.Stride);
+                        }
                     }
                 }
             }
         }
         // Go to to your children
-        addChildrenToPacket(packet, childEntityID);
+        addPlayersToPacket(packet, childEntityID);
     }
 }
 
 void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
 {
-    auto itPair = m_World->GetChildren(entityID);
+    auto itPair = m_World->GetDirectChildren(entityID);
     std::unordered_map<std::string, ComponentPool*> worldComponentPools = m_World->GetComponentPools();
     // Loop through every child
     for (auto it = itPair.first; it != itPair.second; it++) {
@@ -343,7 +344,7 @@ void Server::parseTCPConnect(Packet & packet)
     // Read packet ID 
     m_PreviousPacketID = m_PacketID;    // Set previous packet id
     m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    
+
     LOG_INFO("Parsing connections");
     // Check if player is already connected
     // Ska vara till lagd i TCPServer receive
@@ -455,8 +456,7 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
         }
         isReadingData = !isReadingData;
         m_SaveDataTimer = std::clock();
-    }
+    } else if (e.Command == "KickPlayer" && e.Value > 0) {
-    else if (e.Command == "KickPlayer" && e.Value > 0) {
         kick(0);
     }
 
@@ -507,7 +507,7 @@ bool Server::OnPlayerDamage(const Events::PlayerDamage& e)
     packet.WritePrimitive(e.Damage);
     reliableBroadcast(packet);
 
-    return false;
+    return true;
 }
 
 void Server::parseClientPing()
@@ -536,6 +536,12 @@ void Server::parsePing()
     }
 }
 
+bool Server::parseDoubleJump(Packet & packet)
+{
+    reliableBroadcast(packet);
+    return true;
+}
+
 void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
@@ -595,8 +601,15 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
+    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")) {
+            return true;
+        }
+    }
     return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") || childEntity.FirstParentWithComponent("CapturePoint").Valid();
+        || childEntity.HasComponent("CapturePoint");
 }
 
 PlayerID Server::GetPlayerIDFromEndpoint()

src/Engine/Network/TCPServer.cpp

@@ -4,6 +4,8 @@ using namespace boost::asio::ip;
 TCPServer::TCPServer() 
 {
     acceptor = std::unique_ptr<tcp::acceptor>(new tcp::acceptor(m_IOService, tcp::endpoint(tcp::v4(), 27666)));
+    // Make the acceptor non-blocking so we wont get stuck in AcceptNewConnections().
+    acceptor->non_blocking(true);
     m_Port = GetPort();
     m_Address = GetAddress();
 }
@@ -13,14 +15,24 @@ TCPServer::~TCPServer()
 
 void TCPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)
 {
+    boost::system::error_code error;
     boost::shared_ptr<tcp::socket> newSocket = boost::shared_ptr<tcp::socket>(new tcp::socket(m_IOService));
-    m_IOService.poll();
+    acceptor->accept(*newSocket, error);
-    acceptor->async_accept(*newSocket,
+    // If no error occured add new tcp connection
-        boost::bind(&TCPServer::handle_accept, this, newSocket, boost::ref(nextPlayerID), boost::ref(connectedPlayers),
+    if (!error) {
-            boost::asio::placeholders::error));
+        // Add tcp socket to connections
+        boost::asio::ip::tcp::no_delay option(true);
+        newSocket->set_option(option);
+        PlayerDefinition pd;
+        pd.StopTime = std::clock();
+        pd.TCPSocket = newSocket;
+        pd.TCPAddress = newSocket.get()->remote_endpoint().address();
+        pd.TCPPort = newSocket.get()->remote_endpoint().port();
+        connectedPlayers[nextPlayerID++] = pd;
+    }
 }
 
-PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+PlayerID TCPServer::getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
     boost::asio::ip::address address, unsigned short port)
 {
     for (auto& kv : connectedPlayers) {
@@ -32,24 +44,6 @@ PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& con
     return -1;
 }
 
-void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket,
-    int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-    const boost::system::error_code& error)
-{
-    if (!error && GetPlayerIDFromEndpoint(connectedPlayers, socket->remote_endpoint().address(),
-        socket->remote_endpoint().port()) == -1) {
-        // Add tcp socket to connections
-        boost::asio::ip::tcp::no_delay option(true);
-        socket->set_option(option);
-        PlayerDefinition pd;
-        pd.StopTime = std::clock();
-        pd.TCPSocket = socket;
-        pd.TCPAddress = socket.get()->remote_endpoint().address();
-        pd.TCPPort = socket.get()->remote_endpoint().port();
-        connectedPlayers[nextPlayerID++] = pd;
-    }
-}
-
 void TCPServer::Send(Packet & packet, PlayerDefinition & playerDefinition)
 {
     packet.UpdateSize();

src/Engine/Rendering/CubeMapPass.cpp

@@ -17,6 +17,7 @@ void CubeMapPass::LoadTextures(std::string input)
             m_CubeMapTextures.push_back(img);
         }
         GenerateCubeMapTexture();
+        m_PreviusCubeMapTexture = input;
     }
 }
 

src/Game/Game.cpp

@@ -16,7 +16,7 @@
 #include "Game/Systems/PickupSpawnSystem.h"
 #include "Game/Systems/AmmoPickupSystem.h"
 #include "Game/Systems/DamageIndicatorSystem.h"
-#include "Game/Systems/Weapon/WeaponSystem.h"
+#include "Game/Systems/Weapon/DefenderWeaponBehaviour.h"
 #include "Rendering/AnimationSystem.h"
 #include "Game/Systems/HealthHUDSystem.h"
 #include "Rendering/BoneAttachmentSystem.h"
@@ -98,6 +98,10 @@ Game::Game(int argc, char* argv[])
             m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
             m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
         }
+    } else {
+        // If network is disabled, pretend we're a server
+        m_IsClient = true;
+        m_IsServer = true;
     }
 
     // Create Octrees
@@ -120,7 +124,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<PlayerMovementSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<SpawnerSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerSpawnSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<WeaponSystem>(updateOrderLevel, m_Renderer, m_OctreeCollision);
+    m_SystemPipeline->AddSystem<DefenderWeaponBehaviour>(updateOrderLevel, m_Renderer, m_OctreeCollision);
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);

src/Game/Network/MultiplayerSnapshotFilter.cpp

@@ -13,6 +13,7 @@ bool MultiplayerSnapshotFilter::FilterComponent(EntityWrapper entity, SharedComp
             component.Info.Name == "Transform"
             || component.Info.Name == "Physics"
             || component.Info.Name == "AssaultWeapon"
+            || component.Info.Name == "DefenderWeapon"
             || component.Info.Name == "Animation"
             || component.Info.Name == "AnimationOffset"
             || entity.Name() == "PlayerName"

src/Game/Systems/CapturePointSystem.cpp

@@ -6,9 +6,11 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
+    if (!IsClient) {
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
-    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
+        EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
+    }
 
 }
 
@@ -16,6 +18,9 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
 //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt
 void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, ComponentWrapper& cCapturePoint, double dt)
 {
+    if (IsClient) {
+        return;
+    }
     if (m_WinnerWasFound) {
         return;
     }

src/Game/Systems/DamageIndicatorSystem.cpp

@@ -13,7 +13,7 @@ DamageIndicatorSystem::DamageIndicatorSystem(SystemParams params)
 }
 
 void DamageIndicatorSystem::Update(double dt) {
-    if (!IsServer) {
+    if (!IsServer && LocalPlayer.Valid()) {
         for (auto& iter = updateDamageIndicatorVector.begin(); iter != updateDamageIndicatorVector.end(); iter++) {
             if (!iter->spriteEntity.Valid()) {
                 updateDamageIndicatorVector.erase(iter);

src/Game/Systems/PlayerMovementSystem.cpp

@@ -4,6 +4,7 @@ PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
     : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
+    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
 }
 
 PlayerMovementSystem::~PlayerMovementSystem()
@@ -36,7 +37,6 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
         if (!player.Valid()) {
             continue;
         }
-
         // Aim pitch
         EntityWrapper cameraEntity = player.FirstChildByName("Camera");
         if (cameraEntity.Valid()) {
@@ -128,15 +128,14 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                     //Enter here if player can double jump and is doing so.
                     (bool)cPhysics["IsOnGround"] = false;
                     velocity.y = player["DoubleJump"]["DoubleJumpSpeed"];
+                    // If IsServer and network is off this will not work
                     if (IsClient) {
                         //put a hexagon at the players feet
-                        auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+                        spawnHexagon(player);
-                        EntityFileParser parser(hexagonEffect);
-                        EntityID hexagonEffectID = parser.MergeEntities(m_World);
-                        EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
-                        hexagonEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
                         controller->SetDoubleJumping(true);
+                        // Publish event for client to listen to
                         Events::DoubleJump e;
+                        e.entityID = player.ID;
                         m_EventBroker->Publish(e);
                     }
                 }
@@ -300,3 +299,26 @@ bool PlayerMovementSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
     }
     return true;
 }
+
+bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e)
+{
+    // If entity does not exist, exit
+    if (!EntityWrapper(m_World, e.entityID).Valid()) { 
+        return false;
+    }
+    // If entity IsLocalPlayer, exit
+    if (e.entityID == m_LocalPlayer.ID) { 
+        return false;
+    }
+    spawnHexagon(EntityWrapper(m_World, e.entityID));
+}
+
+void PlayerMovementSystem::spawnHexagon(EntityWrapper target)
+{ 
+    //put a hexagon at the entitys... feet?
+    auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+    EntityFileParser parser(hexagonEffect);
+    EntityID hexagonEffectID = parser.MergeEntities(m_World);
+    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+    hexagonEW["Transform"]["Position"] = (glm::vec3)target["Transform"]["Position"];
+}

src/Game/Systems/SpawnerSystem.cpp

@@ -36,7 +36,7 @@ EntityWrapper SpawnerSystem::Spawn(EntityWrapper spawner, EntityWrapper parent /
     }
 
     // Find any SpawnPoints existing as children of spawner
-    auto children = spawner.World->GetChildren(spawner.ID);
+    auto children = spawner.World->GetDirectChildren(spawner.ID);
     std::vector<EntityWrapper> spawnPoints;
     for (auto kv = children.first; kv != children.second; ++kv) {
         const EntityID& child = kv->second;

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp_

@@ -1,13 +1,5 @@
 #include "Systems/Weapon/AssaultWeaponBehaviour.h"
 
-AssaultWeaponBehaviour::AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player) 
-    : WeaponBehaviour(systemParams, renderer, collisionOctree, player)
-{
-    m_FirstPersonModel = m_Player.FirstChildByName("Hands");
-    m_ThirdPersonModel = m_Player.FirstChildByName("PlayerModel");
-    EVENT_SUBSCRIBE_MEMBER(m_EAnimationComplete, &AssaultWeaponBehaviour::OnAnimationComplete);
-}
-
 void AssaultWeaponBehaviour::Fire()
 {
     m_TimeSinceLastFire = 0.0;
@@ -36,7 +28,7 @@ void AssaultWeaponBehaviour::Reload()
         return;
     }
 
-    // Don't reload if we're completly out of ammo
+    // Don't reload if we're completely out of ammo
     if (ammo == 0) {
         playEmptySound();
         m_TimeSinceLastFire = -0.0f; // HACK: To make empty sound play with interval
@@ -56,14 +48,14 @@ void AssaultWeaponBehaviour::Update(double dt)
 {
     if (m_Reloading) {
         m_ReloadTimer -= dt;
-        // Re-enable glow on reload impersonator half-way through the animation
+        // Re-enable glow on reload impostor half-way through the animation
         if (IsClient) {
             if (m_ReloadTimer <= (double)m_Player["AssaultWeapon"]["ReloadTime"] / 2.0) {
-                if (m_FirstPersonReloadImpersonator.Valid()) {
+                if (m_FirstPersonReloadImpostor.Valid()) {
-                    m_FirstPersonReloadImpersonator["Model"]["GlowMap"] = true;
+                    m_FirstPersonReloadImpostor["Model"]["GlowMap"] = true;
                 }
-                if (m_ThirdPersonReloadImpersonator.Valid()) {
+                if (m_ThirdPersonReloadImpostor.Valid()) {
-                    m_ThirdPersonReloadImpersonator["Model"]["GlowMap"] = true;
+                    m_ThirdPersonReloadImpostor["Model"]["GlowMap"] = true;
                 }
             }
         }
@@ -96,21 +88,6 @@ void AssaultWeaponBehaviour::Update(double dt)
     }
 }
 
-bool AssaultWeaponBehaviour::OnAnimationComplete(Events::AnimationComplete& e)
-{
-    if (e.Entity != m_FirstPersonModel) {
-        return false;
-    }
-
-    //if (e.Name == "ShootRifle") {
-    //    if (!m_Firing) {
-    //        playIdleAnimation();
-    //    }
-    //}
-
-    return true;
-}
-
 bool AssaultWeaponBehaviour::hasAmmo()
 {
     ComponentWrapper& cAssaultWeapon = m_Player["AssaultWeapon"];
@@ -177,7 +154,6 @@ void AssaultWeaponBehaviour::spawnTracer()
 
 float AssaultWeaponBehaviour::traceRayDistance(glm::vec3 origin, glm::vec3 direction)
 {
-    // TODO: Cast a ray and size tracer appropriately
     float distance;
     glm::vec3 pos;
     auto entity = Collision::EntityFirstHitByRay(Ray(origin, direction), m_CollisionOctree, distance, pos);
@@ -215,6 +191,12 @@ void AssaultWeaponBehaviour::playEmptySound()
 
 void AssaultWeaponBehaviour::viewPunch()
 {
+    // Since we send absolute client orientations to server, running this server side would
+    // cause aim desync.
+    if (!IsClient) {
+        return;
+    }
+
     EntityWrapper playerCamera = m_Player.FirstChildByName("Camera");
     if (!playerCamera.Valid()) {
         return;
@@ -323,8 +305,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
         EntityWrapper firstPersonWeaponModel = m_Player.FirstChildByName("WeaponModel");
         EntityWrapper reloadSpawner = m_Player.FirstChildByName("FirstPersonReloadSpawner");
         if (IsClient) {
-            m_FirstPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            m_FirstPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpersonator["Model"]);
+            firstPersonWeaponModel["Model"].Copy(m_FirstPersonReloadImpostor["Model"]);
         }
         firstPersonWeaponModel["Model"]["Visible"] = false;
     }
@@ -332,8 +314,8 @@ void AssaultWeaponBehaviour::playReloadAnimation()
         EntityWrapper thirdPersonWeaponModel = m_Player.FirstChildByName("ThirdPersonWeaponModel");
         EntityWrapper reloadSpawner = m_Player.FirstChildByName("ThirdPersonReloadSpawner");
         if (IsClient) {
-            m_ThirdPersonReloadImpersonator = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
+            m_ThirdPersonReloadImpostor = SpawnerSystem::Spawn(reloadSpawner, reloadSpawner);
-            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpersonator["Model"]);
+            thirdPersonWeaponModel["Model"].Copy(m_ThirdPersonReloadImpostor["Model"]);
         }
         thirdPersonWeaponModel["Model"]["Visible"] = false;
     }
@@ -371,7 +353,7 @@ bool AssaultWeaponBehaviour::shoot(double damage)
         return false;
     }
 
-    // Don't let us shoot ourselves in the foot
+    // Don't let us shoot ourselves in the foot somehow
     if (victim == LocalPlayer) {
         return false;
     }

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -0,0 +1,188 @@
+#include "Systems/Weapon/DefenderWeaponBehaviour.h"
+
+void DefenderWeaponBehaviour::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt)
+{
+    (double&)cWeapon["TimeSinceLastFire"] += dt;
+    WeaponBehaviour::UpdateComponent(entity, cWeapon, dt);
+}
+
+void DefenderWeaponBehaviour::UpdateWeapon(WeaponInfo& wi, double dt)
+{
+    ComponentWrapper cWeapon = wi.GetComponent();
+
+    bool isFiring = cWeapon["IsFiring"];
+    bool cooldownPassed = (double)cWeapon["TimeSinceLastFire"] >= (60.0 / (double)cWeapon["RPM"]);
+    bool isNotShielding = wi.Player.ChildrenWithComponent("Shield").size() == 0;
+    if (isFiring && cooldownPassed && isNotShielding) {
+        fireShell(wi);
+    }
+}
+
+void DefenderWeaponBehaviour::OnPrimaryFire(WeaponInfo& wi)
+{
+    ComponentWrapper cWeapon = wi.GetComponent();
+    cWeapon["IsFiring"] = true;
+    bool cooldownPassed = (double)cWeapon["TimeSinceLastFire"] >= (60.0 / (double)cWeapon["RPM"]);
+    bool isNotShielding = wi.Player.ChildrenWithComponent("Shield").size() == 0;
+    if (cooldownPassed && isNotShielding) {
+        fireShell(wi);
+    }
+}
+
+void DefenderWeaponBehaviour::OnCeasePrimaryFire(WeaponInfo& wi)
+{
+    ComponentWrapper cWeapon = wi.GetComponent();
+    cWeapon["IsFiring"] = false;
+}
+
+bool DefenderWeaponBehaviour::OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e)
+{
+    if (e.Command == "SpecialAbility" && IsServer) {
+        EntityWrapper attachment = wi.Player.FirstChildByName("ShieldAttachment");
+        if (attachment.Valid()) {
+            if (e.Value > 0) {
+                SpawnerSystem::Spawn(attachment, attachment);
+            } else {
+                attachment.DeleteChildren();
+            }
+        }
+    }
+
+    return false;
+}
+
+bool DefenderWeaponBehaviour::OnSetCamera(const Events::SetCamera& e)
+{
+    m_CurrentCamera = e.CameraEntity;
+    return true;
+}
+
+void DefenderWeaponBehaviour::fireShell(WeaponInfo& wi)
+{
+    ComponentWrapper cWeapon = wi.GetComponent();
+
+    cWeapon["TimeSinceLastFire"] = 0.0;
+    int numPellets = cWeapon["NumPellets"];
+    float spreadAngle = cWeapon["SpreadAngle"];
+    std::uniform_real_distribution<float> randomSpreadAngle(-spreadAngle, spreadAngle);
+
+    // Calculate pellet angles
+    // HACK: Random for now?
+    // TODO: Make distribution even for each quadrant
+    std::vector<glm::vec2> pelletAngles;
+    for (int i = 0; i < numPellets; i++) {
+        pelletAngles.push_back(glm::vec2(randomSpreadAngle(m_RandomEngine), randomSpreadAngle(m_RandomEngine)));
+        LOG_DEBUG("%f %f", pelletAngles[i].x, pelletAngles[i].y);
+    }
+
+    double pelletDamage = (double)cWeapon["BaseDamage"] / numPellets;
+
+    // Tracers
+    EntityWrapper weaponModelEntity;
+    if (wi.Player == LocalPlayer) {
+        weaponModelEntity = wi.FirstPersonEntity;
+    } else {
+        weaponModelEntity = wi.ThirdPersonEntity;
+    }
+    if (weaponModelEntity.Valid()) {
+        EntityWrapper spawner = weaponModelEntity.FirstChildByName("WeaponMuzzle");
+        for (auto& angles : pelletAngles) {
+            glm::vec3 direction = Transform::AbsoluteOrientation(spawner) * glm::quat(glm::vec3(angles, 0.f)) * glm::vec3(0, 0, -1);
+            float distance = traceRayDistance(Transform::AbsolutePosition(spawner), direction);
+            EntityWrapper ray = SpawnerSystem::Spawn(spawner);
+            ((glm::vec3&)ray["Transform"]["Scale"]).z = (distance / 100.f);
+            glm::vec3& orientation = ray["Transform"]["Orientation"];
+            orientation.x += angles.x;
+            orientation.y += angles.y;
+            glm::vec3 trajectory = direction * distance;
+            dealDamage(wi, direction, pelletDamage);
+        }
+    }
+
+}
+
+void DefenderWeaponBehaviour::dealDamage(WeaponInfo& wi, glm::vec3 direction, double damage)
+{
+    // Only deal damage client side
+    if (!IsClient) {
+        return;
+    }
+
+    // Only handle shooting for the local player
+    if (wi.Player != LocalPlayer) {
+        return;
+    }
+
+    // Make sure the player isn't shooting from the grave
+    if (!wi.Player.Valid()) {
+        return;
+    }
+    
+    glm::vec3 maxRange = direction * 2.f;
+    EntityWrapper camera = wi.Player.FirstChildByName("Camera");
+    glm::vec3 cameraPosition = Transform::AbsolutePosition(camera);
+    if (!camera.Valid()) {
+        return;
+    }
+    Rectangle screenResolution = m_Renderer->GetViewportSize();
+    glm::vec2 centerScreen = glm::vec2(screenResolution.Width / 2, screenResolution.Height / 2);
+    glm::vec2 screenCoords = cameraFromEntity(m_CurrentCamera).WorldToScreen(cameraPosition + maxRange, m_Renderer->GetViewportSize());
+    PickData pickData = m_Renderer->Pick(centerScreen + screenCoords);
+    EntityWrapper victim(m_World, pickData.Entity);
+    if (!victim.Valid()) {
+        return;
+    }
+
+    // Don't let us shoot ourselves in the foot somehow
+    if (victim == LocalPlayer) {
+        return;
+    }
+
+    // Only care about players being hit
+    if (!victim.HasComponent("Player")) {
+        victim = victim.FirstParentWithComponent("Player");
+    }
+    if (!victim.Valid()) {
+        return;
+    }
+
+    // Check for friendly fire
+    if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)wi.Player["Team"]["Team"]) {
+        return;
+    }
+
+    // Deal damage! 
+    Events::PlayerDamage ePlayerDamage;
+    ePlayerDamage.Inflictor = wi.Player;
+    ePlayerDamage.Victim = victim;
+    ePlayerDamage.Damage = damage;
+    m_EventBroker->Publish(ePlayerDamage);
+    LOG_DEBUG("Damage: %f", damage);
+}
+
+float DefenderWeaponBehaviour::traceRayDistance(glm::vec3 origin, glm::vec3 direction)
+{
+    float distance;
+    glm::vec3 pos;
+    auto entity = Collision::EntityFirstHitByRay(Ray(origin, direction), m_CollisionOctree, distance, pos);
+    if (entity) {
+        return distance;
+    } else {
+        return 100.f;
+    }
+}
+
+Camera DefenderWeaponBehaviour::cameraFromEntity(EntityWrapper camera)
+{
+    ComponentWrapper cTransform = camera["Transform"];
+    ComponentWrapper cCamera = camera["Camera"];
+    Camera cam(
+        (float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, 
+        (double)cCamera["FOV"], 
+        (double)cCamera["NearClip"], 
+        (double)cCamera["FarClip"]
+    );
+    cam.SetPosition(cTransform["Position"]);
+    cam.SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
+    return cam;
+}

src/Game/Systems/Weapon/WeaponSystem.cpp_

@@ -13,7 +13,7 @@ WeaponSystem::WeaponSystem(SystemParams params, IRenderer* renderer, Octree<Enti
 
 void WeaponSystem::Update(double dt)
 {
-
+    // TODO: Clear inactive weapons
 }
 
 void WeaponSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt)
@@ -72,20 +72,64 @@ bool WeaponSystem::OnInputCommand(Events::InputCommand& e)
 
 void WeaponSystem::selectWeapon(EntityWrapper player, ComponentInfo::EnumType slot)
 {
+    std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
+
+    // Find the weapon attachments matching the slot selected
+    EntityWrapper firstPersonAttachment;
+    EntityWrapper thirdPersonAttachment;
+    for (auto& attachment : weaponAttachments) {
+        ComponentWrapper cWeaponAttachment = attachment["WeaponAttachment"];
+        if ((ComponentInfo::EnumType)cWeaponAttachment["Slot"] == slot) {
+            ComponentWrapper::SubscriptProxy person = cWeaponAttachment["Person"];
+            if (person == person.Enum("FirstPerson")) {
+                firstPersonAttachment = attachment;
+            } else if (person == person.Enum("ThirdPerson")) {
+                thirdPersonAttachment = attachment;
+            }
+        }
+    }
+
+    if (firstPersonAttachment.Valid() && thirdPersonAttachment.Valid()) {
+        LOG_WARNING("No weapon attachment found for slot %i of player #%i", slot, player.ID);
+        return;
+    }
+
+    // TODO: Delete old weapons
+
+    // Spawn the weapon(s)
+    EntityWrapper firstPersonWeapon;
+    EntityWrapper thirdPersonWeapon;
+    if (firstPersonAttachment.Valid()) {
+        firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+    }
+    if (thirdPersonAttachment.Valid()) {
+        firstPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+    }
+
+    // Create the correct behaviour
+    if (firstPersonWeapon.Valid()) {
+        if (firstPersonWeapon.HasComponent("AssaultWeapon") { 
+
+        }
+    }
+
     // Primary
     if (slot == 1) {
         // TODO: if class...
-        if (m_ActiveWeapons.count(player) == 0) {
+        nextBehaviour = std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, player);
-            m_ActiveWeapons.insert(std::make_pair(player, std::make_shared<AssaultWeaponBehaviour>(m_SystemParams, m_Renderer, m_CollisionOctree, player)));
-        } else {
-            //m_ActiveWeapons.erase(player);
-        }
     }
 
     // Secondary
     if (slot == 2) {
         //m_ActiveWeapons[player] = std::make_shared<PistolWeaponBehaviour>();
     }
+
+    if (nextBehaviour != nullptr) {
+        // TODO: Destroy previous behaviour and make new
+        if (m_ActiveWeapons.count(player) == 0) {
+            m_ActiveWeapons[player] = nextBehaviour;
+        }
+    }
 }
 
 bool WeaponSystem::OnPlayerSpawned(Events::PlayerSpawned& e)