Special Delivery...Again

Essentials/AutoCommand.cs

@@ -27,8 +27,7 @@ public class AutoCommand : ViewModel
         private Trigger _trigger = Trigger.Disabled;
         private int _currentStep;
         private string _name;
-        private bool _enabled;
-        private float _ratio;
+        private float _triggerRatio;
         private double _triggerCount;
 
         /*
@@ -88,10 +87,10 @@ public string Interval
         }
 
         [Display(Name = "Trigger Ratio", Description = "Ratio for Sim Speed and Vote Triggers. 0.5 is equivalent to 50%")]
-        public float Ratio
+        public float TriggerRatio
         {
-            get => _ratio;
-            set => SetValue(ref _ratio, Math.Min(Math.Max(value, 0), 1));
+            get => _triggerRatio;
+            set => SetValue(ref _triggerRatio, Math.Min(Math.Max(value, 0), 1));
 
         }
         [Display(Name = "Trigger Count", Description = "Only use with")]
@@ -101,28 +100,6 @@ public double TriggerCount
             set => SetValue(ref _triggerCount, Math.Max(0, value));
 
         }
-        /*
-        [Display(Description = "Adds voting option to this command.  NOTE: A successful vote will activate this command")]
-        public bool Votable
-        {
-            get => _votable;
-            set => SetValue(ref _votable, value);
-        }
-
-        [Display(Name = "Vote Duration", Description = "Sets the duration for the vote. NOTE: Make sure to check the votable box to activate. Format is HH:MM:SS.")]
-        public string VoteDuration
-        {
-            get => _voteDuration.ToString();
-            set => SetValue(ref _voteDuration, TimeSpan.Parse(value));
-        }
-
-        [Display(Name = "Vote Percentage", Description = "Sets the percentage Yes vote needed for the command to activate. NOTE: This only works if the votable box is checked")]
-        public int Percentage
-        {
-            get => _votepercentage;
-            set => SetValue(ref _votepercentage, Math.Min(Math.Max(value, 0), 100));
-        }
-        */
 
         [Display(Name = "Day of week", GroupName = "Schedule", Description = "Combined with Scheduled Time, will run the command on the given day of the week at the set time.")]
         public DayOfWeek DayOfWeek
@@ -243,7 +220,8 @@ public enum Trigger
         Vote,
         PlayerCount,
         GridCount,
-        SimSpeed
+        SimSpeed,
+        OnStart
     }
 
     public enum DayOfWeek

Essentials/AutoCommands.cs

@@ -4,8 +4,10 @@
 using System.Text;
 using System.Timers;
 using NLog;
-using Torch.ViewModels;
+using Torch;
+using Torch.API;
 using Sandbox.Game.World;
+using Sandbox.Game.Multiplayer;
 using Sandbox.Game.Entities;
 using VRage.Game.ModAPI;
 
@@ -17,7 +19,6 @@ public class AutoCommands : IDisposable
         private static AutoCommands _instance;
         public static AutoCommands Instance => _instance ?? (_instance = new AutoCommands());
         private static readonly Logger Log = LogManager.GetLogger("Essentials");
-
         private Timer _timer;
 
         public void Start()
@@ -28,66 +29,19 @@ public void Start()
             _timer.Start();
         }
 
-       /* public void RunChecks()
+        public void RunOnStart()
         {
             foreach (var command in EssentialsPlugin.Instance.Config.AutoCommands)
             {
-                switch (command.CommandTrigger)
+                if (command.CommandTrigger != Trigger.OnStart)
+                    return;
+                else if(command.CommandTrigger == Trigger.OnStart)
                 {
-                    case Trigger.SimSpeed:
-                        {
-                            if (MySession.Static.SessionSimSpeedServer <= command.Ratio)
-                                try
-                                {
-                                    command.Update();
-                                }
-                                catch (Exception ex)
-                                {
-                                    Log.Error(ex, "Error encountered during autocommand update!");
-                                }
-                        }
-                        break;
-                    case Trigger.PlayerCount:
-                        {
-                            if (MySession.Static.Players.GetOnlinePlayerCount() >= command.TriggerCount)
-                                try
-                                {
-                                    command.Update();
-                                }
-                                catch (Exception ex)
-                                {
-                                    Log.Error(ex, "Error encountered during autocommand update!");
-                                }
-                            break;
-                        }
-                    case Trigger.GridCount:
-                        {
-                            int gridCount = 0;
-                            foreach (var e in MyEntities.GetEntities())
-                            {
-                                if(e is IMyCubeGrid)
-                                    gridCount++;
-                            }
-                            if (gridCount >= command.TriggerCount)
-                            {
-                                try
-                                {
-                                    command.Update();
-                                }
-                                catch (Exception ex)
-                                {
-                                    Log.Error(ex, "Error encountered during autocommand update!");
-                                }
-                            }
-                            break;
-                        }
-                    default:
-                        break;
+                    if(TimeSpan.Parse(command.Interval) == ((ITorchServer)TorchBase.Instance).ElapsedPlayTime)
+                        command.RunNow();
                 }
             }
-
-        }*/
-
+        }
         private bool CanRun(AutoCommand command)
         {
             switch (command.CommandTrigger)
@@ -113,16 +67,18 @@ private bool CanRun(AutoCommand command)
                         return true;
                     else return false;
                 case Trigger.SimSpeed:
-                    if (MySession.Static.SessionSimSpeedServer <= command.Ratio)
+                    if (Math.Min(Sync.ServerSimulationRatio, 1) <= command.TriggerRatio)
                         return true;
                     else
                         return false;
 
             }
         }
 
-            private void TimerElapsed(object sender, ElapsedEventArgs e)
+
+        private void TimerElapsed(object sender, ElapsedEventArgs e)
         {
+            RunOnStart();
             foreach (var command in EssentialsPlugin.Instance.Config.AutoCommands)
             {
                 if(!CanRun(command))

Essentials/Commands/VotingModule.cs

@@ -239,14 +239,14 @@ private IEnumerable VoteCountdown(TimeSpan time)
                     double vr = ((_voteReg.Count / MySession.Static.Players.GetOnlinePlayerCount()) * 100);
                     Task.Delay(5000).ContinueWith(_ =>
                     {
-                        if (vr >= command.Ratio)
+                        if (vr >= command.TriggerRatio)
                         {
                             Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
                                 .SendMessageAsSelf($"Vote for {voteInProgress} is successful");
                             voteResult = Status.voteSuccess;
                             command.RunNow();
                         }
-                        else if (vr < command.Ratio)
+                        else if (vr < command.TriggerRatio)
                         {
                             Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
                                 .SendMessageAsSelf($"Vote for {voteInProgress} failed");

Essentials/EssentialsPlugin.cs

@@ -91,8 +91,7 @@ private void SessionChanged(ITorchSession session, TorchSessionState state)
                                                    _control.IsEnabled = true;
                                                    _control.DataContext = Config;
                                                });
-                    Task.Delay(10000).ContinueWith(_ =>
-                    AutoCommands.Instance.Start());
+                    AutoCommands.Instance.Start();
                     InfoModule.Init();
                     break;
                 case TorchSessionState.Unloading: