Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Fixed NeedReloadText & Added it so you cant spam fire shotgun

Browse Source
This commit is contained in:
MH261677 2024-02-23 18:59:12 +00:00
parent 2fc034892d
commit b74e7bee9a
5 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset (Stored with Git LFS)
View File

Binary file not shown.

26
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp
View File

@ -18,10 +18,18 @@ void AShotgunClass::BeginPlay()
Super::BeginPlay(); Super::BeginPlay();
} }
void AShotgunClass::ClickDetectionTimer()
{
Super::ClickDetectionTimer();
GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Magenta, TEXT("ClickDetectionTimer Activated"));
}
void AShotgunClass::Fire() void AShotgunClass::Fire()
{ {
if(currentAmmoCount > 0) if(currentAmmoCount > 0 && !bSingleShotOnly)
{ {
bSingleShotOnly = true;
GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Magenta, TEXT("Fire Activated"));
traceStart = GunStartArrow->GetComponentLocation(); traceStart = GunStartArrow->GetComponentLocation();
if (GetWorldTimerManager().IsTimerActive(timerHandle)) return; if (GetWorldTimerManager().IsTimerActive(timerHandle)) return;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
@ -30,11 +38,12 @@ void AShotgunClass::Fire()
traceEnd = newStartTrace + (GunStartArrow->GetForwardVector() * BulletDistance); traceEnd = newStartTrace + (GunStartArrow->GetForwardVector() * BulletDistance);
GetWorld()->LineTraceSingleByChannel(outHit, newStartTrace, traceEnd, ECC_Visibility, collisionParams); GetWorld()->LineTraceSingleByChannel(outHit, newStartTrace, traceEnd, ECC_Visibility, collisionParams);
DrawDebugLine(this->GetWorld(), newStartTrace, traceEnd, FColor::Black , false, 0.2f, 0U, 0.2f); DrawDebugLine(this->GetWorld(), newStartTrace, traceEnd, FColor::Black , false, 0.2f, 0U, 0.2f);
currentAmmoCount --;
} }
currentAmmoCount --;
playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1); playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1);
GenerateRecoilVector(); GenerateRecoilVector();
ClickDetectionTimer(); ClickDetectionTimer();
this->GetWorld()->GetTimerManager().SetTimer(ShotgunTimerHandle, this, &AShotgunClass::StopFire, FireRate, false);
bulletCountShoot += 1; bulletCountShoot += 1;
bStopShooting = false; bStopShooting = false;
if (outHit.bBlockingHit) if (outHit.bBlockingHit)
@ -51,10 +60,23 @@ void AShotgunClass::Fire()
if (!Cast<AAICharacter>(outHit.GetActor())) return; if (!Cast<AAICharacter>(outHit.GetActor())) return;
Cast<AAICharacter>(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this); Cast<AAICharacter>(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this);
} }
HideNeedReloadUI();
} }
else if(currentAmmoCount <= 0) else if(currentAmmoCount <= 0)
{ {
UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount); UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount);
ShowNeedReloadUI();
} }
} }
void AShotgunClass::CancelFire()
{
Super::CancelFire();
}
void AShotgunClass::StopFire()
{
bSingleShotOnly = false;
}

11
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.h
View File

@ -22,9 +22,20 @@ public:
UPROPERTY(EditAnywhere, Category = "Weapon") UPROPERTY(EditAnywhere, Category = "Weapon")
FVector ShotgunBulletSpread; FVector ShotgunBulletSpread;
FTimerHandle ShotgunTimerHandle;
void StopFire();
bool bSingleShotOnly;
protected: protected:
virtual void Fire() override; virtual void Fire() override;
virtual void BeginPlay() override; virtual void BeginPlay() override;
virtual void ClickDetectionTimer() override;
virtual void CancelFire() override;
}; };

2
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp
View File

@ -72,10 +72,12 @@ void ASniperClass::Fire()
if (!Cast<AAICharacter>(outHit.GetActor())) return; if (!Cast<AAICharacter>(outHit.GetActor())) return;
Cast<AAICharacter>(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this); Cast<AAICharacter>(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this);
} }
HideNeedReloadUI();
} }
else if(currentAmmoCount <= 0) else if(currentAmmoCount <= 0)
{ {
UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount); UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount);
ShowNeedReloadUI();
} }
} }