Gacha: 排出時に確率を表示するように (#23)

2RiniaR · Nov 20, 2024 · 376d089 · 376d089
1 parent fe8d7b6
commit 376d089
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 44 deletions.
diff --git a/Common/GachaManager.cs b/Common/GachaManager.cs
@@ -4,7 +4,7 @@ namespace Approvers.King.Common;
 
 public class GachaManager : Singleton<GachaManager>
 {
-    private readonly List<ReplyMessage> _replyMessageTable = new();
+    private readonly List<GachaProbability> _replyMessageTable = new();
 
     /// <summary>
     ///     現在のメッセージに反応する確率
@@ -14,7 +14,7 @@ public class GachaManager : Singleton<GachaManager>
     /// <summary>
     ///     各メッセージの確率
     /// </summary>
-    public IReadOnlyList<ReplyMessage> ReplyMessageTable => _replyMessageTable;
+    public IReadOnlyList<GachaProbability> ReplyMessageTable => _replyMessageTable;
 
     public bool IsTableEmpty => ReplyMessageTable.Count == 0;
 
@@ -24,16 +24,7 @@ public async Task LoadAsync()
 
         var probabilities = await app.GachaProbabilities.ToListAsync();
         _replyMessageTable.Clear();
-        foreach (var probability in probabilities)
-        {
-            var message = MasterManager.RandomMessageMaster.Find(probability.RandomMessageId);
-            if (message == null) continue;
-            _replyMessageTable.Add(new ReplyMessage
-            {
-                Rate = probability.Probability,
-                Message = message
-            });
-        }
+        _replyMessageTable.AddRange(probabilities.Where(x => x.RandomMessage != null));
 
         var rareReplyRatePermillage = await app.AppStates.GetIntAsync(AppStateType.RareReplyProbabilityPermillage);
         RareReplyRate = NumberUtility.GetPercentFromPermillage(rareReplyRatePermillage ?? 0);
@@ -44,11 +35,7 @@ public async Task SaveAsync()
         await using var app = AppService.CreateSession();
 
         app.GachaProbabilities.RemoveRange(app.GachaProbabilities);
-        app.GachaProbabilities.AddRange(_replyMessageTable.Select(x => new GachaProbability
-        {
-            RandomMessageId = x.Message.Id,
-            Probability = x.Rate
-        }));
+        app.GachaProbabilities.AddRange(_replyMessageTable);
 
         var rareReplyRatePermillage = NumberUtility.GetPermillageFromPercent(RareReplyRate);
         await app.AppStates.SetIntAsync(AppStateType.RareReplyProbabilityPermillage, rareReplyRatePermillage);
@@ -61,33 +48,37 @@ public void RefreshMessageTable()
         _replyMessageTable.Clear();
         var messages = MasterManager.RandomMessageMaster
             .GetAll(x => x.Type == RandomMessageType.GeneralReply)
-            .Select(x => new ReplyMessage { Rate = 1f, Message = x });
+            .Select(x => new GachaProbability()
+            {
+                RandomMessageId = x.Id,
+                Probability = 1f
+            });
         _replyMessageTable.AddRange(messages);
     }
 
-    public RandomMessage? Roll()
+    public GachaProbability? Roll()
     {
         if (RandomUtility.IsHit(RareReplyRate) == false) return null;
         return GetRandomResult();
     }
 
-    public RandomMessage RollWithoutNone()
+    public GachaProbability RollWithoutNone()
     {
         return GetRandomResult();
     }
 
-    private RandomMessage GetRandomResult()
+    private GachaProbability GetRandomResult()
     {
-        var totalRate = _replyMessageTable.Sum(x => x.Rate);
+        var totalRate = _replyMessageTable.Sum(x => x.Probability);
         var value = RandomUtility.GetRandomFloat(totalRate);
 
         foreach (var element in _replyMessageTable)
         {
-            if (value < element.Rate) return element.Message;
-            value -= element.Rate;
+            if (value < element.Probability) return element;
+            value -= element.Probability;
         }
 
-        return _replyMessageTable[^1].Message;
+        return _replyMessageTable[^1];
     }
 
     public void ShuffleRareReplyRate()
@@ -109,16 +100,10 @@ public void ShuffleMessageRates()
         borders.Add(100);
         var randomIndices = Enumerable.Range(0, _replyMessageTable.Count).Shuffle().ToList();
 
-        _replyMessageTable[randomIndices[0]].Rate = borders[0] * 0.01f;
+        _replyMessageTable[randomIndices[0]].Probability = borders[0] * 0.01f;
         for (var i = 1; i < _replyMessageTable.Count; i++)
         {
-            _replyMessageTable[randomIndices[i]].Rate = (borders[i] - borders[i - 1]) * 0.01f;
+            _replyMessageTable[randomIndices[i]].Probability = (borders[i] - borders[i - 1]) * 0.01f;
         }
     }
-
-    public class ReplyMessage
-    {
-        public float Rate { get; set; }
-        public RandomMessage Message { get; set; }
-    }
 }
diff --git a/Common/Models/GachaProbability.cs b/Common/Models/GachaProbability.cs
@@ -6,4 +6,10 @@ public class GachaProbability
 {
     [Key] public string RandomMessageId { get; set; }
     public float Probability { get; set; }
+
+    private RandomMessage? _randomMessage;
+
+    public RandomMessage? RandomMessage => _randomMessage == null || _randomMessage.Id != RandomMessageId
+        ? _randomMessage = MasterManager.RandomMessageMaster.Find(RandomMessageId)
+        : _randomMessage;
 }
