Merge lp:~wuntvor/mafiabot/deadlines into lp:mafiabot

[Matthias Schröder]

Merged deadlines.

[Matthias Schröder (wuntvor)]

review: Approve

=== modified file 'MafiaBotV2/Bot.cs'
--- MafiaBotV2/Bot.cs	2009-03-27 11:16:13 +0000
+++ MafiaBotV2/Bot.cs	2009-05-02 09:56:08 +0000
@@ -6,6 +6,7 @@
 using MafiaBotV2.Network;
 using MafiaBotV2.Network.Irc;
 using MafiaBotV2.Network.File;
+using MafiaBotV2.Util;
 
 namespace MafiaBotV2
 {
@@ -59,6 +60,7 @@
 
         public void Run() {
             while (net.ProcessMessage()) {
+                Scheduler.Instance.Execute();
                 System.Threading.Thread.Sleep(1);
             }
         }

=== modified file 'MafiaBotV2/MafiaBotV2.csproj'
--- MafiaBotV2/MafiaBotV2.csproj	2009-04-13 21:21:56 +0000
+++ MafiaBotV2/MafiaBotV2.csproj	2009-05-02 10:03:48 +0000
@@ -76,6 +76,7 @@
     <Compile Include="GameManager.cs" />
     <Compile Include="IGame.cs" />
     <Compile Include="ICommand.cs" />
+    <Compile Include="MafiaGame\Commands\DeadlineCommand.cs" />
     <Compile Include="MafiaGame\Commands\FactionCommand.cs" />
     <Compile Include="MafiaGame\Commands\ModkillCommand.cs" />
     <Compile Include="MafiaGame\Commands\PowerCommand.cs" />
@@ -140,6 +141,7 @@
     <Compile Include="Util\Huffman.cs" />
     <Compile Include="Util\ListFormatter.cs" />
     <Compile Include="Util\ListShuffle.cs" />
+    <Compile Include="Util\Scheduler.cs" />
     <Compile Include="Util\Tree\ComplexSubtree.cs" />
     <Compile Include="Util\Tree\ComplexTree.cs" />
     <Compile Include="Util\Tree\ComplexTreeNode.cs" />

=== added file 'MafiaBotV2/MafiaGame/Commands/DeadlineCommand.cs'
--- MafiaBotV2/MafiaGame/Commands/DeadlineCommand.cs	1970-01-01 00:00:00 +0000
+++ MafiaBotV2/MafiaGame/Commands/DeadlineCommand.cs	2009-05-02 14:25:01 +0000
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MafiaBotV2.Util;
+
+namespace MafiaBotV2.MafiaGame.Commands
+{
+    class DeadlineCommand : ICommand
+    {
+        #region ICommand Members
+
+        public string Name {
+            get { return "deadline"; }
+        }
+
+        public bool AllowedInPublic {
+            get { return true; }
+        }
+
+        MafiaGame game;
+
+        public object Parent {
+            get { return game; }
+        }
+
+        public DeadlineCommand(MafiaGame game) {
+            this.game = game;
+        }
+
+        public string Execute(MafiaBotV2.Network.NetUser from, MafiaBotV2.Network.NetObject source, string[] args) {
+            if(args.Length == 0) {
+                return "Syntax: ##deadline <seconds>";
+            }
+
+            if(from != game.Creator) {
+                return "Only the creator can set deadlines.";
+            }
+
+            DateTime executionTime = DateTime.Now.AddSeconds(Int32.Parse(args[0]));
+            game.SetDeadline(executionTime);
+            return null;
+        }
+
+        #endregion
+    }
+}

=== modified file 'MafiaBotV2/MafiaGame/MafiaGame.cs'
--- MafiaBotV2/MafiaGame/MafiaGame.cs	2009-04-13 21:15:12 +0000
+++ MafiaBotV2/MafiaGame/MafiaGame.cs	2009-05-02 14:25:01 +0000
@@ -70,12 +70,38 @@
             }
             
             Channel.SetTopic(topic);
+
+            if(e.NewPhase.Type == PhaseType.Night) {
+                SetDeadline(DateTime.Now.AddSeconds(120));
+            }
         }
 
         void OnGameOver(object sender, GameOverEventArgs e) {
             Games.Destroy(this);
         }
 
