Promised nothing is forgotten this time (#130)

* AutoCommand update 1/2

* AutoCommands Update 2/2

* Few forgotten things

Essentials/AutoCommand.cs

@@ -25,26 +25,28 @@ public class AutoCommand : ViewModel
         private DateTime _nextRun = DateTime.MinValue;
         private DayOfWeek _day = DayOfWeek.All;
         private Trigger _trigger = Trigger.Disabled;
+        private Gtl _comparer = Gtl.LessThan;
         private int _currentStep;
         private string _name;
         private float _triggerRatio;
         private double _triggerCount;
 
-        /*
-        [Display(Description = "Enables or disables this command. NOTE: !admin runauto does NOT respect this setting!")]
-        public bool Enabled
-        {
-            get => _enabled;
-            set => SetValue(ref _enabled, value);
-        }
-        */
+
         [Display(Name = "Trigger", Description ="Choose a trigger for the command")]
         public Trigger CommandTrigger
         {
             get => _trigger;
             set => SetValue(ref _trigger, value);
         }
 
+        [Display(Name = "Trigger Operator", Description ="Choose a Ratio Comparer for the command")]
+        public Gtl Compare
+        {
+            get => _comparer;
+            set => SetValue(ref _comparer, value);
+        }
+
+
         [Display(Description = "Sets the name of this command. Use this name in conjunction with !admin runauto to trigger the command from ingame or from other auto commands.")]
         public string Name
         {
@@ -120,13 +122,19 @@ public void Update()
             if (DateTime.Now < _nextRun)
                 return;
 
-            if(CommandTrigger == Trigger.Scheduled && Interval == TimeSpan.Zero.ToString())
-                if (DayOfWeek != DayOfWeek.All && DateTime.Now.DayOfWeek != (System.DayOfWeek)(int)DayOfWeek)
-                {
+            switch (CommandTrigger)
+            {
+                case Trigger.GridCount:
+                case Trigger.SimSpeed:
+                case Trigger.PlayerCount:
+                    RunNow();
+                    _nextRun = DateTime.Now + _interval;
+                    return;
+                case Trigger.Scheduled when Interval == TimeSpan.Zero.ToString() && DayOfWeek != DayOfWeek.All && DateTime.Now.DayOfWeek != (System.DayOfWeek)(int)DayOfWeek:
                     //adding one day because I can't be bothered to calculate exact interval
                     _nextRun += TimeSpan.FromDays(1);
                     return;
-                }
+            }
 
 
             if (Steps.Count <= 0)
@@ -140,11 +148,9 @@ public void Update()
 
             if (_currentStep < Steps.Count) return;
             _currentStep = 0;
-            if(CommandTrigger == Trigger.Scheduled && Interval == TimeSpan.Zero.ToString())
-                _nextRun = DateTime.Now.Date + _scheduledTime + TimeSpan.FromDays(1);
-            else if((CommandTrigger != Trigger.Disabled || CommandTrigger != Trigger.Vote) && Interval != TimeSpan.Zero.ToString())
-
-                _nextRun = DateTime.Now + _interval;
+            _nextRun = _scheduledTime != TimeSpan.Zero
+                    ? DateTime.Now.Date + _scheduledTime + TimeSpan.FromDays(1)
+                    : _nextRun = DateTime.Now + _interval;
         }
 
 
@@ -210,6 +216,13 @@ public override string ToString()
             return $"{Name} : {_trigger.ToString()} : {Steps.Count}";
         }
     }
