From 86eb4b031be5fb6ae05debe859b7b3c58d7b5d45 Mon Sep 17 00:00:00 2001
From: YoumuKon <38815081+YoumuKon@users.noreply.github.com>
Date: Wed, 5 Jun 2024 23:31:54 +0800
Subject: [PATCH 1/3] fix

---
 lua/server/events/hp.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/server/events/hp.lua b/lua/server/events/hp.lua
index 924a21d..b88d3d1 100644
--- a/lua/server/events/hp.lua
+++ b/lua/server/events/hp.lua
@@ -121,12 +121,14 @@ function Damage:main()
   local room = self.room
   local logic = room.logic
 
-  if not damageStruct.chain and logic:damageByCardEffect(not not damageStruct.from) then
+  if not damageStruct.chain and logic:damageByCardEffect(false) then
     local cardEffectData = logic:getCurrentEvent():findParent(GameEvent.CardEffect)
     if cardEffectData then
       local cardEffectEvent = cardEffectData.data[1]
       damageStruct.damage = damageStruct.damage + (cardEffectEvent.additionalDamage or 0)
-      damageStruct.by_user = true
+      if damageStruct.from and cardEffectData.from == damageStruct.from.id then
+        damageStruct.by_user = true
+      end
     end
   end
 
-- 
Gitee


From 6918fb4878db1f666ee3403562d43a3df362ec0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E5=A6=96=E6=A2=A6=E5=8E=A8?=
 <12796194+youmuKon-supreme@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 00:03:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AA=E7=94=B5fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 standard_cards/init.lua | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/standard_cards/init.lua b/standard_cards/init.lua
index 4a3a94d..54c1666 100644
--- a/standard_cards/init.lua
+++ b/standard_cards/init.lua
@@ -723,7 +723,16 @@ local lightningSkill = fk.CreateActiveSkill{
     local nextp = to
     repeat
       nextp = nextp:getNextAlive(true)
-      if nextp == to then break end
+      if nextp == to then
+        if nextp:isProhibited(nextp, effect.card) then
+          room:moveCards{
+            ids = room:getSubcardsByRule(effect.card, { Card.Processing }),
+            toArea = Card.DiscardPile,
+            moveReason = fk.ReasonPut
+          }
+        end
+        break
+      end
     until not nextp:hasDelayedTrick("lightning") and not nextp:isProhibited(nextp, effect.card)
 
 
-- 
Gitee


From 016d80db971bf23d58de0cf52460c2773f09f6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E5=A6=96=E6=A2=A6=E5=8E=A8?=
 <12796194+youmuKon-supreme@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 16:58:00 +0800
Subject: [PATCH 3/3] fix

---
 standard_cards/init.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/standard_cards/init.lua b/standard_cards/init.lua
index 54c1666..72f6a8f 100644
--- a/standard_cards/init.lua
+++ b/standard_cards/init.lua
@@ -730,6 +730,7 @@ local lightningSkill = fk.CreateActiveSkill{
             toArea = Card.DiscardPile,
             moveReason = fk.ReasonPut
           }
+          return
         end
         break
       end
-- 
Gitee