Implemented Target Elimination Checkpoint
This commit is contained in:
parent
88f5824f24
commit
b4c8ac75c6
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/BP_WeaponTable.uasset
(Stored with Git LFS)
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5ff92e3fd19f5c6ab5990b04df89fdff800e92817c8590b51529b0d46b7aab46
|
||||||
|
size 130912
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Checkpoints/CP_PickUpWeapon.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ab23608f919ecfc92215a4480723e0e1520ab11a2c64b7ce818aa7eba94dc263
|
|
||||||
size 21392
|
|
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:3e288ec30f3b26b7bb4874519eca7cf2192fb9d2c09a84cb2dec4bcdff1044d1
|
||||||
|
size 54626
|
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:311f0f503d0da57fc6fbc985d867b9228f21a408771a2fc99529721c8e12c3a0
|
||||||
|
size 13004
|
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:34ede5014ff062f3380f92b939c6b4367cab00507155900653e87091ea9cfb90
|
||||||
|
size 54658
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/DiningRoomEnemy/PP_TF_DiningRoom.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:abb704094c43932bacf948aa6451819dd13a7b8a461381076432ac89d08be01e
|
||||||
|
size 54660
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/LivingRoomEnemy/PP_TF_LivingRoom.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0d0078b843c7d067953620918f93d3f3834389e94368a10ff5cf64c072fc3a4d
|
||||||
|
size 54606
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_OutBack.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/OutsidePatrolEnemy/PP_TF_Outside.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:94bfbbff8021abe73e75d71827e07c5baa766e501cabefaeae63ca1f588a7396
|
||||||
|
size 54570
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/RoamingEnemy/PP_TF_Roaming.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0d7bcf8d56e53185921c8a741fe0c75ba93c984c3bf5b8739973156a68297b9c
|
||||||
|
size 54821
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/TargetEnemy/PP_TF_Target.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4a6053e080c36fbe43295469fb7ae72edf2aeb7c01f3f551d60e37275543b23a
|
||||||
|
size 54630
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/Enemies/UpstairsPatrolEnemy/PP_TF_Upstairs.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ad2c3fac00abe5849662523a1d0fd805b554a62a6600f9e9fee11c5c8b371697
|
oid sha256:d73138039ec29e349f1ba70f6e663c7df352a1d4bccf5df3625b9a30ce9c1ed0
|
||||||
size 15046
|
size 14064
|
||||||
|
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/TutorialFacility/TrainingFacilityBountyDirector.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:1e8f601f1c0be33c202b9bb03cd129eaa0c44466f712c644c4e4adaccc1d7297
|
oid sha256:6c6110d8157a50cba88d602bfad783df68d380acef66c96145bd841c19096bdd
|
||||||
size 452373
|
size 453717
|
||||||
|
BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset
(Stored with Git LFS)
Binary file not shown.
@ -59,6 +59,12 @@ void AAI_EnemyController::Tick(float DeltaTime)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AAI_EnemyController::AssignPatrolPathLate()
|
||||||
|
{
|
||||||
|
Blackboard->SetValueAsBool("IsPatroling", true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void AAI_EnemyController::SetupPerceptionSystem()
|
void AAI_EnemyController::SetupPerceptionSystem()
|
||||||
{
|
{
|
||||||
SightConfig = CreateDefaultSubobject<UAISenseConfig_Sight>(TEXT("Sight Config"));
|
SightConfig = CreateDefaultSubobject<UAISenseConfig_Sight>(TEXT("Sight Config"));
|
||||||
|
@ -25,6 +25,9 @@ public:
|
|||||||
// Called every frame
|
// Called every frame
|
||||||
virtual void Tick(float DeltaTime) override;
|
virtual void Tick(float DeltaTime) override;
|
||||||
|
|
||||||
|
UFUNCTION(BlueprintCallable)
|
||||||
|
void AssignPatrolPathLate();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
UPROPERTY()
|
UPROPERTY()
|
||||||
class UAISenseConfig_Sight* SightConfig;
|
class UAISenseConfig_Sight* SightConfig;
|
||||||
|
@ -49,6 +49,7 @@ void ABountyClass::SpawnCheckpoints()
|
|||||||
// Activate the first checkpoint and listen for its completion
|
// Activate the first checkpoint and listen for its completion
|
||||||
BountyCheckpoints[0]->Active = true;
|
BountyCheckpoints[0]->Active = true;
|
||||||
BountyCheckpoints[0]->SpawnWaypoint();
|
BountyCheckpoints[0]->SpawnWaypoint();
|
||||||
|
BountyCheckpoints[0]->CheckpointActivated();
|
||||||
BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint);
|
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
|
// Set the new checkpoint in pos 0 to be active and listen for it's completion
|
||||||
BountyCheckpoints[0]->Active = true;
|
BountyCheckpoints[0]->Active = true;
|
||||||
BountyCheckpoints[0]->SpawnWaypoint();
|
BountyCheckpoints[0]->SpawnWaypoint();
|
||||||
|
BountyCheckpoints[0]->CheckpointActivated();
|
||||||
BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint);
|
BountyCheckpoints[0]->CompletedCheckpoint.AddDynamic(this, &ABountyClass::IncrementBountyCheckpoint);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CoreMinimal.h"
|
#include "CoreMinimal.h"
|
||||||
#include "InteractionInterface.h"
|
|
||||||
#include "EndlessVendetta/BountySystem/CheckpointClass.h"
|
#include "EndlessVendetta/BountySystem/CheckpointClass.h"
|
||||||
|
#include "EndlessVendetta/InteractionInterface.h"
|
||||||
#include "InteractableCP_CallBPEvent.generated.h"
|
#include "InteractableCP_CallBPEvent.generated.h"
|
||||||
|
|
||||||
/**
|
/**
|
@ -1,9 +1,9 @@
|
|||||||
// Fill out your copyright notice in the Description page of Project Settings.
|
// 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();
|
BroadcastCompletion();
|
||||||
}
|
}
|
@ -5,13 +5,13 @@
|
|||||||
#include "CoreMinimal.h"
|
#include "CoreMinimal.h"
|
||||||
#include "EndlessVendetta/InteractionInterface.h"
|
#include "EndlessVendetta/InteractionInterface.h"
|
||||||
#include "EndlessVendetta/BountySystem/CheckpointClass.h"
|
#include "EndlessVendetta/BountySystem/CheckpointClass.h"
|
||||||
#include "PickUpGunTutorialCheckPoint.generated.h"
|
#include "InteractableCP_CompleteCP.generated.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
UCLASS()
|
UCLASS()
|
||||||
class ENDLESSVENDETTA_API APickUpGunTutorialCheckPoint : public ACheckpointClass, public IInteractionInterface
|
class ENDLESSVENDETTA_API AInteractableCP_CompleteCP : public ACheckpointClass, public IInteractionInterface
|
||||||
{
|
{
|
||||||
GENERATED_BODY()
|
GENERATED_BODY()
|
||||||
|
|
@ -27,6 +27,15 @@ void ACheckpointClass::SpawnWaypoint()
|
|||||||
WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription);
|
WaypointActor->SetupWaypoint(WaypointIcon, CheckpointDescription);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ACheckpointClass::UpdateChecpointWaypoint(FString WaypointDesc, FVector WaypointNewLoc)
|
||||||
|
{
|
||||||
|
FActorSpawnParameters SpawnParams;
|
||||||
|
SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
|
||||||
|
if (WaypointActor) WaypointActor->Destroy();
|
||||||
|
WaypointActor = Cast<AWaypointActor>(GetWorld()->SpawnActor<AActor>(WaypointActorClass, WaypointNewLoc, GetActorRotation(), SpawnParams));
|
||||||
|
WaypointActor->SetupWaypoint(WaypointIcon, WaypointDesc);
|
||||||
|
}
|
||||||
|
|
||||||
// Called every frame
|
// Called every frame
|
||||||
void ACheckpointClass::Tick(float DeltaTime)
|
void ACheckpointClass::Tick(float DeltaTime)
|
||||||
{
|
{
|
||||||
|
@ -36,7 +36,9 @@ protected:
|
|||||||
UE_LOG(LogTemp, Warning, TEXT("Completed Checkpoint"));
|
UE_LOG(LogTemp, Warning, TEXT("Completed Checkpoint"));
|
||||||
CompletedCheckpoint.Broadcast();
|
CompletedCheckpoint.Broadcast();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UFUNCTION(BlueprintCallable)
|
||||||
|
void UpdateChecpointWaypoint(FString WaypointDesc, FVector WaypointNewLoc);
|
||||||
// Called when the game starts or when spawned
|
// Called when the game starts or when spawned
|
||||||
virtual void BeginPlay() override;
|
virtual void BeginPlay() override;
|
||||||
|
|
||||||
@ -50,6 +52,9 @@ public:
|
|||||||
|
|
||||||
void SpawnWaypoint();
|
void SpawnWaypoint();
|
||||||
|
|
||||||
|
UFUNCTION(BlueprintImplementableEvent)
|
||||||
|
void CheckpointActivated();
|
||||||
|
|
||||||
// ------ Getters for CP Properties ------
|
// ------ Getters for CP Properties ------
|
||||||
FString GetCheckpointDesc()
|
FString GetCheckpointDesc()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user