From 5138042732e85f51a4aad34a6ecd01e7f8cfea20 Mon Sep 17 00:00:00 2001 From: Bryce Douglas Olcott <10872719@uvu.edu> Date: Tue, 14 Oct 2025 10:45:32 -0600 Subject: [PATCH] Auto stash before rebase of "main" onto "main/main" --- .../MAIN_CONTENT/Blueprints/BP_PlayerController.uasset | 4 ++-- .../Spells/Gameplay_Abilities/BLOOD/GA_BloodCage.uasset | 4 ++-- Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset | 4 ++-- .../Private/Attributes/LevelAttributeSet.cpp | 7 ++++++- .../Private/Attributes/ManaAttributeSet.cpp | 5 +++++ .../Private/Attributes/StaminaAttributeSet.cpp | 2 ++ .../Public/Attributes/StaminaAttributeSet.h | 1 - .../Elistria_Calling/Public/ElistriaAttributeSetBase.h | 2 ++ 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset index f84b3e1..97cd9f6 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b657eaa907256967eb6a9c092a2aaddfa2fc4a53e48e018fadf0e0c76d64ab6 -size 707950 +oid sha256:171ea1cf164c199c6fe3889f80872f46d074fbe863e4aef86cd695654a8dfb60 +size 708102 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/BLOOD/GA_BloodCage.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/BLOOD/GA_BloodCage.uasset index 356b101..bbe931d 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/BLOOD/GA_BloodCage.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/BLOOD/GA_BloodCage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99df4e64884711745e9656d6efa9b59427d86e85eac91bb2d475a4443ff0f432 -size 84269 +oid sha256:cec28847ab60aaaa9aa2638f41337077ce29b87cfe5397399af624d7c7cb66a5 +size 86056 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset b/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset index b3be350..94e3c1d 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81e2593f5452315c2bf8eedbef85b46afcb57aa4a5ac50cb8f95435a67e38800 -size 336607 +oid sha256:23dfa959501f06b435b2afe4f3c16812099ff7e80f3f8de1ce8934109814a60b +size 347900 diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp index f7e8873..e5d003c 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp +++ b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp @@ -48,8 +48,12 @@ void ULevelAttributeSet::ConsumeXPGain() const float Gain = GetXPGain(); if (Gain > 0.0f) { - SetXP(GetXP() + Gain); + float OldXP = GetXP(); + float NewXP =OldXP + Gain; + SetXP(NewXP); SetXPGain(0.0f); + OnXPChanged.Broadcast(this, GetXP(), Gain); + OnLevelChanged.Broadcast(this, GetXP()-Gain, Level.GetCurrentValue()); } } @@ -108,5 +112,6 @@ void ULevelAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallb SetLevel(static_cast(Lvl)); SetXP(FMath::Clamp(GetXP(),0.0f,ComputeXPForLevel(Lvl))); SetXPToNextLevel(ComputeXPForLevel(Lvl)); + OnXPToNextLevelChanged.Broadcast(this, OldValue.GetCurrentValue(), XPToNextLevel.GetCurrentValue()); } } diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/ManaAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/ManaAttributeSet.cpp index 993ec7a..0dee79f 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/ManaAttributeSet.cpp +++ b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/ManaAttributeSet.cpp @@ -38,6 +38,7 @@ void UManaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallba if (Data.EvaluatedData.Attribute == GetManaAttribute()) { SetMana(FMath::Clamp(GetMana(), 0.0f, GetMaxMana())); + ; } if (Data.EvaluatedData.Attribute == GetCostAttribute()) { @@ -48,7 +49,9 @@ void UManaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallba if (OldMana!=NewMana) { SetMana(NewMana); + OnManaChanged.Broadcast(this, OldMana, NewMana); } + OnManaChanged.Broadcast(this, OldMana, NewMana); SetCost(0.0f); } if (Data.EvaluatedData.Attribute==GetRestoreAttribute()) @@ -60,7 +63,9 @@ void UManaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallba if (OldMana!=NewMana) { SetMana(NewMana); + OnManaChanged.Broadcast(this, OldMana, NewMana); } + OnManaChanged.Broadcast(this, OldMana, NewMana); SetRestore(0.0f); } } diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp index f3b92bc..913f53d 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp +++ b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp @@ -45,6 +45,7 @@ void UStaminaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCal if (OldStamina!=NewStamina) { SetStamina(NewStamina); + OnMaxStaminaChanged.Broadcast(this, OldMaxStamina, NewMaxStamina); } SetDrain(0.0f); } @@ -57,6 +58,7 @@ void UStaminaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCal if (OldStamina!=NewStamina) { SetStamina(NewStamina); + OnMaxStaminaChanged.Broadcast(this, OldMaxStamina, NewMaxStamina); } } } \ No newline at end of file diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h index 956a511..ba3828a 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h +++ b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h @@ -11,7 +11,6 @@ /** * */ - UCLASS() class ELISTRIA_CALLING_API UStaminaAttributeSet : public UElistriaAttributeSetBase { diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h index b351967..bcef487 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h +++ b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h @@ -9,6 +9,8 @@ /** * */ +DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, + float, NewValue); #define ATTRIBUTE_ACCESSORS(ClassName, PropertyName) \ GAMEPLAYATTRIBUTE_PROPERTY_GETTER(ClassName, PropertyName) \ GAMEPLAYATTRIBUTE_VALUE_GETTER(PropertyName) \