Fixed crash when trying to blend to a nonexistent node

Commited input test stuff

include/Engine/Core/EntityFile.h

@@ -1,164 +1,21 @@
 #ifndef EntityFile_h__
 #define EntityFile_h__
 
-#include <stack>
-#include <boost/lexical_cast.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/sax2/SAX2XMLReader.hpp>
-#include <xercesc/sax2/XMLReaderFactory.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/sax2/Attributes.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/XMLChar.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/framework/XMLDocumentHandler.hpp>
-#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
-#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
-#include <xercesc/framework/psvi/XSParticle.hpp>
-#include <xercesc/framework/psvi/XSModelGroup.hpp>
-#include <xercesc/framework/psvi/XSAnnotation.hpp>
-#include <xercesc/framework/psvi/XSValue.hpp>
-#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMLSInput.hpp>
-#include <xercesc/dom/DOMElement.hpp>
+#include "World.h"
+#include "EntityXMLFile.h"
+#include "EntityXMLFilePreprocessor.h"
+#include "EntityXMLFileParser.h"
+#include "EntityWrapper.h"
 
-#include "../GLM.h"
-#include "Util/XercesString.h"
-#include "ResourceManager.h"
-#include "Entity.h"
-#include "ComponentInfo.h"
-
-class EntityFileHandler
-{
-    friend class EntityFileSAXHandler;
-public:
-    // @param EntityID The entity found
-    // @param EntityID The parent of the entity
-    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
-    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
-    // @param EntityID The entity the component corresponds to
-    // @param std::string Type name of the component
-    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
-    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
-    // @param EntityID Entity 
-    // @param std::string Component name 
-    // @param std::string Field name
-    // @param std::map<std::string, std::string> Field attribute names and values
-    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
-    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
-    // @param EntityID Entity 
-    // @param std::string Component name 
-    // @param std::string Field name
-    // @param char* Field data
-    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
-    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
-
-private:
-    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
-    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
-    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
-    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
-};
-
-class EntityFileSAXHandler : public xercesc::DefaultHandler
+class EntityFile : private World, public Resource
 {
 public:
-    enum class State
-    {
-        Unknown,
-        Entity,
-        Component,
-        ComponentField
-    };
+    EntityFile(std::string path);
 
-    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
-
-    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
-    void characters(const XMLCh* const chars, const XMLSize_t length) override;
-    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
-
-    void warning(const xercesc::SAXParseException& e);
-    void error(const xercesc::SAXParseException& e);
-    void fatalError(const xercesc::SAXParseException& e);
+    EntityWrapper MergeInto(World* other);
 
 private:
-    const EntityFileHandler* m_Handler;
-    xercesc::XMLGrammarPool* m_GrammarPool;
-    xercesc::SAX2XMLReader* m_Reader;
-    //State m_CurrentScope = State::Unknown;
-    std::stack<State> m_StateStack;
-    unsigned int m_NextEntityID = 0;
-    std::stack<EntityID> m_EntityStack;
-    std::string m_CurrentComponent;
-    std::string m_CurrentField;
-    std::map<std::string, std::string> m_CurrentAttributes;
-
-    void onStartEntity(const xercesc::Attributes& attrs); 
-    void onEndEntity();
-    void onStartEntityRef(const xercesc::Attributes& attrs);
-    void onStartComponent(const std::string& name);
-    void onEndComponent(const std::string& name);
-    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
-    void onEndComponentField(const std::string& field);
-    void onFieldData(char* data);
-};
-
-class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
-{
-public:
-	void warning(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Warning", e);
-	}
-	void error(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Error", e);
-	}
-	void fatalError(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("FATAL ERROR", e);
-	}
-	void resetErrors() override { }
-
-private:
-	void reportParseException(std::string type, const xercesc::SAXParseException& e)
-	{
-		char* message = xercesc::XMLString::transcode(e.getMessage());
-		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
-		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
-		std::cerr << type << ": " << message << std::endl;
-		xercesc::XMLString::release(&systemID);
-		xercesc::XMLString::release(&message);
-	}
-};
-
-class EntityFile : public Resource
-{
-    friend class ResourceManager;
-    friend class EntityFileSAXHandler;
-private:
-    EntityFile(boost::filesystem::path path);
-    ~EntityFile();
-
-public:
-    static unsigned int GetTypeStride(std::string typeName);
-    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
-    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
-
-    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
-
-    void Parse(const EntityFileHandler* handler) const;
-
-private:
-    boost::filesystem::path m_FilePath;
-    xercesc::XMLGrammarPool* m_GrammarPool;
-    xercesc::SAX2XMLReader* m_SAX2XMLReader;
-	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
-    //std::vector<std::string> m_EntityReferences;
-
-    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+    EntityID m_RootEntity = EntityID_Invalid;
 };
 
 #endif

include/Engine/Core/EntityWrapper.h

@@ -27,7 +27,9 @@ struct EntityWrapper
     bool HasComponent(const std::string& componentType);
     void AttachComponent(const char* componentName);
     EntityWrapper Parent();
+    EntityWrapper FirstParentByName(const std::string& parentEntityName);
     EntityWrapper FirstChildByName(const std::string& name);
+    EntityWrapper FirstLevelChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
     EntityWrapper Clone(EntityWrapper parent = EntityWrapper::Invalid);
     std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);

include/Engine/Core/EntityXMLFile.h

@@ -0,0 +1,164 @@
+#ifndef EntityXMLFile_h__
+#define EntityXMLFile_h__
+
+#include <stack>
+#include <boost/lexical_cast.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+#include <xercesc/sax2/XMLReaderFactory.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/sax2/Attributes.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/XMLChar.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/framework/XMLDocumentHandler.hpp>
+#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
+#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
+#include <xercesc/framework/psvi/XSParticle.hpp>
+#include <xercesc/framework/psvi/XSModelGroup.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
+#include <xercesc/framework/psvi/XSValue.hpp>
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+
+#include "../GLM.h"
+#include "Util/XercesString.h"
+#include "ResourceManager.h"
+#include "Entity.h"
+#include "ComponentInfo.h"
+
+class EntityFileHandler
+{
+    friend class EntityFileSAXHandler;
+public:
+    // @param EntityID The entity found
+    // @param EntityID The parent of the entity
+    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
+    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
+    // @param EntityID The entity the component corresponds to
+    // @param std::string Type name of the component
+    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
+    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param std::map<std::string, std::string> Field attribute names and values
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
+    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param char* Field data
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
+    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
+
+private:
+    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
+    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
+    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
+    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
+};
+
+class EntityFileSAXHandler : public xercesc::DefaultHandler
+{
+public:
+    enum class State
+    {
+        Unknown,
+        Entity,
+        Component,
+        ComponentField
+    };
+
+    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
+
+    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
+    void characters(const XMLCh* const chars, const XMLSize_t length) override;
+    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
+
+    void warning(const xercesc::SAXParseException& e);
+    void error(const xercesc::SAXParseException& e);
+    void fatalError(const xercesc::SAXParseException& e);
+
+private:
+    const EntityFileHandler* m_Handler;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_Reader;
+    //State m_CurrentScope = State::Unknown;
+    std::stack<State> m_StateStack;
+    unsigned int m_NextEntityID = 0;
+    std::stack<EntityID> m_EntityStack;
+    std::string m_CurrentComponent;
+    std::string m_CurrentField;
+    std::map<std::string, std::string> m_CurrentAttributes;
+
+    void onStartEntity(const xercesc::Attributes& attrs); 
+    void onEndEntity();
+    void onStartEntityRef(const xercesc::Attributes& attrs);
+    void onStartComponent(const std::string& name);
+    void onEndComponent(const std::string& name);
+    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
+    void onEndComponentField(const std::string& field);
+    void onFieldData(char* data);
+};
+
+class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
+{
+public:
+	void warning(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Warning", e);
+	}
+	void error(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Error", e);
+	}
+	void fatalError(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("FATAL ERROR", e);
+	}
+	void resetErrors() override { }
+
+private:
+	void reportParseException(std::string type, const xercesc::SAXParseException& e)
+	{
+		char* message = xercesc::XMLString::transcode(e.getMessage());
+		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
+		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
+		std::cerr << type << ": " << message << std::endl;
+		xercesc::XMLString::release(&systemID);
+		xercesc::XMLString::release(&message);
+	}
+};
+
+class EntityXMLFile : public Resource
+{
+    friend class ResourceManager;
+    friend class EntityFileSAXHandler;
+private:
+    EntityXMLFile(boost::filesystem::path path);
+    ~EntityXMLFile();
+
+public:
+    static unsigned int GetTypeStride(std::string typeName);
+    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
+    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
+
+    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
+
+    void Parse(const EntityFileHandler* handler) const;
+
+private:
+    boost::filesystem::path m_FilePath;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_SAX2XMLReader;
+	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
+    //std::vector<std::string> m_EntityReferences;
+
+    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+};
+
+#endif

include/Engine/Core/EntityXMLFileParser.h

@@ -1,18 +1,19 @@
-#ifndef EntityFileParser_h__
-#define EntityFileParser_h__
+#ifndef EntityXMLFileParser_h__
+#define EntityXMLFileParser_h__
 
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 #include "World.h"
 
-class EntityFileParser
+class EntityXMLFileParser
 {
+    friend class EntityFile;
 public:
-    EntityFileParser(const EntityFile* entityFile);
-
-    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+    EntityXMLFileParser(const EntityXMLFile* entityFile);
 
 private:
-    const EntityFile* m_EntityFile;
+    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+
+    const EntityXMLFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;
     EntityID m_FirstEntity = EntityID_Invalid;

include/Engine/Core/EntityXMLFilePreprocessor.h

@@ -1,5 +1,5 @@
-#ifndef EntityFilePreprocessor_h__
-#define EntityFilePreprocessor_h__
+#ifndef EntityXMLFilePreprocessor_h__
+#define EntityXMLFilePreprocessor_h__
 
 #include <xercesc/framework/psvi/XSElementDeclaration.hpp>
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
@@ -17,17 +17,18 @@
 #include "Util/XercesString.h"
 #include "ResourceManager.h"
 #include "World.h"
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 
-class EntityFilePreprocessor
+class EntityXMLFilePreprocessor
 {
+    friend class EntityFile;
 public:
-    EntityFilePreprocessor(const EntityFile* entityFile);
-
-    void RegisterComponents(World* world);
+    EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
 
 private:
-    const EntityFile* m_EntityFile;
+    void RegisterComponents(World* world);
+
+    const EntityXMLFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;
 

include/Engine/Core/EntityXMLFileWriter.h

@@ -1,5 +1,5 @@
-#ifndef EntityFileWriter_h__
-#define EntityFileWriter_h__
+#ifndef EntityXMLFileWriter_h__
+#define EntityXMLFileWriter_h__
 
 #include <boost/filesystem.hpp>
 #include <xercesc/dom/DOM.hpp>
@@ -8,13 +8,13 @@
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
 #include "Util/XercesString.h"
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 #include "World.h"
 
-class EntityFileWriter
+class EntityXMLFileWriter
 {
 public:
-    EntityFileWriter(boost::filesystem::path file)
+    EntityXMLFileWriter(boost::filesystem::path file)
         : m_FilePath(file)
     {
         using namespace xercesc;

include/Engine/Core/MemoryPool.h

@@ -118,9 +118,6 @@ public:
 		else {
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
-            if (!DisableMemoryPool::Value) {
-			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
-            }
 			return m_ExtraMemory.back();
 		}
 	}

include/Engine/Core/World.h

@@ -6,6 +6,7 @@
 #include "ObjectPool.h"
 #include "ComponentPool.h"
 #include "EventBroker.h"
+struct EntityWrapper;
 
 class World
 {
@@ -18,13 +19,13 @@ public:
     World(const World& other);
 
     // Create empty entity
-    EntityID CreateEntity(EntityID parent = 0);
+    EntityID CreateEntity(EntityID parent = EntityID_Invalid);
     // Delete entity and all components within
     void DeleteEntity(EntityID entity);
     // Check if an entity exists
     bool ValidEntity(EntityID entity) const;
     // Register a component type and allocate space for it
-    void RegisterComponent(ComponentInfo& ci);
+    void RegisterComponent(const ComponentInfo& ci);
     // Attach a component to an entity and fill it with default values
     ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType);
     // Check if an entity has a component
@@ -49,6 +50,12 @@ public:
     void SetName(EntityID entity, const std::string& name);
     // Get the textual name of an entity
     std::string GetName(EntityID entity) const;
+    // Get the first entity in the world with the name.
+    EntityWrapper GetFirstEntityByName(const std::string& name);
+
+    // Merge another world into this one
+    // Returns a map that maps entities from the other world to their copies in this one
+    std::unordered_map<EntityID, EntityID> Merge(const World* other);
 
 private:
     EventBroker* m_EventBroker = nullptr;

include/Engine/Editor/EditorGUI.h

@@ -22,6 +22,7 @@
 #include "../Core/ELockMouse.h"
 #include "../Core/EFileDropped.h"
 #include "../Rendering/Texture.h"
+#include "Game/Events/ESpawnerSpawn.h"
 
 class EditorGUI
 {

include/Engine/Editor/EditorSystem.h

@@ -5,9 +5,8 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityFilePreprocessor.h"
-#include "../Core/EntityFileParser.h"
-#include "../Core/EntityFileWriter.h"
+#include "../Core/EntityFile.h"
+#include "../Core/EntityXMLFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"
 #include "EditorGUI.h"

include/Engine/Input/FirstPersonInputController.h

@@ -27,9 +27,10 @@ public:
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer);
+    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID);
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
+    bool SpecialAbilityKeyDown() const { return m_SpecialAbilityKeyDown; }
 
 protected:
     const int m_PlayerID;
@@ -41,6 +42,7 @@ protected:
     bool m_Crouching = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
+    double m_DashEffectResetTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -51,7 +53,7 @@ protected:
     bool m_ShiftDashing = false;
     bool m_ValidDoubleTap = false;
 
-    //specialabilitys
+    //specialabilities
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
     int m_NumberOfMovementKeysDown = 0;
@@ -144,10 +146,10 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             if (m_NumberOfMovementKeysDown == 0) {
                 m_MovementKeyDown = false;
             }
-                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-                m_AssaultDashDoubleTapDeltaTime = 0.f;
-            
+            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+            m_AssaultDashTapDirection = m_CurrentDirectionVector;
+            m_AssaultDashDoubleTapDeltaTime = 0.f;
+
         }
     }
 
