Merge remote-tracking branch 'origin/Weapons' into Movement

# Conflicts:
#	resources/Schema/Entities/PlayerDefenderBlue.xml

include/Engine/Core/EPlayerDeath.h

@@ -10,8 +10,9 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityWrapper Player;
-    std::string KilledByWhat;
+    EntityWrapper Player = EntityWrapper::Invalid;
+    EntityWrapper Killer = EntityWrapper::Invalid;
+    std::string KilledByWhat = "";
 };
 
 }

include/Engine/Core/System.h

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

include/Engine/Input/InputProxy.h

@@ -18,7 +18,7 @@ public:
     
     void LoadBindings(std::string file);
 	void Update(double dt);
-    void Process();
+    void Process(bool suppressNewEvents = false);
     template <typename T>
     void AddHandler();
     void Publish(const Events::InputCommand& e);

include/Engine/Network/Client.h

@@ -52,7 +52,7 @@ public:
     void Connect(std::string address, int port);
     void Update() override;
 private:
-    UDPClient m_Unreliable;
+    //UDPClient m_Unreliable;
     TCPClient m_Reliable;
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();

include/Engine/Network/EKillDeath.h

@@ -0,0 +1,19 @@
+#ifndef Events_KillDeath_h__
+#define Events_KillDeath_h__
+
+#include "Core/EventBroker.h"
+
+typedef unsigned int PlayerID;
+
+namespace Events
+{
+
+struct KillDeath : public Event 
+{
+    PlayerID Casualty = -1;
+    PlayerID Killer = -1;
+};
+
+}
+
+#endif

include/Engine/Network/EPlayerConnected.h

@@ -0,0 +1,17 @@
+#ifndef Events_PlayerConnected
+#define Events_PlayerConnected
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+struct PlayerConnected : public Event
+{
+    std::string PlayerName = "";
+    int PlayerID = -1;
+};
+
+}
+#endif // !Events_PlayerConnected
+

include/Engine/Network/Server.h

@@ -21,6 +21,9 @@
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 #include "Core/EAmmoPickup.h"
+#include "Core/EPlayerDeath.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EKillDeath.h"
 
 class Server : public Network
 {
@@ -33,7 +36,7 @@ public:
 private:
     // Network channels
     TCPServer m_Reliable;
-    UDPServer m_Unreliable;
+    //UDPServer m_Unreliable;
     UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
@@ -77,7 +80,8 @@ private:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID GetPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEntityID(EntityID entityID);
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
@@ -103,6 +107,8 @@ private:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Server, Events::AmmoPickup> m_EAmmoPickup;
     bool OnAmmoPickup(const Events::AmmoPickup& e);
+    EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::PlayerDeath& e);
 };
 
 #endif

include/Game/Systems/PlayerMovementSystem.h

@@ -30,6 +30,8 @@ private:
     bool m_LeftFoot = false;
     // To get a difference when calculating the walking state.
     glm::vec3 m_LastPosition = glm::vec3();
+    // Used to track afterimages for sprint effect.
+    float m_SprintEffectTimer;
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
     // Spawn a hexagon at origin of an Entity

include/Game/Systems/ScoreScreenSystem.h

