diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index a0b6dbb6..261909c6 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -90,6 +90,7 @@ r.GPUSkin.UnlimitedBoneInfluences=True r.SkinCache.CompileShaders=True r.SkinCache.DefaultBehavior=0 SkeletalMesh.UseExperimentalChunking=1 +r.Streaming.PoolSize=3000 [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_001.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_001.uasset new file mode 100644 index 00000000..60f68922 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e947b1392ad85f0d4dcecfb9a2be895cb08f01946d872b83610a650fc04be8b +size 8511 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_002.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_002.uasset new file mode 100644 index 00000000..5ad044b4 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9233ab4004d9517457a46e137b38af253a0101a8d93a65c87c9d198d01674a53 +size 8365 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_003.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_003.uasset new file mode 100644 index 00000000..199fae4a --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef88dad14022b2d91de2e59bbfb6b710288205c371555058d92c31a30774d0db +size 8047 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_004.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_004.uasset new file mode 100644 index 00000000..d02068fd --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bfca48a8e4933db79fff21541ccd29729028febd31ef411d62194fe1ed7dc9f +size 8365 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_005.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_005.uasset new file mode 100644 index 00000000..a81829e6 --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:193163d12b6ae795587660503ebf1913e95bbd03129bb45408ed433e6103e3f0 +size 8365 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/security_office_door.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/security_office_door.uasset new file mode 100644 index 00000000..6563551a --- /dev/null +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/security_office_door.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc154ab82bcd426ada32f443d3bd7a0675cf42fa95e70b2ea549031fcfa6bd5d +size 36392 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece03/M_WallPiece03.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece03/M_WallPiece03.uasset index bd286162..17e74054 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece03/M_WallPiece03.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece03/M_WallPiece03.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bbe99ad098ed0f33354c0a3dd8b8ecc2f3c35919ceedaa5639b30a4d15a961c -size 14743 +oid sha256:ff386be92368bec29ed4c855a784e58fe0854ec38d485499bfb03a83fd5e9e98 +size 14761 diff --git a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece04/M_WallPiece04.uasset b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece04/M_WallPiece04.uasset index 7daec671..59b5c11f 100644 --- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece04/M_WallPiece04.uasset +++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece04/M_WallPiece04.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:881e1b20cef0fbb9f7af595dca136b3a541457834f69be5e8e26d040edf61e99 -size 11829 +oid sha256:d9b31bed1be8bec24efd959f7ff218a01708348f28c1e11a4b4f3d8f62dc3aa1 +size 11872 diff --git a/EndlessVendetta/Content/Cyberpunk_Gigapack/Materials/Master/MM_Glass_01_Restaurant.uasset b/EndlessVendetta/Content/Cyberpunk_Gigapack/Materials/Master/MM_Glass_01_Restaurant.uasset new file mode 100644 index 00000000..5b35c3ec --- /dev/null +++ b/EndlessVendetta/Content/Cyberpunk_Gigapack/Materials/Master/MM_Glass_01_Restaurant.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1df7aa397be23a2d8a2a7b4016942b0b637363cf21efcba5840793280fdfe63 +size 39550 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset index 942e3bb2..dd7dd0f7 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:835c097b3a17338495ff44616dc23bd30b64a0ec073785f9ea50010d9fe08546 -size 41553 +oid sha256:be2df8f3887c25a9cc9b7c38b6bb39d1a84c9fbaa04e45dd68c5acc5c4c83a78 +size 40852 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset index 1c672c2a..1a047483 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d5b9b574cce4c115d12e4022cb1d11420e48614a851d0dab46199aee45ad6d2 -size 238431 +oid sha256:f123a6be394692bcf1008c3ca474412b1dea16cf5162e4403e5bfeffecf7aaca +size 232957 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/NS_Pistol_Muzzle_Flash_ONCE.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/NS_Pistol_Muzzle_Flash_ONCE.uasset new file mode 100644 index 00000000..20387334 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/NS_Pistol_Muzzle_Flash_ONCE.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167cfdb2543370c3dabaf6bb38736f59c39b4c6f4c59621e87feab5a5c9e0d5d +size 2104231 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Shooting.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Shooting.uasset index e7192f28..35f79b6e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Shooting.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Shooting.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b763bedf641851551cf054fa3eff51789bc8169540678cbe92f70890f496747 -size 13847 +oid sha256:1a940aa1b2152dddba38da24db7dc7a74447b2e4344dd379433c12bf52915e4d +size 13850 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset index 530f332e..f5dd6321 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0dc340b553531be453d5c905366d4b7f5ee963b825809bc2a9862857db42a48 -size 149397 +oid sha256:de73d2ac1fc0b7edb6bf31f180d0911728cdbb24a2742ee49cc13777440d8c09 +size 148132 diff --git a/EndlessVendetta/Content/Levels/Apartment_hit.umap b/EndlessVendetta/Content/Levels/Apartment_hit.umap index d1012d67..c4930b09 100644 --- a/EndlessVendetta/Content/Levels/Apartment_hit.umap +++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba6c5231fe16d7055c78d25e17660b8b0a8e56c238d6ebbd9d22e154daeb569 -size 843481 +oid sha256:6faab0a35dd51b9e033c5effec7aa9fe8e1d05d36da8e3d97162d8d4cc855583 +size 946965 diff --git a/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_3FB962C0.uasset b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_3FB962C0.uasset new file mode 100644 index 00000000..ddc556e2 --- /dev/null +++ b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_3FB962C0.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ef6bd85663f032f640ad4a4341efc0cd231b517a9d21282733d51696045bead +size 13433 diff --git a/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_8FB5D3DE.uasset b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_8FB5D3DE.uasset new file mode 100644 index 00000000..bbee510a --- /dev/null +++ b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_8FB5D3DE.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9ac0222540d5439f32693a225518981e8bb85b44e8d67022200e16c4f5a766 +size 13164 diff --git a/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_96D91098.uasset b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_96D91098.uasset new file mode 100644 index 00000000..1e9e67c6 --- /dev/null +++ b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_96D91098.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa13e31601416aa6a4c3c530ccef3fe9e95f01dd1181f3c79455300e8bbb3fe1 +size 13059 diff --git a/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_DDC9E983.uasset b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_DDC9E983.uasset new file mode 100644 index 00000000..1a122480 --- /dev/null +++ b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_DDC9E983.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be0b6568b6f66f4efd52a764eebb649cfd81f7a6c2121a486fea144071ce6729 +size 13398 diff --git a/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_FA2CB9A9.uasset b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_FA2CB9A9.uasset new file mode 100644 index 00000000..fbb3dcc4 --- /dev/null +++ b/EndlessVendetta/Content/Levels/_GENERATED/kacpe/Box_FA2CB9A9.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0760e6e9970a4aad96c0c8dfeafa33208af3850c4ef46ffa4f98f131acc46bcf +size 13579 diff --git a/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/MI_White_Marble_Tiles_vetldicv_2K.uasset b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/MI_White_Marble_Tiles_vetldicv_2K.uasset new file mode 100644 index 00000000..a2e6926f --- /dev/null +++ b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/MI_White_Marble_Tiles_vetldicv_2K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f41ef4807d88c9e17623f9ab3fcc639dff053c5bb6e5092a9915e81d146cf618 +size 3949 diff --git a/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_WhiteMarbleTiles_vetldicv_2K_ORDp.uasset b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_WhiteMarbleTiles_vetldicv_2K_ORDp.uasset new file mode 100644 index 00000000..1afc7f78 --- /dev/null +++ b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_WhiteMarbleTiles_vetldicv_2K_ORDp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e29993c1c96e73e4f0665026aa8e43558ec6512694e77745c10a819072c2479 +size 7376279 diff --git a/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_White_Marble_Tiles_vetldicv_2K_D.uasset b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_White_Marble_Tiles_vetldicv_2K_D.uasset new file mode 100644 index 00000000..9ad6924e --- /dev/null +++ b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_White_Marble_Tiles_vetldicv_2K_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1d2c8554288eb5b8ae0e71b5546f62194fbbb6416b90e2d36f8c0e98e556489 +size 16377324 diff --git a/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_White_Marble_Tiles_vetldicv_2K_N.uasset b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_White_Marble_Tiles_vetldicv_2K_N.uasset new file mode 100644 index 00000000..6a22538c --- /dev/null +++ b/EndlessVendetta/Content/Megascans/Surfaces/White_Marble_Tiles_vetldicv/T_White_Marble_Tiles_vetldicv_2K_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a09fd4a42cdd82f3a256d9dc763b70b5c10dfc4c234b175eeabf4e9547e24c09 +size 464697 diff --git a/EndlessVendetta/Content/SuperGrid/StarterPack/Source/New/SuperGrid_Box.uasset b/EndlessVendetta/Content/SuperGrid/StarterPack/Source/New/SuperGrid_Box.uasset index fa6f7785..ec3091da 100644 --- a/EndlessVendetta/Content/SuperGrid/StarterPack/Source/New/SuperGrid_Box.uasset +++ b/EndlessVendetta/Content/SuperGrid/StarterPack/Source/New/SuperGrid_Box.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f63aa6658d3fa0f53f34796618b4e0c9208d130f29cccfdd1278afe6de2b40a6 -size 20977 +oid sha256:1ba5a2a93fc2c82b0a9f69b4af11ac13ea094d65477ba9245a62dde9fa793a4a +size 21306 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset index d602682b..cc218a93 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/24/JBARER4CBJ0QZT5CZY8ID6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b23ffe118dd1641c807cd8f9ffa43063c1e16ac7e95f4d4a09bd8f4f2030e504 -size 6596 +oid sha256:624574d06d0678bdb53ec083c7b9635e45021665db71193cdbbd1c149026a7ba +size 6519 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset index cf89892d..4ebc02bf 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/GQ/QPISORMXEPSB0MNOUMBIZ4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1443a0a8f338f4b7a64d85b7c9bce3084f8c03a4da6927cf69d5c3fde98d9dab -size 6516 +oid sha256:be9ead9b6e2287def289d84c6e530b269908be77686eebdca96acc7a7039000e +size 6593 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset index e1d2e879..f35d5c73 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/V5/00HOTT7GJB6N5M6TZHPJO5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fc49ed8abd698fc05114d406436c49a7967ece3a59e32c40ee5bd04502e6c9d -size 6686 +oid sha256:227182e3c4bf297a0f312798841c02a738f6cf738d30d574a85f837401023418 +size 6609 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/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index d77d04eb..556634fb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -251,6 +251,7 @@ void AEndlessVendettaCharacter::SetupPlayerInputComponent(class UInputComponent* void AEndlessVendettaCharacter::Interact() { + if (bIsReloading) return; UE_LOG(LogTemp, Warning, TEXT("Interaction Has Been Called")); if (InPauseMenu) return; if (bIsInDialogue) @@ -336,6 +337,7 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve void AEndlessVendettaCharacter::ToggleRecon() { + if (bIsReloading) return; if (PlayerOnShip || InPauseMenu) return; if (!GadgetManager->IsValidReconGadget()) return; @@ -359,6 +361,7 @@ void AEndlessVendettaCharacter::ToggleRecon() void AEndlessVendettaCharacter::ToggleCombat() { + if (bIsReloading) return; if (PlayerOnShip || InPauseMenu) return; if (!GadgetManager->IsValidCombatGadget()) return; @@ -384,6 +387,7 @@ void AEndlessVendettaCharacter::ToggleCombat() //When 1 is pressed it calls EquipPrimary void AEndlessVendettaCharacter::EquipPrimary() { + if (bIsReloading) return; if (PlayerOnShip || InPauseMenu) return; if (!IsValid(PrimaryWeaponClass)) return; FActorSpawnParameters spawnParams; @@ -444,6 +448,7 @@ void AEndlessVendettaCharacter::EquipPrimary() void AEndlessVendettaCharacter::EquipSecondary() { + if (bIsReloading) return; if (!IsValid(SecondaryWeaponClass)) return; if (PlayerOnShip || InPauseMenu) return; FActorSpawnParameters spawnParams; @@ -498,6 +503,7 @@ void AEndlessVendettaCharacter::EquipSecondary() void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit) { + if (bIsReloading) return; FAttachmentTransformRules AttachmentRules(EAttachmentRule::SnapToTarget, true); FDetachmentTransformRules DetatchRules(EDetachmentRule::KeepWorld, false); FActorSpawnParameters spawnParams; @@ -571,6 +577,7 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit) //Calls the fire function in the baseWeaponClass void AEndlessVendettaCharacter::FireCaller() { + if (bIsReloading) return; if (InPauseMenu) return; if (IsValid(PrimaryWeapon) && !bIsReloading) { @@ -596,6 +603,7 @@ void AEndlessVendettaCharacter::StopFire() void AEndlessVendettaCharacter::GunRightClick() { + if (bIsReloading) return; if (InPauseMenu) return; if (IsValid(PrimaryWeapon) && !bIsScoped) { @@ -615,6 +623,7 @@ void AEndlessVendettaCharacter::GunRightClick() void AEndlessVendettaCharacter::StopGunRightClick() { + if (bIsReloading) return; if (IsValid(PrimaryWeapon)) { bIsScoped = false; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp index d120d561..884de46c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp @@ -37,7 +37,11 @@ void AShotgunClass::Fire() FVector newStartTrace = UKismetMathLibrary::RandomPointInBoundingBox(traceStart, ShotgunBulletSpread); traceEnd = newStartTrace + (GunStartArrow->GetForwardVector() * BulletDistance); 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::Yellow , false, 500.2f, 0U, 0.2f); + if (outHit.bBlockingHit) + { + GEngine->AddOnScreenDebugMessage(-1, 20.f, FColor::Orange, FString(TEXT("SHOTGUN HIT"))); + } } currentAmmoCount --; playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1);