BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

Browse Source
This commit is contained in:
viktorljung
2016-03-13 21:10:39 +01:00
parent 3a0cff7a83 27443d4e08
commit 93f4384da6
12 changed files with 1106 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Client.h
+2
View File
@@ -16,6 +16,7 @@
#include "Network/UDPClient.h" #include "Network/UDPClient.h"
#include "Network/TCPClient.h" #include "Network/TCPClient.h"
#include "Network/SnapshotDefinitions.h" #include "Network/SnapshotDefinitions.h"
#include "Network/EKillDeath.h"
#include "Core/World.h" #include "Core/World.h"
#include "Core/EntityFile.h" #include "Core/EntityFile.h"
#include "Core/EventBroker.h" #include "Core/EventBroker.h"
@@ -104,6 +105,7 @@ private:
void parseDashEffect(Packet& packet); void parseDashEffect(Packet& packet);
void parseAmmoPickup(Packet& packet); void parseAmmoPickup(Packet& packet);
void parseRemoveWorld(Packet& packet); void parseRemoveWorld(Packet& packet);
void parseKDEvent(Packet& packet);
void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType); void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
void parseSnapshot(Packet& packet); void parseSnapshot(Packet& packet);
void identifyPacketLoss(); void identifyPacketLoss();
include/Engine/Network/EKillDeath.h
+11
View File
@@ -10,8 +10,19 @@ namespace Events
struct KillDeath : public Event struct KillDeath : public Event
{ {
int CasualtyTeam;
PlayerID Casualty = -1; PlayerID Casualty = -1;
std::string CasualtyName;
//1 = assault, 2 = defender, 3 = sniper
int CasualtyClass;
int KillerTeam;
PlayerID Killer = -1; PlayerID Killer = -1;
std::string KillerName;
//1 = assault, 2 = defender, 3 = sniper
int KillerClass;
}; };
} }
include/Engine/Network/MessageType.h
+1
View File
@@ -24,6 +24,7 @@ enum class MessageType
ServerlistRequest, ServerlistRequest,
AmmoPickup, AmmoPickup,
RemoveWorld, RemoveWorld,
KD,
Invalid Invalid
}; };
include/Game/Systems/KillFeedSystem.h
+20 -7
View File
@@ -3,7 +3,7 @@
#include "../../Engine/Core/System.h" #include "../../Engine/Core/System.h"
#include "../../Engine/GLM.h" #include "../../Engine/GLM.h"
#include "Core/EPlayerDeath.h" #include "Network/EKillDeath.h"
class KillFeedSystem : public ImpureSystem class KillFeedSystem : public ImpureSystem
{ {
@@ -11,8 +11,7 @@ public:
KillFeedSystem(SystemParams params) KillFeedSystem(SystemParams params)
: System(params) : System(params)
{ {
EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath); EVENT_SUBSCRIBE_MEMBER(m_EKillDeath, &KillFeedSystem::OnPlayerKillDeath)
} }
virtual void Update(double dt) override; virtual void Update(double dt) override;
@@ -22,16 +21,30 @@ private:
EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath; EventRelay<KillFeedSystem, Events::KillDeath> m_EKillDeath;
bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e); bool KillFeedSystem::OnPlayerKillDeath(Events::KillDeath& e);
struct KillFeedInfo struct KillFeedInfo
{ {
std::string Content; std::string KillerName = "";
glm::vec4 Color; int KillerClass = 0;
int KillerID = -1;
int KillerTeam = 0;
std::string KillerColor = "";
std::string VictimName = "";
int VictimClass = 0;
int VictimID = -1;
int VictimTeam = 0;
std::string VictimColor = "";
bool redused;
float TimeToLive = 5.f; float TimeToLive = 5.f;
}; };
std::string m_RedColor = "\\C08366D";
std::string m_BlueColor = "\\C6A1208";
std::list<KillFeedInfo> m_DeathQueue; std::list<KillFeedInfo> m_DeathQueue;
}; };
resources/Schema/Entities/MovementTest.xml
+655 -604
View File
File diff suppressed because it is too large Load Diff
resources/Schema/Entities/OverwatchCamera.xml
+55 -3
View File
@@ -8,7 +8,7 @@
</c:RaptorCopter> </c:RaptorCopter>
<c:Transform> <c:Transform>
<Position X="0" Y="-4" Z="0"/> <Position X="0" Y="-4" Z="0"/>
<Orientation X="0" Y="58.3794823" Z="0"/> <Orientation X="0" Y="71.5427246" Z="0"/>
</c:Transform> </c:Transform>
</Components> </Components>
@@ -275,7 +275,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="1" B="0" G="0.294117659" R="0.980392158"/> <Color A="1" B="0" G="0.294117659" R="0.980392158"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:InputCmdButton> <c:InputCmdButton>
<Command>PickTeam</Command> <Command>PickTeam</Command>
@@ -311,7 +310,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="1" B="0.980392158" G="0.294117659" R="0"/> <Color A="1" B="0.980392158" G="0.294117659" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:InputCmdButton> <c:InputCmdButton>
<Command>PickTeam</Command> <Command>PickTeam</Command>
@@ -715,6 +713,60 @@
</Entity> </Entity>
</Children> </Children>
</Entity> </Entity>
<Entity name="KillFeed">
<Components>
<c:KillFeed/>
<c:Transform>
<Position X="0.431000024" Y="0.253000021" 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/Hind-Edited.otf,64</Resource>
<Alignment>
<Right/>
</Alignment>
</c:Text>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="KillFeed2">
<Components>
<c:Text>
<Content></Content>
<Resource>Fonts/Hind-Edited.otf,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/Hind-Edited.otf,64</Resource>
<Alignment>
<Right/>
</Alignment>
</c:Text>
<c:Transform>
<Position X="0" Y="-2" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children> </Children>
</Entity> </Entity>
</Children> </Children>
resources/Schema/Entities/PlayerAssaultBlue.xml
+94 -110
View File
@@ -104,6 +104,82 @@
</c:Transform> </c:Transform>
</Components> </Components>
<Children> <Children>
<Entity name="BackgroundHexagon">
<Components>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<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:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>2</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<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:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>3</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
</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"> <Entity name="BackgroundHexagon">
<Components> <Components>
<c:Sprite> <c:Sprite>
@@ -112,7 +188,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/> <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="1.62788737" Y="0.919596612" Z="0"/> <Position X="1.62788737" Y="0.919596612" Z="0"/>
@@ -133,7 +208,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -153,87 +227,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/> <Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite>
<c:Transform>
<Position X="0" Y="0.919596612" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity name="ProgressionHexagon">
<Components>
<c:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>2</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
</c:Transform>
</Components>
<Children>
<Entity name="ProgressionHexagon">
<Components>
<c:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>3</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/> <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
@@ -253,7 +246,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -273,7 +265,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.699999988" B="0" G="0" R="1"/> <Color A="0.699999988" B="0" G="0" R="1"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="-1.58304751" Y="0.919596612" Z="0"/> <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -292,7 +283,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -319,7 +309,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -332,7 +322,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -347,7 +337,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -393,12 +383,12 @@
<Percentage>1</Percentage> <Percentage>1</Percentage>
<Color A="1" B="1" G="0" R="0"/> <Color A="1" B="1" G="0" R="0"/>
</c:Fill> </c:Fill>
<c:HealthHUD/>
<c:Text> <c:Text>
<Content>100/100</Content> <Content>100/100</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
<Color A="0.505882382" B="0" G="1.17647064" R="0"/> <Color A="0.505882382" B="1.56862748" G="1.17647064" R="0"/>
</c:Text> </c:Text>
<c:HealthHUD/>
<c:Transform> <c:Transform>
<Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/> <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
<Orientation X="0" Y="0" Z="1.57070696"/> <Orientation X="0" Y="0" Z="1.57070696"/>
@@ -419,7 +409,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture> <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
<Color A="0.588235319" B="0" G="0" R="0"/> <Color A="0.588235319" B="0" G="0" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/> <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
@@ -438,18 +427,17 @@
<Entity name="Assault"> <Entity name="Assault">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="0.533333361" G="1.56862748" R="0.329411775"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.0392156877" G="0.184313729" R="0"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.0870000049" Z="0"/> <Position X="0.0250000004" Y="0.0650000051" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/> <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
</c:Transform> </c:Transform>
@@ -459,18 +447,17 @@
<Entity name="Defender"> <Entity name="Defender">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="1.96078432" G="0.58431375" R="0.105882354"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.34117648" G="0.192156866" R="0"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0240000002" Y="0.131999999" Z="0"/> <Position X="0.0240000002" Y="0.104000002" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/> <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
</c:Transform> </c:Transform>
@@ -480,19 +467,17 @@
<Entity name="Sniper"> <Entity name="Sniper">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="0.345098048" G="0" R="1.96078432"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.121568628" G="0" R="0.443137258"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Visible>false</Visible>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.145000011" Z="0"/> <Position X="0.0240000002" Y="0.145000011" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/> <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
</c:Transform> </c:Transform>
@@ -513,7 +498,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Abilities/Long/Superman-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Abilities/Long/Superman-01.png</DiffuseTexture>
<Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/> <Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.0100000007" Z="0"/> <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
@@ -923,10 +907,10 @@
<c:Transform/> <c:Transform/>
</Components> </Components>
<Children> <Children>
<Entity name="DashLeft"> <Entity name="DashRight">
<Components> <Components>
<c:Animation> <c:Animation>
<AnimationName>DashLeftF</AnimationName> <AnimationName>DashRightF</AnimationName>
<Time>1</Time> <Time>1</Time>
<Speed>1.7999999523162842</Speed> <Speed>1.7999999523162842</Speed>
<Loop>false</Loop> <Loop>false</Loop>
@@ -935,10 +919,10 @@
</Components> </Components>
<Children/> <Children/>
</Entity> </Entity>
<Entity name="DashRight"> <Entity name="DashLeft">
<Components> <Components>
<c:Animation> <c:Animation>
<AnimationName>DashRightF</AnimationName> <AnimationName>DashLeftF</AnimationName>
<Time>1</Time> <Time>1</Time>
<Speed>1.7999999523162842</Speed> <Speed>1.7999999523162842</Speed>
<Loop>false</Loop> <Loop>false</Loop>
resources/Schema/Entities/PlayerDefenderBlue.xml
+124 -140
View File
@@ -141,6 +141,82 @@
</c:Transform> </c:Transform>
</Components> </Components>
<Children> <Children>
<Entity name="BackgroundHexagon">
<Components>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<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:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>2</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<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:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>3</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
</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"> <Entity name="BackgroundHexagon">
<Components> <Components>
<c:Sprite> <c:Sprite>
@@ -149,7 +225,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/> <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="1.62788737" Y="0.919596612" Z="0"/> <Position X="1.62788737" Y="0.919596612" Z="0"/>
@@ -170,7 +245,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -190,87 +264,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/> <Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite>
<c:Transform>
<Position X="0" Y="0.919596612" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity name="ProgressionHexagon">
<Components>
<c:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>2</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite>
<c:Transform>
<Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
</c:Transform>
</Components>
<Children>
<Entity name="ProgressionHexagon">
<Components>
<c:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>3</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/> <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
@@ -290,7 +283,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -310,7 +302,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.699999988" B="0" G="0" R="1"/> <Color A="0.699999988" B="0" G="0" R="1"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="-1.58304751" Y="0.919596612" Z="0"/> <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -329,7 +320,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -356,7 +346,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -369,7 +359,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -384,7 +374,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -430,12 +420,12 @@
<Percentage>1</Percentage> <Percentage>1</Percentage>
<Color A="1" B="1" G="0" R="0"/> <Color A="1" B="1" G="0" R="0"/>
</c:Fill> </c:Fill>
<c:HealthHUD/>
<c:Text> <c:Text>
<Content>150/150</Content> <Content>150/150</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
<Color A="0.505882382" B="0" G="1.17647064" R="0"/> <Color A="0.505882382" B="1.56862748" G="1.17647064" R="0"/>
</c:Text> </c:Text>
<c:HealthHUD/>
<c:Transform> <c:Transform>
<Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/> <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
<Orientation X="0" Y="0" Z="1.57070696"/> <Orientation X="0" Y="0" Z="1.57070696"/>
@@ -456,7 +446,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture> <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
<Color A="0.588235319" B="0" G="0" R="0"/> <Color A="0.588235319" B="0" G="0" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/> <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
@@ -475,18 +464,17 @@
<Entity name="Assault"> <Entity name="Assault">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="0.533333361" G="1.56862748" R="0.329411775"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.0392156877" G="0.184313729" R="0"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.0870000049" Z="0"/> <Position X="0.0250000004" Y="0.0650000051" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/> <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
</c:Transform> </c:Transform>
@@ -496,18 +484,17 @@
<Entity name="Defender"> <Entity name="Defender">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="1.96078432" G="0.58431375" R="0.105882354"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.34117648" G="0.192156866" R="0"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0240000002" Y="0.131999999" Z="0"/> <Position X="0.0240000002" Y="0.104000002" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/> <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
</c:Transform> </c:Transform>
@@ -517,19 +504,17 @@
<Entity name="Sniper"> <Entity name="Sniper">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="0.345098048" G="0" R="1.96078432"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.121568628" G="0" R="0.443137258"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Visible>false</Visible>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.145000011" Z="0"/> <Position X="0.0240000002" Y="0.145000011" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/> <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
</c:Transform> </c:Transform>
@@ -551,7 +536,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Abilities/Long/SheildDots-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Abilities/Long/SheildDots-01.png</DiffuseTexture>
<Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/> <Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.0100000007" Z="0"/> <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
@@ -904,40 +888,6 @@
<c:Transform/> <c:Transform/>
</Components> </Components>
<Children> <Children>
<Entity name="ActionBlend">
<Components>
<c:Blend>
<Pose1>Fire</Pose1>
<Pose2>Reload</Pose2>
<Weight>0</Weight>
</c:Blend>
<c:Transform/>
</Components>
<Children>
<Entity name="Reload">
<Components>
<c:Animation>
<AnimationName>ShootgunReloadU</AnimationName>
<Time>0.14583822250136791</Time>
<Speed>0.5</Speed>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="Fire">
<Components>
<c:Animation>
<AnimationName>ShootRifleU</AnimationName>
<Time>1</Time>
<Loop>false</Loop>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="ShieldBlend"> <Entity name="ShieldBlend">
<Components> <Components>
<c:Blend> <c:Blend>
@@ -973,6 +923,40 @@
</Entity> </Entity>
</Children> </Children>
</Entity> </Entity>
<Entity name="ActionBlend">
<Components>
<c:Blend>
<Pose1>Fire</Pose1>
<Pose2>Reload</Pose2>
<Weight>0</Weight>
</c:Blend>
<c:Transform/>
</Components>
<Children>
<Entity name="Reload">
<Components>
<c:Animation>
<AnimationName>ShootgunReloadU</AnimationName>
<Time>0.14583822250136791</Time>
<Speed>0.5</Speed>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="Fire">
<Components>
<c:Animation>
<AnimationName>ShootRifleU</AnimationName>
<Time>1</Time>
<Loop>false</Loop>
</c:Animation>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children> </Children>
</Entity> </Entity>
<Entity name="IdleDefender"> <Entity name="IdleDefender">
resources/Schema/Entities/PlayerHUD.xml
+52 -68
View File
@@ -48,47 +48,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/> <Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite>
<c:Transform>
<Position X="0" Y="0.919596612" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity name="ProgressionHexagon">
<Components>
<c:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>2</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/> <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
@@ -108,7 +67,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -128,7 +86,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/> <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="1.62788737" Y="0.919596612" Z="0"/> <Position X="1.62788737" Y="0.919596612" Z="0"/>
@@ -149,7 +106,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -169,7 +125,44 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/> <Color A="0.300000012" B="1" G="1" R="1"/>
<Linear>true</Linear> </c:Sprite>
<c:Transform>
<Position X="0" Y="0.919596612" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity name="ProgressionHexagon">
<Components>
<c:Fill>
<Color A="0.699999988" B="1" G="0.200000003" R="0"/>
</c:Fill>
<c:CapturePointHUD>
<CapturePointNumber>2</CapturePointNumber>
</c:CapturePointHUD>
<c:Sprite>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
</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>
<DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.300000012" B="1" G="1" R="1"/>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/> <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
@@ -189,7 +182,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -209,7 +201,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
<Color A="0.699999988" B="0" G="0" R="1"/> <Color A="0.699999988" B="0" G="0" R="1"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="-1.58304751" Y="0.919596612" Z="0"/> <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -228,7 +219,6 @@
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture> <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0" Y="0" Z="0.00999999978"/> <Position X="0" Y="0" Z="0.00999999978"/>
@@ -255,7 +245,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -268,7 +258,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -283,7 +273,7 @@
<Components> <Components>
<c:Text> <c:Text>
<Content></Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/Hind-Edited.otf,64</Resource>
<Alignment> <Alignment>
<Right/> <Right/>
</Alignment> </Alignment>
@@ -329,12 +319,12 @@
<Percentage>1</Percentage> <Percentage>1</Percentage>
<Color A="1" B="1" G="0" R="0"/> <Color A="1" B="1" G="0" R="0"/>
</c:Fill> </c:Fill>
<c:HealthHUD/>
<c:Text> <c:Text>
<Content>100/100</Content> <Content>100/100</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
<Color A="0.505882382" B="0" G="1.17647064" R="0"/> <Color A="0.505882382" B="1.56862748" G="1.17647064" R="0"/>
</c:Text> </c:Text>
<c:HealthHUD/>
<c:Transform> <c:Transform>
<Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/> <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
<Orientation X="0" Y="0" Z="1.57070696"/> <Orientation X="0" Y="0" Z="1.57070696"/>
@@ -355,7 +345,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture> <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
<Color A="0.588235319" B="0" G="0" R="0"/> <Color A="0.588235319" B="0" G="0" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/> <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
@@ -374,18 +363,17 @@
<Entity name="Assault"> <Entity name="Assault">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="0.533333361" G="1.56862748" R="0.329411775"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.0392156877" G="0.184313729" R="0"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.0870000049" Z="0"/> <Position X="0.0250000004" Y="0.0650000051" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/> <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
</c:Transform> </c:Transform>
@@ -395,18 +383,17 @@
<Entity name="Defender"> <Entity name="Defender">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="1.96078432" G="0.58431375" R="0.105882354"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.34117648" G="0.192156866" R="0"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0240000002" Y="0.131999999" Z="0"/> <Position X="0.0240000002" Y="0.104000002" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/> <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
</c:Transform> </c:Transform>
@@ -416,19 +403,17 @@
<Entity name="Sniper"> <Entity name="Sniper">
<Components> <Components>
<c:Fill> <c:Fill>
<Color A="1" B="0.345098048" G="0" R="1.96078432"/> <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
</c:Fill> </c:Fill>
<c:Sprite> <c:Sprite>
<DepthSort>false</DepthSort> <DepthSort>false</DepthSort>
<Model>Models/Core/UnitQuad.mesh</Model> <Model>Models/Core/UnitQuad.mesh</Model>
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture> <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
<Color A="0.392156869" B="0.121568628" G="0" R="0.443137258"/> <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
<Visible>false</Visible>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.145000011" Z="0"/> <Position X="0.0240000002" Y="0.145000011" Z="0"/>
<Orientation X="0" Y="0" Z="3.14199996"/> <Orientation X="0" Y="0" Z="3.14199996"/>
<Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/> <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
</c:Transform> </c:Transform>
@@ -449,7 +434,6 @@
<GlowMap></GlowMap> <GlowMap></GlowMap>
<DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture> <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
<Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/> <Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/>
<Linear>true</Linear>
</c:Sprite> </c:Sprite>
<c:Transform> <c:Transform>
<Position X="0.0250000004" Y="0.0100000007" Z="0"/> <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
src/Engine/Network/Client.cpp
+19
View File
@@ -165,6 +165,9 @@ void Client::parseMessageType(Packet& packet)
case MessageType::RemoveWorld: case MessageType::RemoveWorld:
parseRemoveWorld(packet); parseRemoveWorld(packet);
break; break;
case MessageType::KD:
parseKDEvent(packet);
break;
default: default:
break; break;
} }
@@ -349,6 +352,22 @@ void Client::parseRemoveWorld(Packet & packet)
m_EventBroker->Publish(e); m_EventBroker->Publish(e);
} }
void Client::parseKDEvent(Packet & packet)
{
Events::KillDeath e;
e.Casualty = packet.ReadPrimitive<int>();
e.CasualtyClass = packet.ReadPrimitive<int>();
e.CasualtyName = packet.ReadString();
e.CasualtyTeam = packet.ReadPrimitive<int>();
e.Killer = packet.ReadPrimitive<int>();
e.KillerClass = packet.ReadPrimitive<int>();
e.KillerName = packet.ReadString();
e.KillerTeam = packet.ReadPrimitive<int>();
m_EventBroker->Publish(e);
}
void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID) void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID)
{ {
for (auto field : componentInfo.FieldsInOrder) { for (auto field : componentInfo.FieldsInOrder) {
src/Engine/Network/Server.cpp
+39
View File
@@ -560,9 +560,48 @@ bool Server::OnAmmoPickup(const Events::AmmoPickup & e)
bool Server::OnPlayerDeath(const Events::PlayerDeath& e) bool Server::OnPlayerDeath(const Events::PlayerDeath& e)
{ {
Events::KillDeath eKD; Events::KillDeath eKD;
auto entity = e;
eKD.Casualty = getPlayerIDFromEntityID(e.Player.ID); eKD.Casualty = getPlayerIDFromEntityID(e.Player.ID);
eKD.Killer = getPlayerIDFromEntityID(e.Killer.ID); eKD.Killer = getPlayerIDFromEntityID(e.Killer.ID);
eKD.CasualtyName = m_ConnectedPlayers.at(getPlayerIDFromEntityID(e.Player.ID)).Name;
eKD.KillerName = m_ConnectedPlayers.at(getPlayerIDFromEntityID(e.Killer.ID)).Name;
if(entity.Player.HasComponent("Team")) {
eKD.CasualtyTeam = (const int&)entity.Player["Team"]["Team"];
}
if (entity.Killer.HasComponent("Team")) {
eKD.KillerTeam = (const int&)entity.Killer["Team"]["Team"];
}
if(entity.Player.HasComponent("DashAbility")) {
eKD.CasualtyClass = 1;
} else if (entity.Player.HasComponent("ShieldAbility")) {
eKD.CasualtyClass = 2;
} else if (entity.Player.HasComponent("SprintAbility")) {
eKD.CasualtyClass = 3;
}
if (entity.Killer.HasComponent("DashAbility")) {
eKD.KillerClass = 1;
} else if (entity.Killer.HasComponent("ShieldAbility")) {
eKD.KillerClass = 2;
} else if (entity.Killer.HasComponent("SprintAbility")) {
eKD.KillerClass = 3;
}
m_EventBroker->Publish(eKD); m_EventBroker->Publish(eKD);
Packet kdPacket(MessageType::KD);
kdPacket.WritePrimitive(eKD.Casualty);
kdPacket.WritePrimitive(eKD.CasualtyClass);
kdPacket.WriteString(eKD.CasualtyName);
kdPacket.WritePrimitive(eKD.CasualtyTeam);
kdPacket.WritePrimitive(eKD.Killer);
kdPacket.WritePrimitive(eKD.KillerClass);
kdPacket.WriteString(eKD.KillerName);
kdPacket.WritePrimitive(eKD.KillerTeam);
reliableBroadcast(kdPacket);
return false; return false;
} }
src/Game/Systems/KillFeedSystem.cpp
+34 -27
View File
@@ -7,6 +7,10 @@ void KillFeedSystem::Update(double dt)
return; return;
} }
for (auto it = m_DeathQueue.begin(); it != m_DeathQueue.end(); it++) {
(*it).TimeToLive -= dt;
}
for (auto& killFeedComponent : *killFeeds) { for (auto& killFeedComponent : *killFeeds) {
EntityWrapper entity = EntityWrapper(m_World, killFeedComponent.EntityID); EntityWrapper entity = EntityWrapper(m_World, killFeedComponent.EntityID);
@@ -16,10 +20,7 @@ void KillFeedSystem::Update(double dt)
(Field<std::string>)child["Text"]["Content"] = ""; (Field<std::string>)child["Text"]["Content"] = "";
} }
} }
int feedIndex = 1; int feedIndex = 1;
for (auto it = m_DeathQueue.begin(); it != m_DeathQueue.end(); ) { for (auto it = m_DeathQueue.begin(); it != m_DeathQueue.end(); ) {
bool remove = false; bool remove = false;
@@ -27,14 +28,19 @@ void KillFeedSystem::Update(double dt)
EntityWrapper child = entity.FirstChildByName("KillFeed" + std::to_string(feedIndex)); EntityWrapper child = entity.FirstChildByName("KillFeed" + std::to_string(feedIndex));
if (child.HasComponent("Text")) { if (child.HasComponent("Text")) {
(Field<std::string>)child["Text"]["Content"] = (*it).Content;
(Field<glm::vec4>)child["Text"]["Color"] = (*it).Color;
(*it).TimeToLive -= dt; std::string str = "";
//Add killer to the start of string.
str = (*it).KillerColor + "\\" + std::to_string((*it).KillerClass) + "\\CFFFFFF" + " " + (*it).KillerName + " ";
//Add Weapon to middle of string.
str += "\\" + std::to_string((*it).KillerClass+3) + " ";
//Add victim to the end of string
str += (*it).VictimColor + "\\" + std::to_string((*it).VictimClass) + "\\CFFFFFF" + " " + (*it).VictimName;
(Field<std::string>)child["Text"]["Content"] = str;
if ((*it).TimeToLive <= 0.f) { if ((*it).TimeToLive <= 0.f) {
(Field<std::string>)child["Text"]["Content"] = ""; (Field<std::string>)child["Text"]["Content"] = "";
(Field<glm::vec4>)child["Text"]["Color"] = (*it).Color;
remove = true; remove = true;
} }
} }
@@ -52,29 +58,30 @@ void KillFeedSystem::Update(double dt)
} }
} }
bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e) bool KillFeedSystem::OnPlayerKillDeath(Events::KillDeath& e)
{ {
KillFeedInfo kfInfo; KillFeedInfo info;
if (e.Player.HasComponent("Team")) { info.KillerName = e.KillerName;
int red = e.Player["Team"].Enum("Team", "Red"); info.KillerID = e.Killer;
int blue = e.Player["Team"].Enum("Team", "Blue"); info.KillerClass = e.KillerClass;
info.KillerTeam = e.KillerTeam;
if ((int)e.Player["Team"]["Team"] == red) { if(info.KillerTeam == 2){
kfInfo.Content = "Blue Player killed Red Player"; info.KillerColor = m_BlueColor;
kfInfo.Color = glm::vec4(0.f, 0.2f, 1.f, 0.8f); } else if (info.KillerTeam == 3) {
m_DeathQueue.push_back(kfInfo); info.KillerColor = m_RedColor;
} else if ((int)e.Player["Team"]["Team"] == blue) {
kfInfo.Content = "Red Player killed blue Player";
kfInfo.Color = glm::vec4(1.f, 0.f, 0.f, 0.8f);
m_DeathQueue.push_back(kfInfo);
}
} }
info.VictimName = e.CasualtyName;
if(m_DeathQueue.size() > 3) { info.VictimID = e.Casualty;
m_DeathQueue.pop_front(); info.VictimClass = e.CasualtyClass;
info.VictimTeam = e.CasualtyTeam;
if (info.VictimTeam == 2) {
info.VictimColor = m_BlueColor;
} else if (info.VictimTeam == 3) {
info.VictimColor = m_RedColor;
} }
return true; m_DeathQueue.push_back(info);
return 1;
} }