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

Added a temporary weapon damage for Damage Fall Off

Browse Source
This commit is contained in:
Marcel Hara 2023-11-06 15:58:01 +00:00
parent 0608015705
commit 34ef5c6e40
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ ABaseWeaponClass::ABaseWeaponClass()
void ABaseWeaponClass::BeginPlay() void ABaseWeaponClass::BeginPlay()
{ {
Super::BeginPlay(); Super::BeginPlay();
tempWeaponDamage = WeaponDamage;
collisionParams.AddIgnoredActor(playerInWorld); collisionParams.AddIgnoredActor(playerInWorld);
collisionParams.AddIgnoredActor(this); collisionParams.AddIgnoredActor(this);

4
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
View File

@ -180,12 +180,10 @@ protected:
UArrowComponent* GunStartArrow; UArrowComponent* GunStartArrow;
bool bStopShooting = false; bool bStopShooting = false;
private: int tempWeaponDamage;
float originalMagnitude; float originalMagnitude;
float originalMaxAngleLeft; float originalMaxAngleLeft;
float originalMaxAngleRight; float originalMaxAngleRight;
float originalMinMultiplier; float originalMinMultiplier;
}; };

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

@ -9,6 +9,12 @@ AShotgunClass::AShotgunClass()
{ {
// Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it.
PrimaryActorTick.bCanEverTick = true; PrimaryActorTick.bCanEverTick = true;
ShotgunBulletSpread = FVector(10,10,10);
}
void AShotgunClass::BeginPlay()
{
Super::BeginPlay();
} }
void AShotgunClass::Fire() void AShotgunClass::Fire()
@ -19,8 +25,17 @@ void AShotgunClass::Fire()
if (GetWorldTimerManager().IsTimerActive(timerHandle)) return; if (GetWorldTimerManager().IsTimerActive(timerHandle)) return;
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
FVector newStartTrace = UKismetMathLibrary::RandomPointInBoundingBox(traceStart, FVector(10,10,10)); FVector newStartTrace = UKismetMathLibrary::RandomPointInBoundingBox(traceStart, ShotgunBulletSpread);
traceEnd = newStartTrace + (GunStartArrow->GetForwardVector() * BulletDistance); traceEnd = newStartTrace + (GunStartArrow->GetForwardVector() * BulletDistance);
if (outHit.Distance >= FMath::Floor(BulletDistance/1.5))
{
tempWeaponDamage /= 2;
GLog->Log("Bullet distance reached a quarter");
}
else
{
tempWeaponDamage = WeaponDamage;
}
GetWorld()->LineTraceSingleByChannel(outHit, newStartTrace, traceEnd, ECC_Visibility, collisionParams); GetWorld()->LineTraceSingleByChannel(outHit, newStartTrace, traceEnd, ECC_Visibility, collisionParams);
DrawDebugLine(this->GetWorld(), newStartTrace, traceEnd, FColor::Red , false, 100.f, 0U, 1.f); DrawDebugLine(this->GetWorld(), newStartTrace, traceEnd, FColor::Red , false, 100.f, 0U, 1.f);
currentAmmoCount --; currentAmmoCount --;
@ -41,3 +56,4 @@ void AShotgunClass::Fire()
UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount); UE_LOG(LogTemp, Display, TEXT("No ammo, Ammo count: %d"), currentAmmoCount);
} }
} }

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

@ -18,7 +18,13 @@ public:
// Sets default values for this actor's properties // Sets default values for this actor's properties
AShotgunClass(); AShotgunClass();
//How far apart the bullets will be to eachother when shot with a shotgun
UPROPERTY(EditAnywhere, Category = "Weapon")
FVector ShotgunBulletSpread;
protected: protected:
virtual void Fire() override; virtual void Fire() override;
virtual void BeginPlay() override;
}; };