@@ -0,0 +1,44 @@
+#ifndef ScoreScreenSystem_h__
+#define ScoreScreenSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFile.h"
+#include "Network/EKillDeath.h"
+#include "Core/EPlayerSpawned.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EPlayerDisconnected.h"
+#include "GLM.h"
+
+class ScoreScreenSystem : public PureSystem
+{
+public:
+    ScoreScreenSystem(SystemParams params);
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) override;
+
+    EventRelay<ScoreScreenSystem, Events::KillDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::KillDeath& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawn(const Events::PlayerSpawned& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerConnected> m_EPlayerConnected;
+    bool OnPlayerConnected(const Events::PlayerConnected& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerDisconnected> m_EPlayerDisconnected;
+    bool OnPlayerDisconnected(const Events::PlayerDisconnected& e);
+
+private:
+    struct PlayerData {
+        int ID = -1;
+        std::string Name = "";
+        int Team = 1;
+        int Kills = 0;
+        int Deaths = 0;
+        EntityWrapper Player = EntityWrapper::Invalid;
+    };
+
+    std::vector<int> m_DisconnectedIdentities;
+    int m_PlayerCounter = 0;
+    std::unordered_map<int, PlayerData> m_PlayerIdentities;
+};
+
+#endif

include/Game/Systems/TextFieldReader.h

@@ -2,6 +2,8 @@
 #define AmmunitionHUDSystem_h__
 
 #include <boost/lexical_cast.hpp>
+#include <sstream>
+#include <iomanip>
 #include "../../Engine/Core/System.h"
 #include "../../Engine/GLM.h"
 

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -9,6 +9,7 @@
 #include "Systems/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
 template <typename ETYPE>
 class WeaponBehaviour : public PureSystem
@@ -31,6 +32,20 @@ public:
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
     {
+        /* EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
+         EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
+         if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
+             if (m_ActiveWeapons.count(entity) == 0) {
+                 WeaponInfo& wi = m_ActiveWeapons[entity];
+                 wi.Player = entity;
+                 wi.WeaponEntity = entity;
+                 wi.FirstPersonEntity = firstPersonWeapon;
+                 wi.ThirdPersonEntity = thirdPersonWeapon;
+
+                 OnEquip(cWeapon, wi);
+             }
+         }*/
+
         auto weapon = getActiveWeapon(entity);
         if (!weapon) {
             return;
@@ -73,7 +88,7 @@ protected:
 
     // Returns wi.FirstPersonEntity or wi.ThirdPersonEntity depending on
     // if the player is in first person mode or not.
-    EntityWrapper getRelevantWeaponModelEntity(WeaponInfo& wi)
+    EntityWrapper getRelevantWeaponEntity(WeaponInfo& wi)
     {
         if (isPlayerInFirstPerson(wi.Player)) {
             return wi.FirstPersonEntity;
@@ -94,6 +109,64 @@ protected:
         }
     }
 
+    void playAnimation(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+    }
+
+    void playAnimationAndReturn(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity;
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+
+        Events::AutoAnimationBlend eIdleBlend;
+        eIdleBlend.RootNode = root;
+        eIdleBlend.NodeName = "Idle";
+        eIdleBlend.AnimationEntity = animationNode;
+        eIdleBlend.Delay = -0.2;
+        eIdleBlend.Duration = 0.2;
+        m_EventBroker->Publish(eIdleBlend);
+    }
+
 private:
     EventRelay<ETYPE, Events::SetCamera> m_ESetCamera;
     bool _OnSetCamera(const Events::SetCamera& e)
@@ -180,6 +253,10 @@ private:
 
     void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
+        //if (!IsServer) {
+        //    return;
+        //}
+
         // Don't reselect weapon if it's already active
         if (getActiveWeapon(player)) {
             return;
@@ -209,11 +286,15 @@ private:
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
-        if (firstPersonAttachment.Valid()) {
-            firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+        if (IsClient) {
+            if (firstPersonAttachment.Valid()) {
+                firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+            }
         }
-        if (thirdPersonAttachment.Valid()) {
-            thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+        if (IsServer) {
+            if (thirdPersonAttachment.Valid()) {
+                thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
+            }
         }
 
         WeaponInfo& wi = m_ActiveWeapons[player];

resources/Schema/Components.xsd

@@ -63,4 +63,6 @@
 	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
 	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
 	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
+	<xs:include schemaLocation="Components/ScoreScreen.xsd"/>
+	<xs:include schemaLocation="Components/ScoreIdentity.xsd"/>
 </xs:schema>

resources/Schema/Components/Animation.xml

@@ -4,7 +4,7 @@
 	<Time>0</Time>
 	<Play>false</Play>
 	<Reverse>false</Reverse>
-	<Speed>0</Speed>
+	<Speed>1</Speed>
 	<Loop>true</Loop>
 	<Additive>false</Additive>
 </Animation>

resources/Schema/Components/AssaultWeapon.xml

@@ -11,7 +11,7 @@
 	<RPM>420</RPM>
 	<ViewPunch>0.03</ViewPunch>
 	<ViewReturnSpeed>0.18</ViewReturnSpeed>
-	<ReloadTime>2</ReloadTime>
+	<ReloadTime>1.65</ReloadTime>
 	<EquipTime>0.5</EquipTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>

resources/Schema/Components/ExplosionEffect.xml

@@ -3,6 +3,8 @@
 	<ExplosionOrigin X="0" Y="0" Z="0"/>
 	<TimeSinceDeath>0</TimeSinceDeath>
 	<ExplosionDuration>2</ExplosionDuration>
+	<Speed>1</Speed>
+	<Delay>0</Delay>
 	<!--<Gravity>1</Gravity>-->
 	<!--<GravityForce>1</GravityForce>-->
 	<!--<ObjectRadius>2</ObjectRadius>-->

resources/Schema/Components/ExplosionEffect.xsd

@@ -18,6 +18,8 @@
 				<xs:element name="ExplosionDuration" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>How many seconds the death animation should be</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Speed" type="t:double" minOccurs="0"/>
+				<xs:element name="Delay" type="t:double" minOccurs="0"/>
 				<!--<xs:element name="Gravity" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Enable/disable gravity</xs:documentation></xs:annotation>
 				</xs:element>-->

resources/Schema/Components/ScoreIdentity.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ScoreIdentity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ScoreIdentity.xsd">
+	<Name></Name>
+	<ID>-1</ID>
+	<KD>0.0</KD>
+	<Kills>0</Kills>
+	<Deaths>0</Deaths>
+	<Ping>0</Ping>
+	<Connected>true</Connected>
+</ScoreIdentity>

resources/Schema/Components/ScoreIdentity.xsd

@@ -0,0 +1,32 @@
+<?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="ScoreIdentity">
+		<xs:annotation><xs:documentation>A component tracking data for the score of a player.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Name" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>A name for tracking score identities, this should be unique.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ID" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>An id for tracking identities</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="KD" type="t:double" minOccurs="0">
+				<xs:annotation><xs:documentation>The Kills per death score.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Kills" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>The amount of kills.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Deaths" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>The amount of deaths.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Ping" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Ping of a player.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Connected" type="t:bool" minOccurs="0">
+				<xs:annotation><xs:documentation>If the player is currently connected or not</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ScoreScreen.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ScoreScreen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ScoreScreen.xsd">
+	<TotalIdentities>0</TotalIdentities>
+	<NextPosition>0</NextPosition>
+	<Offset X="0.0" Y="0.0" Z="0.0"/>
+</ScoreScreen>

resources/Schema/Components/ScoreScreen.xsd

@@ -0,0 +1,20 @@
+<?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="ScoreScreen">
+		<xs:annotation><xs:documentation>The screen where player scores will be shown.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="TotalIdentities" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>The amount of score identities this scoreboard hold</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NextPosition" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Where the next scoreIdentity should be placed.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Offset" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>How much offset should be applied per position</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/SprintAbility.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <SprintAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SprintAbility.xsd">
-	<StrengthOfEffect>2.0</StrengthOfEffect>
+	<StrengthOfEffect>1.3</StrengthOfEffect>
+	<Active>false</Active>
 </SprintAbility>

resources/Schema/Components/SprintAbility.xsd

@@ -12,6 +12,9 @@
 				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>This is the strength of the sprint effect</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Active" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>True if currently sprinting.</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Entities/AmmoHUD

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AmmunitionHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <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>
-          <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>
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="MagazineAmmo">
-          <Components>
-            <c:Text>
-              <Content>0</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>
-    <Entity>
-      <Components>
-        <c:Transform>
-          <Position X="-0.00200000009" Y="0.00400000019" Z="-0.00100000005"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="MagazineAmmo">
-          <Components>
-            <c:Text>
-              <Content>0</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="1" B="0" G="0" 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="0" G="0" 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>

resources/Schema/Entities/AmmoPickupWithModel.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Collidable/>
+    <c:Model>
+      <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-4.20782185" Y="7.18348074" Z="-51.9578781"/>
+      <Scale X="0.5" Y="0.5" Z="0.5"/>
+      <Orientation X="0" Y="0.324000001" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AmmoPickup/>
+        <c:Model>
+          <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
+        </c:Model>
+        <c:RaptorCopter>
+          <Speed>8</Speed>
+          <Axis X="0" Y="0.100000001" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Position X="0" Y="2.36784196" Z="0"/>
+          <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
+          <Orientation X="0" Y="72.7095108" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlendTreeAssaultWeapon.xml

@@ -1,46 +1,102 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="PrimaryBlendTree" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Blend>
-      <Pose1>Idle</Pose1>
-      <Pose2>WeaponAction</Pose2>
-      <Weight>0</Weight>
-      <SubTreeRoot>true</SubTreeRoot>
-    </c:Blend>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
+    </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="WeaponAction">
+    <Entity name="FinalBlend">
       <Components>
         <c:Blend>
-          <Pose1>Fire</Pose1>
-          <Pose2>Reload</Pose2>
-          <Weight>1</Weight>
+          <Pose1>BlendTreeAssaultWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
         </c:Blend>
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="Fire">
+        <Entity name="BlendTreeAssaultWeapon">
+          <Components>
+            <c:Blend>
+              <Pose1>Fire</Pose1>
+              <Pose2>Reload</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Reload">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchF</AnimationName>
+                  <Speed>0.5</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Fire">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ShootRifleF</AnimationName>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
           <Components>
             <c:Animation>
-              <AnimationName>ShootShotgunF</AnimationName>
+              <AnimationName>RunF</AnimationName>
               <Speed>1</Speed>
               <Play>true</Play>
-              <Loop>false</Loop>
+              <Additive>true</Additive>
             </c:Animation>
             <c:Transform/>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Reload">
+        <Entity name="Idle">
           <Components>
             <c:Animation>
-              <AnimationName>ReloadSwitchF</AnimationName>
-              <Time>0.58991607886241582</Time>
+              <AnimationName>IdleF</AnimationName>
               <Speed>1</Speed>
               <Play>true</Play>
+              <Additive>true</Additive>
             </c:Animation>
             <c:Transform/>
           </Components>
@@ -48,17 +104,116 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="Idle">
+    <Entity name="ViewModel">
       <Components>
-        <c:Animation>
-          <AnimationName>IdleF</AnimationName>
-          <Time>0.14837891922093149</Time>
-          <Speed>1</Speed>
-          <Play>true</Play>
-        </c:Animation>
-        <c:Transform/>
+        <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.120748274" Y="-0.228437141" Z="-0.181454718"/>
+          <Orientation X="0.0104048206" Y="-0.00268219248" Z="0.0428443849"/>
+        </c:Transform>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="WeaponMuzzle">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+              <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/WeaponAssaultReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <ScaleOffset X="0.5" Y="0.5" Z="1"/>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0540266186" Y="-0.0954354703" Z="-0.255526125"/>
+          <Orientation X="0.000684258412" Y="0.077423811" Z="0.00118651299"/>
+          <Scale X="0.50000006" Y="0.500000477" Z="1.00000083"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
+          <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="Text">
+          <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:TextFieldReader>
+                  <ParentEntityName>PlayerAssault</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>320</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>PlayerAssault</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>Ammo</Field>
+                </c:TextFieldReader>
+                <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>
 

resources/Schema/Entities/BlendTreeDefenderWeapon.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>BlendTreeDefenderWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="BlendTreeDefenderWeapon">
+          <Components>
+            <c:Blend>
+              <Pose1>ActionBlend</Pose1>
+              <Pose2>Shield</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Shield">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ActivateDeactiveShieldF</AnimationName>
+                  <Time>1</Time>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ActionBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>Idle</Pose1>
+                  <Pose2>ActionBlend2</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleF</AnimationName>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ActionBlend2">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>Fire</Pose1>
+                      <Pose2>Reload</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Fire">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootShotgunF</AnimationName>
+                          <Time>0.5</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Reload">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadTwoF</AnimationName>
+                          <Time>0.23333333432674408</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Time>0.93061516164344571</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Time>0.11396167157691739</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlueRifle

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity 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.136586398" Y="0.92942369" Z="-0.139760047"/>
-      <Orientation X="-0.601206124" Y="0.132410824" Z="-0.129014626"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/BoneMarker

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="R_Leg_Top" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Leg_Top</BoneName>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.0664939061" Y="0.714353919" Z="0.0475388765"/>
-      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-      <Orientation X="-0.783109188" Y="-0.0050998251" Z="3.14151597"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/DeadGirl.xlm

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <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>0.28963486380924053</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.120430455" Y="-0.231800437" Z="-0.181454748"/>
-                  <Orientation X="0.0104047749" Y="-0.00268166233" Z="0.042844031"/>
-                </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>0.42156525436696768</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.160716802" Y="1.02800739" Z="-0.215931982"/>
-              <Orientation X="-0.0627654716" Y="-0.0450839326" Z="0.119217664"/>
-            </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>

resources/Schema/Entities/DefenderShield.xml

@@ -2,36 +2,36 @@
 <Entity name="Shield" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:Blend>
+      <Pose1>Deploy</Pose1>
+      <Pose2>Idle</Pose2>
+      <Weight>0</Weight>
+    </c:Blend>
+    <c:Model>
+      <Resource>Models/Characters/Defender/DefenderShield.mesh</Resource>
+    </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="Shield">
+    <Entity name="Deploy">
       <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>
+        <c:Animation>
+          <AnimationName>ActivateDeactiveShieldF</AnimationName>
+          <Time>1</Time>
+          <Speed>1</Speed>
+        </c:Animation>
+        <c:Transform/>
       </Components>
       <Children/>
     </Entity>
-    <Entity name="VisibleSide">
+    <Entity name="Idle">
       <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>
+        <c:Animation>
+          <AnimationName>ShieldFrontF</AnimationName>
+          <Speed>1</Speed>
+        </c:Animation>
+        <c:Transform/>
       </Components>
       <Children/>
     </Entity>

resources/Schema/Entities/DefenderWeaponView.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="DefenderWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
-    </c:Model>
-    <c:Transform>
-      <Position X="0" Y="0.0350000001" Z="-0.295000017"/>
-    </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: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:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>DefenderWeapon</ComponentType>
-                  <Field>MagazineAmmo</Field>
-                </c:TextFieldReader>
-                <c:Text>
-                  <Content>0</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:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>DefenderWeapon</ComponentType>
-                  <Field>Ammo</Field>
-                </c:TextFieldReader>
-                <c:Text>
-                  <Content>0</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

@@ -1,99 +0,0 @@
-<?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/DefenderWeaponWorldRed.xml

@@ -1,41 +0,0 @@
-<?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/FirstPersonArms

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Wave" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Animation>
-      <AnimationName1>Run</AnimationName1>
-      <Weight1>0.5</Weight1>
-      <Time1>0.97312056690160276</Time1>
-      <Speed1>1</Speed1>
-      <Speed2>1</Speed2>
-      <AnimationName2>ReloadSwitch</AnimationName2>
-      <Time2>0.91310356788604263</Time2>
-      <AnimationName3>LeftRight</AnimationName3>
-      <Weight3>0</Weight3>
-      <Time3>0.040207288496060478</Time3>
-      <Speed3>1</Speed3>
-    </c:Animation>
-    <c:AnimationOffset>
-      <AnimationName>DownUp</AnimationName>
-      <Time>0.77999961376190186</Time>
-    </c:AnimationOffset>
-    <c:Model>
-      <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-      <Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.690088332" Y="1.00491476" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm_Weapon_Joint</BoneName>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.120778561" Y="-0.223796993" Z="-0.15143311"/>
-          <Orientation X="0.0957378224" Y="0.0132024018" Z="0.0284451656"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Camera/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/HealthHUDAssault.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUDAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+      <Orientation X="5.83699989" Y="0" Z="4.71199989"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="HealthText">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:Text>
+          <Content>100/100</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+        </c:Text>
+        <c:HealthHUD/>
+        <c:Transform>
+          <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
+          <Orientation X="0" Y="0" Z="1.57070696"/>
+          <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthBar">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="0.301960796" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:HealthHUD/>
+        <c:Sprite>
+          <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BoostIcons">
+      <Components>
+        <c:BoostIconsHUD/>
+        <c:Transform>
+          <Position X="0" Y="0.00500000035" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Assault">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Defender">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0270000007" Y="0.110000007" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Sniper">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="0.345098048" G="0" R="1"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.145000011" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ShiftAbility">
+      <Components>
+        <c:AbilityCooldownHUD/>
+        <c:Fill>
+          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+        </c:Fill>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Abilities/Superman-01.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
+          <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
+          <Orientation X="0" Y="0" Z="3.14159203"/>
+          <Scale X="0.0800000057" Y="0.0700000003" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cooldown">
+          <Components>
+            <c:Text>
+              <Content>0.0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Visible>false</Visible>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+              <Orientation X="0" Y="0" Z="1.57099998"/>
+              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthHUDDefender.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUDDefender" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+      <Orientation X="5.83699989" Y="0" Z="4.71199989"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="HealthText">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:Text>
+          <Content>100/100</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+        </c:Text>
+        <c:HealthHUD/>
+        <c:Transform>
+          <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
+          <Orientation X="0" Y="0" Z="1.57070696"/>
+          <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthBar">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="0.301960796" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:HealthHUD/>
+        <c:Sprite>
+          <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BoostIcons">
+      <Components>
+        <c:BoostIconsHUD/>
+        <c:Transform>
+          <Position X="0" Y="0.00500000035" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Assault">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Defender">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0270000007" Y="0.110000007" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Sniper">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="0.345098048" G="0" R="1"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.145000011" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ShiftAbility">
+      <Components>
+        <c:AbilityCooldownHUD/>
+        <c:Fill>
+          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+        </c:Fill>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Abilities/SheildDots-01.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
+          <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
+          <Orientation X="0" Y="0" Z="3.14159203"/>
+          <Scale X="0.0400000028" Y="0.0400000028" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cooldown">
+          <Components>
+            <c:Text>
+              <Content>0.0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Visible>false</Visible>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+              <Orientation X="0" Y="0" Z="1.57099998"/>
+              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthHUDSniper.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUDSniper" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+      <Orientation X="5.83699989" Y="0" Z="4.71199989"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="HealthText">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:Text>
+          <Content>100/100</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+        </c:Text>
+        <c:HealthHUD/>
+        <c:Transform>
+          <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
+          <Orientation X="0" Y="0" Z="1.57070696"/>
+          <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthBar">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="0.301960796" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:HealthHUD/>
+        <c:Sprite>
+          <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BoostIcons">
+      <Components>
+        <c:BoostIconsHUD/>
+        <c:Transform>
+          <Position X="0" Y="0.00500000035" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Assault">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Defender">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0270000007" Y="0.110000007" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Sniper">
+          <Components>
+            <c:Fill>
+              <Color A="1" B="0.345098048" G="0" R="1"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.145000011" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14199996"/>
+              <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ShiftAbility">
+      <Components>
+        <c:AbilityCooldownHUD/>
+        <c:Fill>
+          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+        </c:Fill>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Icons/Abilities/Dash-01.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
+          <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
+          <Orientation X="0" Y="0" Z="3.14159203"/>
+          <Scale X="0.0400000028" Y="0.0400000028" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cooldown">
+          <Components>
+            <c:Text>
+              <Content>0.0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Visible>false</Visible>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+              <Orientation X="0" Y="0" Z="1.57099998"/>
+              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthPickupWithModel.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Collidable/>
+    <c:Model>
+      <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-7.1308527" Y="7.18348074" Z="-50.9762192"/>
+      <Scale X="0.5" Y="0.5" Z="0.5"/>
+      <Orientation X="0" Y="0.324000001" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:HealthPickup/>
+        <c:Model>
+          <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
+        </c:Model>
+        <c:RaptorCopter>
+          <Speed>8</Speed>
+          <Axis X="0" Y="0.100000001" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Position X="0" Y="2.36784196" Z="0"/>
+          <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
+          <Orientation X="0" Y="40.1343727" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MovementTest.xml

@@ -2,7 +2,9 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="0" Y="-0.872543275" Z="-2.49763942"/>
+    </c:Transform>
   </Components>
 
   <Children>
@@ -15,7 +17,7 @@
         </c:Team>
         <c:PlayerSpawn/>
         <c:Spawner>
-          <EntityFile>Schema/Entities/PlayerAssaultFallbackRed.xml</EntityFile>
+          <EntityFile>Schema/Entities/PlayerDefenderBlue.xml</EntityFile>
         </c:Spawner>
         <c:Transform>
           <Position X="0.300000012" Y="0.0270000007" Z="0"/>
@@ -83,7 +85,7 @@
         </c:Team>
         <c:PlayerSpawn/>
         <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+          <EntityFile>Schema/Entities/PlayerAssaultBlue.xml</EntityFile>
         </c:Spawner>
         <c:Transform>
           <Position X="0.300000012" Y="0.0270000007" Z="6.67400026"/>

resources/Schema/Entities/PlayerAssaultFallbackBlue.xml

@@ -1,698 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
-    <c:Physics>
-      <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>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <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="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <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>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="BoostIcons">
-                      <Components>
-                        <c:BoostIconsHUD/>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Assault">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Defender">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Sniper">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.345098048" G="0" R="1"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShiftAbility">
-                      <Components>
-                        <c:AbilityCooldownHUD/>
-                        <c:Fill>
-                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <DepthSort>false</DepthSort>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
-                          <Scale X="0.27700001" Y="0.190000013" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Cooldown">
-                          <Components>
-                            <c:Text>
-                              <Content>0.0</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="0" G="0" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
-                              <Orientation X="0" Y="0" Z="1.57099998"/>
-                              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>2</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>3</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="1.62788737" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>4</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>1</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD/>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="0" G="0" R="1"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointArrow">
-              <Components>
-                <c:CapturePointArrowHUD/>
-                <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-                </c:Model>
-                <c:Team>
-                  <Team>
-                    <Blue/>
-                  </Team>
-                </c:Team>
-                <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.294117659" R="0"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PrimaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </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>IdleF</AnimationName1>
-          <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <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>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <GlowMap></GlowMap>
-          <DepthSort>false</DepthSort>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <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/Entities/PlayerAssaultFallbackRed.xml

@@ -1,698 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
-    <c:Physics>
-      <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>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <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="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <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>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="BoostIcons">
-                      <Components>
-                        <c:BoostIconsHUD/>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Assault">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Defender">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Sniper">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.345098048" G="0" R="1"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShiftAbility">
-                      <Components>
-                        <c:AbilityCooldownHUD/>
-                        <c:Fill>
-                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <DepthSort>false</DepthSort>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
-                          <Scale X="0.27700001" Y="0.190000013" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Cooldown">
-                          <Components>
-                            <c:Text>
-                              <Content>0.0</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="0" G="0" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
-                              <Orientation X="0" Y="0" Z="1.57099998"/>
-                              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>2</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>3</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="1.62788737" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>4</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>1</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD/>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="0" G="0" R="1"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointArrow">
-              <Components>
-                <c:CapturePointArrowHUD/>
-                <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-                </c:Model>
-                <c:Team>
-                  <Team>
-                    <Red/>
-                  </Team>
-                </c:Team>
-                <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="0.0431372561" G="0.0509803928" R="0.87843138"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PrimaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultRedView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </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>IdleF</AnimationName1>
-          <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultRedWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <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>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <GlowMap></GlowMap>
-          <DepthSort>false</DepthSort>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <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/Entities/PlayerDefenderBlue.xml

@@ -1,30 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="PlayerDefender" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
-    <c:AssaultWeapon/>
     <c:Team>
       <Team>
-        <Blue/>
+        <Red/>
       </Team>
     </c:Team>
     <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
+    <c:DefenderWeapon>
+      <MagazineAmmo>4</MagazineAmmo>
+      <Ammo>52</Ammo>
+    </c:DefenderWeapon>
+    <c:Listener/>
+    <c:Health>
+      <Health>150</Health>
+      <MaxHealth>150</MaxHealth>
+    </c:Health>
+    <c:ShieldAbility/>
     <c:Physics>
-      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+      <Velocity X="-1.86527334e-13" Y="0" Z="1.89149233e-13"/>
+      <IsOnGround>true</IsOnGround>
     </c:Physics>
     <c:Player>
       <MovementSpeed>5</MovementSpeed>
       <CurrentWeapon></CurrentWeapon>
     </c:Player>
     <c:Transform>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
+      <Position X="0.67159152" Y="0.0288829375" Z="1.22672582"/>
+      <Orientation X="0" Y="-0.00174739491" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -37,6 +45,7 @@
         </c:Camera>
         <c:Transform>
           <Position X="0" Y="1.27700007" Z="0"/>
+          <Orientation X="1.11789882" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -212,7 +221,7 @@
                       <Color A="1" B="1" G="0" R="0"/>
                     </c:Fill>
                     <c:Text>
-                      <Content>100/100</Content>
+                      <Content>150/150</Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
                     </c:Text>
@@ -421,6 +430,7 @@
                     <c:Text>
                       <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="0.800000012" B="1" G="0.200000003" R="0"/>
                       <Alignment>
                         <Right/>
                       </Alignment>
@@ -484,12 +494,10 @@
         </Entity>
         <Entity name="Hands">
           <Components>
-            <c:Blend>
-              <Pose1>BlendTreeAssaultWeapon</Pose1>
-              <Pose2>BlendTreeSecondaryWeapon</Pose2>
-              <Weight>0</Weight>
-              <SubTreeRoot>true</SubTreeRoot>
-            </c:Blend>
+            <c:BlendAdditive>
+              <Adder>MovementBlend</Adder>
+              <Receiver>FinalBlend</Receiver>
+            </c:BlendAdditive>
             <c:Model>
               <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
             </c:Model>
@@ -502,14 +510,14 @@
                   <BoneName>R_Arm_Weapon_Joint</BoneName>
                 </c:BoneAttachment>
                 <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
+                  <Weapon>DefenderWeapon</Weapon>
                 </c:WeaponAttachment>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
+                  <EntityFile>Schema/Entities/WeaponDefenderBlueView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
-                  <Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
+                  <Position X="0.120748252" Y="-0.228768602" Z="-0.181454718"/>
+                  <Orientation X="0.0104048951" Y="-0.00268237269" Z="0.0428444892"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -526,78 +534,152 @@
                   <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
-                  <Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
+                  <Position X="0.120748252" Y="-0.228768602" Z="-0.181454718"/>
+                  <Orientation X="0.0104048951" Y="-0.00268237269" Z="0.0428444892"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
-            <Entity name="BlendTreeAssaultWeapon">
+            <Entity name="FinalBlend">
               <Components>
                 <c:Blend>
-                  <Pose1>Idle</Pose1>
-                  <Pose2>WeaponAction</Pose2>
+                  <Pose1>BlendTreeDefenderWeapon</Pose1>
+                  <Pose2>BlendTreeSecondaryWeapon</Pose2>
                   <Weight>0</Weight>
                   <SubTreeRoot>true</SubTreeRoot>
                 </c:Blend>
                 <c:Transform/>
               </Components>
               <Children>
-                <Entity name="WeaponAction">
+                <Entity name="BlendTreeDefenderWeapon">
                   <Components>
                     <c:Blend>
-                      <Pose1>Fire</Pose1>
-                      <Pose2>Reload</Pose2>
-                      <Weight>1</Weight>
+                      <Pose1>ActionBlend</Pose1>
+                      <Pose2>Shield</Pose2>
+                      <Weight>0</Weight>
+                      <SubTreeRoot>true</SubTreeRoot>
                     </c:Blend>
                     <c:Transform/>
                   </Components>
                   <Children>
-                    <Entity name="Fire">
+                    <Entity name="Shield">
                       <Components>
                         <c:Animation>
-                          <AnimationName>ShootShotgunF</AnimationName>
+                          <AnimationName>ActivateDeactiveShieldF</AnimationName>
+                          <Time>1</Time>
                           <Speed>1</Speed>
-                          <Play>true</Play>
                           <Loop>false</Loop>
                         </c:Animation>
                         <c:Transform/>
                       </Components>
                       <Children/>
                     </Entity>
-                    <Entity name="Reload">
+                    <Entity name="ActionBlend">
                       <Components>
-                        <c:Animation>
-                          <AnimationName>ReloadSwitchF</AnimationName>
-                          <Time>0.58991607886241582</Time>
-                          <Speed>1</Speed>
-                          <Play>true</Play>
-                        </c:Animation>
+                        <c:Blend>
+                          <Pose1>Idle</Pose1>
+                          <Pose2>ActionBlend2</Pose2>
+                          <Weight>0</Weight>
+                          <SubTreeRoot>true</SubTreeRoot>
+                        </c:Blend>
                         <c:Transform/>
                       </Components>
-                      <Children/>
+                      <Children>
+                        <Entity name="Idle">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>IdleF</AnimationName>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="ActionBlend2">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Fire</Pose1>
+                              <Pose2>Reload</Pose2>
+                              <Weight>0</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Fire">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>ShootShotgunF</AnimationName>
+                                  <Time>0.5</Time>
+                                  <Speed>1</Speed>
+                                  <Loop>false</Loop>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Reload">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>ShotgunReloadTwoF</AnimationName>
+                                  <Time>0.23333333432674408</Time>
+                                  <Speed>1</Speed>
+                                  <Loop>false</Loop>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
                     </Entity>
                   </Children>
                 </Entity>
-                <Entity name="Idle">
+                <Entity name="BlendTreeSecondaryWeapon">
                   <Components>
-                    <c:Animation>
-                      <AnimationName>IdleF</AnimationName>
-                      <Time>0.14837891922093149</Time>
-                      <Speed>1</Speed>
-                      <Play>true</Play>
-                    </c:Animation>
                     <c:Transform/>
                   </Components>
                   <Children/>
                 </Entity>
               </Children>
             </Entity>
-            <Entity name="BlendTreeSecondaryWeapon">
+            <Entity name="MovementBlend">
               <Components>
+                <c:Blend>
+                  <Pose1>Idle</Pose1>
+                  <Pose2>Run</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
                 <c:Transform/>
               </Components>
-              <Children/>
+              <Children>
+                <Entity name="Run">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>RunF</AnimationName>
+                      <Time>0.93061516164344571</Time>
+                      <Speed>1</Speed>
+                      <Play>true</Play>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleF</AnimationName>
+                      <Time>0.11396167157691739</Time>
+                      <Speed>1</Speed>
+                      <Play>true</Play>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
             </Entity>
           </Children>
         </Entity>
@@ -629,8 +711,8 @@
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
-          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
+          <Resource>Models/Characters/Defender/DefenderBlue.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -647,11 +729,11 @@
               </Person>
             </c:WeaponAttachment>
             <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
+              <EntityFile>Schema/Entities/WeaponDefenderBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
-              <Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
+              <Position X="0.157449082" Y="1.04085267" Z="-0.234242111"/>
+              <Orientation X="-0.0042401799" Y="-0.0355410911" Z="0.137519509"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -671,8 +753,8 @@
               <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
-              <Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
+              <Position X="0.157449082" Y="1.04085267" Z="-0.234242111"/>
+              <Orientation X="-0.0042401799" Y="-0.0355410911" Z="0.137519509"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -718,12 +800,12 @@
           <Components>
             <c:BlendOverride>
               <Master>ReloadSwitchBlend</Master>
-              <Slave>FinalMovementBlend</Slave>
+              <Slave>MovementBlend</Slave>
             </c:BlendOverride>
             <c:Transform/>
           </Components>
           <Children>
-            <Entity name="FinalMovementBlend">
+            <Entity name="MovementBlend">
               <Components>
                 <c:Blend>
                   <Pose1>StandCrouchBlend</Pose1>
@@ -775,11 +857,11 @@
                                 <c:Transform/>
                               </Components>
                               <Children>
-                                <Entity name="Left">
+                                <Entity name="Right">
                                   <Components>
                                     <c:Animation>
-                                      <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                      <Time>0.86105870560012221</Time>
+                                      <AnimationName>CrouchStrafeRightF</AnimationName>
+                                      <Time>0.73997265048741045</Time>
                                       <Speed>1</Speed>
                                       <Play>true</Play>
                                     </c:Animation>
@@ -787,11 +869,11 @@
                                   </Components>
                                   <Children/>
                                 </Entity>
-                                <Entity name="Right">
+                                <Entity name="Left">
                                   <Components>
                                     <c:Animation>
-                                      <AnimationName>CrouchStrafeRightF</AnimationName>
-                                      <Time>0.78838016755090479</Time>
+                                      <AnimationName>CrouchStrafeLeftF</AnimationName>
+                                      <Time>0.81265118853662788</Time>
                                       <Speed>1</Speed>
                                       <Play>true</Play>
                                     </c:Animation>
@@ -805,7 +887,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchWalkF</AnimationName>
-                                  <Time>0.56675415272830776</Time>
+                                  <Time>0.51834663566481343</Time>
                                   <Speed>1</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -848,42 +930,6 @@
                             <c:Transform/>
                           </Components>
                           <Children>
-                            <Entity name="RunWalkBlend">
-                              <Components>
-                                <c:Blend>
-                                  <Pose1>Walk</Pose1>
-                                  <Pose2>Run</Pose2>
-                                  <Weight>1.2938206818383024e-24</Weight>
-                                </c:Blend>
-                                <c:Transform/>
-                              </Components>
-                              <Children>
-                                <Entity name="Walk">
-                                  <Components>
-                                    <c:Animation>
-                                      <AnimationName>WalkF</AnimationName>
-                                      <Time>0.071908782138081051</Time>
-                                      <Speed>1</Speed>
-                                      <Play>true</Play>
-                                    </c:Animation>
-                                    <c:Transform/>
-                                  </Components>
-                                  <Children/>
-                                </Entity>
-                                <Entity name="Run">
-                                  <Components>
-                                    <c:Animation>
-                                      <AnimationName>RunF</AnimationName>
-                                      <Time>0.34392228616198395</Time>
-                                      <Speed>1.5</Speed>
-                                      <Play>true</Play>
-                                    </c:Animation>
-                                    <c:Transform/>
-                                  </Components>
-                                  <Children/>
-                                </Entity>
-                              </Children>
-                            </Entity>
                             <Entity name="StrafeLRBlend">
                               <Components>
                                 <c:Blend>
@@ -898,8 +944,8 @@
                                   <Components>
                                     <c:Animation>
                                       <AnimationName>StrafeRightF</AnimationName>
-                                      <Time>0.27701693305173336</Time>
-                                      <Speed>2</Speed>
+                                      <Time>0.22860941598823903</Time>
+                                      <Speed>1</Speed>
                                       <Play>true</Play>
                                     </c:Animation>
                                     <c:Transform/>
@@ -910,8 +956,44 @@
                                   <Components>
                                     <c:Animation>
                                       <AnimationName>StrafeLeftF</AnimationName>
-                                      <Time>0.25350140317161873</Time>
-                                      <Speed>2</Speed>
+                                      <Time>0.2050938861081244</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                            <Entity name="RunWalkBlend">
+                              <Components>
+                                <c:Blend>
+                                  <Pose1>Walk</Pose1>
+                                  <Pose2>Run</Pose2>
+                                  <Weight>1.2938206818383024e-24</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="Walk">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>WalkF</AnimationName>
+                                      <Time>0.023501265074586719</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="Run">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>RunF</AnimationName>
+                                      <Time>0.29551476909848962</Time>
+                                      <Speed>1</Speed>
                                       <Play>true</Play>
                                     </c:Animation>
                                     <c:Transform/>
@@ -926,7 +1008,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>IdleF</AnimationName>
-                              <Time>0.07079692416292005</Time>
+                              <Time>0.038981432856261655</Time>
                               <Speed>1</Speed>
                               <Play>true</Play>
                             </c:Animation>
@@ -986,7 +1068,7 @@
                                 <c:Animation>
                                   <AnimationName>DashForwardF</AnimationName>
                                   <Time>1</Time>
-                                  <Speed>1.7999999523162842</Speed>
+                                  <Speed>1</Speed>
                                   <Loop>false</Loop>
                                 </c:Animation>
                                 <c:Transform/>
@@ -998,7 +1080,7 @@
                                 <c:Animation>
                                   <AnimationName>DashBackwardF</AnimationName>
                                   <Time>1</Time>
-                                  <Speed>1.7999999523162842</Speed>
+                                  <Speed>1</Speed>
                                   <Loop>false</Loop>
                                 </c:Animation>
                                 <c:Transform/>
@@ -1022,7 +1104,7 @@
                                 <c:Animation>
                                   <AnimationName>DashLeftF</AnimationName>
                                   <Time>1</Time>
-                                  <Speed>1.7999999523162842</Speed>
+                                  <Speed>1</Speed>
                                   <Loop>false</Loop>
                                 </c:Animation>
                                 <c:Transform/>
@@ -1034,7 +1116,7 @@
                                 <c:Animation>
                                   <AnimationName>DashRightF</AnimationName>
                                   <Time>1</Time>
-                                  <Speed>1.7999999523162842</Speed>
+                                  <Speed>1</Speed>
                                   <Loop>false</Loop>
                                 </c:Animation>
                                 <c:Transform/>
@@ -1095,7 +1177,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>IdleAssaultRifleU</AnimationName>
-                              <Time>1.4961314671805894</Time>
+                              <Time>0.44772395011709509</Time>
                               <Speed>1</Speed>
                               <Play>true</Play>
                             </c:Animation>
@@ -1107,7 +1189,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>IdleSecWepU</AnimationName>
-                              <Time>1.4996565074703767</Time>
+                              <Time>0.45124899040688238</Time>
                               <Speed>1</Speed>
                               <Play>true</Play>
                             </c:Animation>
@@ -1155,6 +1237,50 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="ShieldSpawner">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0.854167223" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Shield">
+              <Components>
+                <c:Blend>
+                  <Pose1>Deploy</Pose1>
+                  <Pose2>Idle</Pose2>
+                  <Weight>0</Weight>
+                </c:Blend>
+                <c:Model>
+                  <Resource>Models/Characters/Defender/DefenderShield.mesh</Resource>
+                </c:Model>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Deploy">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ActivateDeactiveShieldF</AnimationName>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShieldFrontF</AnimationName>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="AABBStanding">
@@ -1187,7 +1313,7 @@
     <Entity name="PlayerName">
       <Components>
         <c:Text>
-          <Content>Insert name here</Content>
+          <Content></Content>
           <Resource>Fonts/DroidSans.ttf,100</Resource>
           <Color A="1" B="0" G="1" R="0"/>
         </c:Text>

resources/Schema/Entities/PlayerHUD.xml

@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="0" Z="-0.5"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Crosshair">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <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>
+    <Entity name="HitMarkerSpawner">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthHUD">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="HealthBar">
+          <Components>
+            <c:Fill>
+              <Percentage>1</Percentage>
+              <Color A="0.301960796" B="1" G="0" R="0"/>
+            </c:Fill>
+            <c:HealthHUD/>
+            <c:Sprite>
+              <DiffuseTexture>Textures/HUD/HealthHudTriMain.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+              <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
+              <Scale X="0.0799999982" Y="0.333000004" Z="0.150000006"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="BoostIcons">
+              <Components>
+                <c:BoostIconsHUD/>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Sniper">
+                  <Components>
+                    <c:Fill>
+                      <Color A="1" B="0.345098048" G="0" R="1"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.225000009" Y="0.38500002" Z="0"/>
+                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Assault">
+                  <Components>
+                    <c:Fill>
+                      <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.225000009" Y="0.168000013" Z="0"/>
+                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Defender">
+                  <Components>
+                    <c:Fill>
+                      <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.224999994" Y="0.27700001" Z="0"/>
+                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="HealthText">
+          <Components>
+            <c:Fill>
+              <Percentage>1</Percentage>
+              <Color A="1" B="1" G="0" R="0"/>
+            </c:Fill>
+            <c:Text>
+              <Content>100/100</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:HealthHUD/>
+            <c:Transform>
+              <Position X="-0.372000009" Y="-0.212000012" Z="0.0560000017"/>
+              <Orientation X="0" Y="0.410000026" Z="0"/>
+              <Scale X="0.0189999994" Y="0.0250000004" Z="0.0350000001"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="CapturePointHUD">
+      <Components>
+        <c:Transform>
+          <Position X="0" Y="0.190541431" Z="0"/>
+          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.300000012" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>2</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.300000012" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>3</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="1.62788737" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>4</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Percentage>1</Percentage>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.300000012" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>1</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.699999988" B="0" G="0" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="-1.58304751" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD/>
+                <c:Fill>
+                  <Percentage>1</Percentage>
+                  <Color A="0.699999988" B="0" G="0" R="1"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="4.71238899"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="KillFeed">
+      <Components>
+        <c:KillFeed/>
+        <c:Transform>
+          <Position X="0.486000031" Y="0.26000002" Z="0"/>
+          <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="KillFeed1">
+          <Components>
+            <c:Text>
+              <Content></Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Right/>
+              </Alignment>
+            </c:Text>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillFeed2">
+          <Components>
+            <c:Text>
+              <Content></Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Right/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="-1" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillFeed3">
+          <Components>
+            <c:Text>
+              <Content></Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Right/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="-2" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="CapturePointArrow">
+      <Components>
+        <c:CapturePointArrowHUD/>
+        <c:Model>
+          <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="0.714000046" Z="-1.30000007"/>
+          <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
+          <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/PlayerModel.xml

@@ -0,0 +1,542 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="PlayerModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>BlendTreeAim</Adder>
+      <Receiver>BlendTreeAssault</Receiver>
+    </c:BlendAdditive>
+    <c:Shielded/>
+    <c:HiddenForLocalPlayer/>
+    <c:Model>
+      <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+      <Color A="1" B="1" G="0.25" R="0"/>
+      <Visible>false</Visible>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="PrimaryAttachment">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:WeaponAttachment>
+          <Weapon>AssaultWeapon</Weapon>
+          <Person>
+            <ThirdPerson/>
+          </Person>
+        </c:WeaponAttachment>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.165396646" Y="1.14537966" Z="-0.206537575"/>
+          <Orientation X="0.484640986" Y="-0.00695174001" Z="0.0685098693"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="SecondaryAttachment">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:WeaponAttachment>
+          <Weapon>SidearmWeapon</Weapon>
+          <Person>
+            <ThirdPerson/>
+          </Person>
+        </c:WeaponAttachment>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.165396646" Y="1.14537966" Z="-0.206537575"/>
+          <Orientation X="0.484640986" Y="-0.00695174001" Z="0.0685098693"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BlendTreeAim">
+      <Components>
+        <c:Blend>
+          <Pose1>AimPrimary</Pose1>
+          <Pose2>AimSecondary</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="AimSecondary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimSecWepA</AnimationName>
+              <Time>0.71143966913223267</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AimPrimary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimRifleA</AnimationName>
+              <Time>0.71143966913223267</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="BlendTreeAssault">
+      <Components>
+        <c:BlendOverride>
+          <Master>ReloadSwitchBlend</Master>
+          <Slave>FinalMovementBlend</Slave>
+        </c:BlendOverride>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="FinalMovementBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>StandCrouchBlend</Pose1>
+              <Pose2>JumpDashBlend</Pose2>
+              <Weight>2.5146881298480398e-63</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="StandCrouchBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>StandMovement</Pose1>
+                  <Pose2>CrouchMovement</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="CrouchMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>MovementBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="MovementBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Walk</Pose1>
+                          <Pose2>StrafeLRBlend</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="StrafeLRBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Left</Pose1>
+                              <Pose2>Right</Pose2>
+                              <Weight>0.033793529385008014</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Left">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchStrafeLeftF</AnimationName>
+                                  <Time>0.93215091236880454</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchStrafeRightF</AnimationName>
+                                  <Time>0.85947237431958712</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchWalkF</AnimationName>
+                              <Time>0.63784635949699009</Time>
+                              <Speed>1</Speed>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Idle">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>CrouchF</AnimationName>
+                          <Time>0.99862473341677438</Time>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="StandMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>MovementBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="MovementBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>RunWalkBlend</Pose1>
+                          <Pose2>StrafeLRBlend</Pose2>
+                          <Weight>2.4565650245976452e-16</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="RunWalkBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Walk</Pose1>
+                              <Pose2>Run</Pose2>
+                              <Weight>1.2938206818383024e-24</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Walk">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>WalkF</AnimationName>
+                                  <Time>0.14300098890676338</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Run">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>RunF</AnimationName>
+                                  <Time>0.41501449293066628</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="StrafeLRBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Left</Pose1>
+                              <Pose2>Right</Pose2>
+                              <Weight>0.033793529385008014</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Left">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>StrafeLeftF</AnimationName>
+                                  <Time>0.32459360994030106</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>StrafeRightF</AnimationName>
+                                  <Time>0.34810913982041569</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Idle">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleF</AnimationName>
+                          <Time>1.2585556863362655</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="JumpDashBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>Jump</Pose1>
+                  <Pose2>DashBlend</Pose2>
+                  <Weight>1</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Jump">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>JumpF</AnimationName>
+                      <Time>0.5</Time>
+                      <Speed>1</Speed>
+                      <Loop>false</Loop>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="DashBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>DashFBBlend</Pose1>
+                      <Pose2>DashLRBlend</Pose2>
+                      <Weight>0.014621149736541383</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="DashFBBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>DashForward</Pose1>
+                          <Pose2>DashBackward</Pose2>
+                          <Weight>0.014363533804961248</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="DashForward">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashForwardF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashBackward">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashBackwardF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="DashLRBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>DashLeft</Pose1>
+                          <Pose2>DashRight</Pose2>
+                          <Weight>4.3244885367500671e-16</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="DashLeft">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashLeftF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashRight">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashRightF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ReloadSwitchBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>ReloadSwitch</Pose1>
+              <Pose2>WeaponActionBlend</Pose2>
+              <Weight>1</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="ReloadSwitch">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchU</AnimationName>
+                  <Time>0.00030848838797092881</Time>
+                  <Speed>1</Speed>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="WeaponActionBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>IdleBlend</Pose1>
+                  <Pose2>ShootBlend</Pose2>
+                  <Weight>0</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="IdleBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>IdlePrimary</Pose1>
+                      <Pose2>IdleSecondary</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="IdlePrimary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleAssaultRifleU</AnimationName>
+                          <Time>0.56722367394927176</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="IdleSecondary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleSecWepU</AnimationName>
+                          <Time>0.57074871423905904</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ShootBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>ShootPrimary</Pose1>
+                      <Pose2>ShootSecondary</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ShootPrimary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootFastRifleU</AnimationName>
+                          <Time>0.12914212153428517</Time>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ShootSecondary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootSecWepFastU</AnimationName>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ReloadEffectView.xml

@@ -1,20 +1,20 @@
 <?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">
+<Entity name="ReloadEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
-      <Lifetime>2</Lifetime>
+      <Lifetime>1</Lifetime>
     </c:Lifetime>
     <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="3.33300018" Y="0.0320000015" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="19.6078434" G="19.6078434" R="1"/>
+      <Velocity X="0" Y="1" Z="0"/>
+      <ExplosionOrigin X="-0.0450000018" Y="0.148000002" Z="-0.646000028"/>
+      <ExplosionDuration>1</ExplosionDuration>
+      <EndColor A="0" B="3.92156863" G="0.545098066" R="1"/>
       <Randomness>true</Randomness>
     </c:ExplosionEffect>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+      <Transparent>true</Transparent>
     </c:Model>
     <c:Transform/>
   </Components>

resources/Schema/Entities/ScoreBoard.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoardOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="66.4319992" Y="37.9560013" Z="0"/>
+      <Orientation X="0" Y="4.71199989" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Background_Main">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Scale X="60" Y="30" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BlueSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="1" G="0.505882382" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="16" Y="0" Z="0.5"/>
+          <Scale X="25" Y="28" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="RedSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="0" G="0.219607845" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-16" Y="0" Z="0.5"/>
+          <Scale X="25" Y="28" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Background_Spectator">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="-20.5" Z="0"/>
+          <Scale X="20" Y="10" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Blue">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-2" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="16" Y="12" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Red">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-2" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-16" Y="12" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Spectators">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-1" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team/>
+        <c:Transform>
+          <Position X="0" Y="-17.5" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreBoard_Blue.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoard_Blue_Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="BlueSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="1" G="0.505882382" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.5"/>
+          <Scale X="32" Y="23" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Blue">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-3" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="7" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="IDText">
+          <Components>
+            <c:Text>
+              <Content>ID</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-13" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="NameText">
+          <Components>
+            <c:Text>
+              <Content>Name</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-10" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KDText">
+          <Components>
+            <c:Text>
+              <Content>KD</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="1.28838646" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillsText">
+          <Components>
+            <c:Text>
+              <Content>Kills</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="4.6874299" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="DeathsText">
+          <Components>
+            <c:Text>
+              <Content>Deaths</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="8.9577198" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreBoard_Main.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoard_Main_Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Background_Spectator">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="-19" Z="0"/>
+          <Scale X="30" Y="12" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Spectators">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-1" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team/>
+        <c:Transform>
+          <Position X="0" Y="-14" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Background_Main">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Scale X="69" Y="25" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spawner_1">
+      <Components>
+        <c:Spawner>
+          <EntityFile></EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="16.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spawner_2">
+      <Components>
+        <c:Spawner>
+          <EntityFile></EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="-16.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreBoard_Red.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoard_Red_Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="RedSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="0" G="0.0862745121" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.5"/>
+          <Scale X="32" Y="23" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Red">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-3" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="7" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="IDText">
+          <Components>
+            <c:Text>
+              <Content>ID</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-13" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="NameText">
+          <Components>
+            <c:Text>
+              <Content>Name</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-10" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KDText">
+          <Components>
+            <c:Text>
+              <Content>KD</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="1.28838646" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillsText">
+          <Components>
+            <c:Text>
+              <Content>Kills</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="4.6874299" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="DeathsText">
+          <Components>
+            <c:Text>
+              <Content>Deaths</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="8.9577198" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreIdentity.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreIdentity" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:ScoreIdentity>
+      <Name></Name>
+    </c:ScoreIdentity>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="ID">
+      <Components>
+        <c:Text>
+          <Content>-1</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>ID</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="-13" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Name">
+      <Components>
+        <c:Text>
+          <Content></Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Name</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="-10" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="KD">
+      <Components>
+        <c:Text>
+          <Content>0.0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>KD</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="1.28572214" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Kills">
+      <Components>
+        <c:Text>
+          <Content>0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Kills</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="6" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Deaths">
+      <Components>
+        <c:Text>
+          <Content>0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Deaths</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="10" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/Spawnpoint

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="BluSpawn" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:PlayerSpawn/>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-    </c:Model>
-    <c:Spawner>
-      <EntityFile>Schema/Entities/Player.xml</EntityFile>
-    </c:Spawner>
-    <c:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:SpawnPoint/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/SprintEffect.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SprintEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Animation>
+      <AnimationName1></AnimationName1>
+      <AnimationName2></AnimationName2>
+      <AnimationName3></AnimationName3>
+    </c:Animation>
+    <c:Lifetime>
+      <Lifetime>0.15</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="0" Y="0" Z="0"/>
+      <ExplosionDuration>0.15</ExplosionDuration>
+    </c:ExplosionEffect>
+    <c:Model>
+      <Resource></Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/Testingu

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitPlane.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Scale X="10" Y="10" Z="10"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/WeaponAssaultBlueView.xml

@@ -1,44 +1,161 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
     <c:Model>
-      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+      <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
     </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
+    <Entity name="FinalBlend">
       <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
-          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="FirstPersonReloadSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-        </c:Spawner>
+        <c:Blend>
+          <Pose1>BlendTreeAssaultWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
         <c:Transform/>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="BlendTreeAssaultWeapon">
+          <Components>
+            <c:Blend>
+              <Pose1>Fire</Pose1>
+              <Pose2>Reload</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Reload">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchF</AnimationName>
+                  <Speed>0.5</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Fire">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ShootRifleF</AnimationName>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
     </Entity>
-    <Entity name="AmmunitionHUD">
+    <Entity name="MovementBlend">
       <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ViewModel">
+      <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.0440000035" Y="0.136000007" Z="-0.119000003"/>
-          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+          <Position X="0.120748274" Y="-0.228437141" Z="-0.181454718"/>
+          <Orientation X="0.0104048206" Y="-0.00268219248" Z="0.0428443849"/>
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="AmmunitionHUDBackground">
+        <Entity name="WeaponMuzzle">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+              <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/WeaponAssaultReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <ScaleOffset X="0.5" Y="0.5" Z="1"/>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0540266186" Y="-0.0954354703" Z="-0.255526125"/>
+          <Orientation X="0.000684258412" Y="0.077423811" Z="0.00118651299"/>
+          <Scale X="0.50000006" Y="0.500000477" Z="1.00000083"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
@@ -52,7 +169,7 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="AmmunitionText">
+        <Entity name="Text">
           <Components>
             <c:Transform/>
           </Components>
@@ -65,7 +182,7 @@
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
                 <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
+                  <ParentEntityName></ParentEntityName>
                   <ComponentType>AssaultWeapon</ComponentType>
                   <Field>MagazineAmmo</Field>
                 </c:TextFieldReader>
@@ -83,7 +200,7 @@
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
                 <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
+                  <ParentEntityName></ParentEntityName>
                   <ComponentType>AssaultWeapon</ComponentType>
                   <Field>Ammo</Field>
                 </c:TextFieldReader>

resources/Schema/Entities/WeaponAssaultBlueWorld.xml

@@ -20,7 +20,7 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="ThirdPersonReloadSpawner">
+    <Entity name="ReloadSpawner">
       <Components>
         <c:Spawner>
           <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>

resources/Schema/Entities/WeaponAssaultRedView.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
-          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
-        </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:Transform>
-          <Position X="-0.0440000035" Y="0.136000007" Z="-0.119000003"/>
-          <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:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>AssaultWeapon</ComponentType>
-                  <Field>MagazineAmmo</Field>
-                </c:TextFieldReader>
-                <c:Transform>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Ammo">
-              <Components>
-                <c:Text>
-                  <Content>320</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                </c:Text>
-                <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>AssaultWeapon</ComponentType>
-                  <Field>Ammo</Field>
-                </c:TextFieldReader>
-                <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/WeaponAssaultRedWorld.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Model>
-      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayRed.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/WeaponAssaultReloadEffectView.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ReloadEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>2</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Out">
+      <Components>
+        <c:ExplosionEffect>
+          <Velocity X="0" Y="1" Z="0"/>
+          <ExplosionOrigin X="-0.0450000018" Y="0.148000002" Z="-0.646000028"/>
+          <TimeSinceDeath>1</TimeSinceDeath>
+          <Delay>1</Delay>
+          <Speed>-1</Speed>
+          <ExplosionDuration>1</ExplosionDuration>
+          <EndColor A="0" B="3.92156863" G="0.545098066" R="1"/>
+          <Randomness>true</Randomness>
+        </c:ExplosionEffect>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+          <Transparent>true</Transparent>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="In">
+      <Components>
+        <c:Lifetime>
+          <Lifetime>1</Lifetime>
+        </c:Lifetime>
+        <c:ExplosionEffect>
+          <Velocity X="0" Y="1" Z="0"/>
+          <ExplosionOrigin X="-0.0450000018" Y="0.148000002" Z="-0.646000028"/>
+          <ExplosionDuration>1</ExplosionDuration>
+          <EndColor A="0" B="3.92156863" G="0.545098066" R="1"/>
+          <Randomness>true</Randomness>
+        </c:ExplosionEffect>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+          <Transparent>true</Transparent>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/WeaponDefenderBlueView.xml

@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>ActionBlend</Pose1>
+          <Pose2>Shield</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Shield">
+          <Components>
+            <c:Animation>
+              <AnimationName>ActivateDeactiveShieldF</AnimationName>
+              <Time>1</Time>
+              <Speed>1</Speed>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ActionBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>Fire</Pose1>
+              <Pose2>ReloadBlend</Pose2>
+              <Weight>0</Weight>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Fire">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ShootShotgunF</AnimationName>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ReloadBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>ReloadLoop</Pose1>
+                  <Pose2>ReloadTransitionBlend</Pose2>
+                  <Weight>1</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="ReloadLoop">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShotgunReloadTwoF</AnimationName>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ReloadTransitionBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>ReloadStart</Pose1>
+                      <Pose2>ReloadEnd</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ReloadStart">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadOneF</AnimationName>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ReloadEnd">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadThreeF</AnimationName>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ViewModel">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0.120748252" Y="-0.228437155" Z="-0.181454688"/>
+          <Orientation X="0.0104048811" Y="-0.00268213497" Z="0.0428443402"/>
+        </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="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0540265739" Y="-0.095435515" Z="-0.255526066"/>
+          <Orientation X="0.000684314175" Y="0.0774238482" Z="0.00118648494"/>
+          <Scale X="1.00000012" Y="1.00000048" Z="1.00000048"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
+          <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="Text">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>38</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName></ParentEntityName>
+                  <ComponentType>DefenderWeapon</ComponentType>
+                  <Field>Ammo</Field>
+                </c:TextFieldReader>
+                <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>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>5</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName></ParentEntityName>
+                  <ComponentType>DefenderWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/WeaponDefenderBlueWorld.xml

@@ -2,17 +2,10 @@
 <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>
+      <Resource>Models/Weapons/Blue/DefenderWeaponBlue.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>
+    <c:Transform/>
   </Components>
 
   <Children>

resources/Schema/Entities/aaaatestremoveme.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/Unithexagon.mesh</Resource>
-        </c:Model>
-        <c:Shield/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="dl">
-      <Components>
-        <c:DirectionalLight/>
-        <c:Transform>
-          <Orientation X="0" Y="2.61800003" Z="0.756000042"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="sl">
-      <Components>
-        <c:SceneLight>
-          <Gamma>2.2000000476837158</Gamma>
-        </c:SceneLight>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/aim_rays.xml

@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="0.980392158" G="1" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.100000001" Y="0" Z="0"/>
-          <Scale X="50" Y="1" Z="51.1000023"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-14.500001" Y="1.50000012" Z="16.9222012"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:DirectionalLight/>
-        <c:Transform>
-          <Orientation X="4.38500023" Y="0" Z="0.458000034"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="1" G="0" R="0"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="-14.500001" Y="1.50000012" Z="-17.6888409"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="12.1000004" Y="1.50000012" Z="16.9222012"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="1" G="0" R="0"/>
-        </c:Model>
-        <c:Transform>
-          <Position X="12.1228638" Y="1.50000012" Z="-17.9642811"/>
-          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-20.6000004" Y="1" Z="21.7150002"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:PlayerSpawn/>
-            <c:Transform>
-              <Position X="-12.2000008" Y="1" Z="21.5000019"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:Transform>
-              <Position X="15.4000006" Y="1" Z="21.6000004"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="10.500001" Y="0" Z="21.9000015"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-9.70000076" Y="1" Z="-23.4000015"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="-18.8000011" Y="1" Z="-22.3000011"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="8.10000038" Y="1" Z="-23.2000008"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="16.2000008" Y="1" Z="-23.2000008"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-          <Color A="1" B="39.2156868" G="0" R="3.13725495"/>
-        </c:Model>
-        <c:Transform>
-          <Scale X="-70" Y="-70" Z="-70"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:CapturePoint>
-          <HomePointForTeam>
-            <Blue/>
-          </HomePointForTeam>
-        </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
-        </c:Model>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="0" Y="0.773066521" Z="-18.975975"/>
-          <Scale X="4.9000001" Y="0.600000024" Z="3.50000024"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:CapturePoint>
-          <HomePointForTeam>
-            <Red/>
-          </HomePointForTeam>
-          <CapturePointNumber>1</CapturePointNumber>
-        </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="1" R="0"/>
-        </c:Model>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="0" Y="0.452868998" Z="18.5607414"/>
-          <Scale X="4.60000038" Y="0.900000036" Z="4.10000038"/>
-        </c:Transform>
-        <c:Trigger/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/awdawd

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Test" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-      <Name>L_Foot</Name>
-      <InheritScale>true</InheritScale>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.0863945931" Y="0.221357167" Z="-0.0781617165"/>
-      <Scale X="0.199999973" Y="0.199999973" Z="0.199999973"/>
-      <Orientation X="-2.80262542" Y="0.0150706368" Z="-3.13294244"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/ble

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="AnimationTests" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:SceneLight>
-      <Gamma>0.30000001192092896</Gamma>
-      <Exposure>3</Exposure>
-    </c:SceneLight>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Transform>
-          <Position X="0.100000001" Y="-1.5150001" Z="-3.70500016"/>
-          <Orientation X="0" Y="2.41300011" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:DirectionalLight>
-              <Intensity>0</Intensity>
-            </c:DirectionalLight>
-            <c:Model>
-              <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="2.42800021" Z="-2.80000019"/>
-              <Orientation X="5.60000038" Y="3.14159203" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Light">
-          <Components>
-            <c:PointLight>
-              <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
-              <Radius>8</Radius>
-              <Intensity>0.60000002384185791</Intensity>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="1.32209361" Y="1.37392569" Z="-0.0505663045"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Assault">
-          <Components>
-            <c:BlendAdditive>
-              <Adder></Adder>
-              <Receiver></Receiver>
-            </c:BlendAdditive>
-            <c:Model>
-              <GlowIntensity>5</GlowIntensity>
-              <Resource>Models/Characters/Defender/DefenderBlue.mesh</Resource>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="WeaponAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Scale X="1.00000012" Y="1" Z="1.00000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="AimBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>AimPrimary</Pose1>
-                  <Pose2>AimSecondary</Pose2>
-                  <Weight>0</Weight>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="AimPrimary">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName></AnimationName>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AimSecondary">
-                  <Components>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Plane">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitPlane.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Scale X="5" Y="1" Z="5"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Light">
-          <Components>
-            <c:PointLight>
-              <Color A="1" B="0.956862748" G="0.960784316" R="0.819607854"/>
-              <Radius>8</Radius>
-              <Intensity>0.60000002384185791</Intensity>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="-1.36898434" Y="1.37392569" Z="0.620898128"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Light">
-          <Components>
-            <c:PointLight>
-              <Radius>8</Radius>
-              <Intensity>0.80000001192092896</Intensity>
-            </c:PointLight>
-            <c:Transform>
-              <Position X="-0.127636135" Y="1.37392569" Z="-1.52101767"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/temp

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="MagazineAmmo">
-      <Components>
-        <c:Text>
-          <Content>0</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>

resources/Schema/Entities/yeeee.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Assault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BlendAdditive>
-      <Adder>AimAdditive</Adder>
-      <Receiver>BlendOverride</Receiver>
-    </c:BlendAdditive>
-    <c:Model>
-      <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponAttachment">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm_Weapon_Joint</BoneName>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Scale X="1.00000012" Y="1" Z="1.00000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AimAdditive">
-      <Components>
-        <c:Animation>
-          <AnimationName>AimRifleA</AnimationName>
-          <Time>1</Time>
-          <Additive>true</Additive>
-        </c:Animation>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="BlendOverride">
-      <Components>
-        <c:BlendOverride>
-          <Master>ShootRifleAnimation</Master>
-          <Slave>MovementBlend</Slave>
-        </c:BlendOverride>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="ShootRifleAnimation">
-          <Components>
-            <c:Animation>
-              <AnimationName>ShootFastRifleU</AnimationName>
-              <Time>0.11937709655124218</Time>
-              <Speed>1</Speed>
-            </c:Animation>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="MovementBlend">
-          <Components>
-            <c:Blend>
-              <Pose1>BlendWalkRun</Pose1>
-              <Pose2>StrafeAnimation</Pose2>
-              <Weight>1</Weight>
-            </c:Blend>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="StrafeAnimation">
-              <Components>
-                <c:Animation>
-                  <AnimationName>StrafeRightF</AnimationName>
-                  <Time>0.37772682263908042</Time>
-                  <Speed>1</Speed>
-                </c:Animation>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="BlendWalkRun">
-              <Components>
-                <c:Blend>
-                  <Pose1>RunAnimtaion</Pose1>
-                  <Pose2>WalkAnimation</Pose2>
-                  <Weight>0.43000054359436035</Weight>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="RunAnimtaion">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>RunF</AnimationName>
-                      <Time>0.13674529278927716</Time>
-                      <Speed>1</Speed>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="WalkAnimation">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>WalkF</AnimationName>
-                      <Time>0.36615803446482609</Time>
-                      <Speed>1</Speed>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -66,6 +66,8 @@
 							<xs:element ref="c:HealthHUD" minOccurs="0"/>
 							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
 							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
+							<xs:element ref="c:ScoreScreen" minOccurs="0"/>
+							<xs:element ref="c:ScoreIdentity" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

src/Engine/Input/InputProxy.cpp

@@ -45,7 +45,7 @@ void InputProxy::Update(double dt)
     }
 }
 
-void InputProxy::Process()
+void InputProxy::Process(bool suppressNewEvents /*= false*/)
 {
     for (auto& pair : m_CommandHandlers) {
         const std::string& command = pair.first;
@@ -62,8 +62,10 @@ void InputProxy::Process()
             e.PlayerID = -1;
             e.Command = command;
             e.Value = currentValue;
-            m_EventBroker->Publish(e);
-            //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            if (!suppressNewEvents || e.Value == 0) {
+                m_EventBroker->Publish(e);
+                //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+            }
             m_LastCommandValues[command] = currentValue;
         }
     }
@@ -78,8 +80,10 @@ void InputProxy::Process()
             e.Value += value;
         }
         //e.Value = std::max(-1.f, std::min(e.Value, 1.f));
-        m_EventBroker->Publish(e);
-        //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+        if (!suppressNewEvents || e.Value == 0) {
+            m_EventBroker->Publish(e);
+            //LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID);
+        }
     }
     m_CommandQueue.clear();
 }