@@ -160,18 +162,11 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     }
 
     if (e.Command == "SpecialAbility") {
-        if (e.Value > 0) {
-            m_SpecialAbilityKeyDown = true;
-        } else {
-            m_SpecialAbilityKeyDown = false;
-        }
-    }
-    if (m_SpecialAbilityKeyDown && m_MovementKeyDown) {
-        m_ShiftDashing = true;
-    } else {
-        m_ShiftDashing = false;
+        m_SpecialAbilityKeyDown = e.Value > 0;
     }
 
+    m_ShiftDashing = m_SpecialAbilityKeyDown && m_MovementKeyDown;
+
     return true;
 }
 
@@ -190,12 +185,19 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 }
 
 template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer) {
+void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID) {
     m_AssaultDashDoubleTapDeltaTime += dt;
+    m_DashEffectResetTimer += dt;
     assaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
     if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
+        if (m_DashEffectResetTimer > 0.05) {
+            Events::DashAbility e;
+            e.Player = playerID;
+            m_EventBroker->Publish(e);
+            m_DashEffectResetTimer = 0.0;
+        }
     } else {
         m_PlayerIsDashing = false;
     }
@@ -207,6 +209,9 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
+        Events::DashAbility e;
+        e.Player = playerID;
+        m_EventBroker->Publish(e);
         return;
     }
 
@@ -237,6 +242,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
 
     Events::DashAbility e;
+    e.Player = playerID;
     m_EventBroker->Publish(e);
 }
 

include/Engine/Network/Client.h

@@ -28,6 +28,7 @@
 #include "Core/EPlayerSpawned.h"
 #include "Core/EAmmoPickup.h"
 #include "Network/ESearchForServers.h"
+#include "../Game/Events/EDashAbility.h"
 
 struct ServerInfo
 {
@@ -107,6 +108,7 @@ private:
     void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
     void parseDoubleJump(Packet& packet);
+    void parseDashEffect(Packet& packet);
     void parseAmmoPickup(Packet& packet);
     void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
@@ -135,6 +137,9 @@ private:
     EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
     EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
     bool OnDoubleJump(Events::DoubleJump & e);
+    EventRelay<Client, Events::DashAbility> m_EDashAbility;
+    bool OnDashAbility(const Events::DashAbility& e);
+
     bool OnSearchForServers(const Events::SearchForServers& e);
     UDPClient m_ServerlistRequest;
     std::vector<ServerInfo> m_Serverlist;

include/Engine/Network/MessageType.h

@@ -20,6 +20,7 @@ enum class MessageType
     ComponentDeleted,
     PlayerTransform,
     OnDoubleJump,
+    OnDashEffect,
     ServerlistRequest,
     AmmoPickup,
     Invalid

include/Engine/Network/Packet.h

@@ -24,7 +24,9 @@ public:
     {
         // Check if we are trying to add more than the package can fit.
         if (m_MaxPacketSize < m_Offset + sizeof(T)) {
-            LOG_WARNING("Packet AddPrimitive(): You are trying to add more than we have allocated for! New size is %i bytes\n", m_MaxPacketSize*2);
+            if (m_MaxPacketSize >= 32000) {
+                LOG_WARNING("Package::WritePrimitive(): New size is huge %i bytes\n", m_MaxPacketSize*2);
+            }
             resizeData();
         }
         memcpy(m_Data + m_Offset, &val, sizeof(T));

include/Engine/Network/Server.h

@@ -83,6 +83,7 @@ private:
     void parseClientPing();
     void parsePing();
     bool parseDoubleJump(Packet& packet);
+    void parseDashEffect(Packet& packet);
     void parseUDPConnect(Packet& packet);
     void parseTCPConnect(Packet& packet);
     void parseDisconnect();

include/Engine/Rendering/AnimationSystem.h

@@ -3,27 +3,32 @@
 
 #include "GLM.h"
 
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
+#include "../Common.h"
+#include "../Core/System.h"
+#include "../Core/ResourceManager.h"
 #include "Rendering/Model.h"
-#include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
+#include "Rendering/BlendTree.h"
+#include "Rendering/EAutoAnimationBlend.h"
+#include "../Core/EntityWrapper.h"
+#include "Rendering/AutoBlendQueue.h"
+#include "../Input/EInputCommand.h"
+#include "imgui/imgui.h"
 
-class AnimationSystem : public PureSystem
+class AnimationSystem : public ImpureSystem
 {
 public:
-    AnimationSystem(SystemParams params)
-        : System(params)
-        , PureSystem("Animation")
-    {
-
-    }
+    AnimationSystem(SystemParams params);
     ~AnimationSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
+    virtual void Update(double dt) override;
 private:
+    void CreateBlendTrees();
+    void UpdateAnimations(double dt);
+    void UpdateWeights(double dt);
 
+    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
+    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
+    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 
 #endif

include/Engine/Rendering/AutoBlendQueue.h

@@ -0,0 +1,46 @@
+#ifndef AutoBlendQueue_h__
+#define AutoBlendQueue_h__
+
+#include "../Core/ResourceManager.h"
+#include "Skeleton.h"
+#include "Model.h"
+#include "BlendTree.h"
+#include "../Core/EntityWrapper.h"
+
+class AutoBlendQueue
+{
+public:
+    struct AutoBlendJob
+    {
+        EntityWrapper RootNode = EntityWrapper::Invalid;
+        double Duration;
+        double CurrentTime = 0.0;
+        double Delay = 0.0;
+        EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+        BlendTree::AutoBlendInfo BlendInfo;
+    };
+
+    struct AutoblendNode
+    {
+        AutoBlendJob BlendJob;
+        double StartTime;
+        double EndTime;
+    };
+
+    AutoBlendQueue() { };
+
+    void Insert(AutoBlendJob autoBlendJob);
+    void UpdateTime(double dt);
+
+    void PrintQueue();
+    bool HasActiveBlendJob();
+    std::shared_ptr<BlendTree> GetBlendTree();
+
+    AutoBlendQueue::AutoBlendJob& GetActiveBlendJob();
+private:
+     std::list<AutoblendNode> m_BlendQueue;
+    
+
+};
+
+#endif

include/Engine/Rendering/BlendTree.h

@@ -0,0 +1,100 @@
+#ifndef BlendTree_h__
+#define BlendTree_h__
+
+#include "Common.h"
+#include "../GLM.h"
+#include "Skeleton.h"
+#include "../Core/EntityWrapper.h"
+#include "../Core/World.h"
+#include <stack>
+
+class BlendTree
+{
+public:
+    enum class NodeType
+    {
+        Additive,
+        Blend,
+        Override,
+        Animation,
+    };
+
+    
+
+    struct Node
+    {
+        std::string Name;
+        EntityWrapper Entity;
+        Node* Parent = nullptr;
+        Node* Child[2] = { nullptr, nullptr };
+        NodeType Type;
+        std::map<int, Skeleton::PoseData> Pose;
+        bool SubTreeRoot = false;
+        double Weight = 0.0;
+
+        Node* Next() {
+            Node* next = this;
+
+            if (next->Child[1] == nullptr) {
+                // Node has no right child
+                next = this;
+                while (next->Parent != nullptr && next == next->Parent->Child[1]) {
+                    next = next->Parent;
+                }
+                next = next->Parent;
+            } else {
+                // Find the leftmost node in the right subtree
+                next = next->Child[1];
+                while (next->Child[0] != nullptr) {
+                    next = next->Child[0];
+                }
+            }
+
+            return next;
+
+        }
+    };
+
+  
+    struct AutoBlendInfo
+    {
+        std::string NodeName;
+        double progress;
+        bool Start;
+        bool SingleBlend;
+        std::unordered_map<EntityWrapper, double> StartWeights;
+    };
+
+    
+
+    BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton);
+    ~BlendTree();
+
+
+    std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
+    glm::mat4 GetBoneTransform(int boneID);
+    bool IsValid() { return  (m_Root == nullptr ? false : true); }
+
+    void PrintTree();
+    BlendTree::AutoBlendInfo AutoBlendStep(AutoBlendInfo blendInfo);
+
+    BlendTree::Node* GetCommonParent(std::string NodeName1, std::string NodeName2);
+    BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);
+
+    EntityWrapper GetSubTreeRoot(std::string nodeName);
+
+private:
+    Skeleton* m_Skeleton = nullptr;
+    Node* m_Root = nullptr;
+
+    std::vector<glm::mat4> m_FinalPose;
+    std::map<int, glm::mat4> m_FinalBoneTransforms;
+
+    std::vector<glm::mat4> AccumulateFinalPose();
+    BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
+    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
+
+    void Blend(std::map<int, Skeleton::PoseData>& pose);
+};
+
+#endif

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -8,6 +8,7 @@
 #include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
 #include "Rendering/Skeleton.h"
+#include "Rendering/BlendTree.h"
 
 //Needs to be a higher orderlevel than AnimationSystem
 class BoneAttachmentSystem : public PureSystem

include/Engine/Rendering/EAutoAnimationBlend.h

@@ -0,0 +1,27 @@
+#ifndef Events_AutoAnimationBlend_h__
+#define Events_AutoAnimationBlend_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct AutoAnimationBlend : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Duration = 0.0;
+    double Delay = 0.0;
+    
+    bool Start = false;
+    bool Reverse = false;
+    bool Restart = false;
+    bool SingleLevelBlend = false;
+
+    EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+};
+
+}
+
+#endif

include/Engine/Rendering/ModelJob.h

@@ -15,6 +15,7 @@
 #include "../Core/Transform.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
+#include "BlendTree.h"
 
 struct ModelJob : RenderJob
 {
@@ -123,32 +124,14 @@ struct ModelJob : RenderJob
             Skeleton = Model->m_RawModel->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                if (world->HasComponent(Entity, "Animation")) {
-                    auto animationComponent = world->GetComponent(Entity, "Animation");
+                
+                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
 
-                    for (int i = 1; i <= 3; i++) {
-                        ::Skeleton::AnimationData animationData;
-                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
-                        if (animationData.animation == nullptr) {
-                            continue;
-                        }
-                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
-                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
-
-                        Animations.push_back(animationData);
-                    }
-                }
-
-                if (world->HasComponent(Entity, "AnimationOffset")) {
-                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
-                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
-                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
-                } else {
-                    AnimationOffset.animation = nullptr;
+                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
+                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
                 }
             }
         }
-            
     };
 
     unsigned int TextureID;
@@ -167,10 +150,7 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    
-
+    std::shared_ptr<::BlendTree> BlendTree = nullptr;
     float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;

include/Engine/Rendering/Skeleton.h

@@ -6,27 +6,9 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
+#include "../Core/EntityWrapper.h"
 
-//struct Bone
-//{
-//	Bone(std::string name, glm::mat4 offsetMatrix)
-//		: Name(name)
-//		, OffsetMatrix(offsetMatrix)
-//	{ }
-//
-//	~Bone()
-//	{
-//		for (auto kv : Children) {
-//			delete kv.second;
-//		}
-//	}
-//
-//	std::string Name;
-//	glm::mat4 OffsetMatrix;
-//	glm::mat4 LocalMatrix;
-//
-//	std::map<std::string, Bone*> Children;
-//};
+class BlendTree;
 
 class Skeleton
 {
@@ -68,58 +50,43 @@ public:
         std::map<int, std::vector<Keyframe>> JointAnimations;
 	};
 
-    struct AnimationData
-    {
-        const Animation* animation;
-        float time;
-        float weight;
-    };
-
-    struct JointFrameTransform {
-        glm::vec3 PositionInterp = glm::vec3(0);
-        glm::quat RotationInterp = glm::quat();
-        glm::vec3 ScaleInterp = glm::vec3(0);
-        float Weight;
-    };
-
-    struct AnimationOffset {
-        const Animation* animation;
-        float time;
+    struct PoseData {
+        glm::vec3 Translation;
+        glm::quat Orientation;
+        glm::vec3 Scale;
     };
 
 	Skeleton() { }
 	~Skeleton();
 
 	Bone* RootBone;
-
 	std::map<int, Bone*> Bones;
 
+    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+
 	// Attach a new bone to the skeleton
 	// Returns: New bone index
 	int CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix);
-
 	int GetBoneID(std::string name);
