From 26509a08392d6d30c638d26c388c963664f9add7 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Wed, 30 Apr 2025 01:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87=E5=9B=9E=E5=A4=8D=E8=8D=AF?=
 =?UTF-8?q?=E6=B2=BB=E7=96=97=E9=87=8F=EF=BC=9B=E6=AD=BB=E4=BA=A1=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E8=A2=AB=E5=B8=A6=E5=85=A5=E6=88=98=E6=96=97=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86=E6=97=A0=E6=B3=95=E8=A1=8C=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OshimaModules/Items/Consumable/回复药.cs    |  6 +++---
 OshimaServers/Service/FunGameActionQueue.cs | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/OshimaModules/Items/Consumable/回复药.cs b/OshimaModules/Items/Consumable/回复药.cs
index 1011b83..262bd08 100644
--- a/OshimaModules/Items/Consumable/回复药.cs
+++ b/OshimaModules/Items/Consumable/回复药.cs
@@ -76,7 +76,7 @@ namespace Oshima.FunGame.OshimaModules.Items
         public override string Name => "小回复药";
         public override string Description => Skills.Active?.Description ?? "";
         public override QualityType QualityType => QualityType.White;
-        public double HP { get; set; } = 300;
+        public double HP { get; set; } = 600;
 
         public 小回复药(User? user = null, int remainUseTimes = 1) : base(ItemType.Consumable)
         {
@@ -96,7 +96,7 @@ namespace Oshima.FunGame.OshimaModules.Items
         public override string Name => "中回复药";
         public override string Description => Skills.Active?.Description ?? "";
         public override QualityType QualityType => QualityType.Green;
-        public double HP { get; set; } = 700;
+        public double HP { get; set; } = 1800;
 
         public 中回复药(User? user = null, int remainUseTimes = 1) : base(ItemType.Consumable)
         {
@@ -116,7 +116,7 @@ namespace Oshima.FunGame.OshimaModules.Items
         public override string Name => "大回复药";
         public override string Description => Skills.Active?.Description ?? "";
         public override QualityType QualityType => QualityType.Blue;
-        public double HP { get; set; } = 1500;
+        public double HP { get; set; } = 3000;
 
         public 大回复药(User? user = null, int remainUseTimes = 1) : base(ItemType.Consumable)
         {
diff --git a/OshimaServers/Service/FunGameActionQueue.cs b/OshimaServers/Service/FunGameActionQueue.cs
index 9a2dd29..6685ace 100644
--- a/OshimaServers/Service/FunGameActionQueue.cs
+++ b/OshimaServers/Service/FunGameActionQueue.cs
@@ -32,6 +32,14 @@ namespace Oshima.FunGame.OshimaServers.Service
                 // 创建顺序表并排序
                 ActionQueue actionQueue = new(characters, false, WriteLine);
                 actionQueue.SetCharactersToAIControl(false, characters);
+                foreach (Character dead in characters)
+                {
+                    if (dead.HP <= 0)
+                    {
+                        actionQueue.Queue.Remove(dead);
+                        actionQueue.Eliminated.Add(dead);
+                    }
+                }
                 ActionQueue = actionQueue;
                 if (PrintOut) Console.WriteLine();
 
@@ -242,6 +250,14 @@ namespace Oshima.FunGame.OshimaServers.Service
                         MaxScoreToWin = maxScoreToWin
                     };
                     actionQueue.SetCharactersToAIControl(false, characters);
+                    foreach (Character dead in characters)
+                    {
+                        if (dead.HP <= 0)
+                        {
+                            actionQueue.Queue.Remove(dead);
+                            actionQueue.Eliminated.Add(dead);
+                        }
+                    }
                     ActionQueue = actionQueue;
                     if (PrintOut) Console.WriteLine();