133 - Hit Scan Weapons

Source/Blaster/Character/BlasterCharacter.cpp

@@ -270,6 +270,12 @@ void ABlasterCharacter::PlayReloadMontage()
 		case EWeaponType::EWT_RocketLauncher:
 			SectionName = FName("Rifle"); // Todo: create rocket reload montage section
 			break;
+		case EWeaponType::EWT_Pistol:
+			SectionName = FName("Rifle"); // Todo: create pistol reload montage section
+			break;
+		default:
+			SectionName = FName("Rifle"); 
+			break;
 		}
 
 		AnimInstance->Montage_JumpToSection(SectionName);

Source/Blaster/Components/CombatComponent.cpp

@@ -456,4 +456,5 @@ void UCombatComponent::InitializeCarriedAmmo()
 {
 	CarriedAmmoMap.Emplace(EWeaponType::EWT_AssaultRifle, StartingARAmmo);
 	CarriedAmmoMap.Emplace(EWeaponType::EWT_RocketLauncher, StartingRocketAmmo);
+	CarriedAmmoMap.Emplace(EWeaponType::EWT_Pistol, StartingPistolAmmo);
 }

Source/Blaster/Components/CombatComponent.h

@@ -126,6 +126,9 @@ private:
 	UPROPERTY(EditAnywhere)
 	int32 StartingRocketAmmo = 8;
 	
+	UPROPERTY(EditAnywhere)
+	int32 StartingPistolAmmo = 15;
+	
 	void InitializeCarriedAmmo();
 
 	UPROPERTY(ReplicatedUsing=OnRep_CombatState)

Source/Blaster/Weapon/HitScanWeapon.cpp

@@ -0,0 +1,64 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "HitScanWeapon.h"
+
+#include "Blaster/Character/BlasterCharacter.h"
+#include "Engine/SkeletalMeshSocket.h"
+#include "Kismet/GameplayStatics.h"
+
+void AHitScanWeapon::Fire(const FVector& HitTarget)
+{
+	Super::Fire(HitTarget);
+
+	APawn* OwnerPawn = Cast<APawn>(GetOwner());
+	if (OwnerPawn == nullptr) return;
+	AController* InstigatorController = OwnerPawn->GetController();
+	
+	const USkeletalMeshSocket* MuzzleFlashSocket = GetWeaponMesh()->GetSocketByName("MuzzleFlash");
+	if (MuzzleFlashSocket && InstigatorController)
+	{
+		FTransform SocketTransform = MuzzleFlashSocket->GetSocketTransform(GetWeaponMesh());
+		FVector Start = SocketTransform.GetLocation();
+		FVector End = Start + (HitTarget - Start) * 1.25f;
+
+		FHitResult FireHit;
+		UWorld* World = GetWorld();
+		if (World)
+		{
+			World->LineTraceSingleByChannel(
+				FireHit,
+				Start,
+				End,
+				ECC_Visibility
+			);
+			if (FireHit.bBlockingHit)
+			{
+				ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(FireHit.GetActor());
+				if (BlasterCharacter)
+				{
+					if (HasAuthority())
+					{
+						UGameplayStatics::ApplyDamage(
+							BlasterCharacter,
+							Damage,
+							InstigatorController,
+							this,
+							UDamageType::StaticClass()
+						);
+					}
+				}
+
+				if (ImpactParticles)
+				{
+					UGameplayStatics::SpawnEmitterAtLocation(
+						World,
+						ImpactParticles,
+						FireHit.ImpactPoint,
+						FireHit.ImpactNormal.Rotation()
+					);
+				}
+			}
+		}
+	}
+}

Source/Blaster/Weapon/HitScanWeapon.h

@@ -0,0 +1,28 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Weapon.h"
+#include "HitScanWeapon.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class BLASTER_API AHitScanWeapon : public AWeapon
+{
+	GENERATED_BODY()
+
+public:
+
+	virtual void Fire(const FVector& HitTarget) override;
+
+private:
+
+	UPROPERTY(EditAnywhere)
+	float Damage = 20.f;
+
+	UPROPERTY(EditAnywhere)
+	class UParticleSystem* ImpactParticles;
+};

Source/Blaster/Weapon/Weapon.h

@@ -89,25 +89,25 @@ protected:
 	);
 
 private:
-	UPROPERTY(VisibleAnywhere, Category="Weapon Properties")
+	UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
 	USkeletalMeshComponent* WeaponMesh;
 
-	UPROPERTY(VisibleAnywhere, Category="Weapon Properties")
+	UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
 	class USphereComponent* AreaSphere;
 
-	UPROPERTY(ReplicatedUsing = OnRep_WeaponState, VisibleAnywhere, Category="Weapon Properties")
+	UPROPERTY(ReplicatedUsing = OnRep_WeaponState, VisibleAnywhere, Category = "Weapon Properties")
 	EWeaponState WeaponState;
 
 	UFUNCTION()
 	void OnRep_WeaponState();
 	
-	UPROPERTY(VisibleAnywhere, Category="Weapon Properties")
+	UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
 	class UWidgetComponent* PickupWidget;
 
-	UPROPERTY(EditAnywhere, Category= "Weapon Properties")
+	UPROPERTY(EditAnywhere, Category = "Weapon Properties")
 	class UAnimationAsset* FireAnimation;
 
-	UPROPERTY(EditAnywhere, Category= "Weapon Properties")
+	UPROPERTY(EditAnywhere, Category = "Weapon Properties")
 	TSubclassOf<class ACasing> CasingClass;
 	
 	UPROPERTY(EditAnywhere, ReplicatedUsing=OnRep_Ammo)

Source/Blaster/Weapon/WeaponTypes.h

@@ -5,6 +5,7 @@ enum class EWeaponType: uint8
 {
 	EWT_AssaultRifle UMETA(DisplayName="Assault Rifle"),
 	EWT_RocketLauncher UMETA(DisplayName="Rocket Launcher"),
+	EWT_Pistol UMETA(DisplayName="Pistol"),
 	
 	EWT_MAX UMETA(DisplayName="DefaultMAX")
 };