DefenderWeapon and SidearmWeapon

src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

@@ -14,7 +14,7 @@ void SidearmWeaponBehaviour::UpdateComponent(EntityWrapper& entity, ComponentWra
 
 void SidearmWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt)
 {
-    if (canFire(cWeapon)) {
+    if ((bool)cWeapon["Automatic"] && canFire(cWeapon)) {
         fireBullet(cWeapon, wi);
     }
 }
@@ -32,6 +32,11 @@ void SidearmWeaponBehaviour::OnCeasePrimaryFire(ComponentWrapper cWeapon, Weapon
     cWeapon["TriggerHeld"] = false;
 }
 
+void SidearmWeaponBehaviour::OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi)
+{
+    cWeapon["FireCooldown"] = (double)cWeapon["EquipTime"];
+}
+
 void SidearmWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi)
 {
     // Make sure the trigger is released if weapon is holstered while firing
@@ -46,7 +51,23 @@ void SidearmWeaponBehaviour::OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi)
 
 void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi)
 {
+    cWeapon["FireCooldown"] = 60.0 / (double)cWeapon["RPM"];
 
+    // Get weapon model based on current person
+    EntityWrapper weaponModelEntity = getRelevantWeaponModelEntity(wi);
+    if (!weaponModelEntity.Valid()) {
+        return;
+    }
+
+    // Tracer
+    EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzle");
+    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);
+        ((glm::vec3&)ray["Transform"]["Scale"]).z = (distance / 100.f);
+    }
 }
 
 bool SidearmWeaponBehaviour::canFire(ComponentWrapper cWeapon)