-
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
-
     const Animation* GetAnimation(std::string name);
 
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
+    std::map<int, Skeleton::PoseData> GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion = false);
+    
+    std::map<int, Skeleton::PoseData> BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight);
+    std::map<int, Skeleton::PoseData> OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose);
+    std::map<int, Skeleton::PoseData> BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose);
+    void GetFinalPose(std::map<int, Skeleton::PoseData>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
+    
+    std::vector<glm::mat4> GetTPose();
 
-    void PrintSkeleton();
-	void PrintSkeleton(const Bone* parent, int depthCount);
-	std::map<std::string, Animation> Animations;
-
-    glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix);
-    int GetKeyframe(const Animation& animation, double time);
 
+    std::map<std::string, Animation> Animations;
 private:
-
-    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
+    Skeleton::PoseData GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);
+    
+    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, Skeleton::PoseData>& poseDatas, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix);
+    void AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
+    void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
 
 	std::map<std::string, Bone*> m_BonesByName;
     

include/Game/Events/EDashAbility.h

@@ -2,11 +2,15 @@
 #define Events_DashAbility_h__
 
 #include "Core/Event.h"
+#include "Core/EntityWrapper.h"
 
 namespace Events
 {
 
-struct DashAbility : public Event { };
+struct DashAbility : public Event 
+{
+    EntityID Player;
+};
 
 }
 

include/Game/Game.h

@@ -13,13 +13,13 @@
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
 #include "Core/EKeyDown.h"
-#include "Core/EntityFilePreprocessor.h"
+#include "Core/EntityXMLFilePreprocessor.h"
 #include "Core/SystemPipeline.h"
 #include "Systems/ExplosionEffectSystem.h"
 #include "Editor/EditorSystem.h"
-#include "Core/EntityFile.h"
+#include "Core/EntityXMLFile.h"
 #include "Rendering/RenderSystem.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityXMLFileParser.h"
 #include "Core/Octree.h"
 #include "Rendering/Font.h"
 #include "Systems/InterpolationSystem.h"

include/Game/Systems/AbilityCooldownHUDSystem.h

@@ -0,0 +1,17 @@
+#ifndef AbilityCooldownHUDSystem_h__
+#define AbilityCooldownHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class AbilityCooldownHUDSystem : public ImpureSystem
+{
+public:
+    AbilityCooldownHUDSystem(SystemParams params)
+        : System(params)
+    { }
+
+    virtual void Update(double dt) override;
+};
+
+#endif

include/Game/Systems/AmmoPickupSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"

include/Game/Systems/AmmunitionHUDSystem.h

@@ -1,17 +0,0 @@
-#ifndef AmmunitionHUDSystem_h__
-#define AmmunitionHUDSystem_h__
-
-#include "../../Engine/Core/System.h"
-#include "../../Engine/GLM.h"
-
-class AmmunitionHUDSystem : public ImpureSystem
-{
-public:
-    AmmunitionHUDSystem(SystemParams params)
-        : System(params)
-    { }
-
-    virtual void Update(double dt) override;
-};
-
-#endif

include/Game/Systems/BoostIconsHUDSystem.h

@@ -0,0 +1,19 @@
+#ifndef BoostIconsHUDSystem_h__
+#define BoostIconsHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class BoostIconsHUDSystem : public PureSystem
+{
+public:
+    BoostIconsHUDSystem(SystemParams params)
+        : System(params)
+        , PureSystem("BoostIconsHUD")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
+
+};
+
+#endif

include/Game/Systems/BoostSystem.h

@@ -3,7 +3,7 @@
 
 #include "Core/System.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 

include/Game/Systems/DamageIndicatorSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 #include <tuple>

include/Game/Systems/FloatingEffectSystem.h

@@ -0,0 +1,19 @@
+#include "Common.h"
+#include "Core/System.h"
+
+class FloatingEffectSystem : public PureSystem
+{
+public:
+    FloatingEffectSystem(SystemParams params)
+        : System(params)
+        , PureSystem("FloatingEffect")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
+    {
+        ComponentWrapper& transform = m_World->GetComponent(component.EntityID, "Transform");
+        (double&)component["Time"] += dt;
+        (glm::vec3&)transform["Position"] = (float)(double)component["Amplitude"] * glm::sin((glm::two_pi<float>() / (float)(double)component["Period"]) *  (float)(double)component["Time"]) * (glm::vec3)component["Axis"];
+
+    }
+};

include/Game/Systems/LifetimeSystem.h

@@ -10,7 +10,7 @@ public:
         : System(params)
         , PureSystem("Lifetime")
     {
-        LOG_INFO("ASDASDASSA");
+
     }
 
     virtual void Update(double dt) override;

include/Game/Systems/PickupSpawnSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"

include/Game/Systems/PlayerDeathSystem.h

@@ -6,11 +6,9 @@
 #include "GLM.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
-
 #include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
-
 #include "Core/EPlayerDeath.h"
+#include "Core/EEntityDeleted.h"
 
 class PlayerDeathSystem : public ImpureSystem
 {
@@ -20,8 +18,12 @@ public:
     virtual void Update(double dt) override;
 
 private:
+    EntityWrapper m_LocalPlayerDeathEffect;
+
     EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
     bool OnPlayerDeath(Events::PlayerDeath& e);
+    EventRelay<PlayerDeathSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(Events::EntityDeleted& e);
 
     void createDeathEffect(EntityWrapper player);
 

include/Game/Systems/PlayerMovementSystem.h

@@ -6,9 +6,7 @@
 #include <imgui/imgui.h>
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
-
 #include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
 
 class PlayerMovementSystem : public ImpureSystem
 {
@@ -41,6 +39,8 @@ private:
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
     EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
     bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);
+    EventRelay<PlayerMovementSystem, Events::DashAbility> m_EDashAbility;
+    bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e);
 
     void updateMovementControllers(double dt);
     void updateVelocity(EntityWrapper player, double dt);

include/Game/Systems/SpawnerSystem.h

@@ -7,8 +7,7 @@
 #include "Core/System.h"
 #include "Events/ESpawnerSpawn.h"
 #include "Core/Transform.h"
-#include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 
 class SpawnerSystem : public System
 {

include/Game/Systems/TextFieldReader.h

@@ -0,0 +1,19 @@
+#ifndef AmmunitionHUDSystem_h__
+#define AmmunitionHUDSystem_h__
+
+#include <boost/lexical_cast.hpp>
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class TextFieldReader : public PureSystem
+{
+public:
+    TextFieldReader(SystemParams params)
+        : System(params)
+        , PureSystem("TextFieldReader")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cTextFieldReader, double dt) override;
+};
+
+#endif

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,47 +1,40 @@
 #ifndef AssaultWeaponBehaviour_h__
 #define AssaultWeaponBehaviour_h__
 
-#include "Sound/EPlaySoundOnEntity.h"
-#include "Collision/Collision.h"
-#include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
-#include "../SpawnerSystem.h"
+#include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
-#include "Core/EShoot.h"
+#include "Sound/EPlaySoundOnEntity.h"
 
 class AssaultWeaponBehaviour : public WeaponBehaviour<AssaultWeaponBehaviour>
 {
 public:
     AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
-        : WeaponBehaviour(systemParams, "AssaultWeapon", renderer, collisionOctree) 
+        : System(systemParams)
+        , WeaponBehaviour(systemParams, "AssaultWeapon", renderer, collisionOctree)
+        , m_RandomEngine(m_RandomDevice())
     { }
 
-protected:
-    virtual void OnPrimaryFire(WeaponInfo& wi) override;
-    virtual void OnCeasePrimaryFire(WeaponInfo& wi) override;
-    virtual void OnReload(WeaponInfo& wi) override;
+    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
+    void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    //bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) override;
 
 private:
-    // State
-    bool m_Firing = false;
-    bool m_Reloading = false;
-    double m_ReloadTimer = 0.0;
-    double m_TimeSinceLastFire = 0.0;
-    EntityWrapper m_FirstPersonReloadImpostor;
+    std::random_device m_RandomDevice;
+    std::mt19937 m_RandomEngine;
 
-    bool hasAmmo();
-    void fireRound();
-    void spawnTracer();
-    float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
-    void playFireSound();
-    void playEmptySound();
-    void viewPunch();
-    void finishReload();
-    void playShootAnimation();
-    void playIdleAnimation();
-    void playReloadAnimation();
-    bool shoot(double damage);
-    void showHitMarker();
+    // Weapon functions
+    void fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi);
+    //void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
+    bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);
+    bool dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi);
+
+    // Utility
+    //Camera cameraFromEntity(EntityWrapper camera);
 };
 
 #endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -1,7 +1,10 @@
+#ifndef DefenderWeaponBehaviour_h__
+#define DefenderWeaponBehaviour_h__
+
 #include "WeaponBehaviour.h"
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
-#include "Rendering/ESetCamera.h"
+#include "Sound/EPlaySoundOnEntity.h"
 
 class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
 {
@@ -10,29 +13,27 @@ public:
         : System(systemParams)
         , WeaponBehaviour(systemParams, "DefenderWeapon", renderer, collisionOctree)
         , m_RandomEngine(m_RandomDevice())
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &DefenderWeaponBehaviour::OnSetCamera);
-    }
+    { }
 
     void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
-    void UpdateWeapon(WeaponInfo& wi, double dt) override;
-    void OnPrimaryFire(WeaponInfo& wi) override;
-    void OnCeasePrimaryFire(WeaponInfo& wi) override;
-    bool OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e) override;
+    void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) override;
 
 private:
     std::random_device m_RandomDevice;
     std::mt19937 m_RandomEngine;
-    EntityWrapper m_CurrentCamera;
-
-    EventRelay<DefenderWeaponBehaviour, Events::SetCamera> m_ESetCamera;
-    bool OnSetCamera(const Events::SetCamera& e);
 
     // Weapon functions
-    void fireShell(WeaponInfo& wi);
-    void dealDamage(WeaponInfo& wi, glm::vec3 direction, double damage);
+    void fireShell(ComponentWrapper cWeapon, WeaponInfo& wi);
+    void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
+    bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);
 
     // Utility
-    float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
     Camera cameraFromEntity(EntityWrapper camera);
-};
+};
+
+#endif

include/Game/Systems/Weapon/SidearmWeaponBehaviour.h

@@ -0,0 +1,38 @@
+#ifndef SidearmWeaponBehaviour_h__
+#define SidearmWeaponBehaviour_h__
+
+#include "WeaponBehaviour.h"
+#include "Collision/Collision.h"
+#include "Core/EPlayerDamage.h"
+
+class SidearmWeaponBehaviour : public WeaponBehaviour<SidearmWeaponBehaviour>
+{
+public:
+    SidearmWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree)
+        : System(systemParams)
+        , WeaponBehaviour(systemParams, "SidearmWeapon", renderer, collisionOctree)
+        , m_RandomEngine(m_RandomDevice())
+    { }
+
+    void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override;
+    void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
+    void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+
+private:
+    std::random_device m_RandomDevice;
+    std::mt19937 m_RandomEngine;
+
+    // Weapon functions
+    void fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi);
+    //void dealDamage(WeaponInfo& wi, glm::vec3 direction, double damage);
+
+    // Utility
+    bool canFire(ComponentWrapper cWeapon);
+    bool playerInFirstPerson(EntityWrapper player);
+    //float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
+};
+
+#endif

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -7,6 +7,8 @@
 #include "Collision/EntityAABB.h"
 #include "Input/EInputCommand.h"
 #include "Systems/SpawnerSystem.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/ConfigFile.h"
 
 template <typename ETYPE>
 class WeaponBehaviour : public PureSystem
@@ -20,42 +22,85 @@ public:
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
     {
-        EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &WeaponBehaviour::_OnInputCommand)
+        EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &WeaponBehaviour::_OnInputCommand);
+        EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &WeaponBehaviour::_OnSetCamera);
+        auto config = ResourceManager::Load<ConfigFile>("Config.ini");
+        m_ConfigAutoReload = config->Get<bool>("Gameplay.AutoReload", true);
     }
     virtual ~WeaponBehaviour() = default;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
     {
         auto weapon = getActiveWeapon(entity);
         if (!weapon) {
             return;
         } else {
-            UpdateWeapon(*weapon, dt);
+            UpdateWeapon(cWeapon, *weapon, dt);
         }
     }
 
 protected:
     struct WeaponInfo
     {
-        std::string WeaponComponent;
         EntityWrapper Player;
         EntityWrapper WeaponEntity;
         EntityWrapper FirstPersonEntity;
         EntityWrapper ThirdPersonEntity;
-        ComponentWrapper GetComponent() { return WeaponEntity[WeaponComponent]; }
     };
 
     IRenderer* m_Renderer;
+    EntityWrapper m_CurrentCamera;
     Octree<EntityAABB>* m_CollisionOctree;
     std::unordered_map<EntityWrapper, WeaponInfo> m_ActiveWeapons;
+    bool m_ConfigAutoReload;
 