diff --git a/Common/Models/User.cs b/Common/Models/User.cs
@@ -12,19 +12,19 @@ public void ResetMonthlyPurchase()
         MonthlyPurchase = 0;
     }
 
-    public RandomMessage? RollGachaOnce()
+    public GachaProbability? RollGachaOnce()
     {
         MonthlyPurchase += MasterManager.SettingMaster.PricePerGachaOnce;
         return GachaManager.Instance.Roll();
     }
 
-    public RandomMessage RollGachaOnceCertain()
+    public GachaProbability RollGachaOnceCertain()
     {
         MonthlyPurchase += MasterManager.SettingMaster.PricePerGachaOnceCertain;
         return GachaManager.Instance.RollWithoutNone();
     }
 
-    public List<RandomMessage?> RollGachaTenTimes()
+    public List<GachaProbability?> RollGachaTenTimes()
     {
         const int pickCount = 10;
         MonthlyPurchase += MasterManager.SettingMaster.PricePerGachaTenTimes;

diff --git a/Common/NumberUtility.cs b/Common/NumberUtility.cs
@@ -7,6 +7,11 @@ public static DateTime GetBaseDateTime()
         return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     }
 
+    public static bool IsApproximate(this float a, float b)
+    {
+        return Math.Abs(a - b) < float.Epsilon;
+    }
+
     public static float GetSecondsFromMilliseconds(float milliseconds)
     {
         return milliseconds / 1000f;

diff --git a/Events/GachaCommandPresenter.cs b/Events/GachaCommandPresenter.cs
@@ -17,15 +17,19 @@ protected override async Task MainAsync()
         await app.SaveChangesAsync();
     }
 
-    private async Task SendReplyAsync(User user, IReadOnlyList<RandomMessage?> results)
+    private async Task SendReplyAsync(User user, IReadOnlyList<GachaProbability?> results)
     {
         var builder = new StringBuilder();
         builder.AppendLine($"↓↓↓ いっそう{results.Count}連おみくじ ↓↓↓");
         foreach (var result in results)
         {
-            builder.AppendLine(result != null ? Format.Bold($"・{result.Content}") : Format.Code("x"));
+            builder.AppendLine(result != null
+                ? Format.Bold(
+                    $"・{result.RandomMessage?.Content ?? MessageConst.MissingMessage} ({result.Probability:P0})")
+                : Format.Code("x"));
         }
 
+        // 爆死してたら煽る
         if (results.All(x => x == null))
         {
             builder.AppendLine();

diff --git a/Events/GachaUtility.cs b/Events/GachaUtility.cs
@@ -8,8 +8,9 @@ public static class GachaUtility
     public static EmbedBuilder GetInfoEmbedBuilder()
     {
         var records = GachaManager.Instance.ReplyMessageTable
-            .OrderByDescending(x => x.Rate)
-            .Select(x => (x.Message.Content, x.Rate.ToString("P0")));
+            .OrderByDescending(x => x.Probability)
+            .Where(x => x.Probability.IsApproximate(0f) == false)
+            .Select(x => (x.RandomMessage?.Content ?? MessageConst.MissingMessage, x.Probability.ToString("P0")));
         return new EmbedBuilder()
             .WithTitle(
                 $"{IssoUtility.SmileStamp}{IssoUtility.SmileStamp}{IssoUtility.SmileStamp} 本日のいっそう {IssoUtility.SmileStamp}{IssoUtility.SmileStamp}{IssoUtility.SmileStamp}")

diff --git a/Events/InteractReplyPresenter.cs b/Events/InteractReplyPresenter.cs
@@ -11,7 +11,7 @@ protected override async Task MainAsync()
         var user = await app.FindOrCreateUserAsync(Message.Author.Id);
 
         var message = user.RollGachaOnceCertain();
-        await SendReplyAsync(message.Content);
+        await SendReplyAsync(message.RandomMessage?.Content ?? MessageConst.MissingMessage);
 
         await app.SaveChangesAsync();
     }

diff --git a/Events/MasterReloadPresenter.cs b/Events/MasterReloadPresenter.cs
@@ -16,9 +16,9 @@ protected override async Task MainAsync()
 
     private async Task UpdateGachaTableAsync()
     {
-        var beforeTable = GachaManager.Instance.ReplyMessageTable.Select(x => x.Message.Id).ToHashSet();
+        var beforeTable = GachaManager.Instance.ReplyMessageTable.Select(x => x.RandomMessageId).ToHashSet();
         GachaManager.Instance.RefreshMessageTable();
-        var afterTable = GachaManager.Instance.ReplyMessageTable.Select(x => x.Message.Id).ToHashSet();
+        var afterTable = GachaManager.Instance.ReplyMessageTable.Select(x => x.RandomMessageId).ToHashSet();
 
         // テーブルに差分がある場合は排出率を更新する
         var hasDiff = beforeTable.SetEquals(afterTable);

diff --git a/Events/MessageConst.cs b/Events/MessageConst.cs
@@ -0,0 +1,6 @@
+namespace Approvers.King.Events;
+
+public static class MessageConst
+{
+    public const string MissingMessage = "[不明なメッセージ]";
+}
diff --git a/Events/RareReplyPresenter.cs b/Events/RareReplyPresenter.cs
@@ -16,7 +16,7 @@ protected override async Task MainAsync()
         var message = user.RollGachaOnce();
         if (message != null)
         {
-            await SendReplyAsync(message.Content);
+            await SendReplyAsync(message.RandomMessage?.Content ?? MessageConst.MissingMessage);
         }
 
         await app.SaveChangesAsync();