Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 57 additions & 18 deletions src/Stats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,6 @@ public interface IStat<T>
/// </summary>
T CurrentValue { get; }

public static bool operator >(IStat<T> lhs, IStat<T> rhs) =>
lhs.CurrentValue > rhs.CurrentValue;

public static bool operator <(IStat<T> lhs, IStat<T> rhs) =>
lhs.CurrentValue < rhs.CurrentValue;

public static bool operator >=(IStat<T> lhs, IStat<T> rhs) =>
lhs.CurrentValue >= rhs.CurrentValue;

public static bool operator <=(IStat<T> lhs, IStat<T> rhs) =>
lhs.CurrentValue <= rhs.CurrentValue;

public static T operator *(T lhs, IStat<T> rhs) =>
lhs * rhs.CurrentValue;

public static T operator *(IStat<T> lhs, T rhs) =>
lhs.CurrentValue * lhs;

event StatValueChanged<T> OnStatChanged;
}

Expand Down Expand Up @@ -236,6 +218,62 @@ public interface IStatModifier<T> : IStatModifier
public class ResourceStat<T> : IResourceStat<T>
where T : INumber<T>, IMinMaxValue<T>
{
public static bool operator >(ResourceStat<T> lhs, T value) =>
lhs.CurrentValue > value;

public static bool operator <(ResourceStat<T> lhs, T value) =>
lhs.CurrentValue < value;

public static bool operator >=(ResourceStat<T> lhs, T value) =>
lhs.CurrentValue >= value;

public static bool operator <=(ResourceStat<T> lhs, T value) =>
lhs.CurrentValue <= value;

public static bool operator ==(ResourceStat<T> lhs, T value) =>
lhs.CurrentValue == value;

public static bool operator !=(ResourceStat<T> lhs, T value) =>
lhs.CurrentValue != value;

public static T operator *(T lhs, ResourceStat<T> rhs) =>
lhs * rhs.CurrentValue;

public static T operator *(ResourceStat<T> lhs, T rhs) =>
lhs.CurrentValue * rhs;

public static bool operator >(ResourceStat<T> lhs, ResourceStat<T> rhs) =>
lhs.CurrentValue > rhs.CurrentValue;

public static bool operator <(ResourceStat<T> lhs, ResourceStat<T> rhs) =>
lhs.CurrentValue < rhs.CurrentValue;

public static bool operator >=(ResourceStat<T> lhs, ResourceStat<T> rhs) =>
lhs.CurrentValue >= rhs.CurrentValue;

public static bool operator <=(ResourceStat<T> lhs, ResourceStat<T> rhs) =>
lhs.CurrentValue <= rhs.CurrentValue;

public static bool operator ==(ResourceStat<T> lhs, ResourceStat<T> rhs) =>
lhs.CurrentValue == rhs.CurrentValue;

public static bool operator !=(ResourceStat<T> lhs, ResourceStat<T> rhs) =>
lhs.CurrentValue != rhs.CurrentValue;

public override bool Equals(object? obj)
{
if (obj is ResourceStat<T> other)
{
return CurrentValue == other.CurrentValue;
}
return false;
}

public override int GetHashCode()
{
return HashCode.Combine(CurrentValue, Min, Max);
}

public T Max { get; set; } = T.MaxValue;

private T _currentValue;
Expand Down Expand Up @@ -350,6 +388,7 @@ public ModifiableStat(T baseValue)
/// <param name="currentValue">The current value for the stat.</param>
public ModifiableStat(T baseValue, T currentValue)
{
_currentValue = currentValue;
BaseValue = baseValue;
CurrentValue = currentValue;
}
Expand Down