src/Engine/Network/Client.cpp

@@ -49,16 +49,16 @@ void Client::Connect(std::string address, int port)
 void Client::Update()
 {
     m_EventBroker->Process<Client>();
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet);
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
+    //while (m_Unreliable.IsSocketAvailable()) {
+    //    // Packet will get real data in receive
+    //    Packet packet(MessageType::Invalid);
+    //    m_Unreliable.Receive(packet);
+    //    if (packet.GetMessageType() == MessageType::Connect) {
+    //        parseUDPConnect(packet);
+    //    } else {
+    //        parseMessageType(packet);
+    //    }
+    //}
     while (m_Reliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);
@@ -177,8 +177,8 @@ void Client::parseTCPConnect(Packet& packet)
     Packet UnreliablePacket(MessageType::Connect, m_SendPacketID);
     // Add player id and other stuff
     packet.WritePrimitive(m_PlayerID);
-    m_Unreliable.Send(packet);
-    LOG_INFO("Sent UDP Connect Server");
+ //   m_Unreliable.Send(packet);
+  //  LOG_INFO("Sent UDP Connect Server");
 }
 
 void Client::parsePlayerConnected(Packet & packet)
@@ -476,7 +476,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
     if (e.Command == "ConnectToServer") { // Connect for now
         if (e.Value > 0) {
             m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
-            m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
+        //    m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
         }
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
@@ -613,7 +613,7 @@ void Client::sendLocalPlayerTransform()
         packet.WritePrimitive((int)cAssaultWeapon["Ammo"]);
     }
 
