baz/vampires
baz/vampires
1
0
Fork 0
Code Issues 10 Projects 1 Activity

Compare commits

base: baz:4ff8d8eca31d10487842cedcdb2bc8a3b9aea476
Branches Tags
baz:main
..
compare: baz:6475e1e18320b5641af043555deba353b1d75972
Branches Tags
baz:main

No commits in common. "4ff8d8eca31d10487842cedcdb2bc8a3b9aea476" and "6475e1e18320b5641af043555deba353b1d75972" have entirely different histories.
4ff8d8eca3 ... 6475e1e183

8 changed files with 19 additions and 105 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Player/BP_PlayerCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Weapons/MagicWand/BP_MagicWandProjectile.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Widgets/MainMenu/BP_MainMenuWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Widgets/MainMenu/BP_SelectWeaponWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
Source/vampires/Widgets/LevelUpWidget.h
View File

@ -25,10 +25,14 @@ public:
UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
UListView* UpgradesListView; UListView* UpgradesListView;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
TArray<TSubclassOf<UUpgradeButtonDataObject>> UpgradeItems;
virtual void NativeConstruct() override; virtual void NativeConstruct() override;
private: private:
UFUNCTION() UFUNCTION()
void ResumeButtonClicked(); void ResumeButtonClicked();
}; };

34
Source/vampires/Widgets/MainMenuWidget.cpp
View File

@ -3,7 +3,6 @@
#include "MainMenuWidget.h" #include "MainMenuWidget.h"
#include "SelectWeaponWidget.h"
#include "Blueprint/WidgetBlueprintLibrary.h" #include "Blueprint/WidgetBlueprintLibrary.h"
#include "Components/Button.h" #include "Components/Button.h"
#include "Kismet/GameplayStatics.h" #include "Kismet/GameplayStatics.h"
@ -36,8 +35,6 @@ void UMainMenuWidget::NativeConstruct()
QuitButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayUnhoveredSound); QuitButton->OnUnhovered.AddUniqueDynamic(this, &UMainMenuWidget::PlayUnhoveredSound);
} }
QuitButton->SetIsEnabled(false);
if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0))
{ {
UWidgetBlueprintLibrary::SetInputMode_UIOnlyEx(PlayerController, this, EMouseLockMode::LockAlways); UWidgetBlueprintLibrary::SetInputMode_UIOnlyEx(PlayerController, this, EMouseLockMode::LockAlways);
@ -47,31 +44,18 @@ void UMainMenuWidget::NativeConstruct()
void UMainMenuWidget::NewGameButtonOnClicked() void UMainMenuWidget::NewGameButtonOnClicked()
{ {
if (NewGameMenuWidget) if (!NewGameLevel.IsNull())
{ {
RemoveFromParent(); UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), NewGameLevel);
UUserWidget* selectWeaponWidget = CreateWidget<UUserWidget, APlayerController*>(
UGameplayStatics::GetPlayerController(GetWorld(), 0), NewGameMenuWidget);
if (selectWeaponWidget)
{
selectWeaponWidget->AddToViewport();
}
} }
// if (!NewGameLevel.IsNull()) if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0))
// { {
// UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), NewGameLevel); PlayerController->bShowMouseCursor = false;
// } UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController);
// }
// if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0))
// { SetIsFocusable(false);
// PlayerController->bShowMouseCursor = false;
// UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController);
// }
//
// SetIsFocusable(false);
} }
void UMainMenuWidget::QuitButtonOnClicked() void UMainMenuWidget::QuitButtonOnClicked()

34
Source/vampires/Widgets/SelectWeaponWidget.cpp
View File

@ -1,34 +0,0 @@
// Louis Hobbs | 2024-2025
#include "SelectWeaponWidget.h"
#include "MainMenuWidget.h"
#include "Components/Button.h"
#include "Kismet/GameplayStatics.h"
void USelectWeaponWidget::NativeConstruct()
{
Super::NativeConstruct();
if (BackButton)
{
BackButton->OnClicked.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonClicked);
}
}
void USelectWeaponWidget::BackButtonClicked()
{
if (PreviousWidget)
{
RemoveFromParent();
UUserWidget* selectWeaponWidget = CreateWidget<UUserWidget, APlayerController*>(
UGameplayStatics::GetPlayerController(GetWorld(), 0), PreviousWidget);
if (selectWeaponWidget)
{
selectWeaponWidget->AddToViewport();
}
}
}

37
Source/vampires/Widgets/SelectWeaponWidget.h
View File

@ -1,37 +0,0 @@
// Louis Hobbs | 2024-2025
#pragma once
#include "CoreMinimal.h"
#include "VampireInteractiveWidget.h"
#include "SelectWeaponWidget.generated.h"
class UListView;
class UButton;
/**
*
*/
UCLASS()
class VAMPIRES_API USelectWeaponWidget : public UVampireInteractiveWidget
{
GENERATED_BODY()
public:
UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
UButton* BackButton;
UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
UListView* UpgradesListView;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
TSubclassOf<class UUserWidget> PreviousWidget;
virtual void NativeConstruct() override;
private:
UFUNCTION()
void BackButtonClicked();
};