features and bugs

CardSharp/GameComponents/Desk.cs

@@ -26,9 +26,10 @@ public class Desk : MessageSenderBase, IDesk, IEquatable<Desk>
 
         private ICommandParser _currentParser;
 
-        public Desk(string deskId)
+        public Desk(string deskId, string groupName = "DefaultGroupName")
         {
             DeskId = deskId;
+            GroupName = groupName;
             _currentParser = new WaitingParser();
             _standardParser = new StandardParser();
         }
@@ -64,6 +65,7 @@ public GameState State
         public List<Player> PlayerList => Players.ToList();
 
         public string DeskId { get; }
+        public string GroupName { get; }
 
         public Player LastSuccessfulSender { get; internal set; }
 
@@ -168,12 +170,13 @@ public static List<Card> GenerateCards()
             return list;
         }
 
-        public static Desk GetOrCreateDesk(string deskid)
+        public static Desk GetOrCreateDesk(string deskid, string groupName = "DefaultGroupName")
         {
+            var gname = groupName ?? "DefaultGroupName";
             if (Desks.ContainsKey(deskid))
                 return Desks[deskid];
 
-            var desk = new Desk(deskid);
+            var desk = new Desk(deskid, gname);
             Desks.Add(deskid, desk);
             return desk;
         }
@@ -283,7 +286,7 @@ private void SaveScore(Player p, int dif, Player playerWinner)
 #endif
         }
 
-        public void FinishGame(bool force = false)
+        public void FinishGame(bool force = true)
         {
             if (force) {
                 AddMessage("游戏结束.");
@@ -327,7 +330,7 @@ public void BoardcastDesks()
         {
             foreach (var pair in Desks.Where(desk => desk.Value.State == GameState.Gaming))
             {
-                AddMessageLine($"群{pair.Key}正在游戏中");
+                AddMessageLine($"群{pair.Value.GroupName}-{pair.Key}正在游戏中");
             }
         }
     }

CardSharp/GameComponents/Player.cs

@@ -12,7 +12,7 @@ public Player(string playerId)
 
         }
 
-        public static HashSet<Player> ForceSendPlayers => new HashSet<Player>();
+        public static List<Player> ForceSendPlayers => new List<Player>();
 
         public bool AutoPass { get; set; }
         public bool ForceSend { get; set; }
@@ -80,7 +80,7 @@ protected string RoleToString()
 
         public void SendCards(Desk desk)
         {
-            AddMessage($"{desk.DeskId} {Cards.ToFormatString()}");
+            AddMessage($"{desk.DeskId}-{desk.GroupName} {Cards.ToFormatString()}");
         }
     }
 

CardSharp/GameSteps/CommandParser.cs

@@ -71,7 +71,20 @@ private void ParsePlayerSubmitCard(Desk desk, Player player, string command)
                     }
                     else
                     {
-                        desk.AddMessage("你似乎不能出这些牌哟~");
+                        if (desk.CurrentRule != null)
+                        {
+                            var rule = Rules.Rules.FirstMatchRule(cardsCommand.ToCards());
+                            if (rule != null && rule != desk.CurrentRule) {
+                                desk.AddMessage($"你想出的牌匹配了规则{rule}，但是当前规则是{desk.CurrentRule}，所以你并不能出牌哟~~");
+                            } else {
+                                desk.AddMessage("你似乎不能出这些牌哟~");
+                            }
+                        }
+                        else
+                        {
+                            desk.AddMessage("你似乎不能出这些牌哟~");
+                        }
+
                     }
             }
         }

CardSharp/GameSteps/LandlordDiscuss.cs

@@ -120,6 +120,11 @@ public void Parse(Desk desk, Player player, string command)
             }
 
             if (_count >= 3) {
+                if (desk.SuddenDeathEnabled)
+                {
+                    Parse(desk, player, "抢");
+                    return;
+                }
                 desk.AddMessage("你们干嘛呢 我...我不干了!(╯‵□′)╯︵┻━┻");
                 desk.FinishGame();
             }

CardSharp/GameSteps/StandardParser.cs

@@ -28,6 +28,9 @@ public void Parse(Desk desk, Player player, string command)
 
             var pconfig = PlayerConfig.GetConfig(player);
             switch (command) {
+                case "所有游戏":
+                    desk.BoardcastDesks();
+                    break;
                 case "获取积分":
                     var px = DateTime.Now - pconfig.LastTime;
                     if (px.TotalSeconds.Seconds() > 12.Hours()) {
@@ -105,13 +108,13 @@ 带有[R]的命令 是正式功能，'一般'不会做更改
                         desk.FinishGame();
                         break;
                     case "玩家牌":
-                        Player.ForceSendPlayers.Add(player);
+                        if (!Player.ForceSendPlayers.Contains(player))
+                        {
+                            Player.ForceSendPlayers.Add(player);
+                        }
                         player.ForceSend = true;
                         player.AddMessage(string.Join(Environment.NewLine, desk.Players.Select(p => $"{p.PlayerId} {p.Cards.ToFormatString()}")));
                         break;
-                    case "所有游戏":
-                        desk.BoardcastDesks();
-                        break;
                 }
 
                 if (command.StartsWith("设置积分")) {

CardSharp/Rules/Rules.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Linq;
 using CardSharp.GameComponents;
 
@@ -54,6 +55,18 @@ public static bool IsCardsMatch(IEnumerable<Card> cards, Desk desk)
             return false;
         }
 
+        [Pure]
+        public static IRule FirstMatchRule(IEnumerable<Card> cards)
+        {
+            var cg = cards.ToListAndSort().ExtractCardGroups();
+            foreach (var rule in RulesList)
+                    if (rule.IsMatch(cg, null)) {
+                            return rule;
+                    }
+
+            return null;
+        }
+
         public static (bool exists, List<Card> cards) FirstMatch(Player player, Desk desk)
         {
             foreach (var rule in RulesList)

Origind.Card.Game/MahuaEvents/GroupMessageReceivedMahuaEvent1.cs

@@ -28,7 +28,8 @@ public void ProcessGroupMessage(GroupMessageReceivedContext context)
             var deskid = context.FromGroup;
             var playerid = context.FromQq;
             var message = context.Message;
-            var desk = Desk.GetOrCreateDesk(deskid);
+            var groupName = _mahuaApi.GetGroupsWithModel().Model.FirstOrDefault(g => g.Group == deskid)?.Name;
+            var desk = Desk.GetOrCreateDesk(deskid, groupName);
             desk.ParseCommand(playerid, message);
             desk.PlayerList.Where(player => player.Message != null && !(player is FakePlayer)).ToList().ForEach(player =>
             {