diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset index f570bf8e..52326d2d 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c17011787947edd0492999385adc17e76b12aa4fe03ef946ae96b2ad435f4eda +oid sha256:8a37e791ac9a009d944c1237857829b57281f5950cc05d88d7a1cb6ec7723333 size 9114 diff --git a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user deleted file mode 100644 index 2b08f3a1..00000000 --- a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user +++ /dev/null @@ -1,2 +0,0 @@ - - C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index d90949fc..69a8497a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -200,7 +200,7 @@ void ABaseWeaponClass::Fire() GetWorld()->LineTraceSingleByObjectType(outHit, traceStart, traceEnd, ObjectQueryParams, collisionParams); WeaponFired.Broadcast(); playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1); - endlessVendettaChar->PawnNoiseEmitterComp->MakeNoise(endlessVendettaChar, 1, traceStart); + endlessVendettaChar->PawnNoiseEmitterComp->MakeNoise(endlessVendettaChar, 1, traceStart); //LITERALLY CHANGE THIS FOR SUPPRESSOR AND IT SHOULD WORK LOL currentAmmoCount -= 1; GenerateRecoilVector(); ClickDetectionTimer(); diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h index 583bb67a..45d2f5bc 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h @@ -202,15 +202,17 @@ public: UPROPERTY(BlueprintAssignable, Category = "Weapons") FWeaponFired WeaponFired; + float originalMinMultiplier; + float originalMagnitude; + float originalMaxAngleLeft; + float originalMaxAngleRight; + protected: UArrowComponent* GunStartArrow; bool bStopShooting = false; UPROPERTY(VisibleAnywhere) int tempWeaponDamage; - - float originalMagnitude; - float originalMaxAngleLeft; - float originalMaxAngleRight; - float originalMinMultiplier; + + }; diff --git a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.cpp b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.cpp index cbced9f9..66415b6c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.cpp @@ -3,6 +3,8 @@ #include "GripAttachmentClass.h" +#include "EndlessVendetta/WeaponSystem/BaseWeaponClass.h" + // Sets default values for this component's properties UGripAttachmentClass::UGripAttachmentClass() @@ -19,9 +21,17 @@ UGripAttachmentClass::UGripAttachmentClass() void UGripAttachmentClass::BeginPlay() { Super::BeginPlay(); - - // ... - + BaseWeaponClassRef = Cast(this->GetAttachParentActor()); + if(IsValid(BaseWeaponClassRef)) + { + GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Red, TEXT("GripAttachmentClass called")); + BaseWeaponClassRef->howMnyShotsTillRclStop = 2; + BaseWeaponClassRef->originalMinMultiplier /= 2; + BaseWeaponClassRef->originalMagnitude /= 2; + BaseWeaponClassRef->originalMaxAngleLeft /= 2; + BaseWeaponClassRef->originalMaxAngleRight /= 2; + BaseWeaponClassRef->WeaponScopedFire(); + } } @@ -29,5 +39,6 @@ void UGripAttachmentClass::BeginPlay() void UGripAttachmentClass::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) { Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + } diff --git a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.h b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.h index 89d795a2..a5e423e6 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/GripAttachmentClass.h @@ -23,4 +23,7 @@ protected: public: // Called every frame virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + + UPROPERTY(VisibleAnywhere) + class ABaseWeaponClass* BaseWeaponClassRef; };