-    m_Unreliable.Send(packet);
+    m_Reliable.Send(packet);
 }
 
 void Client::identifyPacketLoss()

src/Engine/Network/Server.cpp

@@ -14,6 +14,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EAmmoPickup, &Server::OnAmmoPickup);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &Server::OnPlayerDeath);
     // BindWW
     if (port == 0) {
         port = config->Get<float>("Networking.Port", 27666);
@@ -46,19 +47,19 @@ void Server::Update()
         }
     }
 
-    PlayerDefinition pd;
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet, pd);
-        m_Address = pd.Endpoint.address();
-        m_Port = pd.Endpoint.port();
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
+    //PlayerDefinition pd;
+    //while (m_Unreliable.IsSocketAvailable()) {
+    //    // Packet will get real data in receive
+    //    Packet packet(MessageType::Invalid);
+    //    m_Unreliable.Receive(packet, pd);
+    //    m_Address = pd.Endpoint.address();
+    //    m_Port = pd.Endpoint.port();
+    //    if (packet.GetMessageType() == MessageType::Connect) {
+    //        parseUDPConnect(packet);
+    //    } else {
+    //        parseMessageType(packet);
+    //    }
+    //}
 
     while (m_ServerlistRequest.IsSocketAvailable()) {
         Packet packet(MessageType::Invalid);
@@ -161,7 +162,7 @@ void Server::unreliableBroadcast(Packet& packet)
 {
     for (auto& kv : m_ConnectedPlayers) {
         packet.ChangePacketID(kv.second.PacketID);
-        m_Unreliable.Send(packet, kv.second);
+//        m_Unreliable.Send(packet, kv.second);
     }
 }
 
@@ -171,7 +172,7 @@ void Server::sendSnapshot()
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
     addPlayersToPacket(packet, EntityID_Invalid);
-    unreliableBroadcast(packet);
+    reliableBroadcast(packet);
 }
 
 void Server::addInputCommandsToPacket(Packet& packet)
