From fd768743e05f358712f623f6979320aa97aadbf6 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 12 Mar 2021 11:39:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=83=E7=89=8C=E8=A7=84?=
 =?UTF-8?q?=E5=88=99,=20=E5=8F=AF=E4=BB=A5=E5=90=83=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E5=BC=A0=E5=8D=95=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/DiscardCommand.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index 72ab266..3f0862c 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -79,7 +79,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
         })
         return
       }
-      if (this.state.cards.size > 1) {
+      if (this.state.cards.size > 1 || this.state.cards.size == 0) {
         this.room.send(client, 'discard_card_s2c', {
           errcode: 6,
           errmsg: '不符合吃牌规则'
@@ -104,6 +104,9 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
         })
         return
       }
+      for (let [key, val] of this.state.cards) {
+        this.state.cards.delete(key)
+      }
     } else {
       if (!gameUtil.checkDiscard(tmpCards, new GameEnv().selfEatCount)) {
         this.room.send(client, 'discard_card_s2c', {
@@ -112,9 +115,6 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
         })
         return
       }
-      for (let [key, val] of this.state.cards) {
-        this.state.cards.delete(key)
-      }
     }
 
 
@@ -122,10 +122,17 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
     stopDrawCardClock(this.room, player)
 
     for (let card of tmpCards) {
-      this.state.cards.set(card.id + '', card)
       player.cardQueue.push(card)
       gameUtil.deleteCardFromPlayer(player, card.id)
     }
+    // 如果当前出的牌只有一张, 且是法术牌或者随从牌, 则替换state.cards中的牌
+    if (tmpCards.length == 1 && (tmpCards[0].type == CardType.general || tmpCards[0].type == CardType.variable_unit)) {
+      for (let [key, val] of this.state.cards) {
+        this.state.cards.delete(key)
+      }
+      let card = tmpCards[0]
+      this.state.cards.set(card.id + '', card)
+    }
     /**
      * 这说明是当前轮正常出牌,
      * 如果出一张牌的话, 进入胡牌轮
@@ -138,7 +145,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
     })
     const singleEat = !!this.state.rules.get(RULE_SINGLEEAT)
     if (cards.length === 1
-      && !(singleEat && tmpCards.length == 1 && (tmpCards[0].type == 1 || tmpCards[0].type == 11))) {
+      && !(singleEat && tmpCards.length == 1 && (tmpCards[0].type == CardType.general || tmpCards[0].type == CardType.variable_unit))) {
       let cardArr: Card[] = [...this.state.cards.values()]
       let time = this.room.battleMan.onCardDiscarded(player, cardArr[0])
       await this.delay(time)