diff --git a/resources/Schema/Components/SidearmWeapon.xml b/resources/Schema/Components/SidearmWeapon.xml
index 968306a6..a41bc201 100644
--- a/resources/Schema/Components/SidearmWeapon.xml
+++ b/resources/Schema/Components/SidearmWeapon.xml
@@ -7,7 +7,7 @@
500
false
0.01
- 0.5
+ 1.0
0.5
false
0
diff --git a/resources/Schema/Entities/MovementTest.xml b/resources/Schema/Entities/MovementTest.xml
index b4db78d9..ca0ae6e2 100644
--- a/resources/Schema/Entities/MovementTest.xml
+++ b/resources/Schema/Entities/MovementTest.xml
@@ -2,6 +2,10 @@
+
+ 2.3827375146874772
+ 4
+
@@ -257,6 +261,735 @@
+
+
+
+
+
+
+
+
+ 0.049999997019767761
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Classes/Sniper-01.png
+
+
+ PickClass
+ 3
+
+
+
+
+
+
+
+
+
+
+ Sniper
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Classes/Assault-01.png
+
+
+ PickClass
+ 1
+
+
+
+
+
+
+
+
+
+
+ Assault
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Classes/Defender-01.png
+
+
+ PickClass
+ 2
+
+
+
+
+
+
+
+
+
+
+ Defender
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pick Class
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+ SwapToTeamPick
+ 1
+
+
+
+
+
+
+
+
+
+
+ Change
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+ Team
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pick Team
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+ PickTeam
+ 1
+
+
+
+
+
+
+
+
+
+
+ Spectator
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+ PickTeam
+ 2
+
+
+
+
+
+
+
+
+
+
+ Red
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+ PickTeam
+ 3
+
+
+
+
+
+
+
+
+
+
+ Blue
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ false
+
+
+ SwapToClassPick
+ 1
+
+
+
+
+
+
+
+
+
+
+ Change
+ Fonts/DroidSans.ttf,64
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Class
+ Fonts/DroidSans.ttf,64
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+ 0.10332605343919568
+
+
+
+ 1
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+ SwapToTeamPick
+ 1
+
+
+
+
+
+
+
+
+
+
+ Change
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+ Team
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+
+
+ SwapToClassPick
+ 1
+
+
+
+
+
+
+
+
+
+
+ Change
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+ Class
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/MuzzleFlashSideArmBlue.xml b/resources/Schema/Entities/MuzzleFlashSideArmBlue.xml
new file mode 100644
index 00000000..2d4dd59b
--- /dev/null
+++ b/resources/Schema/Entities/MuzzleFlashSideArmBlue.xml
@@ -0,0 +1,219 @@
+
+
+
+
+
+ 0.08
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+ 0.08
+
+
+ 2
+ Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+
+ false
+ false
+
+
+
+ 0.40000000596046448
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/DefenderRayBlue.xml b/resources/Schema/Entities/RayAssaultBlue.xml
similarity index 65%
rename from resources/Schema/Entities/DefenderRayBlue.xml
rename to resources/Schema/Entities/RayAssaultBlue.xml
index 7680f1da..c358a4d5 100644
--- a/resources/Schema/Entities/DefenderRayBlue.xml
+++ b/resources/Schema/Entities/RayAssaultBlue.xml
@@ -3,11 +3,9 @@
- 0.5
+ 0.079999998211860657
-
-
-
+
@@ -16,14 +14,15 @@
Models/Core/UnitQuad.mesh
- Textures/Effects/NewRay3.png
-
- true
+ Textures/Effects/NewRay5.png
+
+ true
+ true
-
+
@@ -33,14 +32,15 @@
Models/Core/UnitQuad.mesh
- Textures/Effects/NewRay3.png
-
- true
+ Textures/Effects/NewRay5.png
+
+ true
+ true
-
+
diff --git a/resources/Schema/Entities/RayDefenderBlue.xml b/resources/Schema/Entities/RayDefenderBlue.xml
new file mode 100644
index 00000000..066f2fb1
--- /dev/null
+++ b/resources/Schema/Entities/RayDefenderBlue.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ 0.079999998211860657
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Effects/NewRay7.png
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Effects/NewRay7.png
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/RaySideArmBlue.xml b/resources/Schema/Entities/RaySideArmBlue.xml
new file mode 100644
index 00000000..072f8e95
--- /dev/null
+++ b/resources/Schema/Entities/RaySideArmBlue.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ 0.08
+
+
+ 0.08
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Effects/NewRay5.png
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Effects/NewRay5.png
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/WeaponAssaultBlueView.xml b/resources/Schema/Entities/WeaponAssaultBlueView.xml
index 6d7e6fa0..3b3d418d 100644
--- a/resources/Schema/Entities/WeaponAssaultBlueView.xml
+++ b/resources/Schema/Entities/WeaponAssaultBlueView.xml
@@ -88,6 +88,7 @@
R_Arm_Weapon_Joint
+ 1.5
Models/Weapons/Blue/AssaultWeaponBlue.mesh
@@ -127,7 +128,7 @@
- Schema/Entities/RayBlue.xml
+ Schema/Entities/RayAssaultBlue.xml
diff --git a/resources/Schema/Entities/WeaponDefenderBlueView.xml b/resources/Schema/Entities/WeaponDefenderBlueView.xml
index 8c8da6a3..37fd2722 100644
--- a/resources/Schema/Entities/WeaponDefenderBlueView.xml
+++ b/resources/Schema/Entities/WeaponDefenderBlueView.xml
@@ -146,42 +146,6 @@
-
-
-
- R_Arm_Weapon_Joint
-
-
- Models/Weapons/Blue/DefenderWeaponBlue.mesh
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/DefenderRayBlue.xml
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/ReloadEffectView.xml
-
-
-
-
-
-
-
@@ -256,6 +220,70 @@
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Blue/DefenderWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/ReloadEffectView.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/RayDefenderBlue.xml
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/MuzzleFlashBlue.xml
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml
index 0d7e2172..e48cffba 100644
--- a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml
+++ b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml
@@ -80,42 +80,6 @@
-
-
-
- R_Arm_Weapon_Joint
-
-
- Models/Weapons/Blue/SecondaryWeaponBlue.mesh
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/RayBlue.xml
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/WeaponSidearmReloadEffectView.xml
-
-
-
-
-
-
-
@@ -206,6 +170,70 @@
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ 1.2999999523162842
+ Models/Weapons/Blue/SecondaryWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/WeaponSidearmReloadEffectView.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/RaySideArmBlue.xml
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/MuzzleFlashSideArmBlue.xml
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml b/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml
index 3ff8b0a2..129082ed 100644
--- a/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml
+++ b/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml
@@ -80,42 +80,6 @@
-
-
-
- R_Arm_Weapon_Joint
-
-
- Models/Weapons/Blue/SecondaryWeaponBlue.mesh
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/Ray2Red.xml
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/WeaponSidearmReloadEffectView.xml
-
-
-
-
-
-
-
@@ -206,6 +170,70 @@
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ 1.5
+ Models/Weapons/Blue/SecondaryWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/WeaponSidearmReloadEffectView.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/MuzzleFlashSideArmBlue.xml
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/RaySideArmBlue.xml
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/WeaponSidearmReloadEffectView.xml b/resources/Schema/Entities/WeaponSidearmReloadEffectView.xml
index fce19d7f..bae68bc2 100644
--- a/resources/Schema/Entities/WeaponSidearmReloadEffectView.xml
+++ b/resources/Schema/Entities/WeaponSidearmReloadEffectView.xml
@@ -2,47 +2,46 @@
-
- 2
-
-
+
-
-
- 1
- 1
+
+ 0.5
+ 0.5
-1
- 1
+ 0.5
true
+ 1.5
Models/Weapons/Blue/SecondaryWeaponBlue.mesh
+ false
true
-
+
- 1
+ 0.5
-
-
- 1
+
+ 0.5
true
+ 1.5
Models/Weapons/Blue/SecondaryWeaponBlue.mesh
+ false
true
diff --git a/src/Game/Systems/FadeSystem.cpp b/src/Game/Systems/FadeSystem.cpp
index 0ed98ddb..e3cf55a9 100644
--- a/src/Game/Systems/FadeSystem.cpp
+++ b/src/Game/Systems/FadeSystem.cpp
@@ -11,7 +11,7 @@ void FadeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade,
return;
}
- if (!(bool)cFade["Out"]) {
+ if ((bool)cFade["Out"]) {
dTime *= -1;
}
diff --git a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
index 0686aebf..ce2b833c 100644
--- a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
+++ b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
@@ -354,7 +354,16 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo& wi, std::vector pattern)
{
- EntityWrapper muzzle = getRelevantWeaponEntity(wi).FirstChildByName("WeaponMuzzle");
+ EntityWrapper flashSpawner = getRelevantWeaponEntity(wi).FirstChildByName("WeaponMuzzleFlash");
+ if (flashSpawner.Valid()) {
+ std::uniform_real_distribution randomSpreadAngle(0.f, 3.1415f*2);
+ EntityWrapper flash = SpawnerSystem::Spawn(flashSpawner, flashSpawner);
+ if (flash.Valid()) {
+ ((glm::vec3&)flash["Transform"]["Orientation"]).z = randomSpreadAngle(m_RandomEngine);
+ }
+ }
+
+ EntityWrapper muzzle = getRelevantWeaponEntity(wi).FirstChildByName("WeaponMuzzleRay");
if (!muzzle.Valid()) {
return;
}
diff --git a/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp b/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
index c9272127..1b8a3139 100644
--- a/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
+++ b/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
@@ -189,18 +189,29 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
return;
}
- // Tracer
- EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzle");
+ //Tracer
+ EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay");
if (tracerSpawner.Valid()) {
glm::vec3 origin = Transform::AbsolutePosition(tracerSpawner);
glm::vec3 direction = Transform::AbsoluteOrientation(tracerSpawner) * glm::vec3(0, 0, -1);
float distance = traceRayDistance(origin, direction);
- EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner);
+ EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
if (ray.Valid()) {
((glm::vec3&)ray["Transform"]["Scale"]).z = distance;
}
}
+ //Flash
+ EntityWrapper flashSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleFlash");
+ if (flashSpawner.Valid()) {
+ std::uniform_real_distribution randomSpreadAngle(0.f, 3.1415f*2);
+ EntityWrapper flash = SpawnerSystem::Spawn(flashSpawner, flashSpawner);
+ if(flash.Valid()){
+ ((glm::vec3&)flash["Transform"]["Orientation"]).z = randomSpreadAngle(m_RandomEngine);
+ }
+ }
+
+
// Deal damage
if (dealDamage(cWeapon, wi)) {
// Show hit marker