rename TimeBase -> DaylightCycleDescriptor

Author: pandinocoder

Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs

@@ -61,7 +61,7 @@ public enum GameObjectType
     [GameObjectInfo(typeof(TilesetDescriptor), "tilesets")]
     Tileset,
 
-    [GameObjectInfo(typeof(TimeBase), "")]
+    [GameObjectInfo(typeof(DaylightCycleDescriptor), "")]
     Time,
 
     [GameObjectInfo(typeof(GuildVariableDescriptor), "guild_variables")]

…t.Framework.Core/GameObjects/TimeBase.cs …DaylightCycle/DaylightCycleDescriptor.csFramework/Intersect.Framework.Core/GameObjects/TimeBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/DaylightCycle/DaylightCycleDescriptor.cs Framework/Intersect.Framework.Core/GameObjects/TimeBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/DaylightCycle/DaylightCycleDescriptor.cs

@@ -3,14 +3,14 @@
 
 namespace Intersect.GameObjects;
 
-public partial class TimeBase
+public partial class DaylightCycleDescriptor
 {
-    private static TimeBase sTimeBase = new();
-
+    public static DaylightCycleDescriptor Instance { get; set; } = new();
+    
     [NotMapped]
     public Color[]? DaylightHues { get; set; }
 
-    public TimeBase()
+    public DaylightCycleDescriptor()
     {
         ResetColors();
     }
@@ -44,7 +44,7 @@ public string GetInstanceJson()
 
     public static string GetTimeJson()
     {
-        return JsonConvert.SerializeObject(sTimeBase);
+        return JsonConvert.SerializeObject(Instance);
     }
 
     public void ResetColors()
@@ -121,14 +121,4 @@ public static int GetTimeInterval(int index)
 
         return 5;
     }
-
-    public static void SetStaticTime(TimeBase time)
-    {
-        sTimeBase = time;
-    }
-
-    public static TimeBase GetTimeBase()
-    {
-        return sTimeBase;
-    }
 }

Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ConditionalBranch.cs

@@ -499,10 +499,10 @@ private void UpdateFormElements(ConditionType type)
                 cmbTime1.Items.Clear();
                 cmbTime2.Items.Clear();
                 var time = new DateTime(2000, 1, 1, 0, 0, 0);
