Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Quality of Life Changes

Browse Source
This commit is contained in:
Rafal Swierczek 2024-02-28 07:17:52 +00:00
parent d8a04aec38
commit 8d5e02916f
15 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_GadgetWall.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/GadgetRoom/BP_ReconWorkbench.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/BP_InvisibleWall.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Gadgets/GM_GadgetManager.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Levels/ControlTutorialLevel.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/PauseMenu/Tabs/WBP_TestMenuTab.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
View File

@ -122,6 +122,8 @@ void ABountyHunterCharacter::BeginPlay()
SpawnMainBounty(GI); SpawnMainBounty(GI);
if (UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName) if (UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName)
{ {
InOpenWorld = true;
SpawnBikeUI();
SpawnSideBounties(GI); SpawnSideBounties(GI);
FTransform SpawnTransfrom = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave; FTransform SpawnTransfrom = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave;
SetActorTransform(SpawnTransfrom); SetActorTransform(SpawnTransfrom);

4
EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
View File

@ -92,7 +92,9 @@ protected:
// Called When Actor destroyed or Removed from Level // Called When Actor destroyed or Removed from Level
virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
UFUNCTION(BlueprintImplementableEvent)
void SpawnBikeUI();
public: public:
// Used by Final Checkpoint to always load the Level set as the Open Level in here // Used by Final Checkpoint to always load the Level set as the Open Level in here
FString GetOpenWorldLevelName() FString GetOpenWorldLevelName()

2
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
View File

@ -745,7 +745,7 @@ void AEndlessVendettaCharacter::UpdateInventorySize(int Cols, int Rows)
void AEndlessVendettaCharacter::HoldInteract() void AEndlessVendettaCharacter::HoldInteract()
{ {
if (InPauseMenu) return; if (InPauseMenu || !InOpenWorld) return;
if (PlayerOnShip) if (PlayerOnShip)
{ {
ExitShip(GetActorTransform()); ExitShip(GetActorTransform());

2
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
View File

@ -32,6 +32,8 @@ protected:
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Mesh) UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Mesh)
USkeletalMeshComponent* Mesh1P; USkeletalMeshComponent* Mesh1P;
bool InOpenWorld = false;
private: private:
/** First person camera */ /** First person camera */
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true")) UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true"))

9
EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp
View File

@ -37,10 +37,12 @@ void AGadgetTutorialStation::Interact()
APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
PickGadgetWidget = CreateWidget<UUserWidget>(GetWorld(), PickGadgetWidgetClass); PickGadgetWidget = CreateWidget<UUserWidget>(GetWorld(), PickGadgetWidgetClass);
PickGadgetWidget->AddToViewport(3); PickGadgetWidget->AddToViewport(3);
DisableInput(PlayerController);
PlayerController->SetInputMode(InputMode); PlayerController->SetInputMode(InputMode);
PlayerController->bShowMouseCursor = true; PlayerController->bShowMouseCursor = true;
PlayerController->bEnableClickEvents = true; PlayerController->bEnableClickEvents = true;
PlayerController->bEnableMouseOverEvents = true; PlayerController->bEnableMouseOverEvents = true;
EnableInput(PlayerController);
// Set up gadget menu's behaviours // Set up gadget menu's behaviours
GadgetMenu = Cast<UGadgetMenu>(PickGadgetWidget); GadgetMenu = Cast<UGadgetMenu>(PickGadgetWidget);
@ -94,9 +96,14 @@ void AGadgetTutorialStation::SelectGadget()
FActorSpawnParameters SpawnParams; FActorSpawnParameters SpawnParams;
SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
TSubclassOf<ABaseGadgetTutorial> GadgetTutorialToSpawnInClass = GadgetsArray[GadgetIndex]->GetDefaultObject<AGadgetBase>()->GadgetTutorialClass; TSubclassOf<ABaseGadgetTutorial> GadgetTutorialToSpawnInClass = GadgetsArray[GadgetIndex]->GetDefaultObject<AGadgetBase>()->GadgetTutorialClass;
if (!IsValid(GadgetTutorialToSpawnInClass)) return; if (!IsValid(GadgetTutorialToSpawnInClass))
{
CloseWidget();
return;
}
AActor* GadgetTutorialActor = GetWorld()->SpawnActor<AActor>(GadgetTutorialToSpawnInClass, GadgetTutorialSpawnTransform.GetLocation(), GadgetTutorialSpawnTransform.GetRotation().Rotator(), SpawnParams); AActor* GadgetTutorialActor = GetWorld()->SpawnActor<AActor>(GadgetTutorialToSpawnInClass, GadgetTutorialSpawnTransform.GetLocation(), GadgetTutorialSpawnTransform.GetRotation().Rotator(), SpawnParams);
CurrentGadgetTutorial = Cast<ABaseGadgetTutorial>(GadgetTutorialActor); CurrentGadgetTutorial = Cast<ABaseGadgetTutorial>(GadgetTutorialActor);
CloseWidget();
} }
void AGadgetTutorialStation::CloseWidget() void AGadgetTutorialStation::CloseWidget()