Skip to content

Commit cec70e5

Browse files
committed
Reordered modifier values
1 parent f28ee32 commit cec70e5

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

Source/Attributes/Public/AttrModifier.h

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,39 @@ struct ATTRIBUTES_API FAttrModifier
1616

1717
FAttrModifier()
1818
: Guid(FGuid::NewGuid())
19-
, BaseValueMultiplier(0.f)
20-
, LastValueMultiplier(0.f)
2119
, Increment(0.f)
20+
, LastValueMultiplier(0.f)
21+
, BaseValueMultiplier(0.f)
2222
{}
2323

24-
FAttrModifier(float BaseValueMultiplier, float LastMultiplier = 0.f, float Increment = 0.f)
24+
FAttrModifier(float BaseValueMultiplier, float LastValueMultiplier = 0.f, float Increment = 0.f)
2525
: Guid(FGuid::NewGuid())
26-
, BaseValueMultiplier(BaseValueMultiplier)
27-
, LastValueMultiplier(LastValueMultiplier)
2826
, Increment(Increment)
27+
, LastValueMultiplier(LastValueMultiplier)
28+
, BaseValueMultiplier(BaseValueMultiplier)
2929
{}
3030

3131
public:
3232

3333
UPROPERTY(BlueprintReadOnly, Category = Modifier)
3434
FGuid Guid;
3535

36-
/* Adds the incremental coefficient of Base. E.g: +5% damage
37-
* X += Base * Cof
38-
*/
39-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Modifier, meta = (UIMin = "-1.0", UIMax = "1.0"))
40-
float BaseValueMultiplier;
36+
/* Sums an amount to the attribute */
37+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Modifier)
38+
float Increment;
4139

4240
/* Adds the incremental coefficient of the last attribute value. E.g: +5% health
4341
* X += X * Cof
4442
*/
4543
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Modifier, meta = (UIMin = "-1.0", UIMax = "1.0"))
4644
float LastValueMultiplier;
4745

48-
/* Sums an amount to the attribute */
49-
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Modifier)
50-
float Increment;
46+
/* Adds the incremental coefficient of Base. E.g: +5% damage
47+
* X += Base * Cof
48+
*/
49+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Modifier, meta = (UIMin = "-1.0", UIMax = "1.0"))
50+
float BaseValueMultiplier;
51+
5152

5253
/** Apply changes to the value */
5354
void Apply(float& Value, float BaseValue) const;

0 commit comments

Comments
 (0)