From b4c8ac75c67675015d420d90862f8d9136384c15 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek <34179rs@gmail.com> Date: Sat, 21 Oct 2023 17:08:53 +0100 Subject: [PATCH] Implemented Target Elimination Checkpoint --- .../TutorialFacility/Checkpoints/BP_WeaponTable.uasset | 4 ++-- .../Checkpoints/CP_ElimTutorialTarget.uasset | 3 +++ .../TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset | 3 +++ .../TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset | 3 --- .../Enemies/BedroomEnemy/BE_TF_Bedroom.uasset | 3 +++ .../Enemies/BedroomEnemy/PP_TF_Bedroom.uasset | 3 +++ .../Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset | 3 +++ .../Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset | 3 +++ .../Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset | 3 +++ .../Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/PP_TF.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset | 3 +++ .../Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset | 3 +++ .../Enemies/RoamingEnemy/BE_TF_Roaming.uasset | 3 +++ .../Enemies/RoamingEnemy/PP_TF_Roaming.uasset | 3 +++ .../Enemies/TargetEnemy/BE_TF_Target.uasset | 3 +++ .../Enemies/TargetEnemy/PP_TF_Target.uasset | 3 +++ .../Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset | 3 +++ .../Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset | 3 +++ .../TutorialFacility/MB_TutorialFacility.uasset | 4 ++-- .../TrainingFacilityBountyDirector.uasset | 4 ++-- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 ++-- .../Content/StarterContent/Materials/M_Wood_Pine.uasset | 4 ++-- .../StarterContent/Materials/M_Wood_Walnut.uasset | 4 ++-- .../Content/StarterContent/Props/MaterialSphere.uasset | 4 ++-- .../Source/EndlessVendetta/AI/AI_EnemyController.cpp | 6 ++++++ .../Source/EndlessVendetta/AI/AI_EnemyController.h | 3 +++ .../Source/EndlessVendetta/BountySystem/BountyClass.cpp | 2 ++ .../CheckPoints}/InteractableCP_CallBPEvent.cpp | 0 .../CheckPoints}/InteractableCP_CallBPEvent.h | 2 +- ...orialCheckPoint.cpp => InteractableCP_CompleteCP.cpp} | 4 ++-- ...nTutorialCheckPoint.h => InteractableCP_CompleteCP.h} | 4 ++-- .../EndlessVendetta/BountySystem/CheckpointClass.cpp | 9 +++++++++ .../EndlessVendetta/BountySystem/CheckpointClass.h | 7 ++++++- 36 files changed, 101 insertions(+), 25 deletions(-) create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset delete mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset create mode 100644 EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset rename EndlessVendetta/Source/EndlessVendetta/{ => BountySystem/CheckPoints}/InteractableCP_CallBPEvent.cpp (100%) rename EndlessVendetta/Source/EndlessVendetta/{ => BountySystem/CheckPoints}/InteractableCP_CallBPEvent.h (90%) rename EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/{PickUpGunTutorialCheckPoint.cpp => InteractableCP_CompleteCP.cpp} (55%) rename EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/{PickUpGunTutorialCheckPoint.h => InteractableCP_CompleteCP.h} (65%) diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset index 8bbe2a74..fd66d6d4 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acb90ebb48fe601ce45980241ff3ed58a8eefb17c2447d154236917a5894a2ad -size 29632 +oid sha256:00bbbb9790870bbe08879eec576c3c57f0eca6162cfe7063cb2f2a0c10b87a93 +size 29602 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset new file mode 100644 index 00000000..448d77a6 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_ElimTutorialTarget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ff92e3fd19f5c6ab5990b04df89fdff800e92817c8590b51529b0d46b7aab46 +size 130912 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset new file mode 100644 index 00000000..4fb55c0f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:142e42343ef7f5787e23c1d1681e6126c45ef7d93c53b7dc91512ec54e3820ec +size 30032 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset deleted file mode 100644 index 0366f5d3..00000000 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapons.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab23608f919ecfc92215a4480723e0e1520ab11a2c64b7ce818aa7eba94dc263 -size 21392 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset new file mode 100644 index 00000000..a00b83d8 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/BE_TF_Bedroom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e288ec30f3b26b7bb4874519eca7cf2192fb9d2c09a84cb2dec4bcdff1044d1 +size 54626 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset new file mode 100644 index 00000000..7d760e7c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/BedroomEnemy/PP_TF_Bedroom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:311f0f503d0da57fc6fbc985d867b9228f21a408771a2fc99529721c8e12c3a0 +size 13004 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset new file mode 100644 index 00000000..f264227a --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/BE_TF_DiningRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ede5014ff062f3380f92b939c6b4367cab00507155900653e87091ea9cfb90 +size 54658 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset new file mode 100644 index 00000000..58c88511 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8b98d4f4b418d7e056899dc8153137c700342c0325dfc4d9bf126d84af445ca +size 13061 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset new file mode 100644 index 00000000..8854b272 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/BE_TF_LivingRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abb704094c43932bacf948aa6451819dd13a7b8a461381076432ac89d08be01e +size 54660 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset new file mode 100644 index 00000000..65e00893 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:966e6cbe348de1734c26bbf2dfadc4238378765a962a155cb7aae81295fd83bb +size 13061 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset new file mode 100644 index 00000000..4c891d07 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/BE_TF_OutBack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d0078b843c7d067953620918f93d3f3834389e94368a10ff5cf64c072fc3a4d +size 54606 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset new file mode 100644 index 00000000..12e36731 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc837363528efff7871b4dfcbdc89052ce58dee49ff3ab8fb3bfe7b95be9a05a +size 2682 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset new file mode 100644 index 00000000..4bd16431 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:406ab0ed0c686c21a00dda4b3d6e268eacf6bfc911cc5fbfc6615897e6e7f4ee +size 2674 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset new file mode 100644 index 00000000..6cd3336f --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:731235fa24a1937da6099c8925abd34bbf99d4a1a6334c993c89f7a4b3114f0f +size 13791 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset new file mode 100644 index 00000000..54bd64d3 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/BE_TF_Roaming.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94bfbbff8021abe73e75d71827e07c5baa766e501cabefaeae63ca1f588a7396 +size 54570 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset new file mode 100644 index 00000000..67602f41 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:062d6ee93303344368b3401d4a0bd412fa1d1af6cc95a81607453054cc697d67 +size 13100 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset new file mode 100644 index 00000000..d01a8310 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/BE_TF_Target.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d7bcf8d56e53185921c8a741fe0c75ba93c984c3bf5b8739973156a68297b9c +size 54821 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset new file mode 100644 index 00000000..b7adcb40 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496b55e0f80f2e6208269215944632df3161f025bc5888e294cf92b6deb13a2b +size 12985 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset new file mode 100644 index 00000000..a6d730c7 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/BE_TF_Upstairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a6053e080c36fbe43295469fb7ae72edf2aeb7c01f3f551d60e37275543b23a +size 54630 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset new file mode 100644 index 00000000..9c71a224 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2f2065e357769a2642143c21eae5fea45a3a60dfe59706f944d18ffe930b205 +size 13071 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset index d4cea426..dd8fa710 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/MB_TutorialFacility.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad2c3fac00abe5849662523a1d0fd805b554a62a6600f9e9fee11c5c8b371697 -size 15046 +oid sha256:d73138039ec29e349f1ba70f6e663c7df352a1d4bccf5df3625b9a30ce9c1ed0 +size 14064 diff --git a/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset b/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset index ba4f67f6..35ada0bc 100644 --- a/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset +++ b/EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50cf99064b7623a748d250be972c41b82a5abbdf16b677c12d0f77f076b8d208 -size 22391 +oid sha256:a1e75c64d6be90e7099664b99af6b8faab033decb1e269ab3e9f472e0e0fc2eb +size 22314 diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 599f7835..01109aea 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e8f601f1c0be33c202b9bb03cd129eaa0c44466f712c644c4e4adaccc1d7297 -size 452373 +oid sha256:6c6110d8157a50cba88d602bfad783df68d380acef66c96145bd841c19096bdd +size 453717 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index b2b61f27..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc6f8d219a0c4995a971e55423f42065c3d648df5166d4e3152f18c9d2bc5947 -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index eafee70c..b806f261 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 -size 31142 +oid sha256:6370ba2220dd39e544670044b08f74bb1270b3ad784be59a4e3a770c9af63f21 +size 31267 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 2e926194..57cff6fd 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 -size 20495 +oid sha256:fec1a4819a4a6320ab213058a07f234622cee347e705de6a8b90e7e94c2961db +size 20641 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 56bddfc9..d8b842b2 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 -size 47333 +oid sha256:126010c35504dc5096bcc51b3757550afdcb9b138500cf2e6691d4dd9bc510b5 +size 47710 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp index 3f343fa2..6d354168 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.cpp @@ -59,6 +59,12 @@ void AAI_EnemyController::Tick(float DeltaTime) } } +void AAI_EnemyController::AssignPatrolPathLate() +{ + Blackboard->SetValueAsBool("IsPatroling", true); +} + + void AAI_EnemyController::SetupPerceptionSystem() { SightConfig = CreateDefaultSubobject(TEXT("Sight Config")); diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h index ae91c3f4..96c8aa8e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h +++ b/EndlessVendetta/Source/EndlessVendetta/AI/AI_EnemyController.h @@ -25,6 +25,9 @@ public: // Called every frame virtual void Tick(float DeltaTime) override; + UFUNCTION(BlueprintCallable) + void AssignPatrolPathLate(); + private: UPROPERTY() class UAISenseConfig_Sight* SightConfig; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp index d21ffbfe..38d939c9 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/BountyClass.cpp @@ -49,6 +49,7 @@ void ABountyClass::SpawnCheckpoints() // Activate the first checkpoint and listen for its completion BountyCheckpoints[0]->Active = true; BountyCheckpoints[0]->SpawnWaypoint(); + BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } @@ -86,6 +87,7 @@ void ABountyClass::IncrementBountyCheckpoint() // Set the new checkpoint in pos 0 to be active and listen for it's completion BountyCheckpoints[0]->Active = true; BountyCheckpoints[0]->SpawnWaypoint(); + BountyCheckpoints[0]->CheckpointActivated(); BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint); } diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.cpp similarity index 100% rename from EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.cpp rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.cpp diff --git a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.h similarity index 90% rename from EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.h index 3c6dd6e6..99cc5cec 100644 --- a/EndlessVendetta/Source/EndlessVendetta/InteractableCP_CallBPEvent.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CallBPEvent.h @@ -3,8 +3,8 @@ #pragma once #include "CoreMinimal.h" -#include "InteractionInterface.h" #include "EndlessVendetta/BountySystem/CheckpointClass.h" +#include "EndlessVendetta/InteractionInterface.h" #include "InteractableCP_CallBPEvent.generated.h" /** diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.cpp similarity index 55% rename from EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.cpp index f08b99ca..6c6e3aa8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.cpp @@ -1,9 +1,9 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "PickUpGunTutorialCheckPoint.h" +#include "InteractableCP_CompleteCP.h" -void APickUpGunTutorialCheckPoint::Interact() +void AInteractableCP_CompleteCP::Interact() { BroadcastCompletion(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.h similarity index 65% rename from EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h rename to EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.h index c7fb4973..ad93548a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/PickUpGunTutorialCheckPoint.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckPoints/InteractableCP_CompleteCP.h @@ -5,13 +5,13 @@ #include "CoreMinimal.h" #include "EndlessVendetta/InteractionInterface.h" #include "EndlessVendetta/BountySystem/CheckpointClass.h" -#include "PickUpGunTutorialCheckPoint.generated.h" +#include "InteractableCP_CompleteCP.generated.h" /** * */ UCLASS() -class ENDLESSVENDETTA_API APickUpGunTutorialCheckPoint : public ACheckpointClass, public IInteractionInterface +class ENDLESSVENDETTA_API AInteractableCP_CompleteCP : public ACheckpointClass, public IInteractionInterface { GENERATED_BODY() diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index f544c729..5562a2b8 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -27,6 +27,15 @@ void ACheckpointClass::SpawnWaypoint() WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription); } +void ACheckpointClass::UpdateChecpointWaypoint(FString WaypointDesc, FVector WaypointNewLoc) +{ + FActorSpawnParameters SpawnParams; + SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; + if (WaypointActor) WaypointActor->Destroy(); + WaypointActor = Cast(GetWorld()->SpawnActor(WaypointActorClass, WaypointNewLoc, GetActorRotation(), SpawnParams)); + WaypointActor->SetupWaypoint(WaypointIcon, WaypointDesc); +} + // Called every frame void ACheckpointClass::Tick(float DeltaTime) { diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index d3a104ff..3086ca39 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -36,7 +36,9 @@ protected: UE_LOG(LogTemp, Warning, TEXT("Completed Checkpoint")); CompletedCheckpoint.Broadcast(); } - + + UFUNCTION(BlueprintCallable) + void UpdateChecpointWaypoint(FString WaypointDesc, FVector WaypointNewLoc); // Called when the game starts or when spawned virtual void BeginPlay() override; @@ -50,6 +52,9 @@ public: void SpawnWaypoint(); + UFUNCTION(BlueprintImplementableEvent) + void CheckpointActivated(); + // ------ Getters for CP Properties ------ FString GetCheckpointDesc() {