+        public void SetDeadline(DateTime executionTime) {
+            Scheduler.Instance.QueueTask(this, executionTime, new ScheduledTaskHandler(ExecuteTask));
+
+            TimeSpan duration = executionTime - DateTime.Now;
+            if (duration.TotalSeconds > 10) {
+                Scheduler.Instance.QueueTask(this, executionTime.Subtract(new TimeSpan(0, 0, 10)), new ScheduledTaskHandler(Warn), "10");
+                if (duration.TotalSeconds > 60) {
+                    Scheduler.Instance.QueueTask(this, executionTime.Subtract(new TimeSpan(0, 1, 0)), new ScheduledTaskHandler(Warn), "60");
+                }
+            }
+
+            Channel.SendMessage("Deadline set in " + duration.Minutes + ":" + duration.Seconds.ToString("00"));
+        }
+
+        private void Warn(Scheduler scheduler, object[] args) {
+            this.Channel.SendMessage("Deadline in " + args[0] + " seconds.");
+        }
+
+        private void ExecuteTask(Scheduler scheduler, object[] args) {
+            this.Village.Phase.End();
+        }
+
         public override void Start() {
             if (Players.Any(p => p.Name.ToLower() == "nolynch")) {
                 this.RemoveUser(Players.Find(p => p.Name.ToLower() == "nolynch"));
@@ -138,6 +164,7 @@
             if (State != GameState.Forming) {
                 ShowRoles();
             }
+            Scheduler.Instance.RemoveAll(this);
 
             base.Destroy();
         }
@@ -164,6 +191,7 @@
                     if(user == Creator) {
                         this.Creator.Commands.Add(new Commands.ReplaceCommand(this));
                         this.Creator.Commands.Add(new Commands.ModkillCommand(this));
+                        this.Creator.Commands.Add(new Commands.DeadlineCommand(this));
                     }
                     break;
             }

=== modified file 'MafiaBotV2/Network/NetObject.cs'
--- MafiaBotV2/Network/NetObject.cs	2009-05-01 18:53:35 +0000
+++ MafiaBotV2/Network/NetObject.cs	2009-05-02 14:25:01 +0000
@@ -29,7 +29,7 @@
         }
 
         protected virtual string CommandPrefix {
-            get { return "++"; }
+            get { return "##"; }
         }
 
         public abstract void SendMessage(string text);

=== added file 'MafiaBotV2/Util/Scheduler.cs'
--- MafiaBotV2/Util/Scheduler.cs	1970-01-01 00:00:00 +0000
+++ MafiaBotV2/Util/Scheduler.cs	2009-05-02 14:25:01 +0000
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MafiaBotV2.Util
+{
+    delegate void ScheduledTaskHandler(Scheduler sender, object[] args);
+
+    class Scheduler
+    {
+        List<Task> tasks;
+
+        private Scheduler() {
+            tasks = new List<Task>();
+        }
+
+        public void Execute() {
+            List<Task> readyTasks = tasks.FindAll(task => DateTime.Now > task.Time);
+            foreach(Task task in readyTasks) {
+                task.Handler.Invoke(this, task.Args);
+            }
+            tasks.RemoveAll(task => readyTasks.Contains(task));
+
+        }
+
+        public void QueueTask(DateTime time, ScheduledTaskHandler task) {
+            QueueTask(null, time, task);
+        }
+
+        public void QueueTask(object key, DateTime time, ScheduledTaskHandler task, params object[] args) {
+            Task item = new Task(key, time, task, args);
+            tasks.Add(item);
+        }
+
+        public void RemoveAll(object key) {
+            tasks.RemoveAll(task => task.Key == key);
+        }
+
+        public void Clear() {
+            tasks.Clear();
+        }
+
+        #region Scheduler Singleton
+        public static Scheduler Instance {
+            get {
+                return NestedScheduler.instance;
+            }
+        }
+
+        class NestedScheduler
+        {
+            // Explicit static constructor to tell C# compiler
+            // not to mark type as beforefieldinit
+            static NestedScheduler() {
+            }
+
+            internal static readonly Scheduler instance = new Scheduler();
+        }
+        #endregion
+
+        class Task
+        {
+            DateTime time;
+            public System.DateTime Time {
+                get { return time; }
+            }
+            ScheduledTaskHandler handler;
+            public MafiaBotV2.Util.ScheduledTaskHandler Handler {
+                get { return handler; }
+            }
+            object[] args;
+            public object[] Args {
+                get { return args; }
+            }
+            object key;
+            public object Key {
+                get { return key; }
+            }
+
+            public Task(object key, DateTime time, ScheduledTaskHandler task, object[] args) {
+                this.key = key;
+                this.time = time;
+                this.handler = task;
+                this.args = args;
+            }
+        }
+    }
+}

=== modified file 'MafiaRun/input/awesome.txt'
--- MafiaRun/input/awesome.txt	2009-04-13 13:55:29 +0000
+++ MafiaRun/input/awesome.txt	2009-05-02 14:25:01 +0000
@@ -4,5 +4,6 @@
 A:join #mafia_test
 0:say #mafia_test ##variant awesome
 0:say #mafia_test ##start
+0:say #mafia_test ##deadline 0
 1:say #mafia_test ##shoot bot2
 3:say #mafia_test ##shoot bot6
\ No newline at end of file