baz/Nakatomi
baz
/
Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: baz:0e9a36f1c900dea9a6009eb21dd0bc4aae220767
Branches Tags
baz:master
..
compare: baz:a90d50afd7a41fe62d696646cf78b840aa21b112
Branches Tags
baz:master

No commits in common. "0e9a36f1c900dea9a6009eb21dd0bc4aae220767" and "a90d50afd7a41fe62d696646cf78b840aa21b112" have entirely different histories.
0e9a36f1c9 ... a90d50afd7

10 changed files with 9 additions and 50 deletions
Show Stats Expand all files Collapse all files

BIN
Content/UI/LoadGame/BP_SaveGameEntryTemplate.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/UI/Pause/PauseMenu.uasset (Stored with Git LFS)
View File

Binary file not shown.

1
Source/Nakatomi/LevelKeyPickup.cpp
View File

@ -29,7 +29,6 @@ void ALevelKeyPickup::OnOverlapBegin(UPrimitiveComponent* OverlappedComponent, A
if (auto gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld())))
{
gameInstance->GetCurrentLevelManager()->IncrementCollectedLevelKeys();
gameInstance->SaveGame();
}
Super::OnOverlapBegin(OverlappedComponent, OtherActor, OtherComp, OtherBodyIndex, bFromSweep, SweepResult);

5
Source/Nakatomi/MainMenuUIWidget.cpp
View File

@ -3,7 +3,6 @@
#include "MainMenuUIWidget.h"
#include "NakatomiGameInstance.h"
#include "Blueprint/WidgetBlueprintLibrary.h"
#include "Kismet/GameplayStatics.h"
#include "UI/LoadGameUserWidget.h"
@ -69,11 +68,9 @@ void UMainMenuUIWidget::NativeConstruct()
void UMainMenuUIWidget::NewGameButtonOnClicked()
{
// TODO: Replace this is a menu to confirm the user wants to start a new game
if (!NewGameLevel.IsNull())
{
UNakatomiGameInstance* gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld()));
gameInstance->CreateNewSaveGame("test1");
UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), NewGameLevel);
}

11
Source/Nakatomi/NakatomiCharacter.cpp
View File

@ -4,8 +4,6 @@
#include "NakatomiCharacter.h"
#include "NakatomiCMC.h"
#include "NakatomiGameInstance.h"
#include "Kismet/GameplayStatics.h"
// Sets default values
ANakatomiCharacter::ANakatomiCharacter(const FObjectInitializer& ObjectInitializer) : Super(
@ -32,15 +30,6 @@ void ANakatomiCharacter::BeginPlay()
SetInventoryToDefault();
NakatomiCMC = Cast<UNakatomiCMC>(GetCharacterMovement());
if (UNakatomiGameInstance* gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld())))
{
if (UNakatomiSaveGame* Save = gameInstance->GetSaveGameObject())
{
//TODO: More loading here
GetHealthComponent()->SetCurrentHealth(Save->PlayerHealth);
}
}
}
// Called every frame

2
Source/Nakatomi/NakatomiGameInstance.cpp
View File

@ -71,7 +71,7 @@ UNakatomiSaveGame* UNakatomiGameInstance::CreateNewSaveGame(FString PlayerName)
if (UNakatomiSaveGame* Save = Cast<UNakatomiSaveGame>(
UGameplayStatics::CreateSaveGameObject(UNakatomiSaveGame::StaticClass())))
{
Save->PlayerName = PlayerName;
SaveGameObject->PlayerName = PlayerName;
if (UGameplayStatics::SaveGameToSlot(Save, PlayerName, 0))
{

2
Source/Nakatomi/NakatomiGameInstance.h
View File

@ -45,7 +45,7 @@ public:
UNakatomiSaveGame* LoadGameFromSlot(FString SaveSlotName);
UFUNCTION(BlueprintCallable)
bool SaveGame(bool ResetDefaults = false);
bool SaveGame(bool ResetDefaults);
UFUNCTION(BlueprintCallable)
UNakatomiSaveGame* GetSaveGameObject();

8
Source/Nakatomi/PauseUIWidget.cpp
View File

@ -3,7 +3,6 @@
#include "PauseUIWidget.h"
#include "NakatomiGameInstance.h"
#include "Blueprint/WidgetBlueprintLibrary.h"
#include "Kismet/GameplayStatics.h"
@ -106,12 +105,7 @@ void UPauseUIWidget::OptionsButtonOnClicked()
void UPauseUIWidget::SaveButtonOnClicked()
{
UNakatomiGameInstance* gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld()));
if (gameInstance->SaveGame())
{
PlayAnimation(SaveConfirmedAnimation, 0.0f, 1, EUMGSequencePlayMode::Forward, 1.0f);
}
// TODO: Implement Functionality
}
void UPauseUIWidget::QuitButtonOnClicked()

6
Source/Nakatomi/PauseUIWidget.h
View File

@ -36,12 +36,6 @@ public:
UPROPERTY(BlueprintReadWrite, meta = (BindWidget))
UTextBlock* SaveTextBlock;
UPROPERTY(BlueprintReadWrite, meta = (BindWidget))
UTextBlock* SaveConfirmedTextBlock;
UPROPERTY(Transient, meta = (BindWidgetAnim))
UWidgetAnimation* SaveConfirmedAnimation;
UPROPERTY(BlueprintReadWrite, meta = (BindWidget))
UButton* QuitButton;

16
Source/Nakatomi/UI/SaveGameEntryUserWidget.cpp
View File

@ -3,10 +3,6 @@
#include "../UI/SaveGameEntryUserWidget.h"
#include "Blueprint/WidgetBlueprintLibrary.h"
#include "Kismet/GameplayStatics.h"
#include "Nakatomi/NakatomiGameInstance.h"
void USaveGameEntryUserWidget::NativeConstruct()
{
Super::NativeConstruct();
@ -34,17 +30,7 @@ void USaveGameEntryUserWidget::SetSaveInfo(FNakatomiSaveFileInfo SaveFile)
void USaveGameEntryUserWidget::LoadSaveButtonOnClicked()
{
UNakatomiGameInstance* gameInstance = Cast<UNakatomiGameInstance>(UGameplayStatics::GetGameInstance(GetWorld()));
UNakatomiSaveGame* Save = gameInstance->LoadGameFromSlot(SaveFileInfo.PlayerName);
UGameplayStatics::OpenLevel(GetWorld(), FName(Save->LevelName));
if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0))
{
PlayerController->bShowMouseCursor = false;
UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController);
}
SetIsFocusable(false);
// TODO: implement loading of stuff
}
void USaveGameEntryUserWidget::LoadSaveButtonHoveredDelegate()