-    virtual void UpdateWeapon(WeaponInfo& wi, double dt) { }
-    virtual void OnPrimaryFire(WeaponInfo& wi) { }
-    virtual void OnCeasePrimaryFire(WeaponInfo& wi) { }
-    virtual void OnReload(WeaponInfo& wi) { }
-    virtual bool OnInputCommand(WeaponInfo& wi, const Events::InputCommand& e) { return false; }
+    virtual void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) { }
+    virtual void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) { }
+    virtual bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) { return false; }
+
+    bool isPlayerInFirstPerson(EntityWrapper player)
+    {
+        if (!m_CurrentCamera.Valid()) {
+            return false;
+        } else {
+            return m_CurrentCamera == player || m_CurrentCamera.IsChildOf(player);
+        }
+    }
+
+    // Returns wi.FirstPersonEntity or wi.ThirdPersonEntity depending on
+    // if the player is in first person mode or not.
+    EntityWrapper getRelevantWeaponModelEntity(WeaponInfo& wi)
+    {
+        if (isPlayerInFirstPerson(wi.Player)) {
+            return wi.FirstPersonEntity;
+        } else {
+            return wi.ThirdPersonEntity;
+        }
+    }
+
+    float traceRayDistance(glm::vec3 origin, glm::vec3 direction)
+    {
+        float distance;
+        glm::vec3 pos;
+        auto entity = Collision::EntityFirstHitByRay(Ray(origin, direction), m_CollisionOctree, distance, pos);
+        if (entity) {
+            return distance;
+        } else {
+            return 100.f;
+        }
+    }
 
 private:
+    EventRelay<ETYPE, Events::SetCamera> m_ESetCamera;
+    bool _OnSetCamera(const Events::SetCamera& e)
+    {
+        m_CurrentCamera = e.CameraEntity;
+        return true;
+    }
     EventRelay<ETYPE, Events::InputCommand> m_EInputCommand;
     bool _OnInputCommand(const Events::InputCommand& e)
     {
@@ -70,15 +115,19 @@ private:
         }
 
         // Make sure the player has this weapon
-        auto weapon = getWeaponComponent(player);
-        if (!weapon) {
+        auto cWeapon = getWeaponComponent(player);
+        if (!cWeapon) {
             return false;
         }
 
         // Weapon selection
         if (e.Command == "SelectWeapon") {
-            if (static_cast<ComponentInfo::EnumType>(e.Value) == static_cast<ComponentInfo::EnumType>((*weapon)["Slot"])) {
-                selectWeapon(player);
+            if (e.Value > 0) {
+                if (static_cast<ComponentInfo::EnumType>(e.Value) == static_cast<ComponentInfo::EnumType>((*cWeapon)["Slot"])) {
+                    selectWeapon(*cWeapon, player);
+                } else {
+                    holsterWeapon(*cWeapon, player);
+                }
             }
         }
 
@@ -91,18 +140,18 @@ private:
         // Fire
         if (e.Command == "PrimaryFire") {
             if (e.Value > 0) {
-                OnPrimaryFire(*activeWeapon);
+                OnPrimaryFire(*cWeapon, *activeWeapon);
             } else {
-                OnCeasePrimaryFire(*activeWeapon);
+                OnCeasePrimaryFire(*cWeapon, *activeWeapon);
             }
         }
 
         // Reload
         if (e.Command == "Reload" && e.Value != 0) {
-            OnReload(*activeWeapon);
+            OnReload(*cWeapon, *activeWeapon);
         }
 
-        return OnInputCommand(*activeWeapon, e);
+        return OnInputCommand(*cWeapon, *activeWeapon, e);
     }
 
     boost::optional<ComponentWrapper> getWeaponComponent(EntityWrapper player)
@@ -129,8 +178,13 @@ private:
         return activeWeapon;
     }
 
-    void selectWeapon(EntityWrapper player)
+    void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
+        // Don't reselect weapon if it's already active
+        if (getActiveWeapon(player)) {
+            return;
+        }
+
         // Find the weapon attachments matching the weapon type
         std::vector<EntityWrapper> weaponAttachments = player.ChildrenWithComponent("WeaponAttachment");
         EntityWrapper firstPersonAttachment;
@@ -152,14 +206,6 @@ private:
             return;
         }
 
-        // Purge other weapon entities
-        for (auto& attachment : weaponAttachments) {
-            //if (attachment == firstPersonAttachment || attachment == thirdPersonAttachment) {
-            //    continue;
-            //}
-            attachment.DeleteChildren();
-        }
-
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
@@ -170,11 +216,36 @@ private:
             thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
         }
 
-        m_ActiveWeapons[player].WeaponComponent = m_ComponentType;
-        m_ActiveWeapons[player].Player = player;
-        m_ActiveWeapons[player].WeaponEntity = player;
-        m_ActiveWeapons[player].FirstPersonEntity = firstPersonWeapon;
-        m_ActiveWeapons[player].ThirdPersonEntity = thirdPersonWeapon;
+        WeaponInfo& wi = m_ActiveWeapons[player];
+        wi.Player = player;
+        wi.WeaponEntity = player;
+        wi.FirstPersonEntity = firstPersonWeapon;
+        wi.ThirdPersonEntity = thirdPersonWeapon;
+        
+        OnEquip(cWeapon, wi);
+    }
+
+    void holsterWeapon(ComponentWrapper cWeapon, EntityWrapper player)
+    {
+        auto activeWeapon = getActiveWeapon(player);
+        if (!activeWeapon) {
+            return;
+        }
+        WeaponInfo& wi = *activeWeapon;
+
+        // Send holster event
+        OnHolster(cWeapon, wi);
+
+        // Delete weapon entities
+        if (wi.FirstPersonEntity.Valid()) {
+            m_World->DeleteEntity(wi.FirstPersonEntity.ID);
+        }
+        if (wi.ThirdPersonEntity.Valid()) {
+            m_World->DeleteEntity(wi.ThirdPersonEntity.ID);
+        }
+
+        // Make weapon inactive
+        m_ActiveWeapons.erase(player);
     }
 };
 

include/Game/Systems/Weapon/WeaponSystem.h

@@ -9,8 +9,8 @@
 #include "Core/EShoot.h"
 #include "Core/EPlayerSpawned.h"
 #include "Input/EInputCommand.h"
-#include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityXMLFile.h"
+#include "Core/EntityXMLFileParser.h"
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
 #include "Systems/SpawnerSystem.h"

resources/DefaultConfig.ini

@@ -1,10 +1,13 @@
+[Gameplay]
+AutoReload=true
+
 [Debug]
 LogLevel=1
 LoadMap=
 ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
 ; if false -> Use pool allocation.
 DisableMemoryPool=false
-RespawnTime = 8.0
+RespawnTime = -1.0
 EditorEnabled=false
 OutOfBodyExperience=false
 

resources/DefaultInput.ini

@@ -27,4 +27,5 @@ M=SwitchToClient
 P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
-F3=PerformanceTimingCreateExcelData
+F3=PerformanceTimingCreateExcelData
+F4=SwapToClassPick

resources/Schema/Components.xsd

@@ -33,7 +33,6 @@
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
 	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
 	<xs:include schemaLocation="Components/AmmoPickup.xsd"/>
-	<xs:include schemaLocation="Components/AnimationOffset.xsd"/>
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
 	<xs:include schemaLocation="Components/ShieldAbility.xsd"/>
 	<xs:include schemaLocation="Components/SprintAbility.xsd"/>
@@ -45,15 +44,23 @@
 	<xs:include schemaLocation="Components/Sprite.xsd"/>
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
-	<xs:include schemaLocation="Components/AmmunitionHUD.xsd"/>
+	<xs:include schemaLocation="Components/TextFieldReader.xsd"/>
 	<xs:include schemaLocation="Components/Menu.xsd"/>
 	<xs:include schemaLocation="Components/KillFeed.xsd"/>
+	<xs:include schemaLocation="Components/BlendOverride.xsd"/>
+	<xs:include schemaLocation="Components/Blend.xsd"/>
+	<xs:include schemaLocation="Components/BlendAdditive.xsd"/>
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
+	<xs:include schemaLocation="Components/AbilityCooldownHUD.xsd"/>
 	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
 	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
 	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
+	<xs:include schemaLocation="Components/SidearmWeapon.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
+	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
+	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
+	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
 </xs:schema>

resources/Schema/Components/AbilityCooldownHUD.xml

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

resources/Schema/Components/AbilityCooldownHUD.xsd

@@ -0,0 +1,9 @@
+<?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="AbilityCooldownHUD">
+		<xs:annotation>
+			<xs:documentation>HUD element for tracking ability cooldown. If it has a sprite and fill component it will fill the sprite with chosen color depending on the cooldown.\n A child with text component named "Cooldown"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/AmmunitionHUD.xml

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

resources/Schema/Components/AmmunitionHUD.xsd

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-	<xs:include schemaLocation="../Types/TeamEnum.xsd"/>
-	<xs:element name="AmmunitionHUD">
-		<xs:annotation>
-			<xs:documentation>Hud element for tracking ammunition from parent with AssaultWeapon component. Child with the name "MagazineAmmo" tracks clip ammunition. Child with the name "Ammo" tracks ammo.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Animation.xml

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Animation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Animation.xsd">
-	<AnimationName1></AnimationName1>
-	<Weight1>1.0</Weight1>
-	<Time1>0</Time1>
-	<Speed1>0</Speed1>
-	<Loop1>true</Loop1>
-	<AnimationName2></AnimationName2>
-	<Weight2>1.0</Weight2>
-	<Time2>0</Time2>
-	<Speed2>0</Speed2>
-	<Loop2>true</Loop2>
-	<AnimationName3></AnimationName3>
-	<Weight3>1.0</Weight3>
-	<Time3>0</Time3>
-	<Speed3>0</Speed3>
-	<Loop3>true</Loop3>
+	<AnimationName></AnimationName>
+	<Time>0</Time>
+	<Play>false</Play>
+	<Reverse>false</Reverse>
+	<Speed>0</Speed>
+	<Loop>true</Loop>
+	<Additive>false</Additive>
 </Animation>

resources/Schema/Components/Animation.xsd

@@ -2,27 +2,17 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
 	<xs:element name="Animation">
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="AnimationName1" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight1" type="t:double" minOccurs="0"/>
-				<xs:element name="Time1" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed1" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop1" type="t:bool" minOccurs="0"/>
-				<xs:element name="AnimationName2" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight2" type="t:double" minOccurs="0"/>
-				<xs:element name="Time2" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed2" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop2" type="t:bool" minOccurs="0"/>
-				<xs:element name="AnimationName3" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight3" type="t:double" minOccurs="0"/>
-				<xs:element name="Time3" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed3" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop3" type="t:bool" minOccurs="0"/>
+				<xs:element name="AnimationName" type="t:string" minOccurs="0"/>
+				<xs:element name="Time" type="t:double" minOccurs="0"/>
+				<xs:element name="Speed" type="t:double" minOccurs="0"/>
+				<xs:element name="Play" type="t:bool" minOccurs="0"/>
+				<xs:element name="Reverse" type="t:bool" minOccurs="0"/>
+				<xs:element name="Loop" type="t:bool" minOccurs="0"/>
+				<xs:element name="Additive" type="t:bool" minOccurs="0"/>
 			</xs:all>
-			<xs:attribute name="replicated" type="xs:boolean" fixed="true"/>
 		</xs:complexType>
 	</xs:element>
 </xs:schema>

resources/Schema/Components/AnimationOffset.xml

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

resources/Schema/Components/AssaultWeapon.xml

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <AssaultWeapon xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="AssaultWeapon.xsd">
+	<Slot><Primary/></Slot>
 	<MagazineAmmo>32</MagazineAmmo>
 	<MagazineSize>32</MagazineSize>
-	<Ammo>360</Ammo>
-	<MaxAmmo>360</MaxAmmo>
-	<BaseDamage>5</BaseDamage>
-	<RPM>120</RPM>
-	<ViewPunch>0.01</ViewPunch>
+	<Ammo>320</Ammo>
+	<MaxAmmo>320</MaxAmmo>
+	<BaseDamage>15</BaseDamage>
+	<SpreadAngle>0.174533</SpreadAngle> <!-- 0.174533 = 10 degrees -->
+	<MaxTravelAngle>0.10</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
+	<RPM>420</RPM>
+	<ViewPunch>0.03</ViewPunch>
+	<ViewReturnSpeed>0.18</ViewReturnSpeed>
 	<ReloadTime>2</ReloadTime>
-	<Slot><Primary/></Slot>
+	<EquipTime>0.5</EquipTime>
+	<TriggerHeld>false</TriggerHeld>
+	<FireCooldown>0</FireCooldown>
+	<IsReloading>false</IsReloading>
+	<ReloadTimer>0</ReloadTimer>
+	<CurrentTravel>0</CurrentTravel>
 </AssaultWeapon>

resources/Schema/Components/AssaultWeapon.xsd

@@ -7,6 +7,7 @@
 	<xs:element name="AssaultWeapon">
 		<xs:complexType>
 			<xs:all>
+				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
 				<xs:element name="MagazineAmmo" type="t:int" minOccurs="0">
 					<xs:annotation><xs:documentation>Ammo currently loaded into the magazine</xs:documentation></xs:annotation>
 				</xs:element>
@@ -20,16 +21,32 @@
 									<xs:annotation><xs:documentation>Maximum ammo able to be carried</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="BaseDamage" type="t:double" minOccurs="0"/>
+				<xs:element name="SpreadAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Spread angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="RPM" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Rate of fire in rounds per minute</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>View punch in radians for each bullet fired</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ViewReturnSpeed" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The speed in radians per second the view returns to its original position after being punched</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Time it takes to reload the weapon in seconds</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
-				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
+				<xs:element name="EquipTime" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Time it takes from selecting the weapon until it's ready to fire</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="TriggerHeld" type="t:bool" minOccurs="0"/>
+				<xs:element name="FireCooldown" type="t:double" minOccurs="0"/>
+				<xs:element name="IsReloading" type="t:bool" minOccurs="0"/>
+				<xs:element name="ReloadTimer" type="t:double" minOccurs="0"/>
+				<xs:element name="CurrentTravel" type="t:float" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Blend.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Blend xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Blend.xsd">
+	<Pose1></Pose1>
+	<Pose2></Pose2>
+	<Weight>0.5</Weight>
+	<SubTreeRoot>false</SubTreeRoot>
+</Blend>

