diff --git a/Source/vampires/Widgets/HUDWidget.cpp b/Source/vampires/Widgets/HUDWidget.cpp index 6cb3836..de2f87e 100644 --- a/Source/vampires/Widgets/HUDWidget.cpp +++ b/Source/vampires/Widgets/HUDWidget.cpp @@ -9,41 +9,41 @@ void UHUDWidget::Init() { } -void UHUDWidget::UpdateEXPBar(float currentLevelPercent) +void UHUDWidget::UpdateEXPBar(float CurrentLevelPercent) { - EXPbar->SetPercent(currentLevelPercent); + EXPbar->SetPercent(CurrentLevelPercent); } -void UHUDWidget::UpdateLevelBlock(int level) +void UHUDWidget::UpdateLevelBlock(int Level) { - LevelBlock->SetText(FText::FromString("LV" + FString::FromInt(level))); + LevelBlock->SetText(FText::FromString("LV" + FString::FromInt(Level))); } -void UHUDWidget::UpdateTimerBlock(float deltaTime) +void UHUDWidget::UpdateTimerBlock(float DeltaTime) { - int timeSinceStart = FMath::FloorToInt(deltaTime); + int TimeSinceStart = FMath::FloorToInt(DeltaTime); - FString mins = FString::FromInt(timeSinceStart / 60); - if (timeSinceStart / 60 < 10) + FString Mins = FString::FromInt(TimeSinceStart / 60); + if (TimeSinceStart / 60 < 10) { - mins = "0" + mins; - } - - FString secs = FString::FromInt(timeSinceStart % 60); - if (timeSinceStart % 60 < 10) - { - secs = "0" + secs; + Mins = "0" + Mins; } - TimerBLock->SetText(FText::FromString(mins + ":" + secs)); + FString Secs = FString::FromInt(TimeSinceStart % 60); + if (TimeSinceStart % 60 < 10) + { + Secs = "0" + Secs; + } + + TimerBLock->SetText(FText::FromString(Mins + ":" + Secs)); } -void UHUDWidget::UpdateKillBlock(int killCount) +void UHUDWidget::UpdateKillBlock(int KillCount) { - KillBLock->SetText(FText::FromString("Kills: " + FString::FromInt(killCount))); + KillBLock->SetText(FText::FromString("Kills: " + FString::FromInt(KillCount))); } -void UHUDWidget::UpdateGoldBlock(int goldCount) +void UHUDWidget::UpdateGoldBlock(int GoldCount) { - GoldBLock->SetText(FText::FromString("Gold: " + FString::FromInt(goldCount))); + GoldBLock->SetText(FText::FromString("Gold: " + FString::FromInt(GoldCount))); } diff --git a/Source/vampires/Widgets/HUDWidget.h b/Source/vampires/Widgets/HUDWidget.h index afe63f6..ed1bc9f 100644 --- a/Source/vampires/Widgets/HUDWidget.h +++ b/Source/vampires/Widgets/HUDWidget.h @@ -15,18 +15,17 @@ UCLASS() class VAMPIRES_API UHUDWidget : public UUserWidget { GENERATED_BODY() - -public: - + +protected: UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) UProgressBar* EXPbar; - + UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) UTextBlock* LevelBlock; - + UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) UTextBlock* TimerBLock; - + UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) UTextBlock* KillBLock; @@ -34,20 +33,20 @@ public: UTextBlock* GoldBLock; void Init(); - + +public: UFUNCTION() - void UpdateEXPBar(float currentLevelPercent); + void UpdateEXPBar(float CurrentLevelPercent); UFUNCTION() - void UpdateLevelBlock(int level); + void UpdateLevelBlock(int Level); UFUNCTION() - void UpdateTimerBlock(float deltaTime); + void UpdateTimerBlock(float DeltaTime); UFUNCTION() - void UpdateKillBlock(int killCount); + void UpdateKillBlock(int KillCount); UFUNCTION() - void UpdateGoldBlock(int goldCount); - + void UpdateGoldBlock(int GoldCount); }; diff --git a/Source/vampires/Widgets/HealthbarWidget.cpp b/Source/vampires/Widgets/HealthbarWidget.cpp index 0f882b3..b5d6c8c 100644 --- a/Source/vampires/Widgets/HealthbarWidget.cpp +++ b/Source/vampires/Widgets/HealthbarWidget.cpp @@ -12,23 +12,23 @@ void UHealthbarWidget::NativeConstruct() { Super::NativeConstruct(); - if (ACharacter* character = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0)) + if (ACharacter* Character = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0)) { - if (UHealthComponent* healthComponent = character->FindComponentByClass()) + if (UHealthComponent* HealthComponent = Character->FindComponentByClass()) { - healthComponent->OnDamaged.AddDynamic(this, &UHealthbarWidget::UpdateHealthBar); + HealthComponent->OnDamaged.AddDynamic(this, &UHealthbarWidget::UpdateHealthBar); UpdateHealthBar({}); } } } -void UHealthbarWidget::UpdateHealthBar(FDamageInfo damageInfo) +void UHealthbarWidget::UpdateHealthBar(FDamageInfo DamageInfo) { - if (ACharacter* character = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0)) + if (ACharacter* Character = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0)) { - if (UHealthComponent* healthComponent = character->FindComponentByClass()) + if (UHealthComponent* HealthComponent = Character->FindComponentByClass()) { - float percent = healthComponent->GetCurrentHealth() / healthComponent->GetMaxHealth(); + float percent = HealthComponent->GetCurrentHealth() / HealthComponent->GetMaxHealth(); HealthBar->SetPercent(percent); } } diff --git a/Source/vampires/Widgets/HealthbarWidget.h b/Source/vampires/Widgets/HealthbarWidget.h index 4cecd62..5441021 100644 --- a/Source/vampires/Widgets/HealthbarWidget.h +++ b/Source/vampires/Widgets/HealthbarWidget.h @@ -6,6 +6,7 @@ #include "Blueprint/UserWidget.h" #include "HealthbarWidget.generated.h" +struct FDamageInfo; class UProgressBar; /** * @@ -15,13 +16,13 @@ class VAMPIRES_API UHealthbarWidget : public UUserWidget { GENERATED_BODY() -public: +protected: UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) - UProgressBar* HealthBar; + TObjectPtr HealthBar; virtual void NativeConstruct() override; - + private: UFUNCTION() - void UpdateHealthBar(FDamageInfo damageInfo); + void UpdateHealthBar(FDamageInfo DamageInfo); }; diff --git a/Source/vampires/Widgets/LevelUpWidget.cpp b/Source/vampires/Widgets/LevelUpWidget.cpp index cf729b0..b0d239e 100644 --- a/Source/vampires/Widgets/LevelUpWidget.cpp +++ b/Source/vampires/Widgets/LevelUpWidget.cpp @@ -40,50 +40,50 @@ void ULevelUpWidget::NativeConstruct() TArray Inventory = InventoryComponent->GetInventory(); // Get list of weapons that the player owns that can be upgraded - TArray upgradeItems; - for (AWeapon* weapon : Inventory) + TArray UpgradeItems; + for (AWeapon* Weapon : Inventory) { - if (weapon->GetWeaponLevel() < weapon->GetUpgradeDescriptions().Num()) + if (Weapon->GetWeaponLevel() < Weapon->GetUpgradeDescriptions().Num()) { UUpgradeButtonDataObject* Temp = NewObject(this); - Temp->SetData(weapon, this); - upgradeItems.Add(Temp); + Temp->SetData(Weapon, this); + UpgradeItems.Add(Temp); } } // Get list of weapons that the player can still obtain TArray> ObtainableWeapons = InventoryComponent->obtainableWeapons; - for (TSubclassOf weapon : ObtainableWeapons) + for (TSubclassOf Weapon : ObtainableWeapons) { UUpgradeButtonDataObject* Temp = NewObject(this); - Temp->SetData(weapon, this); - upgradeItems.Add(Temp); + Temp->SetData(Weapon, this); + UpgradeItems.Add(Temp); } // If no valid options exist, populate list with default options - if (upgradeItems.Num() == 0) + if (UpgradeItems.Num() == 0) { - UUpgradeButtonDataObject* tempHealth = NewObject(this); - tempHealth->SetData(FText::FromString("Health"), - FText::FromString("Recover 10% of your health"), - nullptr, - this); - upgradeItems.Add(tempHealth); + UUpgradeButtonDataObject* TempHealth = NewObject(this); + TempHealth->SetData(FText::FromString("Health"), + FText::FromString("Recover 10% of your health"), + nullptr, + this); + UpgradeItems.Add(TempHealth); - UUpgradeButtonDataObject* tempGold = NewObject(this); - tempGold->SetData(FText::FromString("Gold"), - FText::FromString("Gain 10 gold"), - nullptr, - this); - upgradeItems.Add(tempGold); + UUpgradeButtonDataObject* TempGold = NewObject(this); + TempGold->SetData(FText::FromString("Gold"), + FText::FromString("Gain 10 gold"), + nullptr, + this); + UpgradeItems.Add(TempGold); } // Select up to three random options from the list of options - for (int i = 0; i < 3 && upgradeItems.Num() > 0; i++) + for (int i = 0; i < 3 && UpgradeItems.Num() > 0; i++) { - int rand = FMath::RandRange(0, upgradeItems.Num() - 1); - UpgradesListView->AddItem(upgradeItems[rand]); - upgradeItems.RemoveAt(rand); + int Rand = FMath::RandRange(0, UpgradeItems.Num() - 1); + UpgradesListView->AddItem(UpgradeItems[Rand]); + UpgradeItems.RemoveAt(Rand); } } SetIsFocusable(true); @@ -93,11 +93,11 @@ void ULevelUpWidget::ResumeButtonClicked() { RemoveFromParent(); - if (APlayerController* playerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) + if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) { - UWidgetBlueprintLibrary::SetInputMode_GameOnly(playerController); - playerController->bShowMouseCursor = false; - playerController->SetPause(false); + UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController); + PlayerController->bShowMouseCursor = false; + PlayerController->SetPause(false); } SetIsFocusable(false); diff --git a/Source/vampires/Widgets/LevelUpWidget.h b/Source/vampires/Widgets/LevelUpWidget.h index b7eb3ab..8537ef0 100644 --- a/Source/vampires/Widgets/LevelUpWidget.h +++ b/Source/vampires/Widgets/LevelUpWidget.h @@ -17,18 +17,16 @@ class VAMPIRES_API ULevelUpWidget : public UUserWidget { GENERATED_BODY() -public: - +protected: UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) UButton* ResumeButton; UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) UListView* UpgradesListView; - + virtual void NativeConstruct() override; - + private: - UFUNCTION() void ResumeButtonClicked(); }; diff --git a/Source/vampires/Widgets/MainMenuWidget.cpp b/Source/vampires/Widgets/MainMenuWidget.cpp index 57bf3fa..56ce77c 100644 --- a/Source/vampires/Widgets/MainMenuWidget.cpp +++ b/Source/vampires/Widgets/MainMenuWidget.cpp @@ -51,27 +51,14 @@ void UMainMenuWidget::NewGameButtonOnClicked() { RemoveFromParent(); - UUserWidget* selectWeaponWidget = CreateWidget( + UUserWidget* SelectWeaponWidget = CreateWidget( UGameplayStatics::GetPlayerController(GetWorld(), 0), NewGameMenuWidget); - if (selectWeaponWidget) + if (SelectWeaponWidget) { - selectWeaponWidget->AddToViewport(); + SelectWeaponWidget->AddToViewport(); } - } - - // if (!NewGameLevel.IsNull()) - // { - // UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), NewGameLevel); - // } - // - // if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) - // { - // PlayerController->bShowMouseCursor = false; - // UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController); - // } - // - // SetIsFocusable(false); + } } void UMainMenuWidget::QuitButtonOnClicked() diff --git a/Source/vampires/Widgets/MainMenuWidget.h b/Source/vampires/Widgets/MainMenuWidget.h index e2050f8..68df1ba 100644 --- a/Source/vampires/Widgets/MainMenuWidget.h +++ b/Source/vampires/Widgets/MainMenuWidget.h @@ -17,7 +17,7 @@ class VAMPIRES_API UMainMenuWidget : public UVampireInteractiveWidget // TODO: Add options menu -public: +protected: UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) TObjectPtr NewGameButton; @@ -38,7 +38,7 @@ public: private: UPROPERTY() - TObjectPtr currentNewGameWidget; + TObjectPtr CurrentNewGameWidget; public: virtual void NativeConstruct() override; diff --git a/Source/vampires/Widgets/PauseWidget.cpp b/Source/vampires/Widgets/PauseWidget.cpp index bb65078..dbc397c 100644 --- a/Source/vampires/Widgets/PauseWidget.cpp +++ b/Source/vampires/Widgets/PauseWidget.cpp @@ -27,11 +27,11 @@ void UPauseWidget::ResumeButtonClicked() { RemoveFromParent(); - if (APlayerController* playerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) + if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) { - UWidgetBlueprintLibrary::SetInputMode_GameOnly(playerController); - playerController->bShowMouseCursor = false; - playerController->SetPause(false); + UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController); + PlayerController->bShowMouseCursor = false; + PlayerController->SetPause(false); } SetIsFocusable(false); diff --git a/Source/vampires/Widgets/PauseWidget.h b/Source/vampires/Widgets/PauseWidget.h index 8af7361..61484a3 100644 --- a/Source/vampires/Widgets/PauseWidget.h +++ b/Source/vampires/Widgets/PauseWidget.h @@ -16,7 +16,6 @@ class VAMPIRES_API UPauseWidget : public UUserWidget GENERATED_BODY() public: - UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) UButton* ResumeButton; @@ -25,7 +24,6 @@ public: virtual void NativeConstruct() override; private: - UFUNCTION() void ResumeButtonClicked(); }; diff --git a/Source/vampires/Widgets/SelectWeaponWidget.cpp b/Source/vampires/Widgets/SelectWeaponWidget.cpp index c337992..d133fd0 100644 --- a/Source/vampires/Widgets/SelectWeaponWidget.cpp +++ b/Source/vampires/Widgets/SelectWeaponWidget.cpp @@ -29,10 +29,10 @@ void USelectWeaponWidget::NativeConstruct() if (UpgradesListView) { // Get a list of weapons that the player owns that can be upgraded - for (TSubclassOf weapon : starterWeapons) + for (TSubclassOf Weapon : StarterWeapons) { UStarterWeaponButtonDataObject* Temp = NewObject(this); - Temp->SetData(weapon, this); + Temp->SetData(Weapon, this); UpgradesListView->AddItem(Temp); } } @@ -44,12 +44,12 @@ void USelectWeaponWidget::BackButtonClicked() { RemoveFromParent(); - UUserWidget* selectWeaponWidget = CreateWidget( + UUserWidget* SelectWeaponWidget = CreateWidget( UGameplayStatics::GetPlayerController(GetWorld(), 0), PreviousWidget); - if (selectWeaponWidget) + if (SelectWeaponWidget) { - selectWeaponWidget->AddToViewport(); + SelectWeaponWidget->AddToViewport(); } - } + } } diff --git a/Source/vampires/Widgets/SelectWeaponWidget.h b/Source/vampires/Widgets/SelectWeaponWidget.h index 79b5e26..a7a14df 100644 --- a/Source/vampires/Widgets/SelectWeaponWidget.h +++ b/Source/vampires/Widgets/SelectWeaponWidget.h @@ -17,7 +17,7 @@ UCLASS() class VAMPIRES_API USelectWeaponWidget : public UVampireInteractiveWidget { GENERATED_BODY() -public: +protected: UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) TObjectPtr BackButton; @@ -29,7 +29,7 @@ public: TObjectPtr UpgradesListView; UPROPERTY(EditDefaultsOnly) - TArray> starterWeapons; + TArray> StarterWeapons; UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) TSubclassOf PreviousWidget; diff --git a/Source/vampires/Widgets/StarterWeaponButtonDataObject.cpp b/Source/vampires/Widgets/StarterWeaponButtonDataObject.cpp index cdfe2b6..cb5f5fc 100644 --- a/Source/vampires/Widgets/StarterWeaponButtonDataObject.cpp +++ b/Source/vampires/Widgets/StarterWeaponButtonDataObject.cpp @@ -5,29 +5,29 @@ #include "vampires/Weapon.h" -void UStarterWeaponButtonDataObject::SetData(AWeapon* Weapon, UUserWidget* parent) +void UStarterWeaponButtonDataObject::SetData(AWeapon* Weapon, UUserWidget* ParentWidget) { WeaponName = Weapon->GetWeaponName(); - Description = Weapon->GetDescription(); + WeaponDescription = Weapon->GetDescription(); WeaponIcon = Weapon->GetIcon(); WeaponInstance = Weapon; - Parent = parent; + Parent = ParentWidget; } -void UStarterWeaponButtonDataObject::SetData(TSubclassOf Weapon, UUserWidget* parent) +void UStarterWeaponButtonDataObject::SetData(TSubclassOf Weapon, UUserWidget* ParentWidget) { if (AWeapon* tempWeapon = NewObject(this, Weapon)) { - SetData(tempWeapon, parent); + SetData(tempWeapon, ParentWidget); WeaponTemplate = Weapon; } } -void UStarterWeaponButtonDataObject::SetData(FText weaponName, FText description, TObjectPtr weaponIcon, - UUserWidget* parent) +void UStarterWeaponButtonDataObject::SetData(FText NewWeaponName, FText NewWeaponDescription, TObjectPtr NewWeaponIcon, + UUserWidget* ParentWidget) { - WeaponName = weaponName; - Description = description; - WeaponIcon = weaponIcon; - Parent = parent; + WeaponName = NewWeaponName; + WeaponDescription = NewWeaponDescription; + WeaponIcon = NewWeaponIcon; + Parent = ParentWidget; } diff --git a/Source/vampires/Widgets/StarterWeaponButtonDataObject.h b/Source/vampires/Widgets/StarterWeaponButtonDataObject.h index 3d9027c..f4e544b 100644 --- a/Source/vampires/Widgets/StarterWeaponButtonDataObject.h +++ b/Source/vampires/Widgets/StarterWeaponButtonDataObject.h @@ -19,7 +19,7 @@ public: FText WeaponName; UPROPERTY(EditAnywhere, BlueprintReadWrite) - FText Description; + FText WeaponDescription; UPROPERTY(EditAnywhere, BlueprintReadWrite) TObjectPtr WeaponIcon; @@ -33,7 +33,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) TObjectPtr Parent; - void SetData(AWeapon* Weapon, UUserWidget* parent); - void SetData(TSubclassOf Weapon, UUserWidget* parent); - void SetData(FText weaponName, FText description, TObjectPtr weaponIcon, UUserWidget* parent); + void SetData(AWeapon* Weapon, UUserWidget* ParentWidget); + void SetData(TSubclassOf Weapon, UUserWidget* ParentWidget); + void SetData(FText NewWeaponName, FText NewWeaponDescription, TObjectPtr NewWeaponIcon, UUserWidget* ParentWidget); }; diff --git a/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp b/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp index 93bed99..aca2c39 100644 --- a/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp +++ b/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp @@ -18,12 +18,10 @@ void UStarterWeaponButtonWidget::NativeConstruct() void UStarterWeaponButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObject) { - UStarterWeaponButtonDataObject* Item = Cast(ListItemObject); - - if (Item) + if (UStarterWeaponButtonDataObject* Item = Cast(ListItemObject)) { WeaponNameTextBlock->SetText(Item->WeaponName); - DescriptionTextBlock->SetText(Item->Description); + DescriptionTextBlock->SetText(Item->WeaponDescription); WeaponIcon->SetBrushFromTexture(Item->WeaponIcon); Parent = Item->Parent; WeaponTemplate = Item->WeaponTemplate; @@ -43,13 +41,13 @@ void UStarterWeaponButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObje void UStarterWeaponButtonWidget::OnClicked() { - if (UVampireGameInstance* gameInstance = Cast(GetGameInstance())) + if (UVampireGameInstance* GameInstance = Cast(GetGameInstance())) { - gameInstance->StarterWeapon = WeaponTemplate; + GameInstance->StarterWeapon = WeaponTemplate; - if (!gameInstance->GameWorld.IsNull()) + if (!GameInstance->GameWorld.IsNull()) { - UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), gameInstance->GameWorld); + UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), GameInstance->GameWorld); if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) { diff --git a/Source/vampires/Widgets/StarterWeaponButtonWidget.h b/Source/vampires/Widgets/StarterWeaponButtonWidget.h index aa96212..65ab11f 100644 --- a/Source/vampires/Widgets/StarterWeaponButtonWidget.h +++ b/Source/vampires/Widgets/StarterWeaponButtonWidget.h @@ -20,7 +20,7 @@ class VAMPIRES_API UStarterWeaponButtonWidget : public UVampireInteractiveWidget { GENERATED_BODY() -public: +protected: UPROPERTY(EditDefaultsOnly, meta=(BindWidget)) TObjectPtr Body; @@ -39,7 +39,6 @@ public: UPROPERTY() TObjectPtr Parent; -protected: virtual void NativeConstruct() override; virtual void NativeOnListItemObjectSet(UObject* ListItemObject) override; diff --git a/Source/vampires/Widgets/UpgradeButtonDataObject.cpp b/Source/vampires/Widgets/UpgradeButtonDataObject.cpp index 646a553..62fd1f0 100644 --- a/Source/vampires/Widgets/UpgradeButtonDataObject.cpp +++ b/Source/vampires/Widgets/UpgradeButtonDataObject.cpp @@ -5,32 +5,32 @@ #include "vampires/Weapon.h" -void UUpgradeButtonDataObject::SetData(AWeapon* Weapon, UUserWidget* parent) +void UUpgradeButtonDataObject::SetData(AWeapon* Weapon, UUserWidget* ParentWidget) { WeaponName = Weapon->GetWeaponName(); WeaponIcon = Weapon->GetIcon(); WeaponInstance = Weapon; - Parent = parent; + Parent = ParentWidget; if (Weapon->GetUpgradeDescriptions().Num() > Weapon->GetWeaponLevel()) { - Description = Weapon->GetUpgradeDescriptions()[Weapon->GetWeaponLevel()]; + WeaponDescription = Weapon->GetUpgradeDescriptions()[Weapon->GetWeaponLevel()]; } } -void UUpgradeButtonDataObject::SetData(TSubclassOf Weapon, UUserWidget* parent) +void UUpgradeButtonDataObject::SetData(TSubclassOf Weapon, UUserWidget* ParentWidget) { if (AWeapon* tempWeapon = NewObject(this, Weapon)) { - SetData(tempWeapon, parent); + SetData(tempWeapon, ParentWidget); } } -void UUpgradeButtonDataObject::SetData(FText weaponName, FText description, TObjectPtr weaponIcon, - UUserWidget* parent) +void UUpgradeButtonDataObject::SetData(FText NewWeaponName, FText NewDescription, TObjectPtr NewWeaponIcon, + UUserWidget* ParentWidget) { - WeaponName = weaponName; - Description = description; - WeaponIcon = weaponIcon; - Parent = parent; + WeaponName = NewWeaponName; + WeaponDescription = NewDescription; + WeaponIcon = NewWeaponIcon; + Parent = ParentWidget; } diff --git a/Source/vampires/Widgets/UpgradeButtonDataObject.h b/Source/vampires/Widgets/UpgradeButtonDataObject.h index 92eadaa..d842187 100644 --- a/Source/vampires/Widgets/UpgradeButtonDataObject.h +++ b/Source/vampires/Widgets/UpgradeButtonDataObject.h @@ -20,7 +20,7 @@ public: FText WeaponName; UPROPERTY(EditAnywhere, BlueprintReadWrite) - FText Description; + FText WeaponDescription; UPROPERTY(EditAnywhere, BlueprintReadWrite) TObjectPtr WeaponIcon; @@ -34,7 +34,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) TObjectPtr Parent; - void SetData(AWeapon* Weapon, UUserWidget* parent); - void SetData(TSubclassOf Weapon, UUserWidget* parent); - void SetData(FText weaponName, FText description, TObjectPtr weaponIcon, UUserWidget* parent); + void SetData(AWeapon* Weapon, UUserWidget* ParentWidget); + void SetData(TSubclassOf Weapon, UUserWidget* ParentWidget); + void SetData(FText NewWeaponName, FText NewDescription, TObjectPtr NewWeaponIcon, UUserWidget* ParentWidget); }; diff --git a/Source/vampires/Widgets/UpgradeButtonWidget.cpp b/Source/vampires/Widgets/UpgradeButtonWidget.cpp index 052cfac..9bfa62e 100644 --- a/Source/vampires/Widgets/UpgradeButtonWidget.cpp +++ b/Source/vampires/Widgets/UpgradeButtonWidget.cpp @@ -22,12 +22,10 @@ void UUpgradeButtonWidget::NativeConstruct() void UUpgradeButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObject) { - UUpgradeButtonDataObject* Item = Cast(ListItemObject); - - if (Item) + if (UUpgradeButtonDataObject* Item = Cast(ListItemObject)) { WeaponNameTextBlock->SetText(Item->WeaponName); - DescriptionTextBlock->SetText(Item->Description); + DescriptionTextBlock->SetText(Item->WeaponDescription); WeaponIcon->SetBrushFromTexture(Item->WeaponIcon); Parent = Item->Parent; @@ -83,7 +81,7 @@ void UUpgradeButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObject) void UUpgradeButtonWidget::OnClicked() { - APlayerController* playerController = UGameplayStatics::GetPlayerController(GetWorld(), 0); + APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0); switch (UpgradeType) { @@ -92,8 +90,7 @@ void UUpgradeButtonWidget::OnClicked() break; case NewWeapon: - if (UWeaponInventoryComponent* Inventory = playerController->GetPawn()->GetComponentByClass< - UWeaponInventoryComponent>()) + if (UWeaponInventoryComponent* Inventory = PlayerController->GetPawn()->GetComponentByClass()) { Inventory->AddWeaponToInventory(WeaponTemplate); Inventory->obtainableWeapons.Remove(WeaponTemplate); @@ -101,22 +98,21 @@ void UUpgradeButtonWidget::OnClicked() break; case Health: - if (playerController) + if (PlayerController) { - if (UHealthComponent* healthComponent = playerController->GetPawn()->GetComponentByClass< - UHealthComponent>()) + if (UHealthComponent* HealthComponent = PlayerController->GetPawn()->GetComponentByClass()) { - healthComponent->RecoverHealth(healthComponent->GetMaxHealth() / 10.0f); + HealthComponent->RecoverHealth(HealthComponent->GetMaxHealth() / 10.0f); } } break; case Gold: - if (playerController) + if (PlayerController) { - if (UGoldComponent* goldComponent = playerController->GetPawn()->GetComponentByClass()) + if (UGoldComponent* GoldComponent = PlayerController->GetPawn()->GetComponentByClass()) { - goldComponent->IncrementGold(10); + GoldComponent->IncrementGold(10); } } break; @@ -129,11 +125,11 @@ void UUpgradeButtonWidget::OnClicked() { Parent->RemoveFromParent(); - if (playerController) + if (PlayerController) { - UWidgetBlueprintLibrary::SetInputMode_GameOnly(playerController); - playerController->bShowMouseCursor = false; - playerController->SetPause(false); + UWidgetBlueprintLibrary::SetInputMode_GameOnly(PlayerController); + PlayerController->bShowMouseCursor = false; + PlayerController->SetPause(false); } Parent->SetIsFocusable(false); diff --git a/Source/vampires/Widgets/UpgradeButtonWidget.h b/Source/vampires/Widgets/UpgradeButtonWidget.h index 95d81bd..af8889e 100644 --- a/Source/vampires/Widgets/UpgradeButtonWidget.h +++ b/Source/vampires/Widgets/UpgradeButtonWidget.h @@ -31,7 +31,7 @@ class VAMPIRES_API UUpgradeButtonWidget : public UVampireInteractiveWidget, publ { GENERATED_BODY() -public: +protected: UPROPERTY(EditDefaultsOnly, meta=(BindWidget)) TObjectPtr Body; @@ -80,11 +80,10 @@ protected: private: UFUNCTION() virtual void OnClicked(); - + UFUNCTION() void OnHoveredDelegate() { SetTextBlockHovered(WeaponNameTextBlock); SetTextBlockHovered(DescriptionTextBlock); } UFUNCTION() void OnUnhoveredDelegate() { SetTextBlockUnhovered(WeaponNameTextBlock); SetTextBlockUnhovered(DescriptionTextBlock); } - }; diff --git a/Source/vampires/Widgets/VampireInteractiveWidget.cpp b/Source/vampires/Widgets/VampireInteractiveWidget.cpp index d0011e9..6410f23 100644 --- a/Source/vampires/Widgets/VampireInteractiveWidget.cpp +++ b/Source/vampires/Widgets/VampireInteractiveWidget.cpp @@ -7,11 +7,11 @@ #include "GameFramework/GameUserSettings.h" #include "Kismet/GameplayStatics.h" -void UVampireInteractiveWidget::SetReturnScreen(UUserWidget* userWidget) +void UVampireInteractiveWidget::SetReturnScreen(UUserWidget* UserWidget) { - if (userWidget) + if (UserWidget) { - PreviousScreen = userWidget; + PreviousScreen = UserWidget; } } diff --git a/Source/vampires/Widgets/VampireInteractiveWidget.h b/Source/vampires/Widgets/VampireInteractiveWidget.h index ff7c111..dfc38a5 100644 --- a/Source/vampires/Widgets/VampireInteractiveWidget.h +++ b/Source/vampires/Widgets/VampireInteractiveWidget.h @@ -14,12 +14,11 @@ UCLASS() class VAMPIRES_API UVampireInteractiveWidget : public UUserWidget { GENERATED_BODY() - -public: +protected: UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) TObjectPtr ButtonHoveredSound; - + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) FLinearColor ButtonHoveredTextColor = {0, 1, 0, 1}; @@ -37,9 +36,8 @@ protected: TObjectPtr PreviousScreen; public: - UFUNCTION() - void SetReturnScreen(UUserWidget* userWidget); + void SetReturnScreen(UUserWidget* UserWidget); protected: UFUNCTION()