From 08571b8b71ab0c0f45c8366b56b487527ed236da Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Sat, 11 May 2024 16:30:38 +0100 Subject: [PATCH 1/3] Update Pistol for Reload SFX --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- .../PistolAnimations/Pistol_Reload_Montage.uasset | 4 ++-- .../BaseWeapons/Pistols/AnimatedPistol/PistolDropMag.uasset | 3 +++ .../BaseWeapons/Pistols/AnimatedPistol/PistolLoadMag.uasset | 3 +++ .../Pistols/AnimatedPistol/PistolLoadMagPt1.uasset | 3 +++ .../Pistols/AnimatedPistol/PistolLoadMagPt2.uasset | 3 +++ 6 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolDropMag.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMag.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt1.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt2.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 5c5ae231..f5d03cb5 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:6598750f3e0230b46fd64eadab3a59a34bfcd517f6f89767fb10af1e32034a6c -size 855791 +oid sha256:22d60ab125ce4bc503d8d7e6e51469ae6cce4cff67c3ab2e7c01a0cf82791956 +size 832214 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolAnimations/Pistol_Reload_Montage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolAnimations/Pistol_Reload_Montage.uasset index 0131ce2d..e2240814 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolAnimations/Pistol_Reload_Montage.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolAnimations/Pistol_Reload_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7aaa74f9fce796939a3102565258f60b16fcd0d8d4f43afa1f524093195aa5a -size 8497 +oid sha256:46735f8ceace466d4c48cf1fc454df829a78abed70fdd31734d939a01c9c51a2 +size 14276 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolDropMag.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolDropMag.uasset new file mode 100644 index 00000000..c8f87557 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolDropMag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2cbb0134c85fe3b3d23f4f6a143e75d15f659a1ad6d488b5202d064de97339b +size 20372 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMag.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMag.uasset new file mode 100644 index 00000000..8ab24194 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44d12387de41f6228338d2a1e099bda818f119ef978e61b3cb35fc7c57abd6a8 +size 46394 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt1.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt1.uasset new file mode 100644 index 00000000..71bab50c --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc6cd1c67d3663c69b4d7e7e7f226cc1907b04205aa548b6d3c26fdb4bd2278b +size 23539 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt2.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt2.uasset new file mode 100644 index 00000000..9e71eee7 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/PistolLoadMagPt2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8224fea2f261812671b15932c127d1d099c609fdb222ef2a16d52b7eb6f1025 +size 29858 From 326968822ba55e1434abb4745b081ec23025b62e Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Sat, 11 May 2024 16:30:54 +0100 Subject: [PATCH 2/3] Update Assault Rifle for Reload SFX --- .../AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset | 4 ++-- .../Animations/Rifle/AssaultRifle_Anims_Reload_Montage.uasset | 4 ++-- .../AssaultRifles/Assault_Rifle/AssaultDropMag.uasset | 3 +++ .../AssaultRifles/Assault_Rifle/AssaultLoadMag.uasset | 3 +++ .../AssaultRifles/Assault_Rifle/AssaultRifleSFX.uasset | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultDropMag.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultLoadMag.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifleSFX.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset index f5ada6bd..532d587f 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/ABP_AssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78ad2e7ab300f1f1c384a5b0d0511b68d5b284a573dad021da7f6c7fc9d1be9a -size 67225 +oid sha256:00bc262792b34a8fb1d1046353891925b0a22a4190bf291a3b9c348ffc65033e +size 67395 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload_Montage.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload_Montage.uasset index b55b4964..c1347618 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload_Montage.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload_Montage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f29ab9e5eb6b9dd678ed4892462b143421179ca064a09eb7ebb2dabf7d9abe8 -size 8112 +oid sha256:27aa0a3821e1ba8c851e20199e5b1cf6cd5e088115b95258ac3f32116166f5ca +size 12666 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultDropMag.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultDropMag.uasset new file mode 100644 index 00000000..0a4281ee --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultDropMag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e72da98185f1f5bacd1bf8c80e9c08334548f9b56946a325e9e84061231f396 +size 54105 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultLoadMag.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultLoadMag.uasset new file mode 100644 index 00000000..eda204b0 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultLoadMag.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0902f41b7860770aec2f99d074deb4573167a07a43c31c3889d399388e5cf1e +size 43330 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifleSFX.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifleSFX.uasset new file mode 100644 index 00000000..5fa7f953 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifleSFX.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77a400f177337fb2156a4a4de19b95d564e866de4f6c8c597768682b88698ca7 +size 119700 From de296a10b9ca7f8318c0d4dedf4113511cf678cd Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Sat, 11 May 2024 16:50:57 +0100 Subject: [PATCH 3/3] Bugfix Bullet Impact Not Overlapping Restricted Bounds --- EndlessVendetta/Config/DefaultEngine.ini | 1 + .../Pistols/Pistol_Assets/BP_HandGun_Projectile.uasset | 4 ++-- .../Source/EndlessVendetta/AI/AI_RestrictedZone.cpp | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index eca8171f..d94d269c 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -41,6 +41,7 @@ +DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Waypoint") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Player") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Enemy") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel5,DefaultResponse=ECR_Overlap,bTraceType=False,bStaticObject=False,Name="RestrictedBounds") +EditProfiles=(Name="Trigger",CustomResponses=((Channel="Projectile",Response=ECR_Ignore))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/BP_HandGun_Projectile.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/BP_HandGun_Projectile.uasset index 43e62eed..919b4e97 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/BP_HandGun_Projectile.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/BP_HandGun_Projectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b599f7add7a160c01e7800a4c556bbdc21ed3025443f8c01376b07b57e5c8da -size 95047 +oid sha256:510212c22d9ee9fa8995889d9e25f1d265e7824cfe5779c69ade26f6c94d8251 +size 95202 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AI_RestrictedZone.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/AI_RestrictedZone.cpp index de23fdad..5158b758 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AI_RestrictedZone.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AI_RestrictedZone.cpp @@ -12,6 +12,7 @@ AAI_RestrictedZone::AAI_RestrictedZone() // 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; BoxCollision = CreateDefaultSubobject(TEXT("BoxCollision")); + BoxCollision->SetCollisionObjectType(ECC_GameTraceChannel5); BoxCollision->SetCollisionResponseToChannel(ECC_EngineTraceChannel4, ECR_Overlap); } @@ -23,7 +24,8 @@ void AAI_RestrictedZone::BeginPlay() BoxCollision->OnComponentEndOverlap.AddDynamic(this, &AAI_RestrictedZone::OnBoxOverlapEnd); } -void AAI_RestrictedZone::OnBoxOverlapBegin(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) +void AAI_RestrictedZone::OnBoxOverlapBegin(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, + int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) { if (Cast(OtherActor)) { @@ -32,7 +34,8 @@ void AAI_RestrictedZone::OnBoxOverlapBegin(UPrimitiveComponent* OverlappedComp, } } -void AAI_RestrictedZone::OnBoxOverlapEnd(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex) +void AAI_RestrictedZone::OnBoxOverlapEnd(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, + int32 OtherBodyIndex) { if (Cast(OtherActor)) {