@@ -319,25 +320,28 @@ void Server::checkForTimeOuts()
     }
 }
 
-void Server::parseUDPConnect(Packet & packet)
-{
-    // Pop size of message int
-    packet.ReadPrimitive<int>();
-    int messageType = packet.ReadPrimitive<int>();
-    // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    // parse player id and other stuff
-    PlayerID playerID = packet.ReadPrimitive<int>();
-    // Do something here?
-    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
-    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
-    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
-    // Send a message to the player that connected
-    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
-    m_Unreliable.Send(connnectPacket);
-    LOG_INFO("UDP Connect sent to client");
-}
+//void Server::parseUDPConnect(Packet & packet)
+//{
+//    // Pop size of message int
+//    packet.ReadPrimitive<int>();
+//    int messageType = packet.ReadPrimitive<int>();
+//    // Read packet ID 
+//    m_PreviousPacketID = m_PacketID;    // Set previous packet id
+//    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
+//    // parse player id and other stuff
+//    PlayerID playerID = packet.ReadPrimitive<int>();
+//    if (!EntityWrapper(m_World, playerID).Valid()) {
+//
+//    }
+//    // Do something here?
+//    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
+//    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
+//    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
+//    // Send a message to the player that connected
+//    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
+//    m_Unreliable.Send(connnectPacket);
+//    LOG_INFO("UDP Connect sent to client");
+//}
 
 void Server::parseTCPConnect(Packet & packet)
 {
@@ -351,7 +355,7 @@ void Server::parseTCPConnect(Packet & packet)
     LOG_INFO("Parsing connections");
     // Check if player is already connected
     // Ska vara till lagd i TCPServer receive
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -363,6 +367,11 @@ void Server::parseTCPConnect(Packet & packet)
     m_ConnectedPlayers.at(playerID).TCPAddress = m_Address;
     m_ConnectedPlayers.at(playerID).TCPPort = m_Port;
 
+    Events::PlayerConnected e;
+    e.PlayerID = playerID;
+    e.PlayerName = m_ConnectedPlayers.at(playerID).Name;
+    m_EventBroker->Publish(e);
+
     LOG_INFO("parseTCPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(),
         m_ConnectedPlayers.at(playerID).TCPAddress.to_string().c_str());
 
@@ -526,10 +535,20 @@ bool Server::OnAmmoPickup(const Events::AmmoPickup & e)
     return true;
 }
 