resources/Schema/Components/Blend.xsd

@@ -0,0 +1,15 @@
+<?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="Blend">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Pose1" type="t:string" minOccurs="0"/>
+				<xs:element name="Pose2" type="t:string" minOccurs="0"/>
+				<xs:element name="Weight" type="t:double" minOccurs="0"/>
+				<xs:element name="SubTreeRoot" type="t:bool" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BlendAdditive.xml

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

resources/Schema/Components/BlendAdditive.xsd

@@ -0,0 +1,13 @@
+<?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="BlendAdditive">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Adder" type="t:string" minOccurs="0"/>
+				<xs:element name="Receiver" type="t:string" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BlendOverride.xml

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

resources/Schema/Components/BlendOverride.xsd

@@ -0,0 +1,13 @@
+<?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="BlendOverride">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Master" type="t:string" minOccurs="0"/>
+				<xs:element name="Slave" type="t:string" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostIconsHUD.xml

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

resources/Schema/Components/BoostIconsHUD.xsd

@@ -0,0 +1,10 @@
+<?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="BoostIconsHUD">
+		<xs:annotation>
+			<xs:documentation>Origin for the 3 boost states. Create 3 children with Sprite and Fill components, name them "Sprint", "Defender", "Assault"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/DefenderWeapon.xml

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

resources/Schema/Components/DefenderWeapon.xsd

@@ -4,9 +4,22 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 	<xs:include schemaLocation="../Types/WeaponSlotEnum.xsd"/>
 
+	<xs:complexType name="WeaponStateEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="Idle" type="t:int" fixed="0" minOccurs="0"/>
+					<xs:element name="Firing" type="t:int" fixed="1" minOccurs="0"/>
+					<xs:element name="Reloading" type="t:int" fixed="2" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
 	<xs:element name="DefenderWeapon">
 		<xs:complexType>
 			<xs:all>
+				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
 				<xs:element name="MagazineAmmo" type="t:int" minOccurs="0">
 					<xs:annotation><xs:documentation>Ammo currently loaded into the magazine</xs:documentation></xs:annotation>
 				</xs:element>
@@ -25,6 +38,9 @@
 				<xs:element name="SpreadAngle" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>Spread angle in radians</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="NumPellets" type="t:int" minOccurs="0"/>
 				<xs:element name="RPM" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Rate of fire in rounds per minute</xs:documentation></xs:annotation>
@@ -32,12 +48,17 @@
 				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="ViewReturnSpeed" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The speed in radians per second the view returns to its original position after being punched</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
-				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
-				<xs:element name="IsFiring" type="t:bool" minOccurs="0"/>
-				<xs:element name="TimeSinceLastFire" type="t:double" minOccurs="0"/>
+				<xs:element name="TriggerHeld" type="t:bool" minOccurs="0"/>
+				<xs:element name="FireCooldown" type="t:double" minOccurs="0"/>
+				<xs:element name="IsReloading" type="t:bool" minOccurs="0"/>
+				<xs:element name="ReloadTimer" type="t:double" minOccurs="0"/>
+				<xs:element name="CurrentTravel" type="t:float" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/FloatingEffect.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<FloatingEffect xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FloatingEffect.xsd">
+	<Period>1</Period>
+	<Amplitude>1</Amplitude>
+	<Time>0</Time>
+	<Axis X="0" Y="0" Z="0"/>
+	<Position X="0" Y="0" Z="0"/>
+</FloatingEffect>

resources/Schema/Components/FloatingEffect.xsd

@@ -3,14 +3,14 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
-	<xs:element name="AnimationOffset">
-	<xs:annotation>
-		<xs:documentation>Aim animation offset for the skeleton</xs:documentation>
-		</xs:annotation>
+	<xs:element name="FloatingEffect">
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="AnimationName" type="t:string" minOccurs="0"/>
+				<xs:element name="Period" type="t:double" minOccurs="0"/>
+				<xs:element name="Amplitude" type="t:double" minOccurs="0"/>
 				<xs:element name="Time" type="t:double" minOccurs="0"/>
+				<xs:element name="Axis" type="t:Vector" minOccurs="0"/>
+				<xs:element name="Position" type="t:Vector" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/InputCmdButton.xml

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

resources/Schema/Components/InputCmdButton.xsd

@@ -0,0 +1,19 @@
+<?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="InputCmdButton">
+		<xs:annotation><xs:documentation>Used with a Button component, the button will send an inputCommand event instead of ButtonPressed/Released event.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Command" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The command name for the inputCommand.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="PressValue" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The value in inputCommand.Value that will be sent on button press.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/SidearmWeapon.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<SidearmWeapon xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SidearmWeapon.xsd">
+	<Slot><Secondary/></Slot>
+	<MagazineAmmo>16</MagazineAmmo>
+	<MagazineSize>16</MagazineSize>
+	<BaseDamage>20</BaseDamage>
+	<RPM>500</RPM>
+	<Automatic>false</Automatic>
+	<ViewPunch>0.01</ViewPunch>
+	<ReloadTime>0.5</ReloadTime>
+	<EquipTime>0.5</EquipTime>
+	<TriggerHeld>false</TriggerHeld>
+	<FireCooldown>0</FireCooldown>
+	<IsReloading>false</IsReloading>
+	<ReloadTimer>0</ReloadTimer>
+</SidearmWeapon>

resources/Schema/Components/SidearmWeapon.xsd

@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:include schemaLocation="../Types/WeaponSlotEnum.xsd"/>
+
+	<xs:complexType name="WeaponStateEnum" mixed="true">
+		<xs:complexContent>
+			<xs:extension base="t:enum">
+				<xs:choice>
+					<xs:element name="Idle" type="t:int" fixed="0" minOccurs="0"/>
+					<xs:element name="Firing" type="t:int" fixed="1" minOccurs="0"/>
+					<xs:element name="Reloading" type="t:int" fixed="2" minOccurs="0"/>
+				</xs:choice>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="SidearmWeapon">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
+				<xs:element name="MagazineAmmo" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Ammo currently loaded into the magazine</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="MagazineSize" type="t:int" minOccurs="0">
+						<xs:annotation><xs:documentation>Max number of rounds in a magazine</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="BaseDamage" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Damage dealt if all shotgun pellets hit</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="RPM" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Rate of fire in rounds per minute</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Automatic" type="t:bool" minOccurs="0"/>
+				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="EquipTime" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Time it takes from selecting the weapon until it's ready to fire</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="TriggerHeld" type="t:bool" minOccurs="0"/>
+				<xs:element name="FireCooldown" type="t:double" minOccurs="0"/>
+				<xs:element name="IsReloading" type="t:bool" minOccurs="0"/>
+				<xs:element name="ReloadTimer" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/SprintAbility.xml

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

resources/Schema/Components/SprintAbility.xsd

@@ -9,8 +9,8 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the cooldown on sprint</xs:documentation></xs:annotation>
+				<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:all>
 		</xs:complexType>

resources/Schema/Components/Text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Text xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Text.xsd">
 	<Content></Content>
-	<Resource></Resource>
+	<Resource>Fonts/DroidSans.ttf,64</Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<Alignment><Center/></Alignment>

resources/Schema/Components/TextFieldReader.xml

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

resources/Schema/Components/TextFieldReader.xsd

@@ -0,0 +1,21 @@
+<?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="TextFieldReader">
+		<xs:annotation><xs:documentation>Reads a value from a specific field of a compoent of parent entity and writes it to the Text component on this entity.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="ParentEntityName" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The name of the parent entity to read the component field from. Leave empty to read from this entity.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ComponentType" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The component type to read the field value from.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Field" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The field name to read the value from.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/AnimationTests2.xml

@@ -2,6 +2,10 @@
 <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>
 
@@ -9,138 +13,542 @@
     <Entity>
       <Components>
         <c:Transform>
-          <Position X="-0.100000001" Y="-1.11500001" Z="-3.10500026"/>
+          <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/>
+            <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.40800047" Y="3.65100026" Z="0"/>
+              <Orientation X="5.60000038" Y="3.14159203" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Running">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Run</AnimationName1>
-              <Weight1>0.5</Weight1>
-              <Time1>0.60188997954429357</Time1>
-              <Speed1>-1</Speed1>
-              <Speed2>1</Speed2>
-              <Weight2>0.5</Weight2>
-              <Time2>0.96957233017255007</Time2>
-              <Time3>0.093923612201312068</Time3>
-              <Speed3>1</Speed3>
-            </c:Animation>
-            <c:AnimationOffset>
-              <AnimationName>AimRifle</AnimationName>
-              <Time>0.5</Time>
-            </c:AnimationOffset>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.690088332" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="R_Arm_Weapon_Joint">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                  <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0.161975682" Y="1.06281972" Z="-0.216630161"/>
-                  <Orientation X="-0.064812161" Y="-0.0739696771" Z="0.143780142"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity>
+        <Entity name="Light">
           <Components>
             <c:PointLight>
               <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
-              <Radius>10</Radius>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
             </c:PointLight>
             <c:Transform>
-              <Position X="-0.375567257" Y="2.13093901" Z="-0.718547285"/>
+              <Position X="1.32209361" Y="1.37392569" Z="-0.0505663045"/>
             </c:Transform>
           </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Assault">
+          <Components>
+            <c:BlendAdditive>
+              <Adder>AimBlend</Adder>
+              <Receiver>FinalBlend</Receiver>
+            </c:BlendAdditive>
+            <c:Model>
+              <GlowIntensity>5</GlowIntensity>
+              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
           <Children>
-            <Entity>
+            <Entity name="WeaponAttachment">
               <Components>
-                <c:PointLight>
-                  <Color A="1" B="1" G="0.70588237" R="0.70588237"/>
-                  <Radius>10</Radius>
-                </c:PointLight>
+                <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="-1.96873236" Y="0" Z="0"/>
+                  <Position X="0.154985309" Y="1.07679462" Z="-0.201120675"/>
+                  <Scale X="1.00000012" Y="1" Z="1.00000012"/>
+                  <Orientation X="-0.0289514996" Y="-0.119508959" Z="0.18072544"/>
                 </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>AimRifleA</AnimationName>
+                      <Time>0.49999979138374329</Time>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="AimSecondary">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>AimSecWepA</AnimationName>
+                      <Time>0.5</Time>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="FinalBlend">
+              <Components>
+                <c:BlendOverride>
+                  <Master>ReloadSwitchBlend</Master>
+                  <Slave>MovementBlend</Slave>
+                </c:BlendOverride>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="MovementBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>StandCrouchBlend</Pose1>
+                      <Pose2>JumpDashBlend</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="StandCrouchBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>StandMovement</Pose1>
+                          <Pose2>CrouchMovement</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="StandMovement">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>MovementBlend</Pose1>
+                              <Pose2>Idle</Pose2>
+                              <Weight>0</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="MovementBlend">
+                              <Components>
+                                <c:Blend>
+                                  <Pose1>RunWalkBlend</Pose1>
+                                  <Pose2>StrafeLRBlend</Pose2>
+                                  <Weight>0</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="RunWalkBlend">
+                                  <Components>
+                                    <c:Blend>
+                                      <Pose1>Walk</Pose1>
+                                      <Pose2>Run</Pose2>
+                                      <Weight>1</Weight>
+                                    </c:Blend>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children>
+                                    <Entity name="Walk">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>WalkF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                    <Entity name="Run">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>RunF</AnimationName>
+                                          <Time>0.89967686078176468</Time>
+                                          <Speed>1</Speed>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                  </Children>
+                                </Entity>
+                                <Entity name="StrafeLRBlend">
+                                  <Components>
+                                    <c:Blend>
+                                      <Pose1>Left</Pose1>
+                                      <Pose2>Right</Pose2>
+                                      <Weight>0</Weight>
+                                    </c:Blend>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children>
+                                    <Entity name="Left">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>StrafeLeftF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                    <Entity name="Right">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>StrafeRightF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                  </Children>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                            <Entity name="Idle">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleF</AnimationName>
+                                  <Time>0.33219857512804407</Time>
+                                  <Speed>1</Speed>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="CrouchMovement">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>MovementBlend</Pose1>
+                              <Pose2>Idle</Pose2>
+                            </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</Weight>
+                                    </c:Blend>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children>
+                                    <Entity name="Left">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>CrouchStrafeLeftF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                    <Entity name="Right">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>CrouchStrafeRightF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                  </Children>
+                                </Entity>
+                                <Entity name="Walk">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>CrouchWalkF</AnimationName>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                            <Entity name="Idle">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchF</AnimationName>
+                                  <Time>0.86553330718370836</Time>
+                                  <Speed>1</Speed>
+                                </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>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Jump">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>JumpF</AnimationName>
+                              <Time>0.5</Time>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>DashFBBlend</Pose1>
+                              <Pose2>DashLRBlend</Pose2>
+                              <Weight>0</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="DashFBBlend">
+                              <Components>
+                                <c:Blend>
+                                  <Pose1>DashForward</Pose1>
+                                  <Pose2>DashBackward</Pose2>
+                                  <Weight>1</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="DashForward">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashForwardF</AnimationName>
+                                      <Loop>false</Loop>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="DashBackward">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashBackwardF</AnimationName>
+                                      <Time>1</Time>
+                                      <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>0</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="DashLeft">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashLeftF</AnimationName>
+                                      <Time>1</Time>
+                                      <Loop>false</Loop>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="DashRight">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashRightF</AnimationName>
+                                      <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>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ReloadSwitch">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ReloadSwitchU</AnimationName>
+                          <Time>0.86721706215490468</Time>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="WeaponActionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>IdleBlend</Pose1>
+                          <Pose2>ShootBlend</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="IdleBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>IdlePrimary</Pose1>
+                              <Pose2>IdleSecondary</Pose2>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="IdlePrimary">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleAssaultRifleU</AnimationName>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="IdleSecondary">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleSecWepU</AnimationName>
+                                </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.19605135393254369</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>
-        <Entity>
+        <Entity name="Plane">
           <Components>
             <c:Model>
               <Resource>Models/Core/UnitPlane.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Scale X="10" Y="1" Z="10"/>
