Implemented Checkpoints for Gadget Tutorial Area
This commit is contained in:
parent
a0cb8d43c3
commit
16784b051f
@ -107,6 +107,7 @@ bSkipMovies=False
|
|||||||
+MapsToCook=(FilePath="/Game/Levels/OpenWorldRework")
|
+MapsToCook=(FilePath="/Game/Levels/OpenWorldRework")
|
||||||
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies")
|
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies")
|
||||||
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies")
|
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies")
|
||||||
|
+MapsToCook=(FilePath="/Game/Levels/TempLevels/NewTutorialMap")
|
||||||
+DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
|
+DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
|
||||||
+DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
|
+DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
|
||||||
+DirectoriesToAlwaysCook=(Path="/Interchange/Materials")
|
+DirectoriesToAlwaysCook=(Path="/Interchange/Materials")
|
||||||
|
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_ElevatorDoor_Ind.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/BP_Ind_Elevator.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ContinueThroughFacility.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_DepositGun.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_Empty.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_EnterTheElevator.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_GadgetTrainingCinematic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_LeaveTheGadgetTrainingFacility.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ProtectTheHoloSupplies.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectCombat.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_SelectRecon.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_ShootTheTargets.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/Tutorial/Checkpoints/CP_TempEmpty.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/GadgetGamemode/BP_WaveComputer.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/Tutorial/MB_Training.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:6018597114beef9dd695ae8cfd205ecb429e5d854c31244a49930a28688df7cf
|
oid sha256:9f66d5325e533e2512616a08ec970350af33783d40079e87a3fddcd7f9c1f8a1
|
||||||
size 1936322
|
size 1936940
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:dcd744415c36d7f01a64653563dd413a017466bf707c108ec6733da0fcfb7d66
|
oid sha256:251d138dfec13168b7377f8bf7ff38b62151dc9968919a11ce68ab1e86bd0e02
|
||||||
size 43745
|
size 43745
|
||||||
|
@ -0,0 +1,18 @@
|
|||||||
|
// Fill out your copyright notice in the Description page of Project Settings.
|
||||||
|
|
||||||
|
|
||||||
|
#include "WeaponDepositCheckpoint.h"
|
||||||
|
|
||||||
|
#include "EndlessVendetta/EndlessVendettaCharacter.h"
|
||||||
|
|
||||||
|
void AWeaponDepositCheckpoint::Interact()
|
||||||
|
{
|
||||||
|
if (!Active) return;
|
||||||
|
|
||||||
|
UE_LOG(LogTemp,Warning, TEXT("Sooooo ermmmmmm"));
|
||||||
|
AEndlessVendettaCharacter* Player = Cast<AEndlessVendettaCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn());
|
||||||
|
if (Player->bHasRifle) Player->EquipSecondary();
|
||||||
|
Player->bLockSecondary = true;
|
||||||
|
OpenElevatorDoor();
|
||||||
|
BroadcastCompletion();
|
||||||
|
}
|
@ -0,0 +1,24 @@
|
|||||||
|
// Fill out your copyright notice in the Description page of Project Settings.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CoreMinimal.h"
|
||||||
|
#include "EndlessVendetta/InteractionInterface.h"
|
||||||
|
#include "EndlessVendetta/BountySystem/CheckpointClass.h"
|
||||||
|
#include "WeaponDepositCheckpoint.generated.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
UCLASS()
|
||||||
|
class ENDLESSVENDETTA_API AWeaponDepositCheckpoint : public ACheckpointClass, public IInteractionInterface
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void Interact() override;
|
||||||
|
|
||||||
|
UFUNCTION(BlueprintImplementableEvent)
|
||||||
|
void OpenElevatorDoor();
|
||||||
|
|
||||||
|
};
|
@ -493,7 +493,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
|
|||||||
|
|
||||||
void AEndlessVendettaCharacter::EquipSecondary()
|
void AEndlessVendettaCharacter::EquipSecondary()
|
||||||
{
|
{
|
||||||
if (bIsReloading) return;
|
if (bIsReloading || bLockSecondary) return;
|
||||||
if (!IsValid(SecondaryWeaponClass)) return;
|
if (!IsValid(SecondaryWeaponClass)) return;
|
||||||
if (PlayerOnShip || InPauseMenu) return;
|
if (PlayerOnShip || InPauseMenu) return;
|
||||||
FActorSpawnParameters spawnParams;
|
FActorSpawnParameters spawnParams;
|
||||||
|
@ -219,6 +219,8 @@ public:
|
|||||||
AGadgetManager* GadgetManager;
|
AGadgetManager* GadgetManager;
|
||||||
bool bIsReloading = false;
|
bool bIsReloading = false;
|
||||||
|
|
||||||
|
bool bLockSecondary = false;
|
||||||
|
|
||||||
bool bIsPlayerMoving = false;
|
bool bIsPlayerMoving = false;
|
||||||
|
|
||||||
UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
|
UPROPERTY(VisibleAnywhere, BlueprintReadWrite)
|
||||||
|
Loading…
Reference in New Issue
Block a user