Merge branch 'master' of https://github.com/Cyl18/CardSharp

Cyl18 · May 4, 2018 · 39b8d94 · 39b8d94
2 parents 390398a + f6c438d
commit 39b8d94
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/CardSharp/GameSteps/CommandParser.cs b/CardSharp/GameSteps/CommandParser.cs
@@ -184,15 +184,10 @@ private bool ParseStandardCommand(Desk desk, Player player, string command)
                         desk.PlayerList.Select(p => $"{p.ToAtCodeWithRole()}: {p.Cards.Count}")));
                     return true;
 
-                case "弃牌":
-                    if (desk.Players.Count(p => p is FakePlayer) == 2)
-                    {
-                        desk.AddMessage("你觉得这样好玩么?");
-                        return true;
-                    }
-                    player.GiveUp = true;
-                    desk.AddMessage("弃牌成功");
-                    return true;
+                //case "弃牌":
+                    //player.GiveUp = true;
+                    //desk.AddMessage("弃牌成功");
+                    //return true;
 
                 case "托管":
                     if (desk.Players.Count(p => p is FakePlayer) == 2)

diff --git a/CardSharp/GameSteps/WaitingParser.cs b/CardSharp/GameSteps/WaitingParser.cs
@@ -15,6 +15,8 @@ public void Parse(Desk desk, Player player, string command)
                     var point = PlayerConfig.GetConfig(player).Point;
                     if (point <= -100000)
                         desk.AddMessage($"CNM 这里是CY 你们的印钞厂停业了.");
+                    else if (point <= 0)
+                        desk.AddMessage("您输光了/您没输入过‘获取积分’.");
                     else
                         desk.AddPlayer(player);
                     break;
@@ -52,6 +54,15 @@ public void Parse(Desk desk, Player player, string command)
                 if (desk.PlayerList.Count == 3)
                     desk.Start(seed);
             }
+            if (command.StartsWith("表演开屎") && PlayerConfig.GetConfig(player).IsAdmin){
+                if (desk.Players.Any()){
+                    desk.AddMessage("有玩家了不可以使用.");
+                    return;
+                }
+
+                for(int i = 0; i < 3; i++) desk.AddPlayer(new FakePlayer(desk));
+                desk.Start();
+            }
         }
     }
-}
+}