+              <Scale X="5" Y="1" Z="5"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity>
+        <Entity name="Light">
           <Components>
-            <c:Animation>
-              <AnimationName1>ShootFastRifle</AnimationName1>
-              <Time1>0.056234247235838808</Time1>
-              <Speed1>1</Speed1>
-              <Speed2>1</Speed2>
-              <AnimationName2>Idl</AnimationName2>
-              <Weight2>0.5</Weight2>
-              <Time2>1.8308673495784191</Time2>
-              <AnimationName3>StrafeRigh</AnimationName3>
-              <Weight3>0.5</Weight3>
-              <Time3>0.32167823998061529</Time3>
-              <Speed3>1</Speed3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-            </c:Model>
-            <c:Transform/>
+            <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>
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0" Y="0.803468645" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
+          <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>

resources/Schema/Entities/AssaultBlendTree.xml

@@ -0,0 +1,513 @@
+<?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>AimBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <GlowIntensity>5</GlowIntensity>
+      <Resource>Models/Characters/Assault/AssaultBlue.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>
+          <Position X="0.156333789" Y="1.03861308" Z="-0.236426264"/>
+          <Orientation X="-0.004295466" Y="-0.0313791931" Z="0.138012439"/>
+          <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>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="AimSecondary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimSecWepA</AnimationName>
+              <Time>0.5</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.5</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:BlendOverride>
+          <Master>ReloadSwitchBlend</Master>
+          <Slave>MovementBlend</Slave>
+        </c:BlendOverride>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="MovementBlend">
+          <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.012867419418159054</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <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.2564968854355536</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.52851038945945739</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.43808950646909217</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.4616050363492068</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>0.0053995709937186831</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="CrouchMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>MovementBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="MovementBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Walk</Pose1>
+                          <Pose2>StrafeLRBlend</Pose2>
+                          <Weight>2.4565650245976452e-16</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.045646808897594759</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.97296827084837822</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.75134225602578031</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>
+              </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>1</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashBackward">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashBackwardF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1</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>1</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashRight">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashRightF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1</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.68071957047806109</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.68424461076784837</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/AssaultWeaponView.xml

@@ -1,17 +1,11 @@
 <?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="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Arm_Weapon_Joint</BoneName>
-    </c:BoneAttachment>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
     </c:Model>
-    <c:Transform>
-      <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
-      <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>
@@ -21,7 +15,8 @@
           <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
         </c:Spawner>
         <c:Transform>
-          <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
+          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -37,9 +32,8 @@
     </Entity>
     <Entity name="AmmunitionHUD">
       <Components>
-        <c:AmmunitionHUD/>
         <c:Transform>
-          <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
+          <Position X="-0.0440000035" Y="0.136000007" Z="-0.119000003"/>
           <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
         </c:Transform>
       </Components>
@@ -70,6 +64,11 @@
                   <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>
@@ -79,10 +78,15 @@
             <Entity name="Ammo">
               <Components>
                 <c:Text>
-                  <Content>360</Content>
+                  <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"/>

resources/Schema/Entities/AssaultWeaponWorld.xml

@@ -1,17 +1,11 @@
 <?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">
+<Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Arm_Weapon_Joint</BoneName>
-    </c:BoneAttachment>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
     </c:Model>
-    <c:Transform>
-      <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
-      <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>

resources/Schema/Entities/BlendTreeTest.xml

@@ -0,0 +1,598 @@
+<?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>AimBlend</Adder>
+              <Receiver>FinalBlend</Receiver>
+            </c:BlendAdditive>
+            <c:Model>
+              <GlowIntensity>5</GlowIntensity>
+              <Resource>Models/Characters/Assault/AssaultBlue.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>
+                  <Position X="0.157041892" Y="1.0375092" Z="-0.236085728"/>
+                  <Orientation X="-0.00432149554" Y="-0.0343661793" Z="0.138000518"/>
+                  <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>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="AimSecondary">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>AimSecWepA</AnimationName>
+                      <Time>0.5</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.5</Time>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="FinalBlend">
+              <Components>
+                <c:BlendOverride>
+                  <Master>ReloadSwitchBlend</Master>
+                  <Slave>MovementBlend</Slave>
+                </c:BlendOverride>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="MovementBlend">
+                  <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.012867419418159054</Weight>
+                          <SubTreeRoot>true</SubTreeRoot>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <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.28642783708275554</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.55844134110665933</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.46802045811629411</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.49153598799640874</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.9353306180083529</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="CrouchMovement">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>MovementBlend</Pose1>
+                              <Pose2>Idle</Pose2>
+                              <Weight>0</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="MovementBlend">
+                              <Components>
+                                <c:Blend>
+                                  <Pose1>Walk</Pose1>
+                                  <Pose2>StrafeLRBlend</Pose2>
+                                  <Weight>2.4565650245976452e-16</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.075577760544797146</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.0028992224955801671</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.78127320767298225</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>
+                      </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>1</Speed>
+                                      <Loop>false</Loop>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="DashBackward">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashBackwardF</AnimationName>
+                                      <Time>1</Time>
+                                      <Speed>1</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>1</Speed>
+                                      <Loop>false</Loop>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="DashRight">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashRightF</AnimationName>
+                                      <Time>1</Time>
+                                      <Speed>1</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.71065052212526325</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.71417556241505054</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>
+        <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/BlueRifle

@@ -2,13 +2,15 @@
 <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/Core/UnitCylinder.mesh</Resource>
-      <Color A="0" B="0" G="0" R="39.2156868"/>
+      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
     </c:Model>
     <c:Transform>
-      <Scale X="0.0400000028" Y="26.2000008" Z="0.0400000028"/>
-      <Orientation X="1.57070005" Y="0" Z="0"/>
+      <Position X="0.136586398" Y="0.92942369" Z="-0.139760047"/>
+      <Orientation X="-0.601206124" Y="0.132410824" Z="-0.129014626"/>
     </c:Transform>
   </Components>
 

resources/Schema/Entities/DashEffect.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="DashEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Animation/>
+    <c:Lifetime>
+      <Lifetime>0.5</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="0" Y="0" Z="0"/>
+      <TimeSinceDeath>0</TimeSinceDeath>
+      <ExplosionDuration>0.5</ExplosionDuration>
+      <EndColor A="0" B="0" G="0" R="0"/>
+    </c:ExplosionEffect>
+    <c:Model/>
+    <c:Transform/>
+  </Components>
+</Entity>

resources/Schema/Entities/DefenderWeaponView.xml

@@ -1,16 +1,12 @@
 <?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="DefenderWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Arm_Weapon_Joint</BoneName>
-      <PositionOffset X="0" Y="0.0480000004" Z="-0.183000013"/>
-    </c:BoneAttachment>
     <c:Model>
       <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
     </c:Model>
     <c:Transform>
-      <Position X="0.120430306" Y="0.775375426" Z="1.36542225"/>
+      <Position X="0" Y="0.0350000001" Z="-0.295000017"/>
     </c:Transform>
   </Components>
 
@@ -37,7 +33,6 @@
     </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"/>
@@ -65,8 +60,13 @@
           <Children>
             <Entity name="MagazineAmmo">
               <Components>
+                <c:TextFieldReader>
+                  <ParentEntityName>Player</ParentEntityName>
+                  <ComponentType>DefenderWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
                 <c:Text>
-                  <Content>32</Content>
+                  <Content>0</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
@@ -78,8 +78,13 @@
             </Entity>
             <Entity name="Ammo">
               <Components>
+                <c:TextFieldReader>
+                  <ParentEntityName>Player</ParentEntityName>
+                  <ComponentType>DefenderWeapon</ComponentType>
+                  <Field>Ammo</Field>
+                </c:TextFieldReader>
                 <c:Text>
-                  <Content>360</Content>
+                  <Content>0</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>

resources/Schema/Entities/MovementTest.xml

@@ -26,7 +26,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
               <Color A="1" B="0" G="0" R="1"/>
             </c:Model>
             <c:Transform>
@@ -39,7 +39,7 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
               <Color A="1" B="0.0117647061" G="0" R="1"/>
             </c:Model>
             <c:Transform>
@@ -94,11 +94,11 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
-              <Position X="0.800000012" Y="0" Z="0"/>
+              <Position X="-0.600000024" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -107,11 +107,11 @@
           <Components>
             <c:SpawnPoint/>
             <c:Model>
-              <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
-              <Position X="-0.600000024" Y="0" Z="0"/>
+              <Position X="0.800000012" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>

resources/Schema/Entities/NewMap2version2.xml

@@ -804,11 +804,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>3002.0048499272534</Time>
+                          <Time>3297.0538973857279</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.00320033543" Z="0"/>
+                          <Position X="-0" Y="-0.0338360146" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -825,7 +825,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23665.3672" Z="0"/>
+                              <Orientation X="0" Y="23901.0449" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -851,11 +851,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2981.7884295114754</Time>
+                          <Time>3276.8374769699499</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.123386621" Z="-0"/>
+                          <Position X="0" Y="0.0977828354" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -872,7 +872,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23644.3164" Z="0"/>
+                              <Orientation X="0" Y="23879.9941" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -898,11 +898,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2965.4934667508096</Time>
+                          <Time>3260.542514209284</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.199960142" Z="-0"/>
+                          <Position X="0" Y="0.19820635" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -919,7 +919,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23585.6074" Z="0"/>
+                              <Orientation X="0" Y="23821.2852" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -945,11 +945,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2922.0307477781698</Time>
+                          <Time>3217.0797952366443</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.0194334686" Z="0"/>
+                          <Position X="-0" Y="-0.0497358106" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -966,7 +966,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5331.15967" Z="0"/>
+                              <Orientation X="0" Y="5567.29199" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -992,11 +992,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2871.33224525081</Time>
+                          <Time>3166.3812927092845</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.172897741" Z="-0"/>
+                          <Position X="0" Y="0.186271787" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1013,7 +1013,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5241.63037" Z="0"/>
+                              <Orientation X="0" Y="5477.7627" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -1039,11 +1039,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2854.2794756870871</Time>
+                          <Time>3149.3285231455616</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.154012829" Z="0"/>
+                          <Position X="-0" Y="-0.171761468" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1060,7 +1060,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="14694.2959" Z="0"/>
+                              <Orientation X="0" Y="14930.6826" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -1086,11 +1086,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2839.2647225755118</Time>
+                          <Time>3134.3137700339862</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.147846922" Z="-0"/>
+                          <Position X="0" Y="0.166757002" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1107,7 +1107,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="12585.2275" Z="0"/>
+                              <Orientation X="0" Y="12821.6143" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -2242,7 +2242,7 @@
                                       <Resource>Models/Props/Stones/AssaultHolder.mesh</Resource>
                                     </c:Model>
                                     <c:Transform>
-                                      <Position X="-3.47628784" Y="0.507368565" Z="0.99732101"/>
+                                      <Position X="-3.30188537" Y="0.507368565" Z="1.6052227"/>
                                     </c:Transform>
                                   </Components>
                                   <Children/>
@@ -2355,11 +2355,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2746.6837512442808</Time>
+                          <Time>3041.7327987027552</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.16754517" Z="0"/>
+                          <Position X="-0" Y="-0.148809776" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2376,7 +2376,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="16210.457" Z="0"/>
+                              <Orientation X="0" Y="16446.9434" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -2402,11 +2402,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2732.8386366079758</Time>
+                          <Time>3027.8876840664502</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.0970942229" Z="0"/>
+                          <Position X="-0" Y="-0.0691253543" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2423,7 +2423,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5167.40771" Z="0"/>
+                              <Orientation X="0" Y="5403.54004" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -2904,11 +2904,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2969.073541383088</Time>
+                          <Time>3264.1225888415624</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.0458931364" Z="-0"/>
+                          <Position X="0" Y="0.0752089471" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2925,7 +2925,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23639.0527" Z="0"/>
+                              <Orientation X="0" Y="23874.7305" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -2951,11 +2951,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2948.85712096731</Time>
+                          <Time>3243.9061684257845</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.0866934955" Z="0"/>
+                          <Position X="-0" Y="-0.0580219813" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2972,7 +2972,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23618.002" Z="0"/>
+                              <Orientation X="0" Y="23853.6797" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -2998,11 +2998,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2932.5621582066442</Time>
+                          <Time>3227.6112056651186</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.196187839" Z="0"/>
+                          <Position X="-0" Y="-0.187905088" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3019,7 +3019,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23559.293" Z="0"/>
+                              <Orientation X="0" Y="23794.9707" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -3045,11 +3045,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2889.0994392340044</Time>
+                          <Time>3184.1484866924789</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.0615537763" Z="-0"/>
+                          <Position X="0" Y="0.0900137872" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3066,7 +3066,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5304.81885" Z="0"/>
+                              <Orientation X="0" Y="5540.95117" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -3092,11 +3092,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2838.4009367066446</Time>
+                          <Time>3133.4499841651191</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.190397173" Z="0"/>
+                          <Position X="-0" Y="-0.197535709" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3113,7 +3113,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5215.28955" Z="0"/>
+                              <Orientation X="0" Y="5451.42188" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -3139,11 +3139,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2821.3481671429217</Time>
+                          <Time>3116.3972146013962</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.177647248" Z="-0"/>
+                          <Position X="0" Y="0.189699799" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3160,7 +3160,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="14667.9326" Z="0"/>
+                              <Orientation X="0" Y="14904.3193" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>
@@ -3186,11 +3186,11 @@
                       <Components>
                         <c:FloatingEffect>
                           <Axis X="0" Y="0.200000003" Z="0"/>
