therivernyx/ElistriaCalling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto stash before rebase of "main" onto "main/main"

Browse Source
This commit is contained in:
Bryce Douglas Olcott
2025-10-14 10:45:32 -06:00
parent 2b794e6836
commit 5138042732
8 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset LFS
View File

Binary file not shown.

BIN
Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/BLOOD/GA_BloodCage.uasset LFS
View File

Binary file not shown.

BIN
Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset LFS
View File

Binary file not shown.

7
Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp
View File

@@ -48,8 +48,12 @@ void ULevelAttributeSet::ConsumeXPGain()
const float Gain = GetXPGain(); const float Gain = GetXPGain();
if (Gain > 0.0f) if (Gain > 0.0f)
{ {
SetXP(GetXP() + Gain); float OldXP = GetXP();
float NewXP =OldXP + Gain;
SetXP(NewXP);
SetXPGain(0.0f); 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<float>(Lvl)); SetLevel(static_cast<float>(Lvl));
SetXP(FMath::Clamp(GetXP(),0.0f,ComputeXPForLevel(Lvl))); SetXP(FMath::Clamp(GetXP(),0.0f,ComputeXPForLevel(Lvl)));
SetXPToNextLevel(ComputeXPForLevel(Lvl)); SetXPToNextLevel(ComputeXPForLevel(Lvl));
OnXPToNextLevelChanged.Broadcast(this, OldValue.GetCurrentValue(), XPToNextLevel.GetCurrentValue());
} }
} }

5
Elistria_Calling/Source/Elistria_Calling/Private/Attributes/ManaAttributeSet.cpp
View File

@@ -38,6 +38,7 @@ void UManaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallba
if (Data.EvaluatedData.Attribute == GetManaAttribute()) if (Data.EvaluatedData.Attribute == GetManaAttribute())
{ {
SetMana(FMath::Clamp(GetMana(), 0.0f, GetMaxMana())); SetMana(FMath::Clamp(GetMana(), 0.0f, GetMaxMana()));
;
} }
if (Data.EvaluatedData.Attribute == GetCostAttribute()) if (Data.EvaluatedData.Attribute == GetCostAttribute())
{ {
@@ -48,7 +49,9 @@ void UManaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallba
if (OldMana!=NewMana) if (OldMana!=NewMana)
{ {
SetMana(NewMana); SetMana(NewMana);
OnManaChanged.Broadcast(this, OldMana, NewMana);
} }
OnManaChanged.Broadcast(this, OldMana, NewMana);
SetCost(0.0f); SetCost(0.0f);
} }
if (Data.EvaluatedData.Attribute==GetRestoreAttribute()) if (Data.EvaluatedData.Attribute==GetRestoreAttribute())
@@ -60,7 +63,9 @@ void UManaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallba
if (OldMana!=NewMana) if (OldMana!=NewMana)
{ {
SetMana(NewMana); SetMana(NewMana);
OnManaChanged.Broadcast(this, OldMana, NewMana);
} }
OnManaChanged.Broadcast(this, OldMana, NewMana);
SetRestore(0.0f); SetRestore(0.0f);
} }
} }

2
Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp
View File

@@ -45,6 +45,7 @@ void UStaminaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCal
if (OldStamina!=NewStamina) if (OldStamina!=NewStamina)
{ {
SetStamina(NewStamina); SetStamina(NewStamina);
OnMaxStaminaChanged.Broadcast(this, OldMaxStamina, NewMaxStamina);
} }
SetDrain(0.0f); SetDrain(0.0f);
} }
@@ -57,6 +58,7 @@ void UStaminaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCal
if (OldStamina!=NewStamina) if (OldStamina!=NewStamina)
{ {
SetStamina(NewStamina); SetStamina(NewStamina);
OnMaxStaminaChanged.Broadcast(this, OldMaxStamina, NewMaxStamina);
} }
} }
} }

1
Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
View File

@@ -11,7 +11,6 @@
/** /**
* *
*/ */
UCLASS() UCLASS()
class ELISTRIA_CALLING_API UStaminaAttributeSet : public UElistriaAttributeSetBase class ELISTRIA_CALLING_API UStaminaAttributeSet : public UElistriaAttributeSetBase
{ {

2
Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h
View File

@@ -9,6 +9,8 @@
/** /**
* *
*/ */
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue,
float, NewValue);
#define ATTRIBUTE_ACCESSORS(ClassName, PropertyName) \ #define ATTRIBUTE_ACCESSORS(ClassName, PropertyName) \
GAMEPLAYATTRIBUTE_PROPERTY_GETTER(ClassName, PropertyName) \ GAMEPLAYATTRIBUTE_PROPERTY_GETTER(ClassName, PropertyName) \
GAMEPLAYATTRIBUTE_VALUE_GETTER(PropertyName) \ GAMEPLAYATTRIBUTE_VALUE_GETTER(PropertyName) \