+
+bool Server::OnPlayerDeath(const Events::PlayerDeath& e)
+{
+    Events::KillDeath eKD;
+    eKD.Casualty = getPlayerIDFromEntityID(e.Player.ID);
+    eKD.Killer = getPlayerIDFromEntityID(e.Killer.ID);
+    m_EventBroker->Publish(eKD);
+    return false;
+}
+
 void Server::parseClientPing()
 {
     LOG_INFO("%i: Parsing ping", m_PacketID);
-    PlayerID player = GetPlayerIDFromEndpoint();
+    PlayerID player = getPlayerIDFromEndpoint();
     if (player == -1) {
         return;
     }
@@ -567,7 +586,7 @@ void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
     // Check which player it was who sent the message
-    player = GetPlayerIDFromEndpoint();
+    player = getPlayerIDFromEndpoint();
     if (player != -1) {
         while (packet.DataReadSize() < packet.Size()) {
             Events::InputCommand e;
@@ -586,7 +605,7 @@ void Server::parseOnInputCommand(Packet& packet)
 
 void Server::parsePlayerTransform(Packet& packet)
 {
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -630,12 +649,16 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
             return true;
         }
     }
-    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") || childEntity.HasComponent("HealthPickup")
-        || childEntity.HasComponent("AmmoPickup");
+    return childEntity.HasComponent("Player") 
+        || childEntity.FirstParentWithComponent("Player").Valid()
+        || childEntity.HasComponent("CapturePoint") 
+        || childEntity.HasComponent("HealthPickup")
+        || childEntity.HasComponent("AmmoPickup")
+        || childEntity.HasComponent("ScoreScreen")
+        || childEntity.FirstParentWithComponent("ScoreScreen").Valid();
 }
 
-PlayerID Server::GetPlayerIDFromEndpoint()
+PlayerID Server::getPlayerIDFromEndpoint()
 {
     // check both tcp and udp connection
     for (auto& kv : m_ConnectedPlayers) {
@@ -647,4 +670,14 @@ PlayerID Server::GetPlayerIDFromEndpoint()
         }
     }
     return -1;
-}
+}
+
+PlayerID Server::getPlayerIDFromEntityID(EntityID entityID)
+{
+    for(auto& kv : m_ConnectedPlayers) {
+        if (entityID == kv.second.EntityID) {
+            return kv.first;
+        }
+    }
+    return -1;
+}

src/Engine/Network/TCPClient.cpp

@@ -76,7 +76,7 @@ size_t TCPClient::readBuffer()
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
     if (sizeOfPacket > m_Socket->available()) {
         LOG_WARNING("TCPClient::readBuffer(): We haven't got the whole packet yet.");
-        return 0;
+        //return 0;
     }
     // if the buffer is to small increase the size of it
     // TODO if message is huge 1 time the buffer will not decrease.
@@ -85,12 +85,15 @@ size_t TCPClient::readBuffer()
         m_ReadBuffer = new char[sizeOfPacket];
         m_BufferSize = sizeOfPacket;
     }
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->read_some(boost
-        ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket),
-        error);
-    if (error) {
-        //LOG_ERROR("receive: %s", error.message().c_str());
+    size_t bytesReceived = 0;
+    while (sizeOfPacket > bytesReceived) {
+        // Read the rest of the message
+        bytesReceived += m_Socket->read_some(boost
+            ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket - bytesReceived),
+            error);
+        if (error) {
+            //LOG_ERROR("receive: %s", error.message().c_str());
+        }
     }
     if (sizeOfPacket > 1000000)
         LOG_WARNING("The packets received are bigger than 1MB");

src/Engine/Network/UDPServer.cpp

@@ -21,33 +21,38 @@ void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
             boost::asio::buffer(packet.Data(), packet.Size()),
             playerDefinition.Endpoint,
             0);
+        LOG_INFO("Size of packet is %i", bytesSent);
     } catch (const boost::system::system_error& e) {
+        LOG_INFO(e.what());
         // TODO: Clean up invalid endpoints out of m_ConnectedPlayers later
         playerDefinition.Endpoint = boost::asio::ip::udp::endpoint();
     }