-                          <Time>2806.3334140313464</Time>
+                          <Time>3101.3824614898208</Time>
                           <Period>2</Period>
                         </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.173328787" Z="0"/>
+                          <Position X="-0" Y="-0.186583459" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3207,7 +3207,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="12558.8643" Z="0"/>
+                              <Orientation X="0" Y="12795.251" Z="0"/>
                             </c:Transform>
                             <c:Trigger/>
                           </Components>

resources/Schema/Entities/NewMap2version3NEW.xml

@@ -802,8 +802,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>309.46063484238653</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.181836113" Z="0"/>
+                          <Position X="-0" Y="-0.198473096" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -821,7 +826,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="24080.8184" Z="0"/>
+                              <Orientation X="0" Y="24396.9355" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -844,8 +849,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>277.77588852554459</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.185762629" Z="-0"/>
+                          <Position X="-0" Y="-0.129464492" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -863,7 +873,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="24059.7676" Z="0"/>
+                              <Orientation X="0" Y="24375.8848" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -886,8 +896,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>265.69306053010564</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.167244121" Z="0"/>
+                          <Position X="-0" Y="-0.164330602" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -905,7 +920,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="24001.0586" Z="0"/>
+                              <Orientation X="0" Y="24317.1758" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -928,8 +943,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>254.01948784300018</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.0644967183" Z="0"/>
+                          <Position X="0" Y="0.0122369174" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -947,7 +967,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5746.52246" Z="0"/>
+                              <Orientation X="0" Y="6061.90527" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -970,8 +990,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>244.21618709850597</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.0994067639" Z="-0"/>
+                          <Position X="0" Y="0.125630379" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -989,7 +1014,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5656.99316" Z="0"/>
+                              <Orientation X="0" Y="5972.37598" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -1012,8 +1037,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>231.37430087102678</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.19803375" Z="-0"/>
+                          <Position X="-0" Y="-0.184606224" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1031,7 +1061,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="15110.7119" Z="0"/>
+                              <Orientation X="0" Y="15425.6113" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -1054,8 +1084,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>219.21100328618962</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.11493478" Z="-0"/>
+                          <Position X="-0" Y="-0.12308117" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1073,7 +1108,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="13001.6436" Z="0"/>
+                              <Orientation X="0" Y="13316.543" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2318,8 +2353,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>192.42971043059836</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.143913418" Z="0"/>
+                          <Position X="0" Y="0.195146352" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2337,7 +2377,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="16626.7168" Z="0"/>
+                              <Orientation X="0" Y="16942.834" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2360,8 +2400,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>180.12130596231671</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.151800558" Z="0"/>
+                          <Position X="0" Y="0.0743921027" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2379,7 +2424,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5582.77051" Z="0"/>
+                              <Orientation X="0" Y="5898.15332" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2857,8 +2902,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>154.99927956894089</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.199556321" Z="-0"/>
+                          <Position X="0" Y="0.000450141786" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2876,7 +2926,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="24054.5039" Z="0"/>
+                              <Orientation X="0" Y="24370.6191" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2899,8 +2949,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>144.56072209865593</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.0983726978" Z="-0"/>
+                          <Position X="0" Y="0.196372822" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2918,7 +2973,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="24033.4531" Z="0"/>
+                              <Orientation X="0" Y="24349.5703" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2941,8 +2996,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>113.54515932497441</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="0" Y="0.199529812" Z="0"/>
+                          <Position X="-0" Y="-0.197990373" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -2960,7 +3020,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="23974.7441" Z="0"/>
+                              <Orientation X="0" Y="24290.8613" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2983,8 +3043,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>101.62883282122999</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.129332498" Z="-0"/>
+                          <Position X="-0" Y="-0.183840692" Z="-0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3002,7 +3067,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5720.18164" Z="0"/>
+                              <Orientation X="0" Y="6035.56445" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -3025,8 +3090,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>90.764091375525993</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.199750423" Z="-0"/>
+                          <Position X="0" Y="0.135024786" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3044,7 +3114,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36800003" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="5630.65234" Z="0"/>
+                              <Orientation X="0" Y="5946.03516" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -3067,8 +3137,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>70.667870676407972</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.164693162" Z="-0"/>
+                          <Position X="0" Y="0.172826052" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3086,7 +3161,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="15084.3486" Z="0"/>
+                              <Orientation X="0" Y="15399.248" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -3109,8 +3184,13 @@
                   <Children>
                     <Entity>
                       <Components>
+                        <c:FloatingEffect>
+                          <Axis X="0" Y="0.200000003" Z="0"/>
+                          <Time>54.385750605052408</Time>
+                          <Period>2</Period>
+                        </c:FloatingEffect>
                         <c:Transform>
-                          <Position X="-0" Y="-0.0709934905" Z="-0"/>
+                          <Position X="0" Y="0.187255353" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -3128,7 +3208,7 @@
                             <c:Transform>
                               <Position X="0" Y="2.36784196" Z="0"/>
                               <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-                              <Orientation X="0" Y="12975.2803" Z="0"/>
+                              <Orientation X="0" Y="13290.1797" Z="0"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -4222,7 +4302,7 @@
                   <HomePointForTeam>
                     <Blue/>
                   </HomePointForTeam>
-                  <CapturePointMaxTimer>-15</CapturePointMaxTimer>
+                  <CaptureTimer>-15</CaptureTimer>
                   <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Trigger/>
@@ -4444,7 +4524,7 @@
         <Entity name="Directional">
           <Components>
             <c:DirectionalLight>
-              <Intensity>1</Intensity>
+              <Intensity>0.40000000596046448</Intensity>
             </c:DirectionalLight>
             <c:Transform>
               <Orientation X="0" Y="1.16600001" Z="2.08000016"/>

resources/Schema/Entities/OverwatchCamera.xml

@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="OverwatchCamera" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:RaptorCopter>
+      <Speed>0.049999997019767761</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
+    <c:Transform>
+      <Position X="0" Y="-4" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="CameraAnchor">
+      <Components>
+        <c:Transform>
+          <Position X="66" Y="59.2180023" Z="0"/>
+          <Orientation X="5.89000034" Y="1.57079637" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="SpectatorCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="SpectatorHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <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>
+                              <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>
+                              <Percentage>0.10332605343919568</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>
+                    <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>
+                              <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>
+                  </Children>
+                </Entity>
+                <Entity name="RespawnTimer">
+                  <Components>
+                    <c:Text>
+                      <Content>16</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.178199276" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="PickClassCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="PickClassHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="DefenderClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>2</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="AssaultClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitRaptor.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="0.149504215" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="SniperClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>3</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/Player.xml

@@ -12,9 +12,7 @@
       </Slot>
     </c:AssaultWeapon>
     <c:Collidable/>
-    <c:DefenderWeapon>
-      <TimeSinceLastFire>52.867678870419283</TimeSinceLastFire>
-    </c:DefenderWeapon>
+    <c:DashAbility/>
     <c:DoubleJump/>
     <c:Health/>
     <c:Physics>
@@ -30,7 +28,7 @@
       </Team>
     </c:Team>
     <c:Transform>
-      <Position X="-1.42731023" Y="0.0288832653" Z="3.63052702"/>
+      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
     </c:Transform>
   </Components>
 
@@ -70,8 +68,8 @@
               <Components>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <DepthSort>false</DepthSort>
                   <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -94,42 +92,105 @@
                 <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:HealthHUD/>
-                    <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:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                    </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:HealthHUD/>
                     <c:Transform>
                       <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
                       <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>
+                  </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/>
@@ -170,8 +231,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -196,7 +257,6 @@
                           <CapturePointNumber>3</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Fill>
-                          <Percentage>0.80222018197612788</Percentage>
                           <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                         </c:Fill>
                         <c:Sprite>
@@ -205,8 +265,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -231,6 +291,7 @@
                           <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>
@@ -239,8 +300,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -273,8 +334,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -286,7 +347,7 @@
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                       <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
+                      <Color A="0.699999988" B="0" G="0" R="1"/>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -297,7 +358,8 @@
                       <Components>
                         <c:CapturePointHUD/>
                         <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                          <Percentage>1</Percentage>
+                          <Color A="0.699999988" B="0" G="0" R="1"/>
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
@@ -305,8 +367,8 @@
                         </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"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -369,19 +431,38 @@
                 </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.9408570429715581</Time1>
+              <Time1>1.8348644854054612</Time1>
               <Speed1>1</Speed1>
               <AnimationName2></AnimationName2>
               <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
-              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
+              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
               <Color A="1" B="1" G="0.309803933" R="0"/>
             </c:Model>
             <c:Transform/>
@@ -389,25 +470,37 @@
           <Children>
             <Entity name="PrimaryAttachment">
               <Components>
-                <c:WeaponAttachment>
-                  <Weapon>DefenderWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/DefenderWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
                 <c:WeaponAttachment>
                   <Weapon>AssaultWeapon</Weapon>
                 </c:WeaponAttachment>
                 <c:Spawner>
                   <EntityFile>Schema/Entities/AssaultWeaponView.xml</EntityFile>
                 </c:Spawner>
-                <c:Transform/>
+                <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>
@@ -435,8 +528,7 @@
     <Entity name="PlayerModel">
       <Components>
         <c:Animation>
-          <AnimationName1>Idle</AnimationName1>
-          <Time1>1.5631122524686134</Time1>
+          <AnimationName1>IdleF</AnimationName1>
           <Speed1>1</Speed1>
           <AnimationName2></AnimationName2>
           <AnimationName3></AnimationName3>
@@ -448,28 +540,13 @@
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
-          <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
+          <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:WeaponAttachment>
-              <Weapon>DefenderWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/DefenderWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
           <Components>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
@@ -484,6 +561,27 @@
           </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">
@@ -522,8 +620,8 @@
         </c:Text>
         <c:Transform>
           <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
           <Orientation X="0" Y="3.14199996" Z="0"/>
+          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -532,8 +630,8 @@
       <Components>
         <c:Sprite>
           <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <DepthSort>false</DepthSort>
           <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
           <Color A="1" B="1" G="0.309803933" R="0"/>
         </c:Sprite>
         <c:HiddenForLocalPlayer/>

resources/Schema/Entities/PlayerAssaultFallbackBlue.xml

@@ -0,0 +1,695 @@
+<?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>
+                  </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.309803933" 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/AssaultWeaponView.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/AssaultWeaponWorld.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 name="AssaultWeapon">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+                </c:Model>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="WeaponMuzzle">
+                  <Components>
+                    <c:Spawner>
+                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+                    </c:Spawner>
+                    <c:Transform>
+                      <Position X="0.00624208851" Y="0.0957332104" Z="-0.159257293"/>
+                    </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>
+          </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/RayBlue

@@ -1,17 +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:Model>
-      <Resource>Models/Core/UnitCylinder.mesh</Resource>
-      <Color A="0" B="0" G="0" R="39.2156868"/>
-    </c:Model>
-    <c:Transform>
-      <Scale X="0.0400000028" Y="26.2000008" Z="0.0400000028"/>
-      <Orientation X="1.57070005" Y="0" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/RayBlue.xml

@@ -1,20 +1,46 @@
 <?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">
+<Entity name="RayRed" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.25</Lifetime>
+      <Lifetime>0.10000000149011612</Lifetime>
     </c:Lifetime>
-    <c:Model>
-      <Resource>Models/Effects/CylinderShot.mesh</Resource>
-      <Color A="0.149019614" B="39.2156868" G="39.2156868" R="0"/>
-      <Transparent>true</Transparent>
-    </c:Model>
     <c:Transform>
-      <Scale X="0.0690000057" Y="0.0690000057" Z="100"/>
+      <Scale X="0" Y="1" Z="1"/>
     </c:Transform>
   </Components>
 
-  <Children/>
+  <Children>
+    <Entity>
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.5"/>
+          <Orientation X="0" Y="-1.57099998" Z="0"/>
+          <Scale X="1" Y="0.0260000005" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.5"/>
+          <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
+          <Scale X="1" Y="0.0260000005" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/RayRed.xml

