Added Weapon Aiming for all primary and secondary weapons

EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp

@@ -491,29 +491,17 @@ void AEndlessVendettaCharacter::GunRightClick()
 {
 	if (IsValid(PrimaryWeapon) && !bIsScoped)
 	{
-		for (UActorComponent* actorComp : this->GetComponentsByTag(UArrowComponent::StaticClass(), FName("ScopedLocationArrow")))
-		{
-			ScopedLocationArrow = Cast<UArrowComponent>(actorComp);
-			break;
-		}
-		if (!IsValid(ScopedLocationArrow)) return;
-		PrimaryWeapon->SetActorLocation(ScopedLocationArrow->GetComponentLocation());
 		bIsScoped = true;
 		PrimaryWeapon->WeaponScopedFire();
-		this->GetFirstPersonCameraComponent()->SetFieldOfView(50); //change this number to a number you can change in editor eventually
+		StartPrimaryWeaponADS();
+		//this->GetFirstPersonCameraComponent()->SetFieldOfView(50); //change this number to a number you can change in editor eventually
 	}
 	if (IsValid(SecondaryWeapon) && !bIsScoped)
 	{
-		for (UActorComponent* actorComp : this->GetComponentsByTag(UArrowComponent::StaticClass(), FName("ScopedLocationArrow")))
-		{
-			ScopedLocationArrow = Cast<UArrowComponent>(actorComp);
-			break;
-		}
-		if (!IsValid(ScopedLocationArrow)) return;
 		bIsScoped = true;
 		SecondaryWeapon->WeaponScopedFire();
-		SecondaryWeapon->SetActorLocation(ScopedLocationArrow->GetComponentLocation());
+		StartSecondaryWeaponADS();
-		this->GetFirstPersonCameraComponent()->SetFieldOfView(50); //change this number to a number you can change in editor eventually
+		//this->GetFirstPersonCameraComponent()->SetFieldOfView(50); //change this number to a number you can change in editor eventually
 	}
 }
 
@@ -523,15 +511,15 @@ void AEndlessVendettaCharacter::StopGunRightClick()
 	{
 		bIsScoped = false;
 		PrimaryWeapon->WeaponScopedFire();
-		PrimaryWeapon->SetActorRelativeLocation(FVector(0, 0, 0));
+		StopPrimaryWeaponADS();
-		this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
+		//this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
 	}
 	if (IsValid(SecondaryWeapon))
 	{
 		bIsScoped = false;
 		SecondaryWeapon->WeaponScopedFire();
-		SecondaryWeapon->SetActorRelativeLocation(FVector(0, 0, 0));
+		StopSecondaryWeaponADS();
-		this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
+		//this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
 	}
 }
 

EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h

@@ -118,6 +118,15 @@ public:
 	bool bIsSecondaryWeaponCreated = false;
 	bool bIsWeaponPickedUp = false;
 
+	UFUNCTION(BlueprintImplementableEvent)
+	void StartPrimaryWeaponADS();
+	UFUNCTION(BlueprintImplementableEvent)
+	void StopPrimaryWeaponADS();
+	UFUNCTION(BlueprintImplementableEvent)
+	void StartSecondaryWeaponADS();
+	UFUNCTION(BlueprintImplementableEvent)
+	void StopSecondaryWeaponADS();
+
 protected:
 	virtual void BeginPlay() override;
 	virtual void Tick(float DeltaTime) override;