-                for (var i = 0; i < 1440; i += TimeBase.GetTimeBase().RangeInterval)
+                for (var i = 0; i < 1440; i += DaylightCycleDescriptor.Instance.RangeInterval)
                 {
                     var addRange = time.ToString("h:mm:ss tt") + " " + Strings.EventConditional.to + " ";
-                    time = time.AddMinutes(TimeBase.GetTimeBase().RangeInterval);
+                    time = time.AddMinutes(DaylightCycleDescriptor.Instance.RangeInterval);
                     addRange += time.ToString("h:mm:ss tt");
                     cmbTime1.Items.Add(addRange);
                     cmbTime2.Items.Add(addRange);

Intersect.Editor/Forms/Editors/frmTime.cs

@@ -11,11 +11,11 @@ namespace Intersect.Editor.Forms.Editors;
 public partial class FrmTime : Form
 {
 
-    private TimeBase mBackupTime;
+    private DaylightCycleDescriptor mBackupTime;
 
     private Bitmap mTileBackbuffer;
 
-    private TimeBase mYTime;
+    private DaylightCycleDescriptor mYTime;
 
     public FrmTime()
     {
@@ -45,32 +45,32 @@ private void InitLocalization()
         btnCancel.Text = Strings.TimeEditor.cancel;
     }
 
-    public void InitEditor(TimeBase time)
+    public void InitEditor(DaylightCycleDescriptor time)
     {
         //Create a backup in case we want to revert
         mYTime = time;
-        mBackupTime = new TimeBase();
+        mBackupTime = new DaylightCycleDescriptor();
         mBackupTime.LoadFromJson(time.GetInstanceJson());
 
         mTileBackbuffer = new Bitmap(pnlColor.Width, pnlColor.Height);
-        UpdateList(TimeBase.GetTimeInterval(cmbIntervals.SelectedIndex));
+        UpdateList(DaylightCycleDescriptor.GetTimeInterval(cmbIntervals.SelectedIndex));
         typeof(Panel).InvokeMember(
             "DoubleBuffered", BindingFlags.SetProperty | BindingFlags.Instance | BindingFlags.NonPublic, null,
             pnlColor, new object[] {true}
         );
 
         chkSync.Checked = mYTime.SyncTime;
         txtTimeRate.Text = mYTime.Rate.ToString();
-        cmbIntervals.SelectedIndex = TimeBase.GetIntervalIndex(mYTime.RangeInterval);
+        cmbIntervals.SelectedIndex = DaylightCycleDescriptor.GetIntervalIndex(mYTime.RangeInterval);
         UpdateList(mYTime.RangeInterval);
         txtTimeRate.Enabled = !mYTime.SyncTime;
     }
 
     private void cmbIntervals_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if (mYTime.RangeInterval != TimeBase.GetTimeInterval(cmbIntervals.SelectedIndex))
+        if (mYTime.RangeInterval != DaylightCycleDescriptor.GetTimeInterval(cmbIntervals.SelectedIndex))
         {
-            mYTime.RangeInterval = TimeBase.GetTimeInterval(cmbIntervals.SelectedIndex);
+            mYTime.RangeInterval = DaylightCycleDescriptor.GetTimeInterval(cmbIntervals.SelectedIndex);
             UpdateList(mYTime.RangeInterval);
             mYTime.ResetColors();
             grpRangeOptions.Hide();

Intersect.Editor/Forms/frmMain.cs

@@ -1522,10 +1522,10 @@ private void UpdateTimeSimulationList()
 
         btn.Click += TimeDropdownButton_Click;
         toolStripTimeButton.DropDownItems.Add(btn);
-        for (var i = 0; i < 1440; i += TimeBase.GetTimeBase().RangeInterval)
+        for (var i = 0; i < 1440; i += DaylightCycleDescriptor.Instance.RangeInterval)
         {
             var addRange = time.ToString("h:mm:ss tt") + " to ";
-            time = time.AddMinutes(TimeBase.GetTimeBase().RangeInterval);
+            time = time.AddMinutes(DaylightCycleDescriptor.Instance.RangeInterval);
             addRange += time.ToString("h:mm:ss tt");
 
             //Create image of overlay color
@@ -1539,7 +1539,7 @@ private void UpdateTimeSimulationList()
                 g.DrawImage(transtile, new System.Drawing.Point(0, 0));
             }
 
-            var clr = TimeBase.GetTimeBase().DaylightHues[x];
+            var clr = DaylightCycleDescriptor.Instance.DaylightHues[x];
             Brush brush = new SolidBrush(System.Drawing.Color.FromArgb(clr.A, clr.R, clr.G, clr.B));
             g.FillRectangle(brush, new System.Drawing.Rectangle(0, 0, 32, 32));
 
@@ -1711,7 +1711,7 @@ private void TryOpenEditorMethod(GameObjectType type)
                     if (mTimeEditor == null || mTimeEditor.Visible == false)
                     {
                         mTimeEditor = new FrmTime();
-                        mTimeEditor.InitEditor(TimeBase.GetTimeBase());
+                        mTimeEditor.InitEditor(DaylightCycleDescriptor.Instance);
                         mTimeEditor.Show();
                     }
 

Intersect.Editor/Localization/Strings.cs

@@ -212,10 +212,10 @@ public static string GetEventConditionalDesc(TimeBetweenCondition condition)
     {
         var timeRanges = new List<string>();
         var time = new DateTime(2000, 1, 1, 0, 0, 0);
-        for (var i = 0; i < 1440; i += TimeBase.GetTimeBase().RangeInterval)
+        for (var i = 0; i < 1440; i += DaylightCycleDescriptor.Instance.RangeInterval)
         {
             var addRange = time.ToString("h:mm:ss tt") + " to ";
-            time = time.AddMinutes(TimeBase.GetTimeBase().RangeInterval);
+            time = time.AddMinutes(DaylightCycleDescriptor.Instance.RangeInterval);
             addRange += time.ToString("h:mm:ss tt");
             timeRanges.Add(addRange);
         }

Intersect.Editor/Networking/PacketHandler.cs

@@ -750,6 +750,6 @@ public void HandlePacket(IPacketSender packetSender, OpenEditorPacket packet)
     //TimeDataPacket
     public void HandlePacket(IPacketSender packetSender, TimeDataPacket packet)
     {
-        TimeBase.GetTimeBase().LoadFromJson(packet.TimeJson);
+        DaylightCycleDescriptor.Instance.LoadFromJson(packet.TimeJson);
     }
 }

Intersect.Server.Core/Database/DbInterface.cs

@@ -1837,13 +1837,13 @@ private static void LoadTime()
                 var time = context.Time.OrderBy(t => t.Id).FirstOrDefault();
                 if (time == null)
                 {
-                    context.Time.Add(TimeBase.GetTimeBase());
+                    context.Time.Add(DaylightCycleDescriptor.Instance);
                     context.ChangeTracker.DetectChanges();
                     context.SaveChanges();
                 }
                 else
                 {
-                    TimeBase.SetStaticTime(time);
+                    DaylightCycleDescriptor.Instance = time;
                 }
             }
             Time.Init();
@@ -1861,7 +1861,7 @@ public static void SaveTime()
         {
             using (var context = CreateGameContext(readOnly: false))
             {
-                context.Time.Update(TimeBase.GetTimeBase());
+                context.Time.Update(DaylightCycleDescriptor.Instance);
                 context.ChangeTracker.DetectChanges();
                 context.SaveChanges();
             }

Intersect.Server.Core/Database/GameData/GameContext.cs

@@ -78,7 +78,7 @@ protected GameContext(DatabaseContextOptions databaseContextOptions) : base(data
     public DbSet<TilesetDescriptor> Tilesets { get; set; }
 
     //Time
-    public DbSet<TimeBase> Time { get; set; }
+    public DbSet<DaylightCycleDescriptor> Time { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

Intersect.Server.Core/Database/GameData/IGameContext.cs

@@ -48,5 +48,5 @@ public interface IGameContext : IDbContext
 
     DbSet<TilesetDescriptor> Tilesets { get; set; }
 
-    DbSet<TimeBase> Time { get; set; }
+    DbSet<DaylightCycleDescriptor> Time { get; set; }
 }