+
+    public enum Gtl
+    {
+        LessThan,
+        GreaterThan,
+        Equal
+    }
 
     public enum Trigger
     {

Essentials/AutoCommands.cs

@@ -10,7 +10,9 @@
 using Sandbox.Game.World;
 using Sandbox.Game.Multiplayer;
 using Sandbox.Game.Entities;
+using Sandbox.ModAPI;
 using VRage.Game.ModAPI;
+using static Essentials.Gtl;
 
 
 namespace Essentials
@@ -23,6 +25,8 @@ public class AutoCommands : IDisposable
         public static AutoCommands Instance => _instance ?? (_instance = new AutoCommands());
         private static readonly Logger Log = LogManager.GetLogger("Essentials");
         private Timer _timer;
+        private readonly Dictionary<AutoCommand,DateTime> _simSpeedCheck  = new Dictionary<AutoCommand, DateTime>();
+
 
         public void Start()
         {
@@ -39,24 +43,81 @@ private bool CanRun(AutoCommand command)
                 case Trigger.Disabled:
                     return  false;
                 case Trigger.OnStart:
-                    var a = Math.Max(TimeSpan.Parse(command.Interval).TotalSeconds, 60);
-                    var b = ((ITorchServer)TorchBase.Instance).ElapsedPlayTime;
-                    if  ((a - b.TotalSeconds) <= 1 && (a - b.TotalSeconds > 0))
-                        command.RunNow();
-                    break;
+                    return Math.Abs((MyAPIGateway.Session.ElapsedPlayTime - TimeSpan.Parse(command.Interval))
+                               .TotalSeconds) < 1;
                 case Trigger.Vote:
                     break;
                 case Trigger.Timed:
                     return true;
                 case Trigger.Scheduled:
                     return true;
                 case Trigger.GridCount:
-                        return Tree.Grids.Count >= command.TriggerCount;
+                    var gridCount = MyEntities.GetEntities().OfType<IMyCubeGrid>().Count();
+                    switch (command.Compare)
+                    {
+                        case GreaterThan:
+                            return gridCount > command.TriggerCount;
+                        case LessThan:
+                            return gridCount < command.TriggerCount;
+                        case Equal:
+                            return Math.Abs(gridCount-command.TriggerCount)<1;
+                        default:
+                            throw new Exception("meh");
+                    }
                 case Trigger.PlayerCount:
-                    return MySession.Static.Players.GetOnlinePlayerCount() >= command.TriggerCount;
+                    switch (command.Compare)
+                    {
+                        case GreaterThan:
+                            return MySession.Static.Players.GetOnlinePlayerCount() >= command.TriggerCount;
+                        case LessThan:
+                            return MySession.Static.Players.GetOnlinePlayerCount() <= command.TriggerCount;
+                        default:
+                            throw new Exception("meh");
+                    }
+
                 case Trigger.SimSpeed:
-                    return Math.Min(Sync.ServerSimulationRatio, 1) <= command.TriggerRatio;
+                    var commandActive = _simSpeedCheck.TryGetValue(command, out var time);
+                    switch (command.Compare)
+                    {
+                        case GreaterThan:
+                            if (commandActive)
+                            {
+                                if ((DateTime.Now - time).TotalSeconds < command.TriggerCount) break;
+                                _simSpeedCheck.Remove(command);
+                                return Math.Min(Sync.ServerSimulationRatio, 1) > command.TriggerRatio;
+                            }
+
+                            if (Math.Min(Sync.ServerSimulationRatio, 1) < command.TriggerRatio) break;
+                            _simSpeedCheck.Add(command, DateTime.Now);
+                            break;
+
+                        case LessThan:
+                            if (commandActive)
+                            {
+                                if ((DateTime.Now - time).TotalSeconds < command.TriggerCount) break;
+                                _simSpeedCheck.Remove(command);
+                                return Math.Min(Sync.ServerSimulationRatio, 1) < command.TriggerRatio;
+                            }
+
+                            if (Math.Min(Sync.ServerSimulationRatio, 1) > command.TriggerRatio) break;
+                            _simSpeedCheck.Add(command, DateTime.Now);
+                            break;
+
+                        case Equal:
+                            if (commandActive)
+                            {
+                                if ((DateTime.Now - time).TotalSeconds < command.TriggerCount) break;
+                                _simSpeedCheck.Remove(command);
+                                return (Math.Abs(Sync.ServerSimulationRatio - command.TriggerRatio) <= 0);
+                            }
 
+                            if (Math.Abs(Sync.ServerSimulationRatio - command.TriggerRatio)>0)
+                                break;
+                            _simSpeedCheck.Add(command, DateTime.Now);
+                            break;
+                       }
+                       break;
+
                 default:
                     throw new Exception("fuck it");
             }