From b96ba07b40c4950195c327d09b2a8c25e1ae68b7 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Sat, 11 May 2024 12:45:30 +0100 Subject: [PATCH] Bugfix Assault Rifle Out of Alignment --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../Content/FirstPerson/Blueprints/BP_MainCharacter.uasset | 4 ++-- .../Animations/Arms/FP_Rifle_Reload_Montage.uasset | 2 +- .../Animations/Rifle/AssaultRifle_Anims_Reload.uasset | 4 ++-- .../AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset | 4 ++-- .../Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset | 4 ++-- .../Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset | 4 ++-- .../Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset | 2 +- .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 6 ++++-- .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 3 ++- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 878519c3..5c5ae231 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f377cbc17912b30552d21ef737c005fdb56653496dc5e04ca129810b0f7cf544 -size 853827 +oid sha256:6598750f3e0230b46fd64eadab3a59a34bfcd517f6f89767fb10af1e32034a6c +size 855791 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset index 765d07b3..42d5b433 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d36b158f701a6104069875b85b6c4fe3c05d5eaa8b8fc085a5fcc92793010fac -size 1621595 +oid sha256:b8a5f64a1f325a12b95017bd754ac02a0b62f135156da1f56494afdcee2d6f24 +size 1585077 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Reload_Montage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Reload_Montage.uasset index 38f6cace..a01e7d35 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Reload_Montage.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Reload_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:265021c990e9b355dd065cbdbe3310c3eb5b0c67286ab78d4be0c82c5598e6e4 +oid sha256:6e22279302395f233b2c798980ada04ef5f5a6798d0832d672a3286555c91552 size 10192 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload.uasset index bab1e15d..8d4060c9 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dc960cb1ee3668f56b26778a2122ba1961c421cab1819698665f8f8f6550c2c -size 271592 +oid sha256:f085c2b96bc490ab1956d5794745331a7bc84b5d4669276aaad2634fa332f5bd +size 33908 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset index 30beff45..012e027f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b1d08215ff193ef0bc4949423e0301d2a64506e039b7b11015e0ab2a0269175 -size 146510 +oid sha256:ad5385075406f8ae679ed793e29babde0085151e91925728780d923660ece6a5 +size 145193 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset index 510c52cd..a1259493 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7122ccd26a3ff4b9b55825c94ecfcbd1c2f0c9cb27bb57b83d70b7c5391cf77 -size 424792 +oid sha256:950d05b4775e7f472dfbbc912757292db35cba787d326dba3f25b2b189748f38 +size 430641 diff --git a/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset b/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset index 36e8f689..1de59575 100644 --- a/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset +++ b/EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:139c9f278e15595ea0d436b333d315c729f4b2473db2dff4b643151f5492794f -size 24002 +oid sha256:b5ad25afb09b20f85b5ed2ba1993ee52d442cbd2541171db23e3fe02b6ca73f2 +size 24105 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset index f287ac72..5a7faf2c 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d0cbafab0a0302236982c6bf2541fa4df78ba03c7fdb0bfae5fab0485a4ffb2 +oid sha256:17f005b9ba605aa3665eac51c74fc13c2b9364ea910949072d00e154f7d8c422 size 6680 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 54f94d63..0d3eb851 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -108,6 +108,7 @@ void AEndlessVendettaCharacter::ReloadAnimationComplete() { if (IsValid(PrimaryWeapon)) { + if (!bIsReloading) return; PrimaryWeapon->WeaponReload(); } if (IsValid(SecondaryWeapon)) @@ -764,7 +765,8 @@ void AEndlessVendettaCharacter::GunReload() if (IsValid(PrimaryWeapon)) { if (PrimaryWeapon->currentAmmoCount == PrimaryWeapon->MagazineSize) return; - PrimaryWeapon->ReloadTimer(); + StartReload.Broadcast(); + //PrimaryWeapon->ReloadTimer(); bIsReloading = true; } else if (IsValid(SecondaryWeapon)) @@ -893,7 +895,7 @@ bool AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf NewGad if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass())) ToggleRecon(); else if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass())) ToggleCombat(); - + return true; } diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index 69a8497a..05707c3e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -200,7 +200,8 @@ void ABaseWeaponClass::Fire() GetWorld()->LineTraceSingleByObjectType(outHit, traceStart, traceEnd, ObjectQueryParams, collisionParams); WeaponFired.Broadcast(); playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1); - endlessVendettaChar->PawnNoiseEmitterComp->MakeNoise(endlessVendettaChar, 1, traceStart); //LITERALLY CHANGE THIS FOR SUPPRESSOR AND IT SHOULD WORK LOL + endlessVendettaChar->PawnNoiseEmitterComp->MakeNoise(endlessVendettaChar, 1, traceStart); + //LITERALLY CHANGE THIS FOR SUPPRESSOR AND IT SHOULD WORK LOL currentAmmoCount -= 1; GenerateRecoilVector(); ClickDetectionTimer();