kingsmedia
/
blaster
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

138 - Weapon Scatter

This commit is contained in:
Kingsmedia 2022-05-20 12:59:55 +02:00
parent c619f07b1e
commit 08a1b89702
7 changed files with 125 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Weapon/BP_Pistol.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/Weapon/BP_Shotgun.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/Weapon/BP_SubmachineGun.uasset
View File

Binary file not shown.

BIN
Content/Maps/BlasterMap.umap
View File

Binary file not shown.

75
Source/Blaster/Weapon/HitScanWeapon.cpp
View File

@ -22,22 +22,10 @@ void AHitScanWeapon::Fire(const FVector& HitTarget)
{
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
);
FVector BeamEnd = End;
if (FireHit.bBlockingHit)
{
BeamEnd = FireHit.ImpactPoint;
WeaponTraceHit(Start, HitTarget, FireHit);
ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(FireHit.GetActor());
if (BlasterCharacter && HasAuthority() && InstigatorController)
{
@ -49,17 +37,15 @@ void AHitScanWeapon::Fire(const FVector& HitTarget)
UDamageType::StaticClass()
);
}
if (ImpactParticles)
{
UGameplayStatics::SpawnEmitterAtLocation(
World,
GetWorld(),
ImpactParticles,
FireHit.ImpactPoint,
FireHit.ImpactNormal.Rotation()
);
}
if (HitSound)
{
UGameplayStatics::PlaySoundAtLocation(
@ -68,26 +54,10 @@ void AHitScanWeapon::Fire(const FVector& HitTarget)
FireHit.ImpactPoint
);
}
}
if (BeamParticles)
{
UParticleSystemComponent* Beam = UGameplayStatics::SpawnEmitterAtLocation(
World,
BeamParticles,
SocketTransform
);
if (Beam)
{
Beam->SetVectorParameter(FName("Target"), BeamEnd);
}
}
}
if (MuzzleFlash)
{
UGameplayStatics::SpawnEmitterAtLocation(
World,
GetWorld(),
MuzzleFlash,
SocketTransform
);
@ -103,6 +73,40 @@ void AHitScanWeapon::Fire(const FVector& HitTarget)
}
}
void AHitScanWeapon::WeaponTraceHit(const FVector& TraceStart, const FVector& HitTarget, FHitResult& OutHit)
{
UWorld* World = GetWorld();
if (World)
{
FVector End = bUseScatter ? TraceEndWithScatter(TraceStart, HitTarget) : TraceStart + (HitTarget - TraceStart) * 1.25f;
World->LineTraceSingleByChannel(
OutHit,
TraceStart,
End,
ECC_Visibility
);
FVector BeamEnd = End;
if (OutHit.bBlockingHit)
{
BeamEnd = OutHit.ImpactPoint;
}
if (BeamParticles)
{
UParticleSystemComponent* Beam = UGameplayStatics::SpawnEmitterAtLocation(
World,
BeamParticles,
TraceStart,
FRotator::ZeroRotator,
true
);
if (Beam)
{
Beam->SetVectorParameter(FName("Target"), BeamEnd);
}
}
}
}
FVector AHitScanWeapon::TraceEndWithScatter(const FVector& TraceStart, const FVector& HitTarget)
{
FVector ToTargetNormalized = (HitTarget - TraceStart).GetSafeNormal();
@ -111,6 +115,7 @@ FVector AHitScanWeapon::TraceEndWithScatter(const FVector& TraceStart, const FVe
FVector EndLoc = SphereCenter + RandVec;
FVector ToEndLoc = EndLoc - TraceStart;
/*
DrawDebugSphere(GetWorld(), SphereCenter, SphereRadius, 12, FColor::Red, true);
DrawDebugSphere(GetWorld(), ToEndLoc, 4.f, 12, FColor::Blue, true);
DrawDebugLine(
@ -120,6 +125,6 @@ FVector AHitScanWeapon::TraceEndWithScatter(const FVector& TraceStart, const FVe
FColor::Cyan,
true
);
*/
return FVector(TraceStart + ToEndLoc * TRACE_LENGTH / ToEndLoc.Size());
}

13
Source/Blaster/Weapon/HitScanWeapon.h
View File

@ -21,14 +21,18 @@ public:
protected:
FVector TraceEndWithScatter(const FVector& TraceStart, const FVector& HitTarget);
void WeaponTraceHit(const FVector& TraceStart, const FVector& HitTarget, FHitResult& OutHit);
private:
UPROPERTY(EditAnywhere)
UParticleSystem* ImpactParticles;
UPROPERTY(EditAnywhere)
USoundCue* HitSound;
UPROPERTY(EditAnywhere)
float Damage = 20.f;
UPROPERTY(EditAnywhere)
UParticleSystem* ImpactParticles;
private:
UPROPERTY(EditAnywhere)
UParticleSystem* BeamParticles;
@ -39,9 +43,6 @@ private:
UPROPERTY(EditAnywhere)
USoundCue* FireSound;
UPROPERTY(EditAnywhere)
USoundCue* HitSound;
// Trace end with scatter
UPROPERTY(EditAnywhere, Category = "Weapon Scatter")

50
Source/Blaster/Weapon/Shotgun.cpp
View File

@ -21,9 +21,57 @@ void AShotgun::Fire(const FVector& HitTarget)
FTransform SocketTransform = MuzzleFlashSocket->GetSocketTransform(GetWeaponMesh());
FVector Start = SocketTransform.GetLocation();
TMap<ABlasterCharacter*, uint32> HitMap;
for (uint32 i = 0; i < NumberOfPellets; i++)
{
FVector End = TraceEndWithScatter(Start, HitTarget);
FHitResult FireHit;
WeaponTraceHit(Start, HitTarget, FireHit);
ABlasterCharacter* BlasterCharacter = Cast<ABlasterCharacter>(FireHit.GetActor());
if (BlasterCharacter && HasAuthority() && InstigatorController)
{
if (HitMap.Contains(BlasterCharacter))
{
HitMap[BlasterCharacter]++;
}
else
{
HitMap.Emplace(BlasterCharacter, 1);
}
}
if (ImpactParticles)
{
UGameplayStatics::SpawnEmitterAtLocation(
GetWorld(),
ImpactParticles,
FireHit.ImpactPoint,
FireHit.ImpactNormal.Rotation()
);
}
if (HitSound)
{
UGameplayStatics::PlaySoundAtLocation(
this,
HitSound,
FireHit.ImpactPoint,
.5f,
FMath::FRandRange(-.5f, .5f)
);
}
}
for (auto HitPair : HitMap)
{
if (HitPair.Key && HasAuthority() && InstigatorController)
{
UGameplayStatics::ApplyDamage(
HitPair.Key,
Damage * HitPair.Value,
InstigatorController,
this,
UDamageType::StaticClass()
);
}
}
}
}