diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 03eef806..92444216 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,15 +8,7 @@ - - - - - - - - - + diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset index 19cfa978..5310f2a3 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b82203fe93ab0db2ec9fce1a765d76d8eef064de5035836ec8964abe3dadb376 -size 140176 +oid sha256:9479dddf3a10d1d0d4c531c7a99b4b92c228fdba019413fae1dcc5b3ef3a611a +size 139218 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset index 798e2226..4e299b9e 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92bcdc4257fb418b5d58b8d291fead0d206ea59774856556af22e6e182299e07 -size 101690 +oid sha256:e333e91573e1d36e39ad1e52eb0da38a11aefc23ed219427acfc9ffe3a3160f0 +size 99655 diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap index 0086cc45..c703f2ec 100644 --- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap +++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5359d34f51cb7298d6e3c64aa6ff60e6a610066339af826e5e53b95436f12be +oid sha256:5f1fb7ff9a560e39c6c7833d79931bcb0cdcba202fcd3f066142ca87a03df911 size 3184727 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..7b2438ec 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:6ecdd9b5a6ecb0db2bf44c5109e77d05f34b06abc71ce6f4f052998429aa0da1 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index 6f8d7ae6..5e3ff30e 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bacbc9ef1c664cee5c8ea9f08490fe6c08051fd2c6db54e5534f5a7e6730276 -size 353648 +oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d +size 348532 diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp index a4a8cf61..275a5440 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/ShotgunClass.cpp @@ -3,6 +3,7 @@ #include "ShotgunClass.h" #include "EndlessVendetta/AI/EnemyCharacter.h" +#include "EndlessVendetta/BountySystem/ControlsTraining/TargetDummy.h" #include "Engine/DamageEvents.h" AShotgunClass::AShotgunClass() @@ -46,6 +47,7 @@ void AShotgunClass::Fire() { tempWeaponDamage = WeaponDamage; } + if (ATargetDummy* TargetDummy = Cast(outHit.GetActor())) TargetDummy->TargetShot(); if (!Cast(outHit.GetActor())) return; Cast(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this); } diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp index 43f17bc9..5d6f8a4f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/SniperClass.cpp @@ -4,6 +4,7 @@ #include "SniperClass.h" #include "EndlessVendetta/EndlessVendettaCharacter.h" #include "EndlessVendetta/AI/AICharacter.h" +#include "EndlessVendetta/BountySystem/ControlsTraining/TargetDummy.h" #include "Engine/DamageEvents.h" #include "Kismet/GameplayStatics.h" @@ -66,6 +67,7 @@ void ASniperClass::Fire() { tempWeaponDamage = WeaponDamage; } + if (ATargetDummy* TargetDummy = Cast(outHit.GetActor())) TargetDummy->TargetShot(); if (!Cast(outHit.GetActor())) return; Cast(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this); }