+
 }
 // Send back to endpoint of received packet
 void UDPServer::Send(Packet & packet)
 {
     packet.UpdateSize();
-    m_Socket->send_to(
+     size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
         m_ReceiverEndpoint,
         0);
+     LOG_INFO("Size of packet is %i", bytesSent);
 }
 
 // Broadcasting respond specific logic
 void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
 {
     packet.UpdateSize();
-    m_Socket->send_to(
+    size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
         endpoint,
         0);
+    LOG_INFO("Size of packet is %i", bytesSent);
 }
 
 // Broadcasting
@@ -55,7 +60,7 @@ void UDPServer::Broadcast(Packet & packet, int port)
 {
     packet.UpdateSize();
     m_Socket->set_option(boost::asio::socket_base::broadcast(true));
-    m_Socket->send_to(
+    size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),

src/Game/Game.cpp

@@ -34,6 +34,7 @@
 #include "Game/Systems/KillFeedSystem.h"
 #include "Game/Systems/BoostSystem.h"
 #include "Game/Systems/BoostIconsHUDSystem.h"
+#include "Game/Systems/ScoreScreenSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"
 
@@ -143,7 +144,6 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
@@ -155,6 +155,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -217,7 +218,7 @@ void Game::Tick()
     PerformanceTimer::StartTimerAndStopPrevious("InputProxy");
     m_InputProxy->Update(dt);
     m_EventBroker->Swap();
-    m_InputProxy->Process();
+    m_InputProxy->Process(ImGui::GetIO().WantCaptureKeyboard || ImGui::GetIO().WantCaptureMouse);
     m_EventBroker->Swap();
 
     PerformanceTimer::StartTimerAndStopPrevious("SoundManager");

src/Game/Network/MultiplayerSnapshotFilter.cpp

@@ -15,7 +15,9 @@ bool MultiplayerSnapshotFilter::FilterComponent(EntityWrapper entity, SharedComp
             || component.Info.Name == "AssaultWeapon"
             || component.Info.Name == "DefenderWeapon"
             || component.Info.Name == "Animation"
-            || component.Info.Name == "AnimationOffset"
+            || component.Info.Name == "Blend"
+            || component.Info.Name == "BlendAdditive"
+            || component.Info.Name == "BlendOverride"
             || entity.Name() == "PlayerName"
         ) {
             return false;

src/Game/Systems/AbilityCooldownHUDSystem.cpp

@@ -14,17 +14,20 @@ void AbilityCooldownHUDSystem::Update(double dt)
         if (!abilityEntity.Valid())
             return;
         EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
+
+        double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
+        double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
+
+        currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+
         if(cooldownTextEntity.Valid()) {
             if(cooldownTextEntity.HasComponent("Text"))
             {
-                double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
-                double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
-                currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
                 std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
-                if(entity.HasComponent("Fill")) {
-                    entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD; //TODO: current time needs to be in the component.
-                }
             }
         }
+        if (entity.HasComponent("Fill")) {
+            entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD;
+        }
     }
 }

src/Game/Systems/BoostSystem.cpp

@@ -11,10 +11,16 @@ bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
     if (e.Victim.ID == e.Inflictor.ID) {
         return false;
     }
-    if (!e.Victim.Valid() && e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+
+    if (!e.Victim.Valid() || !LocalPlayer.Valid()) {
         return false;
     }
-    if (!e.Inflictor.Valid() || !e.Victim.Valid()) {
+
+    if (e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+        return false;
+    }
+
+    if (!e.Inflictor.Valid()) {
         return false;
     }
 

src/Game/Systems/CapturePointHUDSystem.cpp

@@ -9,7 +9,7 @@ CapturePointHUDSystem::CapturePointHUDSystem(SystemParams params)
 
 void CapturePointHUDSystem::Update(double dt)
 {
-    bool LoadCheck = true;
+    bool loadCheck = true;
     int redTeam;
     int blueTeam;
     int spectatorTeam;
@@ -35,11 +35,11 @@ void CapturePointHUDSystem::Update(double dt)
             //Check if the HUD corresponds to the Capture Point Number
             if (HUD_ID == (int)entityCP["CapturePoint"]["CapturePointNumber"]) {
                 ComponentWrapper& teamComponent = entityCP["Team"];
-                if (LoadCheck) {
+                if (loadCheck) {
                     redTeam = (int)teamComponent["Team"].Enum("Red");
                     blueTeam = (int)teamComponent["Team"].Enum("Blue");
                     spectatorTeam = (int)teamComponent["Team"].Enum("Spectator");
-                    LoadCheck = false;
+                    loadCheck = false;
                 }
                 //Color hud with team color
                 auto capturePointTeam = (int)teamComponent["Team"];

src/Game/Systems/ExplosionEffectSystem.cpp

@@ -2,13 +2,17 @@
 
 void ExplosionEffectSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
-    if ((double)component["TimeSinceDeath"] > (double)component["ExplosionDuration"]) {
-        (double)component["TimeSinceDeath"] = 0.f;
+    double& delay = (double)component["Delay"];
+    if (delay > 0) {
+        delay = std::max(0.0, delay - dt);
     }
-    (double&)component["TimeSinceDeath"] += dt;
 
-    //if ((bool)Component["Gravity"] == true) {
-    //    (bool)Component["ExponentialAccelaration"] = false;
-    //}
+    if (delay <= 0) {
+        double& timeSinceDeath = component["TimeSinceDeath"];
+        timeSinceDeath += (double)component["Speed"] * dt;
+        if (timeSinceDeath < 0 || timeSinceDeath > (double)component["ExplosionDuration"]) {
+            timeSinceDeath = 0.0;
+        }
+    }
 }
 

src/Game/Systems/HealthSystem.cpp

@@ -12,15 +12,7 @@ HealthSystem::HealthSystem(SystemParams params)
 }
 
 void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHealth, double dt)
-{
-    double& health = cHealth["Health"];
-    if (health <= 0.0) {
-        Events::PlayerDeath ePlayerDeath;
-        ePlayerDeath.Player = entity;
-        m_EventBroker->Publish(ePlayerDeath);
-        //Note: we will delete the entity in PlayerDeathSystem
-    }
-}
+{ }
 
 bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
 {
@@ -35,7 +27,16 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
     if (playerBoostDefenderEntity.Valid()) {
         e.Damage -= (double)playerBoostDefenderEntity["BoostDefender"]["StrengthOfEffect"];
     }
-    health -= e.Damage;
+    if (health > 0) {
+        health -= e.Damage;
+        if (health <= 0.0) {
+            Events::PlayerDeath ePlayerDeath;
+            ePlayerDeath.Player = e.Victim;
+            ePlayerDeath.Killer = e.Inflictor;
+            m_EventBroker->Publish(ePlayerDeath);
+            //Note: we will delete the entity in PlayerDeathSystem
+        }
+    }
 
     return true;
 }

src/Game/Systems/PlayerMovementSystem.cpp

@@ -2,6 +2,7 @@
 
 PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
     : System(params)
+    , m_SprintEffectTimer(0.f)
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
@@ -19,8 +20,48 @@ void PlayerMovementSystem::Update(double dt)
 {
     updateMovementControllers(dt);
     // Only do physics calculations on client and only for themselves.
-    if (IsClient && LocalPlayer.Valid()) {
-        updateVelocity(LocalPlayer, dt);
+    if (IsClient) {
+        if (LocalPlayer.Valid()){
+            updateVelocity(LocalPlayer, dt);
+        }
+        m_SprintEffectTimer += dt;
+        if (m_SprintEffectTimer < 0.016f) {
+            return;
+        }
+        m_SprintEffectTimer = 0.f;
+        const ComponentPool* pool = m_World->GetComponents("SprintAbility");
+        if (pool == nullptr) {
+            return;
+        }
+        for (auto cSprint : *pool) {
+            if (cSprint.EntityID != LocalPlayer.ID && (bool)cSprint["Active"]) {
+                // Spawn one afterimage for each player that sprints.
+                EntityWrapper player(m_World, cSprint.EntityID);
+                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/SprintEffect.xml");
+                EntityWrapper sprintEffect = entityFile->MergeInto(m_World);
+                auto playerModel = player.FirstChildByName("PlayerModel");
+                if (!playerModel.Valid()) {
+                    continue;
+                }
+                if (!playerModel.HasComponent("Model")) {
+                    continue;
+                }
+                if (!playerModel.HasComponent("Animation")) {
+                    continue;
+                }
+                auto playerEntityModel = playerModel["Model"];
+                auto playerEntityAnimation = playerModel["Animation"];
+                playerEntityModel.Copy(sprintEffect["Model"]);
+                playerEntityAnimation.Copy(sprintEffect["Animation"]);
+                sprintEffect["ExplosionEffect"]["EndColor"] = (glm::vec4)playerEntityModel["Color"];
+                ((glm::vec4&)sprintEffect["ExplosionEffect"]["EndColor"]).w = 0.f;
+                sprintEffect["Animation"]["Speed1"] = 0.0;
+                sprintEffect["Animation"]["Speed2"] = 0.0;
+                sprintEffect["Animation"]["Speed3"] = 0.0;
+                sprintEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+                sprintEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
+            }
+        }
     }
 }
 
@@ -78,6 +119,7 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
         }
         bool sniperSprinting = false;
         if (player.HasComponent("SprintAbility")) {
+            (bool)player["SprintAbility"]["Active"] = controller->SpecialAbilityKeyDown();
             if (controller->SpecialAbilityKeyDown()) {
                 playerMovementSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
                 playerCrouchSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];

src/Game/Systems/ScoreScreenSystem.cpp

@@ -0,0 +1,158 @@
+#include "Game/Systems/ScoreScreenSystem.h"
+
+
+ScoreScreenSystem::ScoreScreenSystem(SystemParams params)
+    : System(params)
+    , PureSystem("ScoreScreen")
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &ScoreScreenSystem::OnPlayerDeath);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &ScoreScreenSystem::OnPlayerSpawn);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerConnected, &ScoreScreenSystem::OnPlayerConnected);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDisconnected, &ScoreScreenSystem::OnPlayerDisconnected);
+}
+
+void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt)
+{
+    if (!IsServer) {
+        return;
+    }
+
+    if(!entity.HasComponent("ScoreScreen")){
+        return;
+    }
+
+    int currentTeam = 0;
+
+    if(entity.HasComponent("Team")) {
+        currentTeam = (int)entity["Team"]["Team"];
+    } else {
+        return;
+    }
+
+    auto children = entity.ChildrenWithComponent("ScoreIdentity");
+
+    float position = 0.f;
+
+    for (auto it = m_PlayerIdentities.begin(); it != m_PlayerIdentities.end(); ++it) {
+        bool found = false;
+        for (auto& child : children) {
+            int ID = (int)child["ScoreIdentity"]["ID"];
+            if (it->first == ID) {
+                if (it->second.Team != currentTeam) {
+                    m_World->DeleteEntity(child.ID);
+                    (int&)entity["ScoreScreen"]["TotalIdentities"] -= 1;
+                    break;
+                }
+                for (auto it2 = m_DisconnectedIdentities.begin(); it2 != m_DisconnectedIdentities.end(); ++it2) {
+                    if (ID == *it2) {
+                        m_World->DeleteEntity(child.ID);
+                        (int&)entity["ScoreScreen"]["TotalIdentities"] -= 1;
+                        it2 = m_DisconnectedIdentities.erase(it2);
+                        it = m_PlayerIdentities.erase(it);
+
+                        //Remove from m_playerIdentities
+                        break;
+                    }
+                }
+                found = true;
+                if(!child.Valid()) {
+                    break;
+                }
+                //Update Deaths for child
+                (int&)child["ScoreIdentity"]["Kills"] = it->second.Kills;
+                //Update Kills for child
+                (int&)child["ScoreIdentity"]["Deaths"] = it->second.Deaths;
+                //KD is not updated at the moment.
+                if (it->second.Deaths != 0) {
+                    (double&)child["ScoreIdentity"]["KD"] = it->second.Kills/it->second.Deaths;
+                }
+
+                //Update position for child
+                glm::vec3 offset = (glm::vec3)entity["ScoreScreen"]["Offset"];
+                (glm::vec3&) child["Transform"]["Position"] = offset * position;
+                position += 1.f;
+
+                break;
+            }
+        }
+
+        if (it == m_PlayerIdentities.end()) {
+            break;
+        }
+
+        if(found == false) {
+            if(it->second.Team != currentTeam) {
+                //This player is not the same team as this scoreboard should show.
+                continue;
+            }
+            //There is no entry for this player, create one.
+            auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/ScoreIdentity.xml");
+            EntityWrapper scoreIdentity = entityFile->MergeInto(m_World);
+            glm::vec3 offset = (glm::vec3)entity["ScoreScreen"]["Offset"];
+            int newPosition = (int)entity["ScoreScreen"]["TotalIdentities"];
+            (glm::vec3&) scoreIdentity["Transform"]["Position"] = offset * (float)newPosition;
+            auto cScoreIdentity = scoreIdentity["ScoreIdentity"];
+            auto data = it->second;
+
+            (std::string&)cScoreIdentity["Name"] = data.Name;
+            (int&)cScoreIdentity["ID"] = data.ID;
+
+            m_World->SetParent(scoreIdentity.ID, entity.ID);
+
+            (int&)entity["ScoreScreen"]["TotalIdentities"] += 1;
+
+        }
+    }
+    //Local player should have an icon, compare with LocalPlayer somthing
+}
+
+bool ScoreScreenSystem::OnPlayerDeath(const Events::KillDeath& e)
+{
+    //When player die, add it to his score, and when possible the player who killed him.
+    std::unordered_map<int, PlayerData>::iterator got;
+    got = m_PlayerIdentities.find(e.Casualty);
+    if(got != m_PlayerIdentities.end()) {
+        got->second.Deaths++;
+    }
+    got = m_PlayerIdentities.find(e.Killer);
+    if (got != m_PlayerIdentities.end()) {
+        got->second.Kills++;
+    }
+    return 0;
+}
+
+bool ScoreScreenSystem::OnPlayerSpawn(const Events::PlayerSpawned& e)
+{
+    //When a player spawn, add data to the list entry with the same ID.
+
+    std::unordered_map<int, PlayerData>::iterator got;
+
+    got = m_PlayerIdentities.find(e.PlayerID);
+    if(got == m_PlayerIdentities.end()) {
+        LOG_ERROR("Player spawned without having an entry on score screen");
+        return 0;
+    }
+    auto& data = got->second;
+    data.Player = e.Player;
+    data.Team = (int)data.Player["Team"]["Team"];
+
+    return 0;
+}
+
+bool ScoreScreenSystem::OnPlayerConnected(const Events::PlayerConnected& e)
+{
+    //player has connected, add his data to the list of ScoreIdentities
+    PlayerData data;
+    data.ID = e.PlayerID;
+    data.Name = e.PlayerName;
+    m_PlayerIdentities.insert( {data.ID, data} );
+
+    return 0;
+}
+
+bool ScoreScreenSystem::OnPlayerDisconnected(const Events::PlayerDisconnected& e)
+{
+    //player has disconnected, remove him from list of ScoreIdentities
+    m_DisconnectedIdentities.push_back(e.PlayerID);
+    return 0;
+}

