Add mob reward proc calculation

Kaioru · Dec 7, 2023 · 4e8f98e · 4e8f98e
1 parent faaa95f
commit 4e8f98e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/common/Edelstein.Common.Gameplay.Game/Objects/Mob/Rewards/MobReward.cs b/src/common/Edelstein.Common.Gameplay.Game/Objects/Mob/Rewards/MobReward.cs
@@ -3,7 +3,8 @@
 namespace Edelstein.Common.Gameplay.Game.Objects.Mob.Rewards;
 
 public record MobReward(
-    int ID
+    int ID,
+    double Proc = 1.0
 ) : IMobReward
 {
     public int? ItemID { get; init; }

diff --git a/src/common/Edelstein.Common.Gameplay.Game/Objects/Mob/Rewards/MobRewardPoolManager.cs b/src/common/Edelstein.Common.Gameplay.Game/Objects/Mob/Rewards/MobRewardPoolManager.cs
@@ -16,14 +16,20 @@ public class MobRewardPoolManager :
 
     public async Task<ICollection<IMobReward>> CalculateRewards(IFieldUser user, IFieldMob mob)
     {
+        var random = new Random();
         var pool = await Retrieve(mob.Template.ID);
-        var items = new List<IMobReward>();
 
-        if (pool != null)
-            items.AddRange(await pool.RetrieveAll());
-        items.AddRange(await Global.RetrieveAll());
-
-        return items
+        return 
+            (pool != null 
+                ? await pool.RetrieveAll()
+                : new List<IMobReward>())
+            .Concat(await Global.RetrieveAll())
+            .Where(r =>
+            {
+                // TODO filters
+
+                return random.NextSingle() <= r.Proc;
+            })
             .OrderBy(i => Random.Shared.Next())
             .ToImmutableArray();
     }

diff --git a/src/common/Edelstein.Common.Gameplay.Game/Objects/Mob/Templates/MobRewardTemplate.cs b/src/common/Edelstein.Common.Gameplay.Game/Objects/Mob/Templates/MobRewardTemplate.cs
@@ -26,6 +26,8 @@ public class MobRewardTemplate : ITemplate, IMobReward
     public DateTime? DateStart { get; }
     public DateTime? DateEnd { get; }
 
+    public double Proc { get; }
+
     public MobRewardTemplate(int id, IDataNode property)
     {
         ID = id;
@@ -36,5 +38,7 @@ public MobRewardTemplate(int id, IDataNode property)
 
         NumberMin = property.ResolveInt("min");
         NumberMax = property.ResolveInt("max");
+
+        Proc = property.ResolveDouble("prob") ?? 1.0;
     }
 }
diff --git a/src/protocol/Edelstein.Protocol.Gameplay.Game/Objects/Mob/Rewards/IMobReward.cs b/src/protocol/Edelstein.Protocol.Gameplay.Game/Objects/Mob/Rewards/IMobReward.cs
@@ -21,4 +21,6 @@ public interface IMobReward : IReward
 
     DateTime? DateStart { get; }
     DateTime? DateEnd { get; }
+
+    double Proc { get; }
 }