@@ -1,20 +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:Lifetime>
-      <Lifetime>0.25</Lifetime>
-    </c:Lifetime>
-    <c:Model>
-      <Resource>Models/Effects/CylinderShot.mesh</Resource>
-      <Color A="0.149019614" B="0" G="0" R="39.2156868"/>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform>
-      <Scale X="0.0690000057" Y="0.0690000057" Z="100"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/SidearmWeaponView.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SidearmWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Model>
+      <Resource>Models/Weapons/SecondaryWeapon.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-0.00200000009" Y="0.0600000024" Z="-0.297000021"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Ray2Red.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0" Y="0.105000004" Z="-0.256000012"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionHUD">
+      <Components>
+        <c:TextFieldReader>
+          <ParentEntityName></ParentEntityName>
+          <ComponentType></ComponentType>
+          <Field></Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="-0.0300000012" Y="0.077000007" 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.00300000003"/>
+              <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>SidearmWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
+                <c:Text>
+                  <Content>16</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="-0.00600000005" Z="0"/>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Infinity!">
+              <Components>
+                <c:Text>
+                  <Content>8</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0150000006" Y="-0.029000001" Z="0"/>
+                  <Orientation X="0" Y="0" Z="1.5710001"/>
+                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/SidearmWeaponWorld.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SidearmWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Model>
+      <Resource>Models/Weapons/SecondaryWeapon.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-0.0160000008" Y="0.0800000057" Z="-0.275000006"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponMuzzle">
+      <Components>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.0123999491" Y="0.102453232" Z="-0.273824364"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/Skeleton.xml

@@ -18,9 +18,9 @@
           <Transparent>true</Transparent>
         </c:Model>
         <c:Transform>
-          <Position X="0.47420007" Y="0.928898275" Z="0.0299553983"/>
+          <Position X="0.155832842" Y="1.12994993" Z="-0.201626897"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.100000001"/>
-          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
+          <Orientation X="0.195066273" Y="-0.0870126858" Z="0.148657113"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -29,16 +29,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Hand</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.448672563" Y="0.992614031" Z="0.0575723015"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
+          <Position X="0.202149346" Y="1.12270021" Z="-0.144635201"/>
+          <Scale X="0.0500000231" Y="0.0500000305" Z="0.0500000119"/>
+          <Orientation X="1.41306889" Y="0.0776072815" Z="-0.744222522"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -47,16 +48,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Arm</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.12972948" Y="1.28044498" Z="-0.0855199769"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.178462029" Y="-0.240202308" Z="-0.227051333"/>
+          <Position X="0.0609518476" Y="1.16432548" Z="0.0783129707"/>
+          <Scale X="0.0500000194" Y="0.0500000082" Z="0.0500000194"/>
+          <Orientation X="0.311971247" Y="0.199406415" Z="0.162320927"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -65,16 +67,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Shoulder</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.0566707924" Y="1.22090316" Z="-0.110467494"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0742288083" Y="1.12503755" Z="-0.00992172211"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -83,16 +86,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Neck</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="6.88049477e-05" Y="1.29971886" Z="-0.151777163"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-1.03466523" Y="-0.0017389874" Z="0.00627749134"/>
+          <Position X="0.0288712904" Y="1.20688999" Z="-0.0585537553"/>
+          <Scale X="0.0500000194" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0778672397" Y="-0.380205482" Z="-0.116210334"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -101,16 +105,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_3</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000299328996" Y="1.2487011" Z="-0.0936965123"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0190485716" Y="1.13146138" Z="-0.0447565243"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -119,16 +124,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_2</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000528411241" Y="1.1669693" Z="0.000368326902"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.00282198261" Y="1.01004541" Z="-0.0218831152"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -137,16 +143,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_1</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000317580998" Y="1.03476369" Z="7.06899816e-17"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.168994248" Y="-0.000270629855" Z="-6.74916964e-06"/>
+          <Position X="-0.00298201409" Y="0.878305078" Z="-0.0124331526"/>
+          <Scale X="0.0500000082" Y="0.0500000007" Z="0.0500000007"/>
+          <Orientation X="-0.478212297" Y="-1.01566339" Z="-0.374480605"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -155,15 +162,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Hip</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="0" Y="0.901226044" Z="0"/>
-          <Scale X="0.100000001" Y="0.0500000007" Z="0.0500000007"/>
+          <Position X="0" Y="0.745380521" Z="0"/>
+          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <Orientation X="-0.0850669593" Y="-0.351720452" Z="0.0214110892"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -172,16 +181,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Leg_Top</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.0735318959" Y="0.86343354" Z="0.00186898722"/>
+          <Position X="-0.0688988566" Y="0.704185605" Z="-0.0198653266"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.431212306" Y="-0.0456388369" Z="-0.00236316444"/>
+          <Orientation X="-0.124463096" Y="0.178934589" Z="0.0281526987"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -190,16 +200,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.0971027464" Y="0.534537971" Z="-0.158307418"/>
+          <Position X="-0.0895988718" Y="0.340622783" Z="0.022300493"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.435873091" Y="0.0584642813" Z="-0.0526505522"/>
+          <Orientation X="-0.634849846" Y="0.204822823" Z="0.0869619399"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -208,16 +219,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Foot</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.136750847" Y="0.215778053" Z="0.0181705151"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-7.45058151e-06" Y="-4.34406102e-05" Z="-2.32085604e-05"/>
+          <Position X="-0.0861766189" Y="0.0597670376" Z="0.257741988"/>
+          <Scale X="0.0500000082" Y="0.0500000007" Z="0.0500000082"/>
+          <Orientation X="-0.185180262" Y="-0.00943047088" Z="-0.00198192359"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -226,16 +238,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Toe</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.142155826" Y="0.180158257" Z="-0.171162993"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-7.45058151e-06" Y="-4.34406102e-05" Z="-2.32085604e-05"/>
+          <Position X="-0.0898738578" Y="-0.0101006478" Z="0.078159079"/>
+          <Scale X="0.0500000082" Y="0.0500000007" Z="0.0500000082"/>
+          <Orientation X="-0.185180262" Y="-0.00943047088" Z="-0.00198192359"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -244,16 +257,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Shoulder</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.0569540039" Y="1.22099173" Z="-0.110411651"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0172477104" Y="1.11405122" Z="-0.107610352"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -262,16 +276,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Arm</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.129911453" Y="1.28064728" Z="-0.0853923708"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.558630228" Y="-0.558619261" Z="-0.988305748"/>
+          <Position X="-0.0692541152" Y="1.13922095" Z="-0.14491269"/>
+          <Scale X="0.0500000194" Y="0.0500000194" Z="0.0500000231"/>
+          <Orientation X="1.49024689" Y="-0.866028547" Z="1.11317146"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -280,16 +295,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Hand</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.454215586" Y="1.41859245" Z="-0.370613039"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931911349" Y="4.81306633e-05" Z="0.000111658264"/>
+          <Position X="0.100635156" Y="1.17628682" Z="-0.439798951"/>
+          <Scale X="0.0500000231" Y="0.0500000305" Z="0.050000038"/>
+          <Orientation X="0.026293885" Y="-0.262760967" Z="2.338521"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -298,16 +314,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.138541639" Y="1.30872273" Z="-0.144261822"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="-0.0505402647" Y="1.1960609" Z="-0.172250509"/>
+          <Scale X="0.0500000194" Y="0.0500000119" Z="0.0500000119"/>
+          <Orientation X="-0.295679778" Y="-1.03809094" Z="-0.506270111"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -316,16 +333,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Chin</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.00033863826" Y="1.2016536" Z="-0.251047492"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
+          <Position X="0.0539259352" Y="1.22412896" Z="-0.183897316"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0481163412" Y="-0.134963214" Z="-0.102023236"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -334,16 +352,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Head</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000338668207" Y="1.33565879" Z="-0.254856527"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
+          <Position X="0.0481297895" Y="1.31164014" Z="-0.0825063139"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0481163412" Y="-0.134963214" Z="-0.102023236"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -352,16 +371,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Perietal</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000338537793" Y="1.43159795" Z="-0.410463303"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
+          <Position X="0.0686318353" Y="1.49197555" Z="-0.104337469"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0481163412" Y="-0.134963214" Z="-0.102023236"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -370,16 +390,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Elbow</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <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.312942117" Y="1.35850036" Z="-0.246365055"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.353978485" Y="-0.15571253" Z="-0.903516531"/>
+          <Position X="-0.0776530653" Y="1.10232043" Z="-0.397976696"/>
+          <Scale X="0.0500000231" Y="0.0500000231" Z="0.0500000231"/>
+          <Orientation X="2.36848879" Y="-0.278962672" Z="2.07910991"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -388,16 +409,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.105701312" Y="0.499459773" Z="0.030466903"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-1.02907228" Y="-0.0580535792" Z="0.116703011"/>
+          <Position X="0.115077674" Y="0.503088951" Z="-0.267230242"/>
+          <Scale X="0.0500000007" Y="0.0499999933" Z="0.049999997"/>
+          <Orientation X="-0.511662602" Y="-0.216903374" Z="-0.0133549664"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -406,16 +428,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Elbow</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.309118003" Y="1.12181115" Z="0.00506293867"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.391992599" Y="-0.509281039" Z="-0.0413108058"/>
+          <Position X="0.301801801" Y="1.09683371" Z="0.023665078"/>
+          <Scale X="0.0500000231" Y="0.0500000194" Z="0.0500000194"/>
+          <Orientation X="1.67780411" Y="0.697954118" Z="-1.36570835"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -424,16 +447,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Leg_Top</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.074000001" Y="0.863433301" Z="0.00200000009"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.0984009728" Y="0.0146064674" Z="0.00352247525"/>
+          <Position X="0.0695244595" Y="0.711660385" Z="0.0306202006"/>
+          <Scale X="0.0500000007" Y="0.0500000007" Z="0.049999997"/>
+          <Orientation X="0.929966331" Y="0.0844758675" Z="0.0447596237"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -442,16 +466,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Foot</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.139749736" Y="0.334264338" Z="0.356020123"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.000313894066" Y="0.00262229913" Z="0.00155029749"/>
+          <Position X="0.137999952" Y="0.19909358" Z="-0.0635268986"/>
+          <Scale X="0.0500000007" Y="0.0499999933" Z="0.049999997"/>
+          <Orientation X="-0.193798333" Y="-0.056662742" Z="-0.0102932369"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -460,16 +485,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Toe</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.144308567" Y="0.298593462" Z="0.166685253"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.000313894066" Y="0.00262229913" Z="0.00155029749"/>
+          <Position X="0.153348058" Y="0.127739012" Z="-0.24189125"/>
+          <Scale X="0.0500000007" Y="0.0499999933" Z="0.049999997"/>
+          <Orientation X="-0.193798333" Y="-0.056662742" Z="-0.0102932369"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -478,16 +504,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.13872239" Y="1.30850673" Z="-0.144398093"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0885034204" Y="1.22286928" Z="0.0661265627"/>
+          <Scale X="0.0500000119" Y="0.0500000119" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809083" Z="-0.237101197"/>
         </c:Transform>
       </Components>
       <Children/>

resources/Schema/Entities/ble

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

@@ -0,0 +1,298 @@
+<?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>Aim</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <GlowIntensity>4</GlowIntensity>
+      <Resource>Models/Characters/Sniper/SniperBlue.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>
+          <Position X="0.161506474" Y="1.12409711" Z="-0.197195739"/>
+          <Scale X="1.00000012" Y="1" Z="1.00000012"/>
+          <Orientation X="0.185420558" Y="-0.0891536027" Z="0.122916825"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Light">
+      <Components>
+        <c:PointLight>
+          <Radius>3</Radius>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0" Y="0.100000001" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Aim">
+      <Components>
+        <c:Animation>
+          <AnimationName>AimRifleA</AnimationName>
+          <Time>0.60000038146972656</Time>
+          <Loop>false</Loop>
+          <Additive>true</Additive>
+        </c:Animation>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:BlendOverride>
+          <Master>WeaponBlend</Master>
+          <Slave>MovementBlend</Slave>
+        </c:BlendOverride>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="WeaponBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>ShootBlend</Pose1>
+              <Pose2>Reload</Pose2>
+              <Weight>1</Weight>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="ShootBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>ShootFast</Pose1>
+                  <Pose2>ShootSlow</Pose2>
+                  <Weight>1</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="ShootFast">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShootFastRifleU</AnimationName>
+                      <Time>0.19319528378127959</Time>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ShootSlow">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShootRifleU</AnimationName>
+                      <Time>0.59328474141239074</Time>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Reload">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchU</AnimationName>
+                  <Time>1</Time>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="MovementBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>StandCrouchBlend</Pose1>
+              <Pose2>Jump</Pose2>
+              <Weight>1</Weight>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="StandCrouchBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>StandMovement</Pose1>
+                  <Pose2>CrouchMovement</Pose2>
+                  <Weight>1</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="CrouchMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>Walk</Pose1>
+                      <Pose2>StrafeBlend</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Walk">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>CrouchWalkF</AnimationName>
+                          <Time>0.35684875796278082</Time>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="StrafeBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Left</Pose1>
+                          <Pose2>Right</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Left">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchStrafeLeftF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Right">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchStrafeRightF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="StandMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>RunWalkBlend</Pose1>
+                      <Pose2>StrafeBlend</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="RunWalkBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Run</Pose1>
+                          <Pose2>Walk</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Run">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>RunF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>WalkF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="StrafeBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Left</Pose1>
+                          <Pose2>Right</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Left">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>StrafeLeftF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Right">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>StrafeRightF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Jump">
+              <Components>
+                <c:Animation>
+                  <AnimationName>JumpF</AnimationName>
+                  <Time>1</Time>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>