src/Game/Systems/TextFieldReader.cpp

@@ -7,17 +7,21 @@ void TextFieldReader::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     }
 
     // Find the entity to read from
-    const std::string& parentEntityName = cAmmunitionHUD["ParentEntityName"];
+    const std::string& entityName = cAmmunitionHUD["ParentEntityName"];
+    const std::string& componentType = cAmmunitionHUD["ComponentType"];
     EntityWrapper readEntity = entity;
-    if (!parentEntityName.empty()) {
-        readEntity = entity.FirstParentByName(parentEntityName);
-        if (!readEntity.Valid()) {
-            return;
+    if (entityName.empty()) {
+        if (!readEntity.HasComponent(componentType)) {
+            readEntity = readEntity.FirstParentWithComponent(componentType);
         }
+    } else {
+        readEntity = entity.FirstParentByName(entityName);
+    }
+    if (!readEntity.Valid()) {
+        return;
     }
 
     // Find the component to read from
-    const std::string& componentType = cAmmunitionHUD["ComponentType"];
     if (componentType.empty() || !readEntity.HasComponent(componentType)) {
         return;
     }
@@ -35,9 +39,17 @@ void TextFieldReader::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
     if (field.Type == "int") {
         text = boost::lexical_cast<std::string>((const int&)component[fieldName]);
     } else if (field.Type == "float") {
-        text = boost::lexical_cast<std::string>((const float&)component[fieldName]);
+        std::ostringstream ss;
+        float f = (float)component[fieldName];
+        ss << std::fixed << std::setprecision(2);
+        ss << f;
+        text = ss.str();
     } else if (field.Type == "double") {
-        text = boost::lexical_cast<std::string>((const double&)component[fieldName]);
+        std::ostringstream ss;
+        double d = (double)component[fieldName];
+        ss << std::fixed << std::setprecision(1);
+        ss << d;
+        text = ss.str();
     } else if (field.Type == "bool") {
         text = boost::lexical_cast<std::string>((const bool&)component[fieldName]);
     } else if (field.Type == "string") {

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -39,7 +39,17 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
         ammo = glm::max(0, ammo - (magSize - magAmmo));
         magAmmo = glm::min(magSize, ammo);
         isReloading = false;
+        if (wi.FirstPersonEntity.Valid()) {
+            wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = true;
+        }
+        if (wi.ThirdPersonEntity.Valid()) {
+            wi.ThirdPersonEntity["Model"]["Visible"] = true;
+        }
     }    
+    double reloadTime = cWeapon["ReloadTime"];
+    if (isReloading && reloadTimer <= reloadTime / 2) {
+
+    }
     
     // Restore view angle
     if (IsClient) {
@@ -56,6 +66,20 @@ void AssaultWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
         }
     }
 
+    // Update first person run animation
+    ComponentWrapper cPlayer = wi.Player["Player"];
+    ComponentWrapper cPhysics = wi.Player["Physics"];
+    const float& movementSpeed = cPlayer["MovementSpeed"];
+    float speed = glm::length((const glm::vec3&)cPhysics["Velocity"]);
+    float animationWeight = glm::min(speed, movementSpeed) / movementSpeed;
+    EntityWrapper rootNode = wi.FirstPersonEntity.FirstParentWithComponent("Model");
+    if (rootNode.Valid()) {
+        EntityWrapper blend = rootNode.FirstChildByName("MovementBlend");
+        if (blend.Valid()) {
+            (double&)blend["Blend"]["Weight"] = animationWeight;
+        }
+    }
+
     // Fire if we're able to fire
     if (canFire(cWeapon, wi)) {
         fireBullet(cWeapon, wi);
@@ -101,26 +125,34 @@ void AssaultWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
     reloadTimer = reloadTime;
 
     // Play animation
-    EntityWrapper modelEntity = wi.FirstPersonEntity.Parent().Parent();
-    if (modelEntity.Valid()) {
-        EntityWrapper blendTree = modelEntity.FirstChildByName("BlendTreeAssaultWeapon");
-        EntityWrapper reloadBlend = blendTree.FirstChildByName("Reload");
-
-        Events::AutoAnimationBlend eFireBlend;
-        eFireBlend.RootNode = modelEntity;
-        eFireBlend.NodeName = "Reload";
-        eFireBlend.Restart = true;
-        eFireBlend.Start = true;
-        m_EventBroker->Publish(eFireBlend);
-
-        Events::AutoAnimationBlend eIdleBlend;
-        eIdleBlend.RootNode = modelEntity;
-        eIdleBlend.NodeName = "Idle";
-        eIdleBlend.AnimationEntity = reloadBlend;
-        eIdleBlend.Delay = -0.2;
-        eIdleBlend.Duration = 0.2;
-        m_EventBroker->Publish(eIdleBlend);
+    playAnimationAndReturn(wi.FirstPersonEntity, "BlendTreeAssaultWeapon", "Reload");
+    // Spawn explosion effect
+    if (wi.FirstPersonEntity.Valid()) {
+        if (IsClient) {
+            EntityWrapper reloadEffectSpawner = wi.FirstPersonEntity.FirstChildByName("ReloadSpawner");
+            if (reloadEffectSpawner.Valid()) {
+                reloadEffectSpawner.DeleteChildren();
+                SpawnerSystem::Spawn(reloadEffectSpawner, reloadEffectSpawner);
+            }
+        }
+        wi.FirstPersonEntity.FirstChildByName("ViewModel")["Model"]["Visible"] = false;
     }
+    if (wi.ThirdPersonEntity.Valid()) {
+        if (IsServer) {
+            EntityWrapper reloadEffectSpawner = wi.ThirdPersonEntity.FirstChildByName("ReloadSpawner");
+            if (reloadEffectSpawner.Valid()) {
+                reloadEffectSpawner.DeleteChildren();
+                SpawnerSystem::Spawn(reloadEffectSpawner, reloadEffectSpawner);
+            }
+        }
+        wi.ThirdPersonEntity["Model"]["Visible"] = false;
+    }
+
+    // Sound
+    Events::PlaySoundOnEntity e;
+    e.EmitterID = wi.Player.ID;
+    e.FilePath = "Audio/weapon/Assault/AssaultWeaponReload.wav";
+    m_EventBroker->Publish(e);
 }
 
 void AssaultWeaponBehaviour::OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi)
@@ -170,7 +202,7 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
     }
 
     // Get weapon model based on current person
-    EntityWrapper weaponModelEntity = getRelevantWeaponModelEntity(wi);
+    EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
     if (!weaponModelEntity.Valid()) {
         return;
     }
@@ -201,26 +233,13 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
     }
     
     // Play animation
-    EntityWrapper modelEntity = wi.FirstPersonEntity.Parent().Parent();
-    if (modelEntity.Valid()) {
-        EntityWrapper blendTree = modelEntity.FirstChildByName("BlendTreeAssaultWeapon");
-        EntityWrapper fireBlend = blendTree.FirstChildByName("Fire");
+    playAnimationAndReturn(wi.FirstPersonEntity, "BlendTreeAssaultWeapon", "Fire");
 
-        Events::AutoAnimationBlend eFireBlend;
-        eFireBlend.RootNode = modelEntity;
-        eFireBlend.NodeName = "Fire";
-        eFireBlend.Restart = true;
-        eFireBlend.Start = true;
-        m_EventBroker->Publish(eFireBlend);
-
-        Events::AutoAnimationBlend eIdleBlend;
-        eIdleBlend.RootNode = modelEntity;
-        eIdleBlend.NodeName = "Idle";
-        eIdleBlend.AnimationEntity = fireBlend;
-        eIdleBlend.Delay = -0.2;
-        eIdleBlend.Duration = 0.2;
-        m_EventBroker->Publish(eIdleBlend);
-    }
+    // Sound
+    Events::PlaySoundOnEntity e;
+    e.EmitterID = wi.Player.ID;
+    e.FilePath = "Audio/weapon/Assault/AssaultWeaponFire.wav";
+    m_EventBroker->Publish(e);
 }
 
 bool AssaultWeaponBehaviour::canFire(ComponentWrapper cWeapon, WeaponInfo& wi)

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -36,6 +36,7 @@ void DefenderWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
             m_EventBroker->Publish(e);
         } else {
             isReloading = false;
+            playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "ReloadEnd");
         }
     }
 
@@ -96,6 +97,23 @@ void DefenderWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)
     // Start reload
     isReloading = true;
     reloadTimer = reloadTime;
+
+    // Play animation
+    if (wi.FirstPersonEntity.Valid()) {
+        Events::AutoAnimationBlend eBlendStart;
+        eBlendStart.RootNode = wi.FirstPersonEntity;
+        eBlendStart.NodeName = "ReloadStart";
+        eBlendStart.Restart = true;
+        eBlendStart.Start = true;
+        m_EventBroker->Publish(eBlendStart);
+        Events::AutoAnimationBlend eBlendLoop;
+        eBlendLoop.RootNode = wi.FirstPersonEntity;
+        eBlendLoop.NodeName = "ReloadLoop";
+        eBlendLoop.Restart = true;
+        eBlendLoop.Start = true;
+        eBlendLoop.AnimationEntity = wi.FirstPersonEntity.FirstChildByName("ReloadStart");
+        m_EventBroker->Publish(eBlendLoop);
+    }
 }
 
 void DefenderWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi)
@@ -110,13 +128,51 @@ void DefenderWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi
 
 bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e)
 {
-    if (e.Command == "SpecialAbility" && IsServer) {
+    if (e.Command == "SpecialAbility") {
         EntityWrapper attachment = wi.Player.FirstChildByName("ShieldAttachment");
         if (attachment.Valid()) {
             if (e.Value > 0) {
-                SpawnerSystem::Spawn(attachment, attachment);
+                if (IsServer) {
+                    SpawnerSystem::Spawn(attachment, attachment);
+                }
+
+                if (IsClient) {
+                    EntityWrapper root = wi.FirstPersonEntity;
+                    if (root.Valid()) {
+                        EntityWrapper subTree = root.FirstChildByName("FinalBlend");
+                        if (subTree.Valid()) {
+                            EntityWrapper animationNode = subTree.FirstChildByName("Shield");
+                            if (animationNode.Valid()) {
+                                Events::AutoAnimationBlend eFireBlend;
+                                eFireBlend.RootNode = root;
+                                eFireBlend.NodeName = "Shield";
+                                eFireBlend.Restart = true;
+                                eFireBlend.Start = true;
+                                m_EventBroker->Publish(eFireBlend);
+                            }
+                        }
+                    }
+                }
             } else {
                 attachment.DeleteChildren();
+
+                if (IsClient) {
+                    EntityWrapper root = wi.FirstPersonEntity;
+                    if (root.Valid()) {
+                        EntityWrapper subTree = root.FirstChildByName("FinalBlend");
+                        if (subTree.Valid()) {
+                            EntityWrapper animationNode = subTree.FirstChildByName("ActionBlend");
+                            if (animationNode.Valid()) {
+                                Events::AutoAnimationBlend eFireBlend;
+                                eFireBlend.RootNode = root;
+                                eFireBlend.NodeName = "ActionBlend";
+                                eFireBlend.Restart = true;
+                                eFireBlend.Start = true;
+                                m_EventBroker->Publish(eFireBlend);
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -195,6 +251,9 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
         }
     }
 
+    // Play animation
+    playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Fire");
+
     // Sound
     Events::PlaySoundOnEntity e;
     e.EmitterID = wi.Player.ID;

src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

@@ -52,7 +52,7 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
     cWeapon["FireCooldown"] = 60.0 / (double)cWeapon["RPM"];
 
     // Get weapon model based on current person
-    EntityWrapper weaponModelEntity = getRelevantWeaponModelEntity(wi);
+    EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
     if (!weaponModelEntity.Valid()) {
         return;
     }